GBA: Remove legacy "mirroring" field from overrides

This commit is contained in:
Vicki Pfau 2024-03-25 01:23:39 -07:00
parent abf484638e
commit 4a17ed3b9c
4 changed files with 101 additions and 116 deletions

View File

@ -96,7 +96,6 @@ struct GBACartridgeOverride {
enum GBASavedataType savetype; enum GBASavedataType savetype;
int hardware; int hardware;
uint32_t idleLoop; uint32_t idleLoop;
bool mirroring;
bool vbaBugCompat; bool vbaBugCompat;
}; };

View File

@ -138,8 +138,6 @@ struct GBAMemory {
struct GBAPrintContext agbPrintCtxBackup; struct GBAPrintContext agbPrintCtxBackup;
uint32_t agbPrintFuncBackup; uint32_t agbPrintFuncBackup;
uint16_t* agbPrintBufferBackup; uint16_t* agbPrintBufferBackup;
bool mirroring;
}; };
struct GBA; struct GBA;

View File

@ -13,47 +13,47 @@
static const struct GBACartridgeOverride _overrides[] = { static const struct GBACartridgeOverride _overrides[] = {
// Advance Wars // Advance Wars
{ "AWRE", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8038810, false }, { "AWRE", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8038810 },
{ "AWRP", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8038810, false }, { "AWRP", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8038810 },
// Advance Wars 2: Black Hole Rising // Advance Wars 2: Black Hole Rising
{ "AW2E", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8036E08, false }, { "AW2E", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8036E08 },
{ "AW2P", GBA_SAVEDATA_FLASH512, HW_NONE, 0x803719C, false }, { "AW2P", GBA_SAVEDATA_FLASH512, HW_NONE, 0x803719C },
// Boktai: The Sun is in Your Hand // Boktai: The Sun is in Your Hand
{ "U3IJ", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE, false }, { "U3IJ", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE },
{ "U3IE", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE, false }, { "U3IE", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE },
{ "U3IP", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE, false }, { "U3IP", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE },
// Boktai 2: Solar Boy Django // Boktai 2: Solar Boy Django
{ "U32J", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE, false }, { "U32J", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE },
{ "U32E", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE, false }, { "U32E", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE },
{ "U32P", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE, false }, { "U32P", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE },
// Crash Bandicoot 2 - N-Tranced // Crash Bandicoot 2 - N-Tranced
{ "AC8J", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "AC8J", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "AC8E", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "AC8E", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "AC8P", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "AC8P", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// DigiCommunication Nyo - Datou! Black Gemagema Dan // DigiCommunication Nyo - Datou! Black Gemagema Dan
{ "BDKJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BDKJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// Dragon Ball Z - The Legacy of Goku // Dragon Ball Z - The Legacy of Goku
{ "ALGP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ALGP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// Dragon Ball Z - The Legacy of Goku II // Dragon Ball Z - The Legacy of Goku II
{ "ALFJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ALFJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "ALFE", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ALFE", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "ALFP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ALFP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// Dragon Ball Z - Taiketsu // Dragon Ball Z - Taiketsu
{ "BDBE", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BDBE", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BDBP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BDBP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// Drill Dozer // Drill Dozer
{ "V49J", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE, false }, { "V49J", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE },
{ "V49E", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE, false }, { "V49E", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE },
{ "V49P", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE, false }, { "V49P", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE },
// e-Reader // e-Reader
{ "PEAJ", GBA_SAVEDATA_FLASH1M, HW_EREADER, GBA_IDLE_LOOP_NONE }, { "PEAJ", GBA_SAVEDATA_FLASH1M, HW_EREADER, GBA_IDLE_LOOP_NONE },
@ -61,156 +61,146 @@ static const struct GBACartridgeOverride _overrides[] = {
{ "PSAE", GBA_SAVEDATA_FLASH1M, HW_EREADER, GBA_IDLE_LOOP_NONE }, { "PSAE", GBA_SAVEDATA_FLASH1M, HW_EREADER, GBA_IDLE_LOOP_NONE },
// Final Fantasy Tactics Advance // Final Fantasy Tactics Advance
{ "AFXE", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8000428, false }, { "AFXE", GBA_SAVEDATA_FLASH512, HW_NONE, 0x8000428 },
// F-Zero - Climax // F-Zero - Climax
{ "BFTJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BFTJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
// Goodboy Galaxy // Goodboy Galaxy
{ "2GBP", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE, false }, { "2GBP", GBA_SAVEDATA_SRAM, HW_RUMBLE, GBA_IDLE_LOOP_NONE },
// Iridion II // Iridion II
{ "AI2E", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "AI2E", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "AI2P", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "AI2P", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE },
// Game Boy Wars Advance 1+2 // Game Boy Wars Advance 1+2
{ "BGWJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BGWJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
// Golden Sun: The Lost Age // Golden Sun: The Lost Age
{ "AGFE", GBA_SAVEDATA_FLASH512, HW_NONE, 0x801353A, false }, { "AGFE", GBA_SAVEDATA_FLASH512, HW_NONE, 0x801353A },
// Koro Koro Puzzle - Happy Panechu! // Koro Koro Puzzle - Happy Panechu!
{ "KHPJ", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE, false }, { "KHPJ", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE },
// Legendz - Yomigaeru Shiren no Shima // Legendz - Yomigaeru Shiren no Shima
{ "BLJJ", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "BLJJ", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "BLJK", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "BLJK", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE },
// Legendz - Sign of Nekuromu // Legendz - Sign of Nekuromu
{ "BLVJ", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "BLVJ", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE },
// Mega Man Battle Network // Mega Man Battle Network
{ "AREE", GBA_SAVEDATA_SRAM, HW_NONE, 0x800032E, false }, { "AREE", GBA_SAVEDATA_SRAM, HW_NONE, 0x800032E },
// Mega Man Zero // Mega Man Zero
{ "AZCE", GBA_SAVEDATA_SRAM, HW_NONE, 0x80004E8, false }, { "AZCE", GBA_SAVEDATA_SRAM, HW_NONE, 0x80004E8 },
// Metal Slug Advance // Metal Slug Advance
{ "BSME", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8000290, false }, { "BSME", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8000290 },
// Pokemon Ruby // Pokemon Ruby
{ "AXVJ", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXVJ", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXVE", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXVE", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXVP", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXVP", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXVI", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXVI", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXVS", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXVS", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXVD", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXVD", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXVF", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXVF", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
// Pokemon Sapphire // Pokemon Sapphire
{ "AXPJ", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXPJ", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXPE", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXPE", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXPP", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXPP", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXPI", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXPI", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXPS", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXPS", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXPD", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXPD", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
{ "AXPF", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "AXPF", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
// Pokemon Emerald // Pokemon Emerald
{ "BPEJ", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6, false }, { "BPEJ", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6 },
{ "BPEE", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6, false }, { "BPEE", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6 },
{ "BPEP", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6, false }, { "BPEP", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6 },
{ "BPEI", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6, false }, { "BPEI", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6 },
{ "BPES", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6, false }, { "BPES", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6 },
{ "BPED", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6, false }, { "BPED", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6 },
{ "BPEF", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6, false }, { "BPEF", GBA_SAVEDATA_FLASH1M, HW_RTC, 0x80008C6 },
// Pokemon Mystery Dungeon // Pokemon Mystery Dungeon
{ "B24E", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "B24E", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "B24P", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "B24P", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
// Pokemon FireRed // Pokemon FireRed
{ "BPRJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPRJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPRE", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPRE", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPRP", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPRP", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPRI", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPRI", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPRS", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPRS", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPRD", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPRD", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPRF", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPRF", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
// Pokemon LeafGreen // Pokemon LeafGreen
{ "BPGJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPGJ", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPGE", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPGE", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPGP", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPGP", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPGI", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPGI", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPGS", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPGS", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPGD", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPGD", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "BPGF", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BPGF", GBA_SAVEDATA_FLASH1M, HW_NONE, GBA_IDLE_LOOP_NONE },
// RockMan EXE 4.5 - Real Operation // RockMan EXE 4.5 - Real Operation
{ "BR4J", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "BR4J", GBA_SAVEDATA_FLASH512, HW_RTC, GBA_IDLE_LOOP_NONE },
// Rocky // Rocky
{ "AR8E", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "AR8E", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "AROP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "AROP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// Sennen Kazoku // Sennen Kazoku
{ "BKAJ", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE, false }, { "BKAJ", GBA_SAVEDATA_FLASH1M, HW_RTC, GBA_IDLE_LOOP_NONE },
// Shin Bokura no Taiyou: Gyakushuu no Sabata // Shin Bokura no Taiyou: Gyakushuu no Sabata
{ "U33J", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE, false }, { "U33J", GBA_SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, GBA_IDLE_LOOP_NONE },
// Stuart Little 2 // Stuart Little 2
{ "ASLE", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ASLE", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "ASLF", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ASLF", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE },
// Super Mario Advance 2 // Super Mario Advance 2
{ "AA2J", GBA_SAVEDATA_EEPROM, HW_NONE, 0x800052E, false }, { "AA2J", GBA_SAVEDATA_EEPROM, HW_NONE, 0x800052E },
{ "AA2E", GBA_SAVEDATA_EEPROM, HW_NONE, 0x800052E, false }, { "AA2E", GBA_SAVEDATA_EEPROM, HW_NONE, 0x800052E },
{ "AA2P", GBA_SAVEDATA_AUTODETECT, HW_NONE, 0x800052E, false }, { "AA2P", GBA_SAVEDATA_AUTODETECT, HW_NONE, 0x800052E },
// Super Mario Advance 3 // Super Mario Advance 3
{ "A3AJ", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8002B9C, false }, { "A3AJ", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8002B9C },
{ "A3AE", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8002B9C, false }, { "A3AE", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8002B9C },
{ "A3AP", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8002B9C, false }, { "A3AP", GBA_SAVEDATA_EEPROM, HW_NONE, 0x8002B9C },
// Super Mario Advance 4 // Super Mario Advance 4
{ "AX4J", GBA_SAVEDATA_FLASH1M, HW_NONE, 0x800072A, false }, { "AX4J", GBA_SAVEDATA_FLASH1M, HW_NONE, 0x800072A },
{ "AX4E", GBA_SAVEDATA_FLASH1M, HW_NONE, 0x800072A, false }, { "AX4E", GBA_SAVEDATA_FLASH1M, HW_NONE, 0x800072A },
{ "AX4P", GBA_SAVEDATA_FLASH1M, HW_NONE, 0x800072A, false }, { "AX4P", GBA_SAVEDATA_FLASH1M, HW_NONE, 0x800072A },
// Super Monkey Ball Jr. // Super Monkey Ball Jr.
{ "ALUE", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ALUE", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
{ "ALUP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "ALUP", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// Top Gun - Combat Zones // Top Gun - Combat Zones
{ "A2YE", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "A2YE", GBA_SAVEDATA_FORCE_NONE, HW_NONE, GBA_IDLE_LOOP_NONE },
// Ueki no Housoku - Jingi Sakuretsu! Nouryokusha Battle // Ueki no Housoku - Jingi Sakuretsu! Nouryokusha Battle
{ "BUHJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "BUHJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE },
// Wario Ware Twisted // Wario Ware Twisted
{ "RZWJ", GBA_SAVEDATA_SRAM, HW_RUMBLE | HW_GYRO, GBA_IDLE_LOOP_NONE, false }, { "RZWJ", GBA_SAVEDATA_SRAM, HW_RUMBLE | HW_GYRO, GBA_IDLE_LOOP_NONE },
{ "RZWE", GBA_SAVEDATA_SRAM, HW_RUMBLE | HW_GYRO, GBA_IDLE_LOOP_NONE, false }, { "RZWE", GBA_SAVEDATA_SRAM, HW_RUMBLE | HW_GYRO, GBA_IDLE_LOOP_NONE },
{ "RZWP", GBA_SAVEDATA_SRAM, HW_RUMBLE | HW_GYRO, GBA_IDLE_LOOP_NONE, false }, { "RZWP", GBA_SAVEDATA_SRAM, HW_RUMBLE | HW_GYRO, GBA_IDLE_LOOP_NONE },
// Yoshi's Universal Gravitation // Yoshi's Universal Gravitation
{ "KYGJ", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE, false }, { "KYGJ", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE },
{ "KYGE", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE, false }, { "KYGE", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE },
{ "KYGP", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE, false }, { "KYGP", GBA_SAVEDATA_EEPROM, HW_TILT, GBA_IDLE_LOOP_NONE },
// Aging cartridge // Aging cartridge
{ "TCHK", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false }, { "TCHK", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, },
// Famicom Mini series 3 (FDS), some aren't mirrored (22 - 28)
// See https://forum.no-intro.org/viewtopic.php?f=2&t=4221 for discussion
{ "FNMJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false },
{ "FMRJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false },
{ "FPTJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false },
{ "FLBJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false },
{ "FFMJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false },
{ "FTKJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false },
{ "FTUJ", GBA_SAVEDATA_EEPROM, HW_NONE, GBA_IDLE_LOOP_NONE, false },
{ { 0, 0, 0, 0 }, 0, 0, GBA_IDLE_LOOP_NONE, false } { { 0, 0, 0, 0 }, 0, 0, GBA_IDLE_LOOP_NONE, false }
}; };
@ -219,7 +209,6 @@ bool GBAOverrideFind(const struct Configuration* config, struct GBACartridgeOver
override->savetype = GBA_SAVEDATA_AUTODETECT; override->savetype = GBA_SAVEDATA_AUTODETECT;
override->hardware = HW_NONE; override->hardware = HW_NONE;
override->idleLoop = GBA_IDLE_LOOP_NONE; override->idleLoop = GBA_IDLE_LOOP_NONE;
override->mirroring = false;
override->vbaBugCompat = false; override->vbaBugCompat = false;
bool found = false; bool found = false;

View File

@ -156,7 +156,6 @@ void OverrideView::updateOverrides() {
gba->override.savetype = static_cast<GBASavedataType>(m_ui.savetype->currentIndex() - 1); gba->override.savetype = static_cast<GBASavedataType>(m_ui.savetype->currentIndex() - 1);
gba->override.hardware = HW_NO_OVERRIDE; gba->override.hardware = HW_NO_OVERRIDE;
gba->override.idleLoop = GBA_IDLE_LOOP_NONE; gba->override.idleLoop = GBA_IDLE_LOOP_NONE;
gba->override.mirroring = false;
gba->override.vbaBugCompat = false; gba->override.vbaBugCompat = false;
gba->vbaBugCompatSet = false; gba->vbaBugCompatSet = false;