From c9c42fb3319151221f317b3cbc255f6d117af5b9 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 18 Aug 2017 17:36:59 -0400 Subject: Removed dependency on ROM-internal arrays I looked at the base stats array and determined that, especially if I limited it to just the data I needed, that it wouldn't be too bad a thing to just include it and the other two arrays I need in my multiboot image rather than reference the ones already located in the game ROM. This way, we get back compatibility with all previously-compatible ROMs, and not just ones that I have dumped. New issue: Deoxys's base stats are actually different per-game, though, so a special case will have to be written for that. --- gba/source/gamedata.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gba/source/gamedata.c') diff --git a/gba/source/gamedata.c b/gba/source/gamedata.c index ae593b1..271eaf9 100644 --- a/gba/source/gamedata.c +++ b/gba/source/gamedata.c @@ -140,9 +140,6 @@ bool initSaveData(struct GameData* gameData) pSaveBlock1 gSaveBlock1; pSaveBlock2 gSaveBlock2; pSaveBlock3 gSaveBlock3; - struct BaseStats* gBaseStats; - const u32 (*gExpTables)[101]; - const u16* gNatOrder; //u32 titlemid = 0; // get the address of the save loading function. @@ -345,9 +342,6 @@ bool initSaveData(struct GameData* gameData) //mainloop = (void(*)()) 0x8000429; //titlemid = 0x807928f; //load_pokemon = (void(*)()) 0x804c245; - gBaseStats = (struct BaseStats*) ( GAME_FR ? 0 : 0x82547d0 ); - gExpTables = (ExperienceTables) ( GAME_FR ? 0 : 0x8253b30 ); - gNatOrder = (const u16*) ( GAME_FR ? 0 : 0x825203a ); break; } @@ -518,9 +512,6 @@ bool initSaveData(struct GameData* gameData) gameData->SaveBlock1 = gSaveBlock1; gameData->SaveBlock2 = gSaveBlock2; gameData->SaveBlock3 = gSaveBlock3; - gameData->baseStats = gBaseStats; - gameData->expTables = gExpTables; - gameData->natOrder = gNatOrder; return true; } -- cgit 1.4.1