Skip to content

Commit 2143c38

Browse files
committed
ntsc-j 1.0 support
1 parent 3066a60 commit 2143c38

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

soh/soh/Extractor/Extract.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static constexpr uint32_t OOT_PAL_GC_DBG2 = 0x87121EFE; // 03-13-2002 build
5858
static constexpr uint32_t OOT_PAL_GC_MQ_DBG = 0x917D18F6;
5959
static constexpr uint32_t OOT_PAL_10 = 0xB044B569;
6060
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;
6262

6363
static const std::unordered_map<uint32_t, const char*> verMap = {
6464
{ OOT_PAL_GC, "PAL Gamecube" },
@@ -68,11 +68,11 @@ static const std::unordered_map<uint32_t, const char*> verMap = {
6868
{ OOT_PAL_GC_MQ_DBG, "PAL MQ Debug" },
6969
{ OOT_PAL_10, "PAL N64 1.0" },
7070
{ 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" },
7272
};
7373

7474
// 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 = {
7676
0xfa8c0555, // MQ DBG 64MB (Original overdump)
7777
0x8652ac4c, // MQ DBG 64MB
7878
0x5B8A1EB7, // MQ DBG 64MB (Empty overdump)
@@ -84,6 +84,7 @@ static constexpr std::array<const uint32_t, 11> goodCrcs = {
8484
0xFD9913B1, // N64 PAL 1.0
8585
0xE033FBBA, // N64 PAL 1.1
8686
0x460C938C, // N64 NTSC US 1.0
87+
0xD0C76FA9, // N64 NTSC JP 1.0
8788
};
8889

8990
enum class ButtonId : int {
@@ -535,7 +536,7 @@ const char* Extractor::GetZapdVerStr() const {
535536
return "N64_PAL_10";
536537
case OOT_PAL_11:
537538
return "N64_PAL_11";
538-
case OOT_NTSC_US_10:
539+
case OOT_NTSC_10:
539540
return "N64_NTSC_10";
540541
default:
541542
// We should never be in a state where this path happens.

0 commit comments

Comments
 (0)