Merge pull request #638 from splash5/snes-ae6j

Fix SNES Daikaijuu Monogatari 2
This commit is contained in:
sanni 2022-11-24 10:16:06 +01:00 committed by GitHub
commit a93a9e51de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions

View File

@ -793,7 +793,10 @@ void getCartInfo_SNES() {
println_Msg(F("SDD1")); println_Msg(F("SDD1"));
} else if (romChips == 69) { } else if (romChips == 69) {
println_Msg(F("SDD1 BATT")); println_Msg(F("SDD1 BATT"));
} else if (romChips == 227) }
else if (romChips == 85)
println_Msg(F("SRTC RAM BATT"));
else if (romChips == 227)
println_Msg(F("RAM GBoy")); println_Msg(F("RAM GBoy"));
else if (romChips == 243) else if (romChips == 243)
println_Msg(F("CX4")); println_Msg(F("CX4"));
@ -908,7 +911,7 @@ void checkAltConf(char crcStr[9]) {
println_Msg(F("Found")); println_Msg(F("Found"));
display_Update(); display_Update();
// Game found, check if ROM sizes differ but only change ROM size if non- standard size found in database, else trust the header to be right and the database to be wrong // Game found, check if ROM sizes differ but only change ROM size if non- standard size found in database, else trust the header to be right and the database to be wrong
if (((romSize != romSize2) || (numBanks != numBanks2)) && ((romSize2 == 10) || (romSize2 == 12) || (romSize2 == 20) || (romSize2 == 24) || (romSize2 == 48))) { if (((romSize != romSize2) || (numBanks != numBanks2)) && ((romSize2 == 10) || (romSize2 == 12) || (romSize2 == 20) || (romSize2 == 24) || (romSize2 == 40) || (romSize2 == 48))) {
// Correct size // Correct size
println_Msg(F("Correcting size")); println_Msg(F("Correcting size"));
print_Msg(F("Size: ")); print_Msg(F("Size: "));
@ -1452,7 +1455,14 @@ void readROM_SNES() {
println_Msg(F("Dumping HiRom...")); println_Msg(F("Dumping HiRom..."));
display_Update(); display_Update();
readHiRomBanks(192, numBanks + 192, &myFile); if (romChips == 85) {
// Daikaijuu Monogatari 2, keeps out S-RTC register area
readHiRomBanks(192, 192 + 64, &myFile);
readHiRomBanks(64, numBanks, &myFile); // (64 + (numBanks - 64))
}
else {
readHiRomBanks(192, numBanks + 192, &myFile);
}
} }
// Close the file: // Close the file:

View File

@ -1625,7 +1625,7 @@ Daikaijuu Monogatari (Japan).sfc
39CA5291,1C07,C721B252,24,048 39CA5291,1C07,C721B252,24,048
Daikaijuu Monogatari II (Japan).sfc Daikaijuu Monogatari II (Japan).sfc
A6C98FFE,E620,6E120C5C,40,160 A6C98FFE,8528,E3982D11,40,080
Daikoukai Jidai II (Japan).sfc Daikoukai Jidai II (Japan).sfc
EEBC4170,6145,96A59072,16,032 EEBC4170,6145,96A59072,16,032