diff --git a/include/rom_data.h b/include/rom_data.h index 24c8bd2..dab1bfd 100644 --- a/include/rom_data.h +++ b/include/rom_data.h @@ -37,35 +37,15 @@ public: int version; int language; - int loc_sendMonToPC; - int loc_gSpecialVar_0x8000; - int loc_gSaveBlock1; // Only used in R/S - int loc_setPokedexFlag; - int loc_gSaveDataBuffer; // The location of the saveDataBuffer - int loc_readFlashSector; - int loc_loadSaveSection30; // The location of the function that loads save section 30: CEReaderTool_LoadTrainerTower_r in FRLG, TryReadTrainerHill_Internal in Emerald - int loc_m4aMPlayStop; - int loc_gMPlayInfo_BGM; - int loc_gMPlayInfo_SE2; - int loc_MPlayStart; - int loc_CreateFanfareTask; - int loc_sFanfareCounter; - int loc_gPlttBufferFaded; - int loc_gSprites; int loc_gMonIconPalettes; - int loc_voicegroup; - int loc_sPicTable_NPC; int loc_gMonFrontPicTable; int loc_gMonPaletteTable; int loc_gMonShinyPaletteTable; int loc_gMonIconTable; int loc_gMonIconPaletteIndices; - int offset_ramscript; // Ramscript offset as found within the SaveBlock1 struct in global.h int offset_flags; // Flag offset as found within the SaveBlock1 struct in global.h int offset_wondercard; int offset_script; - int text_region; - int special_DrawWholeMapView; // PKHeX's list of flags is useful for making sure the detection is accurate: https://github.com/kwsch/PKHeX/blob/78a557c3cdaa6f48b42cc96df8ccb4d20b897937/PKHeX.Core/Resources/text/other/flags_rs.txt int e4_flag; // The flag that is set when you become champion. Often listed as "GAME_CLEAR" @@ -77,14 +57,11 @@ public: u8 map_bank; u8 map_id; u8 npc_id; - u8 npc_palette; u8 def_map_bank; u8 def_map_id; u8 def_npc_id; - int loc_gSaveBlock1PTR; // TODO: Only used for old script, can be removed later - private: void fill_values(const ROM_DATA *rom_values); }; diff --git a/source/rom_data.cpp b/source/rom_data.cpp index 20f544f..163bd76 100644 --- a/source/rom_data.cpp +++ b/source/rom_data.cpp @@ -91,37 +91,16 @@ bool rom_data::load_rom(bool debug) void rom_data::fill_values(const ROM_DATA *rom_values) { - loc_sendMonToPC = rom_values->loc_copyMonToPC; - loc_gSpecialVar_0x8000 = rom_values->loc_gSpecialVar_0x8000; - loc_gSaveBlock1 = rom_values->loc_gSaveBlock1; - loc_setPokedexFlag = rom_values->loc_getSetPokedexFlag; - loc_gSaveDataBuffer = rom_values->loc_gSaveDataBuffer; - loc_readFlashSector = rom_values->loc_readFlashSector; - loc_loadSaveSection30 = rom_values->loc_loadSaveSection30; - loc_m4aMPlayStop = rom_values->loc_m4aMPlayStop; - loc_gMPlayInfo_BGM = rom_values->loc_gMPlayInfo_BGM; - loc_gMPlayInfo_SE2 = rom_values->loc_gMPlayInfo_SE2; - loc_MPlayStart = rom_values->loc_MPlayStart; - loc_CreateFanfareTask = rom_values->loc_CreateFanfareTask; - loc_sFanfareCounter = rom_values->loc_sFanfareCounter; - loc_gPlttBufferFaded = rom_values->loc_gPlttBufferFaded; - loc_gSprites = rom_values->loc_gSprites; - loc_voicegroup = rom_values->loc_voicegroup; - loc_sPicTable_NPC = rom_values->loc_sPicTable_NPC; - + loc_gMonIconPalettes = rom_values->loc_gMonIconPalettes; loc_gMonFrontPicTable = rom_values->loc_gMonFrontPicTable; loc_gMonPaletteTable = rom_values->loc_gMonPaletteTable; loc_gMonShinyPaletteTable = rom_values->loc_gMonShinyPaletteTable; loc_gMonIconTable = rom_values->loc_gMonIconTable; loc_gMonIconPaletteIndices = rom_values->loc_gMonIconPaletteIndices; - loc_gMonIconPalettes = rom_values->loc_gMonIconPalettes; - offset_ramscript = rom_values->offset_ramscript; offset_flags = rom_values->offset_flags; offset_wondercard = rom_values->offset_wondercard; offset_script = rom_values->offset_script; - text_region = rom_values->text_region; - special_DrawWholeMapView = rom_values->special_DrawWholeMapView; e4_flag = rom_values->e4_flag; // The flag that is set when you become champion. Often listed as "GAME_CLEAR" mg_flag = rom_values->mg_flag; // The flag that is set when you enable Mystery Gift. Known as "EXDATA_ENABLE" in RS @@ -132,13 +111,10 @@ void rom_data::fill_values(const ROM_DATA *rom_values) map_bank = rom_values->map_bank; map_id = rom_values->map_id; npc_id = rom_values->npc_id; - npc_palette = rom_values->npc_palette; def_map_bank = rom_values->def_map_bank; def_map_id = rom_values->def_map_id; def_npc_id = rom_values->def_npc_id; - - loc_gSaveBlock1PTR = rom_values->loc_gSaveBlock1PTR; // TODO: Only used for old script, can be removed later } bool rom_data::is_hoenn()