@@ -58,7 +58,7 @@ static constexpr uint32_t OOT_PAL_GC_DBG2 = 0x87121EFE; // 03-13-2002 build
58
58
static constexpr uint32_t OOT_PAL_GC_MQ_DBG = 0x917D18F6 ;
59
59
static constexpr uint32_t OOT_PAL_10 = 0xB044B569 ;
60
60
static constexpr uint32_t OOT_PAL_11 = 0xB2055FBD ;
61
- static constexpr uint32_t OOT_NTSC_US_10 = 0xEC7011B7 ;
61
+ static constexpr uint32_t OOT_NTSC_10 = 0xEC7011B7 ;
62
62
63
63
static const std::unordered_map<uint32_t , const char *> verMap = {
64
64
{ OOT_PAL_GC, " PAL Gamecube" },
@@ -68,11 +68,11 @@ static const std::unordered_map<uint32_t, const char*> verMap = {
68
68
{ OOT_PAL_GC_MQ_DBG, " PAL MQ Debug" },
69
69
{ OOT_PAL_10, " PAL N64 1.0" },
70
70
{ OOT_PAL_11, " PAL N64 1.1" },
71
- { OOT_NTSC_US_10 , " NTSC US N64 1.0" },
71
+ { OOT_NTSC_10 , " NTSC N64 1.0" },
72
72
};
73
73
74
74
// TODO only check the first 54MB of the rom.
75
- static constexpr std::array<const uint32_t , 11 > goodCrcs = {
75
+ static constexpr std::array<const uint32_t , 12 > goodCrcs = {
76
76
0xfa8c0555 , // MQ DBG 64MB (Original overdump)
77
77
0x8652ac4c , // MQ DBG 64MB
78
78
0x5B8A1EB7 , // MQ DBG 64MB (Empty overdump)
@@ -84,6 +84,7 @@ static constexpr std::array<const uint32_t, 11> goodCrcs = {
84
84
0xFD9913B1 , // N64 PAL 1.0
85
85
0xE033FBBA , // N64 PAL 1.1
86
86
0x460C938C , // N64 NTSC US 1.0
87
+ 0xD0C76FA9 , // N64 NTSC JP 1.0
87
88
};
88
89
89
90
enum class ButtonId : int {
@@ -535,7 +536,7 @@ const char* Extractor::GetZapdVerStr() const {
535
536
return " N64_PAL_10" ;
536
537
case OOT_PAL_11:
537
538
return " N64_PAL_11" ;
538
- case OOT_NTSC_US_10 :
539
+ case OOT_NTSC_10 :
539
540
return " N64_NTSC_10" ;
540
541
default :
541
542
// We should never be in a state where this path happens.
0 commit comments