diff --git a/modules/data/symbols/patches/language/pokeemerald.json b/modules/data/symbols/patches/language/pokeemerald.json deleted file mode 100644 index 5417500c..00000000 --- a/modules/data/symbols/patches/language/pokeemerald.json +++ /dev/null @@ -1,892 +0,0 @@ -{ - "CB2_OVERWORLD":{ - "D":"8085e78", - "F":"8085e6c", - "I":"8085e70", - "J":"80857C4", - "S":"8085e70" - }, - "CB2_STARTERCHOOSE":{ - "D":"8133e04", - "F":"8133e24", - "I":"8133df0", - "J":"8134198", - "S":"8133df8" - }, - "CB2_INITCOPYRIGHTSCREENAFTERBOOTUP":{ - "D":"816cb14", - "F":"816cc3c", - "I":"816cb04", - "J":"816cc90", - "S":"816cc14" - }, - "MAINCB2_INTRO":{ - "D":"816c868", - "F":"816c990", - "I":"816c858", - "J":"816ca10", - "S":"816c968" - }, - "MAINCB2_ENDINTRO":{ - "D":"816c8bc", - "F":"816c9e4", - "I":"16c8ac", - "J":"816ca64", - "S":"816c9bc" - }, - "CB2_INITTITLESCREEN":{ - "D":"80aa7c0", - "F":"80aa7b8", - "I":"80aa7b8", - "J":"80aa06c", - "S":"80aa7b8" - }, - "MAINCB2":{ - "D":"80aab48", - "F":"80aab40", - "I":"80aab40", - "J":"80aa400", - "S":"80aab40" - }, - "CB2_GOTOMAINMENU":{ - "D":"80aaed4", - "F":"80aaecc", - "I":"80aaecc", - "J":"80aa7b4", - "S":"80aaecc" - }, - "CB2_INITMAINMENU":{ - "D":"802f6e0", - "I":"802f6e0", - "J":"802f340" - }, - "CB2_MAINMENU":{ - "D":"802f6b4", - "I":"802f6b4", - "J":"802f314" - }, - "CB2_CONTINUESAVEDGAME":{ - "D":"808624c", - "F":"8086240", - "I":"8086244", - "J":"8085b98", - "S":"8086244" - }, - "CB2_RETURNTOFIELDLOCAL":{ - "D":"8086110", - "F":"8086104", - "I":"8086108", - "J":"8085a5c", - "S":"8086108" - }, - "CB2_OVERWORLDBASIC":{ - "D":"8085e6c", - "F":"8085e60", - "I":"8085e64", - "J":"80857b8", - "S":"8085e64" - }, - "CB2_INITBATTLE":{ - "D":"8036764", - "I":"8036764", - "J":"80365b4" - }, - "CB2_HANDLESTARTBATTLE":{ - "D":"8036fb0", - "I":"8036fb0", - "J":"8036e00" - }, - "CB2_RETURNTOFIELD":{ - "D":"80860e4", - "F":"80860d8", - "I":"80860dc", - "J":"8085a30", - "S":"80860dc" - }, - "CB2_RETURNTOFIELDCONTINUESCRIPTPLAYMAPMUSIC":{ - "D":"80861e8", - "F":"80861dc", - "I":"80861e0", - "J":"8085b34", - "S":"80861e0" - }, - "CB2_BAGMENURUN":{ - "D":"81aa868", - "F":"81aa988", - "I":"81aa854", - "J":"81aaad4", - "S":"81aa960" - }, - "CB2_UPDATEPARTYMENU":{ - "D":"81afcd8", - "F":"81afdec", - "I":"81afcb8", - "J":"81afe88", - "S":"81afdd0" - }, - "CB2_FLYMAP":{ - "D":"81244f8", - "F":"8124518", - "I":"81244e4", - "J":"81248e0", - "S":"81244ec" - }, - "CB2_LOADEGGHATCH":{ - "F":"807179c", - "J":"80711a8", - "S":"807179c" - }, - "CB2_EGGHATCH":{ - "F":"8071a90", - "J":"8071498", - "S":"8071a90" - }, - "CB2_BEGINEVOLUTIONSCENE":{ - "D":"813d5ec", - "F":"813d60c", - "I":"813d5dc", - "J":"813dab4", - "S":"813d5e4" - }, - "CB2_EVOLUTIONSCENEUPDATE":{ - "D":"813dfe0", - "F":"813e000", - "I":"813dfd0", - "J":"813e4a8", - "S":"813dfd8" - }, - "CB2_WHITEOUT":{ - "D":"8085f74", - "F":"8085f68", - "I":"8085f6c", - "J":"80858c0", - "S":"8085f6c" - }, - "BattleMainCB1":{ - "J":"8039b35" - }, - "BattleMainCB2":{ - "D":"8038424", - "F":"8038420", - "I":"8038424", - "J":"80380fc", - "S":"8038420" - }, - "TASK_HANDLEMONANIMATION":{ - "D":"817ef90", - "F":"817f0b0", - "I":"817ef80", - "J":"817F344", - "S":"817f088" - }, - "TASK_PLAYCRYWHENRELEASEDFROMBALL":{ - "F":"8075ab8", - "I":"8075abc", - "J":"80754c4", - "S":"8075ab8" - }, - "Task_Fishing":{ - "D":"808c8dc", - "F":"808c8d0", - "I":"808c8d4", - "J":"808c224", - "S":"808c8d4" - }, - "Task_HandleStarterChooseInput":{ - "D":"8133e80", - "F":"8133ea0", - "I":"8133e6c", - "J":"8134214", - "S":"8133e74" - }, - "Task_DuckBGMForPokemonCry":{ - "D":"0x80a3728", - "F":"0x80a3720", - "I":"0x80a3720", - "J":"0x80a2fd4", - "S":"0x80a3720" - }, - "TASK_HANDLECONFIRMSTARTERINPUT":{ - "D":"8134024", - "F":"8134044", - "I":"8134010", - "J":"81343b8", - "S":"8134018" - }, - "Task_BattleStart":{ - "D":"80b060c", - "F":"80b0604", - "I":"80b0604", - "J":"80afeec", - "S":"80b0604" - }, - "Task_ReturnToFieldNoScript":{ - "D":"80af6cc", - "F":"80af6c4", - "I":"80af6c4", - "J":"80aefac", - "S":"80af6c4" - }, - "Task_HandleChooseMonInput":{ - "D":"81b0e98", - "F":"81b0fac", - "I":"81b0e78", - "J":"81b1040", - "S":"81b0f90" - }, - "Task_EvolutionScene":{ - "D":"813e1ac", - "F":"813e1cc", - "I":"813e19c", - "J":"813e638", - "S":"813e1a4" - }, - "Task_HandleReplaceMoveInput":{ - "D":"81c1274", - "F":"81c1388", - "I":"81c1254", - "J":"81c1080", - "S":"81c136c" - }, - "Task_BagMenu_HandleInput":{ - "D":"81ab848", - "F":"81ab968", - "I":"81ab834", - "J":"81abab4", - "S":"81ab940" - }, - "Task_PrintAndWaitForText":{ - "D":"81b16b4", - "F":"81b17c8", - "I":"81b1694", - "J":"81b185c", - "S":"81b17ac" - }, - "Task_HandleInput":{ - "D":"81c0038", - "F":"81c014c", - "I":"81c0018", - "J":"81bfe44", - "S":"81c0130" - }, - "Task_HandleYesNoInput":{ - "D":"80e1db4", - "F":"80e1dd4", - "I":"80e1dac", - "J":"80e166c", - "S":"80e1db4" - }, - "Task_HandleMultichoiceInput":{ - "D":"80e1cb0", - "F":"80e1cd0", - "I":"80e1ca8", - "J":"80e1568", - "S":"80e1cb0" - }, - "Task_DrawFieldMessage":{ - "D":"8098170", - "F":"8098164", - "I":"8098168", - "J":"8097adc", - "S":"8098168" - }, - "Task_ShowStartMenu":{ - "D":"809fa50", - "F":"809fa48", - "I":"809fa48", - "J":"809f30c", - "S":"809fa48" - }, - "Task_HandleSelectionMenuInput":{ - "D":"81b3258", - "F":"81b336c", - "I":"81b3238", - "J":"81b33d0", - "S":"81b3350" - }, - "Task_SlideSelectedSlotsOnscreen": { - "D":"81b3988", - "F":"81b3a9c", - "I":"81b3968", - "J":"81b3b00", - "S":"81b3a80" - }, - "Task_WateringBerryTreeAnim_Continue":{ - "D":"80fab88", - "F":"80faba8", - "I":"80fab74", - "J":"80fb7d4", - "S":"80fab7c" - }, - "Task_ContinueTaskAfterMessagePrints":{ - "D":"8121b60", - "F":"8121b80", - "I":"8121b4c", - "J":"8121f2c", - "S":"8121b54" - }, - "Task_FlyIntoMap":{ - "D":"80b6b28", - "F":"80b6b20", - "I":"80b6b20", - "J":"80b6264", - "S":"80b6b20" - }, - "Task_Fanfare":{ - "D":"80a315c", - "F":"80a3154", - "I":"80a3154", - "J":"80a2a08", - "S":"80a3154" - }, - "Task_PCMainMenu":{ - "D":"80c6ec4", - "F":"80c6edc", - "I":"80c6ebc", - "J":"80c6af4", - "S":"80c6ebc" - }, - "Task_PokeStorageMain":{ - "D":"80c7f08", - "F":"80c7f20", - "I":"80c7f00", - "J":"80c7b48", - "S":"80c7f00" - }, - "Task_ExitDoor":{ - "D":"80af454", - "F":"80af44c", - "I":"80af44c", - "J":"80aed34", - "S":"80af44c" - }, - "Task_ShinyStars":{ - "D":"8172c54", - "F":"8172d7c", - "I":"8172c44", - "J":"8172dd0", - "S":"8172d54" - }, - "Task_ShinyStars_Wait":{ - "D":"8172e18", - "F":"8172f40", - "I":"8172e08", - "J":"8172f94", - "S":"8172f18" - }, - "Task_ItemContext_MultipleRows":{ - "D":"81ac798", - "F":"81ac8ac", - "I":"81ac778", - "J":"81aca70", - "S":"81ac890" - }, - "ExecuteMatchCall":{ - "D":"8195bec", - "F":"8195d0c", - "I":"8195bdc", - "J":"8195ce0", - "S":"8195ce4" - }, - "AnimTask_ThrowBall_Step":{ - "D":"8170b58", - "F":"8170c80", - "I":"8170b48", - "J":"8170cd4", - "S":"8170c58" - }, - "BattleScript_AskToLearnMove":{ - "D":"82f0923", - "F":"82e3bb7", - "I":"82dbb6f", - "J":"828916b", - "S":"82e2373" - }, - "BattleScript_ForgotAndLearnedNewMove": { - "D":"82f0950", - "F":"82e3be4", - "I":"82dbb9c", - "J":"8289198", - "S":"82e239c" - }, - "BattleScript_HandleFaintedMon":{ - "D":"82f0542", - "F":"82e37d6", - "I":"82db78e", - "J":"8288d8a", - "S":"82e1f8e" - }, - "BattleScript_FaintedMonTryChoose":{ - "D":"82f0556", - "F":"82e37ea", - "I":"82db7a2", - "J":"8288d9e", - "S":"82e1fa2" - }, - "BattleScript_FaintedMonEnd":{ - "D":"82f0635", - "F":"82e38c9", - "I":"82db881", - "J":"8288e7d", - "S":"82e2081" - }, - "EventScript_TrainerApproach":{ - "D":"827ca57", - "F":"8276617", - "I":"8270fad", - "J":"82423f0", - "S":"827515a" - }, - "EventScript_ShowTrainerIntroMsg":{ - "D":"827cb41", - "F":"8276701", - "I":"8271097", - "J":"82424da", - "S":"8275244" - }, - "EventScript_DoTrainerBattle":{ - "D":"827cb55", - "F":"8276715", - "I":"82710ab", - "J":"82424ee", - "S":"8275258" - }, - "EventScript_RockSmash":{ - "D":"829ef03", - "F":"8297028", - "I":"829146e", - "J":"825667c", - "S":"8295638" - }, - "EventScript_SmashRock":{ - "D":"829ef58", - "F":"829707d", - "I":"82914c3", - "J":"82566d1", - "S":"829568d" - }, - "EventScript_RepelWoreOff":{ - "D":"82b6715", - "F":"82ad0f5", - "I":"82a5fd3", - "J":"826239b", - "S":"82aadf3" - }, - "EventScript_EggHatch":{ - "D":"82a0780", - "F":"829887c", - "I":"8292bf3", - "J":"8257a89", - "S":"8296d93" - }, - "HandleInputChooseAction":{ - "D":["805758c","8158f7c"], - "F":"81590a4", - "I":["805758c","8158f6c"], - "J":["8057198","8159314"], - "S":"815907c" - }, - "HandleInputChooseMove":{ - "D":"8057c00", - "I":"8057c00", - "J":"805780c" - }, - "WaitForAorBPress":{ - "J":"809a621" - }, - "sMenu":{ - "J":"203ca5c" - }, - "sTextPrinters":{ - "J":"20201ac" - }, - "sMonSummaryScreen":{ - "J":"203cbe8" - }, - "gMoveToLearn":{ - "J":"2024186" - }, - "gPartyMenu":{ - "J":"203cb94" - }, - "sPartyMenuInternal":{ - "J":"203cb90" - }, - "sStartMenuCursorPos":{ - "J":"20372ae" - }, - "sNumStartMenuActions":{ - "J":"20372af" - }, - "sCurrentStartMenuActions":{ - "J":"20372b0" - }, - "sRegionMap":{ - "J":"2039e10" - }, - "GMAIN":{ - "J":"3002360" - }, - "GTASKS":{ - "J":"3005b60" - }, - "gSaveBlock1Ptr":{ - "J":"3005aec" - }, - "gSaveBlock2Ptr":{ - "J":"3005af0" - }, - "gBattleMainFunc":{ - "J":"3005a64" - }, - "gBattlerControllerFuncs":{ - "J":"3005ac0" - }, - "HandleTurnActionSelectionState":{ - "J":"803bab9" - }, - "gBattleMons":{ - "J":"2023D28" - }, - "gBattleTypeFlags":{ - "J":"2022C90" - }, - "gSideTimers":{ - "J":"2023F38" - }, - "gStatuses3":{ - "J":"2023F50" - }, - "gDisableStructs":{ - "J":"2023F60" - }, - "gBattleWeather":{ - "J":"2024070" - }, - "gBattlePartyCurrentOrder":{ - "J":"203cbcc" - }, - "gAbsentBattlerFlags":{ - "J":"2023eb4" - }, - "gBattleResults":{ - "J":"3005A72" - }, - "HandleInputChooseTarget":{ - "J":"8057434", - "X":"8057435" - }, - "gObjectEvents":{ - "J":"2036ff0" - }, - "gEnemyParty":{ - "J":"20243e8" - }, - "gPlayerAvatar":{ - "J":"2037230" - }, - "gMapHeader":{ - "J":"2036FB8" - }, - "gActionSelectionCursor":{ - "J":"2024150" - }, - "gMoveSelectionCursor":{ - "J":"2024154" - }, - "gPlayerPartyCount":{ - "J":"202418d" - }, - "gPlayerParty":{ - "J":"2024190" - }, - "gBattleOutcome":{ - "J":"2023fde" - }, - "gBagPosition":{ - "J":"203cb24" - }, - "gBattlerPartyIndexes":{ - "J":"2023d12" - }, - "gBattlersCount":{ - "J":"2023d10" - }, - "gBattlescriptCurrInstr":{ - "J":"2023eb8" - }, - "gRngValue":{ - "J":"3005ae0" - }, - "ITEMSTORAGE_HANDLEREMOVEITEM":{ - "I":"0" - }, - "Route120_Text_RileyIntro":{ - "D":"0" - }, - "Route104_Text_HaleyIntro":{ - "S":"0" - }, - "Route104_Text_HaleyDefeat":{ - "S":"0" - }, - "BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50":{ - "J":"0" - }, - "Route108_Text_CoryRematchDefeated":{ - "F":"0" - }, - "Route108_Text_CoryRematchPostBattle":{ - "F":"0" - }, - "VictoryRoad_1F_EventScript_ItemPPUp":{ - "I":"0" - }, - "VictoryRoad_B1F_EventScript_ItemFullRestore":{ - "I":"0" - }, - "VictoryRoad_1F_EventScript_ItemMaxElixir":{ - "I":"0" - }, - "VictoryRoad_B1F_EventScript_ItemTMPsychic":{ - "I":"0" - }, - "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail":{ - "I":"0" - }, - "RivalsHouse_2F_Text_MayWhereShouldIGoNext":{ - "I":"0" - }, - "OldaleTown_PokemonCenter_1F_EventScript_Gentleman":{ - "D":"0" - }, - "OldaleTown_PokemonCenter_1F_EventScript_Boy":{ - "D":"0" - }, - "OldaleTown_PokemonCenter_1F_EventScript_Girl":{ - "D":"0" - }, - "OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable":{ - "D":"0" - }, - "OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC":{ - "D":"0" - }, - "OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat":{ - "D":"0" - }, - "OldaleTown_PokemonCenter_1F_EventScript_Nurse":{ - "D":"0" - }, - "Route111_EventScript_Celia":{ - "J":"0" - }, - "Route111_EventScript_Bryan":{ - "J":"0" - }, - "Route111_EventScript_Branden":{ - "J":"0" - }, - "Route111_Text_BattleOurFamily":{ - "J":"0" - }, - "Route111_EventScript_TrainerHillSign":{ - "J":"0" - }, - "LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo":{ - "S":"0" - }, - "BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals":{ - "D":"0" - }, - "BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons":{ - "D":"0" - }, - "BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete":{ - "D":"0" - }, - "BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay":{ - "D":"0" - }, - "BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro":{ - "F":"0" - }, - "BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1":{ - "F":"0" - }, - "BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept":{ - "F":"0" - }, - "BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask":{ - "F":"0" - }, - "MossdeepCity_StevensHouse_EventScript_SendBeldumParty":{ - "J":"0" - }, - "MossdeepCity_StevensHouse_EventScript_SendBeldumPC":{ - "J":"0" - }, - "MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare":{ - "J":"0" - }, - "BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask":{ - "S":"0" - }, - "BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept":{ - "S":"0" - }, - "PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV":{ - "I":"0" - }, - "BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver":{ - "J":"0" - }, - "Route108_Text_JeromePostBattle":{ - "S":"0" - }, - "Route111_Text_DrewPostBattle":{ - "F":"0" - }, - "Route123_Text_AlbertoPostBattle":{ - "D":"0" - }, - "Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger":{ - "D": "82326e4", - "F": "822fb95", - "I": "822ba06", - "J": "8212a42", - "S": "822de70" - }, - "Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone":{ - "D": "8232745", - "F": "822fbf6", - "I": "822ba67", - "J": "8212aa3", - "S": "822ded1" - }, - "LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex":{ - "D": "81fc014", - "F": "81fb46a", - "I": "81f9a6d", - "J": "81f141b", - "S": "81fa666" - }, - "SafariZone_EventScript_TimesUp":{ - "D": "82b676d", - "F": "82ad154", - "I": "82a6033", - "J": "82623e9", - "S": "82aae5a" - }, - "SouthernIsland_Interior_EventScript_Lati":{ - "D": "824b6cd", - "F": "8247d7c", - "J": "822286d", - "S": "8245a41" - }, - "gItems":{ - "D": "85946dc", - "F": "8587d6c", - "I": "858000c", - "J": "855cee8", - "S": "858639c" - }, - "sHardyNatureName":{ - "D": "862e008", - "F": "8620ea8", - "I": "86195c0", - "J": "85ecda4", - "S": "861f3c0" - }, - "gAbilityNames":{ - "D": "833009e", - "F": "832324e", - "I": "831b0db", - "J": "82ebdc4", - "S": "8321999" - }, - "gMoveNames":{ - "D": "832e0ec", - "F": "83212ac", - "I": "8319140", - "J": "82eacc4", - "S": "831f9e0" - }, - "gMoveDescriptionPointers":{ - "D": "862da80", - "F": "8620920", - "I": "8619038", - "J": "85ec81c", - "S": "861ee38" - }, - "gTypeNames":{ - "D": "832f7a8", - "F": "8322968", - "I": "831a7fc", - "J": "82ebc88", - "S": "832109c" - }, - "gSpeciesNames":{ - "D": "832cf38", - "F": "83200f8", - "I": "8317f8c", - "J": "82ea31c", - "S": "831e82c" - }, - "sTileBitAttributes":{ - "D": "8498c2c", - "F": "848bde8", - "I": "8483c40", - "J": "845F31c", - "S": "848a558" - }, - "gMapGroups":{ - "D":"84982a8", - "F":"848b464", - "I":"84832bc", - "J":"845E998", - "S":"8489bd4" - }, - "gWildMonHeaders":{ - "D":"8564a78", - "F":"8557c34", - "I":"854fa8c", - "J":"852d9f4", - "S":"85563a4" - }, - "gRegionMapEntries":{ - "D":"85b24b4", - "F":"85a5adc", - "I":"859dee8", - "J":"857cd6c", - "S":"85a41e4" - }, - "SaveOverwriteInputCallback": { - "D":"80a0272", - "F":"80a026a", - "I":"80a026a", - "J":"809fb2e", - "S":"80a026a" - }, - "Std_MsgboxSign": { - "D":"827ca21", - "F":"82765e1", - "I":"8270f77", - "J":"82423ba", - "S":"8275124" - }, - "Task_UseWaterfall": { - "D":"80b73a0", - "F":"80b7398", - "I":"80b7398", - "J":"80b6adc", - "S":"80b7398" - }, - "Task_SurfFieldEffect": { - "D":"80b8da0", - "F":"80b8d98", - "I":"80b8d98", - "J":"80b84dc", - "S":"80b8d98" - } -} diff --git a/modules/data/symbols/patches/language/pokeemerald.yml b/modules/data/symbols/patches/language/pokeemerald.yml new file mode 100644 index 00000000..7bb6bcd1 --- /dev/null +++ b/modules/data/symbols/patches/language/pokeemerald.yml @@ -0,0 +1,718 @@ +--- +CB2_OVERWORLD: + D: 0x8085e78 + F: 0x8085e6c + I: 0x8085e70 + J: 0x80857C4 + S: 0x8085e70 +CB2_STARTERCHOOSE: + D: 0x8133e04 + F: 0x8133e24 + I: 0x8133df0 + J: 0x8134198 + S: 0x8133df8 +CB2_INITCOPYRIGHTSCREENAFTERBOOTUP: + D: 0x816cb14 + F: 0x816cc3c + I: 0x816cb04 + J: 0x816cc90 + S: 0x816cc14 +MAINCB2_INTRO: + D: 0x816c868 + F: 0x816c990 + I: 0x816c858 + J: 0x816ca10 + S: 0x816c968 +MAINCB2_ENDINTRO: + D: 0x816c8bc + F: 0x816c9e4 + I: 0x8116c8ac + J: 0x816ca64 + S: 0x816c9bc +CB2_INITTITLESCREEN: + D: 0x80aa7c0 + F: 0x80aa7b8 + I: 0x80aa7b8 + J: 0x80aa06c + S: 0x80aa7b8 +MAINCB2: + D: 0x80aab48 + F: 0x80aab40 + I: 0x80aab40 + J: 0x80aa400 + S: 0x80aab40 +CB2_GOTOMAINMENU: + D: 0x80aaed4 + F: 0x80aaecc + I: 0x80aaecc + J: 0x80aa7b4 + S: 0x80aaecc +CB2_INITMAINMENU: + D: 0x802f6e0 + I: 0x802f6e0 + J: 0x802f340 +CB2_MAINMENU: + D: 0x802f6b4 + I: 0x802f6b4 + J: 0x802f314 +CB2_CONTINUESAVEDGAME: + D: 0x808624c + F: 0x8086240 + I: 0x8086244 + J: 0x8085b98 + S: 0x8086244 +CB2_RETURNTOFIELDLOCAL: + D: 0x8086110 + F: 0x8086104 + I: 0x8086108 + J: 0x8085a5c + S: 0x8086108 +CB2_OVERWORLDBASIC: + D: 0x8085e6c + F: 0x8085e60 + I: 0x8085e64 + J: 0x80857b8 + S: 0x8085e64 +CB2_INITBATTLE: + D: 0x8036764 + I: 0x8036764 + J: 0x80365b4 +CB2_HANDLESTARTBATTLE: + D: 0x8036fb0 + I: 0x8036fb0 + J: 0x8036e00 +CB2_RETURNTOFIELD: + D: 0x80860e4 + F: 0x80860d8 + I: 0x80860dc + J: 0x8085a30 + S: 0x80860dc +CB2_RETURNTOFIELDCONTINUESCRIPTPLAYMAPMUSIC: + D: 0x80861e8 + F: 0x80861dc + I: 0x80861e0 + J: 0x8085b34 + S: 0x80861e0 +CB2_BAGMENURUN: + D: 0x81aa868 + F: 0x81aa988 + I: 0x81aa854 + J: 0x81aaad4 + S: 0x81aa960 +CB2_UPDATEPARTYMENU: + D: 0x81afcd8 + F: 0x81afdec + I: 0x81afcb8 + J: 0x81afe88 + S: 0x81afdd0 +CB2_FLYMAP: + D: 0x81244f8 + F: 0x8124518 + I: 0x81244e4 + J: 0x81248e0 + S: 0x81244ec +CB2_LOADEGGHATCH: + F: 0x807179c + J: 0x80711a8 + S: 0x807179c +CB2_EGGHATCH: + F: 0x8071a90 + J: 0x8071498 + S: 0x8071a90 +CB2_BEGINEVOLUTIONSCENE: + D: 0x813d5ec + F: 0x813d60c + I: 0x813d5dc + J: 0x813dab4 + S: 0x813d5e4 +CB2_EVOLUTIONSCENEUPDATE: + D: 0x813dfe0 + F: 0x813e000 + I: 0x813dfd0 + J: 0x813e4a8 + S: 0x813dfd8 +CB2_WHITEOUT: + D: 0x8085f74 + F: 0x8085f68 + I: 0x8085f6c + J: 0x80858c0 + S: 0x8085f6c +BattleMainCB1: + J: 0x8039b35 +BattleMainCB2: + D: 0x8038424 + F: 0x8038420 + I: 0x8038424 + J: 0x80380fc + S: 0x8038420 +TASK_HANDLEMONANIMATION: + D: 0x817ef90 + F: 0x817f0b0 + I: 0x817ef80 + J: 0x817F344 + S: 0x817f088 +TASK_PLAYCRYWHENRELEASEDFROMBALL: + F: 0x8075ab8 + I: 0x8075abc + J: 0x80754c4 + S: 0x8075ab8 +Task_Fishing: + D: 0x808c8dc + F: 0x808c8d0 + I: 0x808c8d4 + J: 0x808c224 + S: 0x808c8d4 +Task_HandleStarterChooseInput: + D: 0x8133e80 + F: 0x8133ea0 + I: 0x8133e6c + J: 0x8134214 + S: 0x8133e74 +Task_DuckBGMForPokemonCry: + D: 0x80a3728 + F: 0x80a3720 + I: 0x80a3720 + J: 0x80a2fd4 + S: 0x80a3720 +TASK_HANDLECONFIRMSTARTERINPUT: + D: 0x8134024 + F: 0x8134044 + I: 0x8134010 + J: 0x81343b8 + S: 0x8134018 +Task_BattleStart: + D: 0x80b060c + F: 0x80b0604 + I: 0x80b0604 + J: 0x80afeec + S: 0x80b0604 +Task_ReturnToFieldNoScript: + D: 0x80af6cc + F: 0x80af6c4 + I: 0x80af6c4 + J: 0x80aefac + S: 0x80af6c4 +Task_HandleChooseMonInput: + D: 0x81b0e98 + F: 0x81b0fac + I: 0x81b0e78 + J: 0x81b1040 + S: 0x81b0f90 +Task_EvolutionScene: + D: 0x813e1ac + F: 0x813e1cc + I: 0x813e19c + J: 0x813e638 + S: 0x813e1a4 +Task_HandleReplaceMoveInput: + D: 0x81c1274 + F: 0x81c1388 + I: 0x81c1254 + J: 0x81c1080 + S: 0x81c136c +Task_BagMenu_HandleInput: + D: 0x81ab848 + F: 0x81ab968 + I: 0x81ab834 + J: 0x81abab4 + S: 0x81ab940 +Task_PrintAndWaitForText: + D: 0x81b16b4 + F: 0x81b17c8 + I: 0x81b1694 + J: 0x81b185c + S: 0x81b17ac +Task_HandleInput: + D: 0x81c0038 + F: 0x81c014c + I: 0x81c0018 + J: 0x81bfe44 + S: 0x81c0130 +Task_HandleYesNoInput: + D: 0x80e1db4 + F: 0x80e1dd4 + I: 0x80e1dac + J: 0x80e166c + S: 0x80e1db4 +Task_HandleMultichoiceInput: + D: 0x80e1cb0 + F: 0x80e1cd0 + I: 0x80e1ca8 + J: 0x80e1568 + S: 0x80e1cb0 +Task_DrawFieldMessage: + D: 0x8098170 + F: 0x8098164 + I: 0x8098168 + J: 0x8097adc + S: 0x8098168 +Task_ShowStartMenu: + D: 0x809fa50 + F: 0x809fa48 + I: 0x809fa48 + J: 0x809f30c + S: 0x809fa48 +Task_HandleSelectionMenuInput: + D: 0x81b3258 + F: 0x81b336c + I: 0x81b3238 + J: 0x81b33d0 + S: 0x81b3350 +Task_SlideSelectedSlotsOnscreen: + D: 0x81b3988 + F: 0x81b3a9c + I: 0x81b3968 + J: 0x81b3b00 + S: 0x81b3a80 +Task_WateringBerryTreeAnim_Continue: + D: 0x80fab88 + F: 0x80faba8 + I: 0x80fab74 + J: 0x80fb7d4 + S: 0x80fab7c +Task_ContinueTaskAfterMessagePrints: + D: 0x8121b60 + F: 0x8121b80 + I: 0x8121b4c + J: 0x8121f2c + S: 0x8121b54 +Task_FlyIntoMap: + D: 0x80b6b28 + F: 0x80b6b20 + I: 0x80b6b20 + J: 0x80b6264 + S: 0x80b6b20 +Task_Fanfare: + D: 0x80a315c + F: 0x80a3154 + I: 0x80a3154 + J: 0x80a2a08 + S: 0x80a3154 +Task_PCMainMenu: + D: 0x80c6ec4 + F: 0x80c6edc + I: 0x80c6ebc + J: 0x80c6af4 + S: 0x80c6ebc +Task_PokeStorageMain: + D: 0x80c7f08 + F: 0x80c7f20 + I: 0x80c7f00 + J: 0x80c7b48 + S: 0x80c7f00 +Task_ExitDoor: + D: 0x80af454 + F: 0x80af44c + I: 0x80af44c + J: 0x80aed34 + S: 0x80af44c +Task_ShinyStars: + D: 0x8172c54 + F: 0x8172d7c + I: 0x8172c44 + J: 0x8172dd0 + S: 0x8172d54 +Task_ShinyStars_Wait: + D: 0x8172e18 + F: 0x8172f40 + I: 0x8172e08 + J: 0x8172f94 + S: 0x8172f18 +Task_ItemContext_MultipleRows: + D: 0x81ac798 + F: 0x81ac8ac + I: 0x81ac778 + J: 0x81aca70 + S: 0x81ac890 +ExecuteMatchCall: + D: 0x8195bec + F: 0x8195d0c + I: 0x8195bdc + J: 0x8195ce0 + S: 0x8195ce4 +AnimTask_ThrowBall_Step: + D: 0x8170b58 + F: 0x8170c80 + I: 0x8170b48 + J: 0x8170cd4 + S: 0x8170c58 +BattleScript_AskToLearnMove: + D: 0x82f0923 + F: 0x82e3bb7 + I: 0x82dbb6f + J: 0x828916b + S: 0x82e2373 +BattleScript_ForgotAndLearnedNewMove: + D: 0x82f0950 + F: 0x82e3be4 + I: 0x82dbb9c + J: 0x8289198 + S: 0x82e239c +BattleScript_HandleFaintedMon: + D: 0x82f0542 + F: 0x82e37d6 + I: 0x82db78e + J: 0x8288d8a + S: 0x82e1f8e +BattleScript_FaintedMonTryChoose: + D: 0x82f0556 + F: 0x82e37ea + I: 0x82db7a2 + J: 0x8288d9e + S: 0x82e1fa2 +BattleScript_FaintedMonEnd: + D: 0x82f0635 + F: 0x82e38c9 + I: 0x82db881 + J: 0x8288e7d + S: 0x82e2081 +EventScript_TrainerApproach: + D: 0x827ca57 + F: 0x8276617 + I: 0x8270fad + J: 0x82423f0 + S: 0x827515a +EventScript_ShowTrainerIntroMsg: + D: 0x827cb41 + F: 0x8276701 + I: 0x8271097 + J: 0x82424da + S: 0x8275244 +EventScript_DoTrainerBattle: + D: 0x827cb55 + F: 0x8276715 + I: 0x82710ab + J: 0x82424ee + S: 0x8275258 +EventScript_RockSmash: + D: 0x829ef03 + F: 0x8297028 + I: 0x829146e + J: 0x825667c + S: 0x8295638 +EventScript_SmashRock: + D: 0x829ef58 + F: 0x829707d + I: 0x82914c3 + J: 0x82566d1 + S: 0x829568d +EventScript_RepelWoreOff: + D: 0x82b6715 + F: 0x82ad0f5 + I: 0x82a5fd3 + J: 0x826239b + S: 0x82aadf3 +EventScript_EggHatch: + D: 0x82a0780 + F: 0x829887c + I: 0x8292bf3 + J: 0x8257a89 + S: 0x8296d93 +HandleInputChooseAction: + D: + - 0x805758c + - 0x8158f7c + F: 0x81590a4 + I: + - 0x805758c + - 0x8158f6c + J: + - 0x8057198 + - 0x8159314 + S: 0x815907c +HandleInputChooseMove: + D: 0x8057c00 + I: 0x8057c00 + J: 0x805780c +WaitForAorBPress: + J: 0x809a621 +sMenu: + J: 0x203ca5c +sTextPrinters: + J: 0x20201ac +sMonSummaryScreen: + J: 0x203cbe8 +gMoveToLearn: + J: 0x2024186 +gPartyMenu: + J: 0x203cb94 +sPartyMenuInternal: + J: 0x203cb90 +sStartMenuCursorPos: + J: 0x20372ae +sNumStartMenuActions: + J: 0x20372af +sCurrentStartMenuActions: + J: 0x20372b0 +sRegionMap: + J: 0x2039e10 +GMAIN: + J: 0x3002360 +GTASKS: + J: 0x3005b60 +gSaveBlock1Ptr: + J: 0x3005aec +gSaveBlock2Ptr: + J: 0x3005af0 +gBattleMainFunc: + J: 0x3005a64 +gBattlerControllerFuncs: + J: 0x3005ac0 +HandleTurnActionSelectionState: + J: 0x803bab9 +gBattleMons: + J: 0x2023D28 +gBattleTypeFlags: + J: 0x2022C90 +gSideTimers: + J: 0x2023F38 +gStatuses3: + J: 0x2023F50 +gDisableStructs: + J: 0x2023F60 +gBattleWeather: + J: 0x2024070 +gBattlePartyCurrentOrder: + J: 0x203cbcc +gAbsentBattlerFlags: + J: 0x2023eb4 +gBattleResults: + J: 0x3005A72 +HandleInputChooseTarget: + J: 0x8057434 + X: 0x8057435 +gObjectEvents: + J: 0x2036ff0 +gEnemyParty: + J: 0x20243e8 +gPlayerAvatar: + J: 0x2037230 +gMapHeader: + J: 0x2036FB8 +gActionSelectionCursor: + J: 0x2024150 +gMoveSelectionCursor: + J: 0x2024154 +gPlayerPartyCount: + J: 0x202418d +gPlayerParty: + J: 0x2024190 +gBattleOutcome: + J: 0x2023fde +gBagPosition: + J: 0x203cb24 +gBattlerPartyIndexes: + J: 0x2023d12 +gBattlersCount: + J: 0x2023d10 +gBattlescriptCurrInstr: + J: 0x2023eb8 +gRngValue: + J: 0x3005ae0 +ITEMSTORAGE_HANDLEREMOVEITEM: + I: 0x0 +Route120_Text_RileyIntro: + D: 0x0 +Route104_Text_HaleyIntro: + S: 0x0 +Route104_Text_HaleyDefeat: + S: 0x0 +BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50: + J: 0x0 +Route108_Text_CoryRematchDefeated: + F: 0x0 +Route108_Text_CoryRematchPostBattle: + F: 0x0 +VictoryRoad_1F_EventScript_ItemPPUp: + I: 0x0 +VictoryRoad_B1F_EventScript_ItemFullRestore: + I: 0x0 +VictoryRoad_1F_EventScript_ItemMaxElixir: + I: 0x0 +VictoryRoad_B1F_EventScript_ItemTMPsychic: + I: 0x0 +Route110_TrickHousePuzzle8_EventScript_ItemBeadMail: + I: 0x0 +RivalsHouse_2F_Text_MayWhereShouldIGoNext: + I: 0x0 +OldaleTown_PokemonCenter_1F_EventScript_Gentleman: + D: 0x0 +OldaleTown_PokemonCenter_1F_EventScript_Boy: + D: 0x0 +OldaleTown_PokemonCenter_1F_EventScript_Girl: + D: 0x0 +OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable: + D: 0x0 +OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC: + D: 0x0 +OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat: + D: 0x0 +OldaleTown_PokemonCenter_1F_EventScript_Nurse: + D: 0x0 +Route111_EventScript_Celia: + J: 0x0 +Route111_EventScript_Bryan: + J: 0x0 +Route111_EventScript_Branden: + J: 0x0 +Route111_Text_BattleOurFamily: + J: 0x0 +Route111_EventScript_TrainerHillSign: + J: 0x0 +LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo: + S: 0x0 +BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals: + D: 0x0 +BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons: + D: 0x0 +BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete: + D: 0x0 +BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay: + D: 0x0 +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro: + F: 0x0 +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1: + F: 0x0 +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept: + F: 0x0 +BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask: + F: 0x0 +MossdeepCity_StevensHouse_EventScript_SendBeldumParty: + J: 0x0 +MossdeepCity_StevensHouse_EventScript_SendBeldumPC: + J: 0x0 +MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare: + J: 0x0 +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask: + S: 0x0 +BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept: + S: 0x0 +PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV: + I: 0x0 +BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver: + J: 0x0 +Route108_Text_JeromePostBattle: + S: 0x0 +Route111_Text_DrewPostBattle: + F: 0x0 +Route123_Text_AlbertoPostBattle: + D: 0x0 +Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger: + D: 0x82326e4 + F: 0x822fb95 + I: 0x822ba06 + J: 0x8212a42 + S: 0x822de70 +Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone: + D: 0x8232745 + F: 0x822fbf6 + I: 0x822ba67 + J: 0x8212aa3 + S: 0x822ded1 +LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex: + D: 0x81fc014 + F: 0x81fb46a + I: 0x81f9a6d + J: 0x81f141b + S: 0x81fa666 +SafariZone_EventScript_TimesUp: + D: 0x82b676d + F: 0x82ad154 + I: 0x82a6033 + J: 0x82623e9 + S: 0x82aae5a +SouthernIsland_Interior_EventScript_Lati: + D: 0x824b6cd + F: 0x8247d7c + J: 0x822286d + S: 0x8245a41 +gItems: + D: 0x85946dc + F: 0x8587d6c + I: 0x858000c + J: 0x855cee8 + S: 0x858639c +sHardyNatureName: + D: 0x862e008 + F: 0x8620ea8 + I: 0x86195c0 + J: 0x85ecda4 + S: 0x861f3c0 +gAbilityNames: + D: 0x833009e + F: 0x832324e + I: 0x831b0db + J: 0x82ebdc4 + S: 0x8321999 +gMoveNames: + D: 0x832e0ec + F: 0x83212ac + I: 0x8319140 + J: 0x82eacc4 + S: 0x831f9e0 +gMoveDescriptionPointers: + D: 0x862da80 + F: 0x8620920 + I: 0x8619038 + J: 0x85ec81c + S: 0x861ee38 +gTypeNames: + D: 0x832f7a8 + F: 0x8322968 + I: 0x831a7fc + J: 0x82ebc88 + S: 0x832109c +gSpeciesNames: + D: 0x832cf38 + F: 0x83200f8 + I: 0x8317f8c + J: 0x82ea31c + S: 0x831e82c +sTileBitAttributes: + D: 0x8498c2c + F: 0x848bde8 + I: 0x8483c40 + J: 0x845F31c + S: 0x848a558 +gMapGroups: + D: 0x84982a8 + F: 0x848b464 + I: 0x84832bc + J: 0x845E998 + S: 0x8489bd4 +gWildMonHeaders: + D: 0x8564a78 + F: 0x8557c34 + I: 0x854fa8c + J: 0x852d9f4 + S: 0x85563a4 +gRegionMapEntries: + D: 0x85b24b4 + F: 0x85a5adc + I: 0x859dee8 + J: 0x857cd6c + S: 0x85a41e4 +SaveOverwriteInputCallback: + D: 0x80a0272 + F: 0x80a026a + I: 0x80a026a + J: 0x809fb2e + S: 0x80a026a +Std_MsgboxSign: + D: 0x827ca21 + F: 0x82765e1 + I: 0x8270f77 + J: 0x82423ba + S: 0x8275124 +Task_UseWaterfall: + D: 0x80b73a0 + F: 0x80b7398 + I: 0x80b7398 + J: 0x80b6adc + S: 0x80b7398 +Task_SurfFieldEffect: + D: 0x80b8da0 + F: 0x80b8d98 + I: 0x80b8d98 + J: 0x80b84dc + S: 0x80b8d98 diff --git a/modules/data/symbols/patches/language/pokefirered.json b/modules/data/symbols/patches/language/pokefirered.json deleted file mode 100644 index 586d0dfe..00000000 --- a/modules/data/symbols/patches/language/pokefirered.json +++ /dev/null @@ -1,593 +0,0 @@ -{ - "CB2_OVERWORLD":{ - "D":"80565d4", - "F":"8056694", - "I":"80565c0", - "J":"8055e74", - "S":"80566a8" - }, - "CB2_InitCopyrightScreenAfterBootup":{ - "D":"80eca44", - "F":"80ecb04", - "I":"80eca44", - "J":"80ed71c", - "S":"80ecb2c" - }, - "CB2_TitleScreenRun":{ - "D":"8078b00", - "F":"8078bc0", - "I":"8078aec", - "J":"", - "S":"8078bd4" - }, - "CB2_Intro":{ - "D":"80ecbf8", - "F":"80eccb8", - "I":"80ecbf8", - "J":"", - "S":"80ecce0" - }, - "gRngValue":{ - "D":"3004f50", - "F":"3004f50", - "I":"3004f50", - "J":"", - "S":"3004f50" - }, - "Task_EndQuestLog":{ - "D":"8112170", - "F":"8112230", - "I":"81121b4", - "J":"", - "S":"811229c" - }, - "CB2_INITTITLESCREEN":{ - "D":"8078878", - "F":"8078938", - "I":"8078864", - "J":"80780ac", - "S":"807894c" - }, - "MAINCB2":{ - "D":"80cd640", - "F":"803cecc", - "I":"80cd520", - "J":"80ce4ec", - "S":"80cd608" - }, - "CB2_INITMAINMENU":{ - "D":"800c280", - "F":"800c26c", - "I":"800c280", - "J":"800bce0", - "S":"800c26c" - }, - "CB2_MAINMENU":{ - "D":"800c254", - "F":"800c240", - "I":"800c254", - "J":"800bcb4", - "S":"800c240" - }, - "CB2_CONTINUESAVEDGAME":{ - "D":"8056958", - "F":"8056a18", - "I":"8056944", - "J":"80561f8", - "S":"8056a2c" - }, - "CB2_RETURNTOFIELDLOCAL":{ - "D":"8056828", - "F":"80568e8", - "I":"8056814", - "J":"80560c8", - "S":"80568fc" - }, - "CB2_OVERWORLDBASIC":{ - "D":"80565c8", - "F":"8056688", - "I":"80565b4", - "J":"8055e68", - "S":"805669c" - }, - "CB2_INITBATTLE":{ - "D":"800fd20", - "F":"800fd0c", - "I":"800fd20", - "J":"800f758", - "S":"800fd0c" - }, - "CB2_HANDLESTARTBATTLE":{ - "D":"801048c", - "F":"8010478", - "I":"801048c", - "J":"800fec4", - "S":"8010478" - }, - "CB2_RETURNTOFIELD":{ - "D":"80567fc", - "F":"80568bc", - "I":"80567e8", - "J":"805609c", - "S":"80568d0" - }, - "CB2_RETURNTOFIELDCONTINUESCRIPTPLAYMAPMUSIC":{ - "D":"8056800", - "F":"80569c0", - "I":"80568ec", - "J":"80561a0", - "S":"80569d4" - }, - "CB2_BAGMENURUN":{ - "D":"8107f5c", - "F":"810801c", - "I":"8107fa0", - "J":"81089e4", - "S":"8108088" - }, - "CB2_UPDATEPARTYMENU":{ - "D":"811ebd4", - "F":"811ec94", - "I":"811ec18", - "J":"811f3a8", - "S":"811ed00" - }, - "CB2_RegionMap":{ - "D":"80c0a84", - "F":"80c0b44", - "I":"80c0a64", - "J":"80c1a98", - "S":"80c0b4c" - }, - "CB2_EggHatch_0":{ - "D":"8046f48", - "F":"8047008", - "I":"8046f34", - "J":"80465d0", - "S":"804701c" - }, - "CB2_EggHatch_1":{ - "D":"804723c", - "F":"80472fc", - "I":"8047228", - "J":"80468c0", - "S":"8047310" - }, - "CB2_BEGINEVOLUTIONSCENE":{ - "D":"80cdeb8", - "F":"80cdf78", - "I":"80cde98", - "J":"80cee70", - "S":"80cdf80" - }, - "CB2_EVOLUTIONSCENEUPDATE":{ - "D":"80ce8b0", - "F":"80ce970", - "I":"80ce890", - "J":"80cf868", - "S":"80ce978" - }, - "BattleMainCB1":{ - "D":"8012368", - "F":"8012354", - "I":"8012368", - "J":"8011c34", - "S":"8012354" - }, - "BattleMainCB2":{ - "D":"8011084", - "F":"8011070", - "I":"8011084", - "J":"80109c0", - "S":"8011070" - }, - "TASK_PLAYCRYWHENRELEASEDFROMBALL":{ - "D":"804b090", - "F":"804b150", - "I":"804B07c", - "J":"804a828", - "S":"804b164" - }, - "Task_Fishing":{ - "D":"805d304", - "F":"805d3c4", - "I":"805d2f0", - "J":"805cbc0", - "S":"805d3d8" - }, - "Task_YesNoMenu_HandleInput":{ - "D":"809cf38", - "F":"809cff8", - "I":"809cf24", - "J":"809c888", - "S":"809d00c" - }, - "Task_StartMenuHandleInput":{ - "D":"806f154", - "F":"806f214", - "I":"806f140", - "J":"806e9e4", - "S":"806f228" - }, - "Task_BattleStart":{ - "D":"807f584", - "F":"807f640", - "I":"807f570", - "J":"807ed38", - "S":"807f658" - }, - "Task_ExitNonDoor":{ - "D":"807e230", - "F":"807e2f0", - "I":"807e21c", - "J":"807d9fc", - "S":"807e304" - }, - "Task_HandleChooseMonInput":{ - "D":"811fb5c", - "F":"811fc1c", - "I":"811fba0", - "J":"8120318", - "S":"811fc88" - }, - "Task_EvolutionScene":{ - "D":"80cea7c", - "F":"80ceb3c", - "I":"80cea5c", - "J":"80cf9f8", - "S":"80ceb44" - }, - "Task_InputHandler_SelectOrForgetMove":{ - "D":"8139470", - "F":"813952c", - "I":"81394b0", - "J":"8139ba8", - "S":"813959c" - }, - "Task_BagMenu_HandleInput":{ - "D":"8108f88", - "F":"8109048", - "I":"8108fcc", - "J":"8109a04", - "S":"81090b4" - }, - "Task_PrintAndWaitForText":{ - "D":"812035c", - "F":"812041c", - "I":"82103a0", - "J":"8120b18", - "S":"8120488" - }, - "Task_HandleInput":{ - "D":"809f354", - "F":"809f414", - "I":"809f33c", - "J":"809ecd0", - "S":"809f424" - }, - "Task_DrawFieldMessageBox":{ - "D":"8069360", - "F":"8069420", - "I":"806934c", - "J":"8068c30", - "S":"8069434" - }, - "Task_MultichoiceMenu_HandleInput":{ - "D":"809cd7c", - "F":"809ce3c", - "I":"809cd68", - "J":"809c6cc", - "S":"809ce50" - }, - "Task_HandleSelectionMenuInput":{ - "D":"8122c94", - "F":"8122d50", - "I":"8122cd4", - "J":"8123438", - "S":"8122dc0" - }, - "Task_SlideSelectedSlotsOnscreen":{ - "D":"81233c0", - "F":"812347c", - "I":"8123400", - "J":"8123b64", - "S":"81234ec" - }, - "Task_ContinueTaskAfterMessagePrints":{ - "D":"80bf704", - "F":"80bf7c4", - "I":"80bf6e4", - "J":"80c0704", - "S":"80bf7cc" - }, - "Task_FlyIntoMap":{ - "D":"808435c", - "F":"808441c", - "I":"8084348", - "J":"8083fe4", - "S":"8084430" - }, - "Task_Fanfare":{ - "D":"8071c20", - "F":"8071ce0", - "I":"8071c0c", - "J":"8071460", - "S":"8071cf4" - }, - "Task_PCMainMenu":{ - "D":"808c4a0", - "F":"808c560", - "I":"808c48c", - "J":"808bdd8", - "S":"808c574" - }, - "Task_PokeStorageMain":{ - "D":"808d3d4", - "F":"808d494", - "I":"808d3c0", - "J":"808ccf8", - "S":"808d4a8" - }, - "Task_ExitDoor":{ - "D":"807df20", - "F":"807dfe0", - "I":"807df0c", - "J":"807d6ec", - "S":"807dff4" - }, - "Task_FieldItemContextMenuHandleInput":{ - "D":"8109c3c", - "F":"8109cfc", - "I":"8109c80", - "J":"810a6e0", - "S":"8109d68" - }, - "WaitForAorBPress":{ - "D":"806b858", - "F":"806b918", - "I":"806b844", - "J":"806b158", - "S":"806b92c" - }, - "gMapGroups":{ - "D":"83525cc", - "F":"834caf8", - "I":"834b788", - "J":"8316758", - "S":"834de70" - }, - "sMapNames":{ - "D":"83f1504", - "F":"83ea268", - "I":"83e8f68", - "J":"83b8834", - "S":"83ebf80" - }, - "gWildMonHeaders":{ - "D":"83c9b04", - "F":"83c4030", - "I":"83c2cc0", - "J":"8390b34", - "S":"83c53a8" - }, - "gSaveBlock1Ptr":{ - "D":"3004f58", - "F":"3004f58", - "I":"3004f58", - "J":"3004058", - "S":"3004f58" - }, - "gSaveBlock2Ptr":{ - "D":"3004f5c", - "F":"3004f5c", - "I":"3004f5c", - "J":"300504c", - "S":"3004f5c" - }, - "gPokemonStoragePtr":{ - "D":"3004f60", - "F":"3004f60", - "I":"3004f60", - "J":"3005050", - "S":"3004f60" - }, - "gMain":{ - "D":"3003040", - "F":"3003040", - "I":"3003040", - "J":"3003130", - "S":"3003040" - }, - "gBattleMainFunc":{ - "D":"3004ed4", - "F":"3004ed4", - "I":"3004ed4", - "J":"", - "S":"3004ed4" - }, - "gBattlerControllerFuncs":{ - "D":"3004F30", - "F":"3004F30", - "I":"3004F30", - "J":"", - "S":"3004F30" - }, - "GTASKS":{ - "D":"3004fe0", - "F":"3004fe0", - "I":"3004fe0", - "J":"30050d0", - "S":"3004fe0" - }, - "EventScript_EggHatch":{ - "D":"81c2fd2", - "F":"81bdf11", - "I":"81bcac0", - "J":"", - "S":"81bf16f" - }, - "gBattleResults":{ - "D":"3004ee0", - "F":"3004ee0", - "I":"3004ee0", - "J":"3004fd0", - "S":"3004ee0" - }, - "HandleTurnActionSelectionState":{ - "D":"8013fc4", - "F":"8013fb0", - "I":"8013fc5", - "J":"", - "S":"8013fb0" - }, - "HandleInputChooseAction":{ - "D":["80f092c", "803405c", "802e3d0", "80dd7c8"], - "F":["80f09ec", "8034120", "802e3a8", "80dd888"], - "I":["802e3bc", "80dd7c8"], - "J":"", - "S":["80f0a14", "8034048", "802e3bc", "80dd8b0"] - }, - "HandleInputChooseMove": { - "D":"802e9a8", - "F":"802e980", - "I":"802e994", - "J":"", - "S":"802e994" - }, - "Task_DuckBGMForPokemonCry":{ - "D":"8072198", - "F":"8072258", - "I":"8072184", - "J":"80719d8", - "S":"807226c" - }, - "BattleScript_HandleFaintedMon":{ - "D":"81dc968", - "F":"81d6ea4", - "I":"81d5b27", - "J":"", - "S":"81d81cf" - }, - "Task_RushInjuredPokemonToCenter":{ - "D":"807f3c0", - "F":"807f480", - "I":"807f3ac", - "J":"", - "S":"807f494" - }, - "EventScript_AfterWhiteOutHeal":{ - "D":"81abbc9", - "F":"81a77c0", - "I":"81a661f", - "J":"", - "S":"81a8860" - }, - "BattleScript_AskToLearnMove":{ - "D":"81dccb1", - "F":"81d71ed", - "I":"81d5e85", - "J":"", - "S":"81d854d" - }, - "BattleScript_ForgotAndLearnedNewMove":{ - "D":"81dccde", - "F":"81d721a", - "I":"81d5eb2", - "J":"", - "S":"81d857a" - }, - "EventScript_RepelWoreOff":{ - "D":"81c36a8", - "F":"81be5d1", - "I":"81bd118", - "J":"", - "S":"81bf7f1" - }, - "EventScript_UseStrength":{ - "D":"81c1be8", - "F":"81bcafd", - "I":"81bb77a", - "J":"", - "S":"81bde41" - }, - "SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved":{ - "D":"8164f01", - "F":"8164fb8", - "I":"8164f39", - "J":"", - "S":"816502d" - }, - "EventScript_FieldPoison":{ - "D":"81abc2f", - "F":"81a7826", - "I":"81a6685", - "J":"", - "S":"81a88c6" - }, - "Std_MsgboxDefault":{ - "D":"81a7b08", - "F":"81a39b9", - "I":"81a27f1", - "J":"", - "S":"81a496a" - }, - "EventScript_DoTrainerBattle":{ - "D":"81a7c81", - "F":"81a3b32", - "I":"81a296a", - "J":"", - "S":"81a4ae3" - }, - "EventScript_DoTrainerBattleFromApproach":{ - "D":"81a7b68", - "F":"81a3a19", - "I":"81a2851", - "J":"", - "S":"81a49ca" - }, - "PokemonMansion_EventScript_DontPressSwitch":{ - "D":"0" - }, - "Route19_Text_LucRematchIntro":{ - "D":"0" - }, - "Route21_North_EventScript_IanRematch":{ - "D":"0" - }, - "EventScript_CutTree":{ - "F":"0" - }, - "Route23_EventScript_MissingBoulderBadge":{ - "F":"0" - }, - "EventScript_SetEnteringCyclingRoad":{ - "F":"0" - }, - "Route23_EventScript_MissingBadge":{ - "F":"0" - }, - "NavelRock_Summit_EventScript_HideHoOh":{ - "F":"0" - }, - "CableClub_Text_YouMayBattleHere":{ - "I":"0" - }, - "Status_Freeze":{ - "I":"0" - }, - "EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom":{ - "I":"0" - }, - "BattleScript_BrickBreakDoHit": { - "S":"0" - }, - "BattleScript_BrickBreakAnim": { - "S":"0" - }, - "EventScript_Open9FDoor3":{ - "S":"0" - }, - "Text_DontBeLikeThat":{ - "S":"0" - } -} \ No newline at end of file diff --git a/modules/data/symbols/patches/language/pokefirered.yml b/modules/data/symbols/patches/language/pokefirered.yml new file mode 100644 index 00000000..854783f6 --- /dev/null +++ b/modules/data/symbols/patches/language/pokefirered.yml @@ -0,0 +1,566 @@ +--- +CB2_OVERWORLD: + D: 0x80565d4 + F: 0x8056694 + I: 0x80565c0 + J: 0x8055e74 + S: 0x80566a8 +CB2_InitCopyrightScreenAfterBootup: + D: 0x80eca44 + F: 0x80ecb04 + I: 0x80eca44 + J: 0x80ed71c + S: 0x80ecb2c +CB2_TitleScreenRun: + D: 0x8078b00 + F: 0x8078bc0 + I: 0x8078aec + J: ~ + S: 0x8078bd4 +CB2_Intro: + D: 0x80ecbf8 + F: 0x80eccb8 + I: 0x80ecbf8 + J: ~ + S: 0x80ecce0 +gRngValue: + D: 0x3004f50 + F: 0x3004f50 + I: 0x3004f50 + J: ~ + S: 0x3004f50 +Task_EndQuestLog: + D: 0x8112170 + F: 0x8112230 + I: 0x81121b4 + J: ~ + S: 0x811229c +CB2_INITTITLESCREEN: + D: 0x8078878 + F: 0x8078938 + I: 0x8078864 + J: 0x80780ac + S: 0x807894c +MAINCB2: + D: 0x80cd640 + F: 0x803cecc + I: 0x80cd520 + J: 0x80ce4ec + S: 0x80cd608 +CB2_INITMAINMENU: + D: 0x800c280 + F: 0x800c26c + I: 0x800c280 + J: 0x800bce0 + S: 0x800c26c +CB2_MAINMENU: + D: 0x800c254 + F: 0x800c240 + I: 0x800c254 + J: 0x800bcb4 + S: 0x800c240 +CB2_CONTINUESAVEDGAME: + D: 0x8056958 + F: 0x8056a18 + I: 0x8056944 + J: 0x80561f8 + S: 0x8056a2c +CB2_RETURNTOFIELDLOCAL: + D: 0x8056828 + F: 0x80568e8 + I: 0x8056814 + J: 0x80560c8 + S: 0x80568fc +CB2_OVERWORLDBASIC: + D: 0x80565c8 + F: 0x8056688 + I: 0x80565b4 + J: 0x8055e68 + S: 0x805669c +CB2_INITBATTLE: + D: 0x800fd20 + F: 0x800fd0c + I: 0x800fd20 + J: 0x800f758 + S: 0x800fd0c +CB2_HANDLESTARTBATTLE: + D: 0x801048c + F: 0x8010478 + I: 0x801048c + J: 0x800fec4 + S: 0x8010478 +CB2_RETURNTOFIELD: + D: 0x80567fc + F: 0x80568bc + I: 0x80567e8 + J: 0x805609c + S: 0x80568d0 +CB2_RETURNTOFIELDCONTINUESCRIPTPLAYMAPMUSIC: + D: 0x8056800 + F: 0x80569c0 + I: 0x80568ec + J: 0x80561a0 + S: 0x80569d4 +CB2_BAGMENURUN: + D: 0x8107f5c + F: 0x810801c + I: 0x8107fa0 + J: 0x81089e4 + S: 0x8108088 +CB2_UPDATEPARTYMENU: + D: 0x811ebd4 + F: 0x811ec94 + I: 0x811ec18 + J: 0x811f3a8 + S: 0x811ed00 +CB2_RegionMap: + D: 0x80c0a84 + F: 0x80c0b44 + I: 0x80c0a64 + J: 0x80c1a98 + S: 0x80c0b4c +CB2_EggHatch_0: + D: 0x8046f48 + F: 0x8047008 + I: 0x8046f34 + J: 0x80465d0 + S: 0x804701c +CB2_EggHatch_1: + D: 0x804723c + F: 0x80472fc + I: 0x8047228 + J: 0x80468c0 + S: 0x8047310 +CB2_BEGINEVOLUTIONSCENE: + D: 0x80cdeb8 + F: 0x80cdf78 + I: 0x80cde98 + J: 0x80cee70 + S: 0x80cdf80 +CB2_EVOLUTIONSCENEUPDATE: + D: 0x80ce8b0 + F: 0x80ce970 + I: 0x80ce890 + J: 0x80cf868 + S: 0x80ce978 +BattleMainCB1: + D: 0x8012368 + F: 0x8012354 + I: 0x8012368 + J: 0x8011c34 + S: 0x8012354 +BattleMainCB2: + D: 0x8011084 + F: 0x8011070 + I: 0x8011084 + J: 0x80109c0 + S: 0x8011070 +TASK_PLAYCRYWHENRELEASEDFROMBALL: + D: 0x804b090 + F: 0x804b150 + I: 0x804B07c + J: 0x804a828 + S: 0x804b164 +Task_Fishing: + D: 0x805d304 + F: 0x805d3c4 + I: 0x805d2f0 + J: 0x805cbc0 + S: 0x805d3d8 +Task_YesNoMenu_HandleInput: + D: 0x809cf38 + F: 0x809cff8 + I: 0x809cf24 + J: 0x809c888 + S: 0x809d00c +Task_StartMenuHandleInput: + D: 0x806f154 + F: 0x806f214 + I: 0x806f140 + J: 0x806e9e4 + S: 0x806f228 +Task_BattleStart: + D: 0x807f584 + F: 0x807f640 + I: 0x807f570 + J: 0x807ed38 + S: 0x807f658 +Task_ExitNonDoor: + D: 0x807e230 + F: 0x807e2f0 + I: 0x807e21c + J: 0x807d9fc + S: 0x807e304 +Task_HandleChooseMonInput: + D: 0x811fb5c + F: 0x811fc1c + I: 0x811fba0 + J: 0x8120318 + S: 0x811fc88 +Task_EvolutionScene: + D: 0x80cea7c + F: 0x80ceb3c + I: 0x80cea5c + J: 0x80cf9f8 + S: 0x80ceb44 +Task_InputHandler_SelectOrForgetMove: + D: 0x8139470 + F: 0x813952c + I: 0x81394b0 + J: 0x8139ba8 + S: 0x813959c +Task_BagMenu_HandleInput: + D: 0x8108f88 + F: 0x8109048 + I: 0x8108fcc + J: 0x8109a04 + S: 0x81090b4 +Task_PrintAndWaitForText: + D: 0x812035c + F: 0x812041c + I: 0x82103a0 + J: 0x8120b18 + S: 0x8120488 +Task_HandleInput: + D: 0x809f354 + F: 0x809f414 + I: 0x809f33c + J: 0x809ecd0 + S: 0x809f424 +Task_DrawFieldMessageBox: + D: 0x8069360 + F: 0x8069420 + I: 0x806934c + J: 0x8068c30 + S: 0x8069434 +Task_MultichoiceMenu_HandleInput: + D: 0x809cd7c + F: 0x809ce3c + I: 0x809cd68 + J: 0x809c6cc + S: 0x809ce50 +Task_HandleSelectionMenuInput: + D: 0x8122c94 + F: 0x8122d50 + I: 0x8122cd4 + J: 0x8123438 + S: 0x8122dc0 +Task_SlideSelectedSlotsOnscreen: + D: 0x81233c0 + F: 0x812347c + I: 0x8123400 + J: 0x8123b64 + S: 0x81234ec +Task_ContinueTaskAfterMessagePrints: + D: 0x80bf704 + F: 0x80bf7c4 + I: 0x80bf6e4 + J: 0x80c0704 + S: 0x80bf7cc +Task_FlyIntoMap: + D: 0x808435c + F: 0x808441c + I: 0x8084348 + J: 0x8083fe4 + S: 0x8084430 +Task_PCMainMenu: + D: 0x808c4a0 + F: 0x808c560 + I: 0x808c48c + J: 0x808bdd8 + S: 0x808c574 +Task_PokeStorageMain: + D: 0x808d3d4 + F: 0x808d494 + I: 0x808d3c0 + J: 0x808ccf8 + S: 0x808d4a8 +Task_ExitDoor: + D: 0x807df20 + F: 0x807dfe0 + I: 0x807df0c + J: 0x807d6ec + S: 0x807dff4 +Task_FieldItemContextMenuHandleInput: + D: 0x8109c3c + F: 0x8109cfc + I: 0x8109c80 + J: 0x810a6e0 + S: 0x8109d68 +WaitForAorBPress: + D: 0x806b858 + F: 0x806b918 + I: 0x806b844 + J: 0x806b158 + S: 0x806b92c + +## MAP + +# Map pointer only needed in JP +gMapHeader: + J: 0x2036d30 +gObjectEvents: + J: 0x2036d6c +gPlayerAvatar: + J: 0x2036fac +gPlayerPartyCount: + J: 0x2023f89 +gPlayerParty: + J: 0x20241e4 +sMapCursor: + J: 0x2039930 +gMapGroups: + D: 0x83525cc + F: 0x834caf8 + I: 0x834b788 + J: 0x8316758 + S: 0x834de70 +sMapNames: + D: 0x83f1504 + F: 0x83ea268 + I: 0x83e8f68 + J: 0x83b8834 + S: 0x83ebf80 +gWildMonHeaders: + D: 0x83c9b04 + F: 0x83c4030 + I: 0x83c2cc0 + J: 0x8390b34 + S: 0x83c53a8 +gSaveBlock1Ptr: + D: 0x3004f58 + F: 0x3004f58 + I: 0x3004f58 + J: 0x3005048 + S: 0x3004f58 +gSaveBlock2Ptr: + D: 0x3004f5c + F: 0x3004f5c + I: 0x3004f5c + J: 0x300504c + S: 0x3004f5c +gPokemonStoragePtr: + D: 0x3004f60 + F: 0x3004f60 + I: 0x3004f60 + J: 0x3005050 + S: 0x3004f60 +gMain: + D: 0x3003040 + F: 0x3003040 + I: 0x3003040 + J: 0x3003130 + S: 0x3003040 +gBattleMainFunc: + D: 0x3004ed4 + F: 0x3004ed4 + I: 0x3004ed4 + J: 0x3004fc4 + S: 0x3004ed4 +gBattlerControllerFuncs: + D: 0x3004f30 + F: 0x3004f30 + I: 0x3004f30 + J: ~ + S: 0x3004f30 +GTASKS: + D: 0x3004fe0 + F: 0x3004fe0 + I: 0x3004fe0 + J: 0x30050d0 + S: 0x3004fe0 + +################ +# Daycare Mode # +################ + +EventScript_EggHatch: + D: 0x81c2fd2 + F: 0x81bdf11 + I: 0x81bcac0 + J: 0x81a59c4 + S: 0x81bf16f + +# EggHatch party identification +gSpecialVar_0x8004: + J: 0x2036ff4 + +Task_Fanfare: + D: 0x8071c20 + F: 0x8071ce0 + I: 0x8071c0c + J: 0x8071460 + S: 0x8071cf4 + +################ +################ + +gBattleResults: + D: 0x3004ee0 + F: 0x3004ee0 + I: 0x3004ee0 + J: 0x3004fd0 + S: 0x3004ee0 +HandleTurnActionSelectionState: + D: 0x8013fc4 + F: 0x8013fb0 + I: 0x8013fc5 + J: ~ + S: 0x8013fb0 +HandleInputChooseAction: + D: + - 0x80f092c + - 0x803405c + - 0x802e3d0 + - 0x80dd7c8 + F: + - 0x80f09ec + - 0x8034120 + - 0x802e3a8 + - 0x80dd888 + I: + - 0x802e3bc + - 0x80dd7c8 + J: ~ + S: + - 0x80f0a14 + - 0x8034048 + - 0x802e3bc + - 0x80dd8b0 +HandleInputChooseMove: + D: 0x802e9a8 + F: 0x802e980 + I: 0x802e994 + J: ~ + S: 0x802e994 +Task_DuckBGMForPokemonCry: + D: 0x8072198 + F: 0x8072258 + I: 0x8072184 + J: 0x80719d8 + S: 0x807226c +BattleScript_HandleFaintedMon: + D: 0x81dc968 + F: 0x81d6ea4 + I: 0x81d5b27 + J: ~ + S: 0x81d81cf +Task_RushInjuredPokemonToCenter: + D: 0x807f3c0 + F: 0x807f480 + I: 0x807f3ac + J: ~ + S: 0x807f494 +EventScript_AfterWhiteOutHeal: + D: 0x81abbc9 + F: 0x81a77c0 + I: 0x81a661f + J: ~ + S: 0x81a8860 +BattleScript_AskToLearnMove: + D: 0x81dccb1 + F: 0x81d71ed + I: 0x81d5e85 + J: ~ + S: 0x81d854d +BattleScript_ForgotAndLearnedNewMove: + D: 0x81dccde + F: 0x81d721a + I: 0x81d5eb2 + J: ~ + S: 0x81d857a +EventScript_RepelWoreOff: + D: 0x81c36a8 + F: 0x81be5d1 + I: 0x81bd118 + J: ~ + S: 0x81bf7f1 +EventScript_UseStrength: + D: 0x81c1be8 + F: 0x81bcafd + I: 0x81bb77a + J: ~ + S: 0x81bde41 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved: + D: 0x8164f01 + F: 0x8164fb8 + I: 0x8164f39 + J: ~ + S: 0x816502d +EventScript_FieldPoison: + D: 0x81abc2f + F: 0x81a7826 + I: 0x81a6685 + J: ~ + S: 0x81a88c6 +Std_MsgboxDefault: + D: 0x81a7b08 + F: 0x81a39b9 + I: 0x81a27f1 + J: ~ + S: 0x81a496a +EventScript_DoTrainerBattle: + D: 0x81a7c81 + F: 0x81a3b32 + I: 0x81a296a + J: ~ + S: 0x81a4ae3 +EventScript_DoTrainerBattleFromApproach: + D: 0x81a7b68 + F: 0x81a3a19 + I: 0x81a2851 + J: ~ + S: 0x81a49ca + +# Menu +sMenu: + J: 0x203b19c +sStartMenuCursorPos: + J: 0x2037028 +sNumStartMenuItems: + J: 0x2037029 +sStartMenuOrder: + J: 0x203702a + +# Bag Menu +gBagMenuState: + J: 0x203ac74 + +# Encounter +gEnemyParty: + J: 0x2023f8c + +# Ununsed symbols that were conflicting with currently used symbols +# We set them to 0 to 'get them out of our way' and correctly target the desired symbol +PokemonMansion_EventScript_DontPressSwitch: + D: 0x0 +Route19_Text_LucRematchIntro: + D: 0x0 +Route21_North_EventScript_IanRematch: + D: 0x0 +EventScript_CutTree: + F: 0x0 +Route23_EventScript_MissingBoulderBadge: + F: 0x0 +EventScript_SetEnteringCyclingRoad: + F: 0x0 +Route23_EventScript_MissingBadge: + F: 0x0 +NavelRock_Summit_EventScript_HideHoOh: + F: 0x0 +CableClub_Text_YouMayBattleHere: + I: 0x0 +Status_Freeze: + I: 0x0 +EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom: + I: 0x0 +BattleScript_BrickBreakDoHit: + S: 0x0 +BattleScript_BrickBreakAnim: + S: 0x0 +EventScript_Open9FDoor3: + S: 0x0 +Text_DontBeLikeThat: + S: 0x0 +Trade_Text_WhatThatsNoMon: + J: 0x0 diff --git a/modules/game.py b/modules/game.py index fc26bfa9..5e74b68b 100644 --- a/modules/game.py +++ b/modules/game.py @@ -1,4 +1,4 @@ -import json +import yaml from typing import Literal from modules.roms import ROM, ROMLanguage @@ -35,31 +35,32 @@ def _load_symbols(symbols_file: str, language: ROMLanguage) -> None: _reverse_symbols[address] = (label.upper(), label, length) language_code = str(language) - language_patch_file = symbols_file.replace(".sym", ".json") + language_patch_file = symbols_file.replace(".sym", ".yml") language_patch_path = get_data_path() / "symbols" / "patches" / "language" / language_patch_file if language_code in {"D", "I", "S", "F", "J"} and language_patch_path.is_file(): with open(language_patch_path, "r") as file: - language_patches = json.load(file) - for label in language_patches: - if language_code in language_patches[label]: - if label.upper() in _symbols: - _reverse_symbols.pop(_symbols[label.upper()][0], None) - - addresses = language_patches[label][language_code] - - if isinstance(addresses, str): - addresses = [addresses] - elif not isinstance(addresses, list): - continue - - for addr in addresses: - if addr: - _symbols[label.upper()] = (int(addr, 16), _symbols[label.upper()][1]) - _reverse_symbols[int(addr, 16)] = ( - label.upper(), - label, - _symbols[label.upper()][1], - ) + language_patches = yaml.safe_load(file) + for label, addr_mapping in language_patches.items(): + if language_code in addr_mapping: + addresses_list = addr_mapping[language_code] + + if not addresses_list: + continue + + if isinstance(addresses_list, int): + addresses_list = [addresses_list] + + if label.upper() in _symbols: + _reverse_symbols.pop(_symbols[label.upper()][0], None) + + for addr in addresses_list: + if addr is not None: + _symbols[label.upper()] = (addr, _symbols[label.upper()][1]) + _reverse_symbols[addr] = ( + label.upper(), + label, + _symbols[label.upper()][1], + ) def _load_event_flags_and_vars(file_name: str) -> None: # TODO Japanese ROMs not working diff --git a/wiki/pages/Mode - Daycare.md b/wiki/pages/Mode - Daycare.md index 9fc5f006..f3d81f1a 100644 --- a/wiki/pages/Mode - Daycare.md +++ b/wiki/pages/Mode - Daycare.md @@ -36,7 +36,7 @@ not Shiny. | | 🟥 Ruby | 🔷 Sapphire | 🟢 Emerald | 🔥 FireRed | 🌿 LeafGreen | | :------- | :-----: | :---------: | :--------: | :--------: | :----------: | | English | ✅ | ✅ | ✅ | ✅ | ✅ | -| Japanese | ❌ | ❌ | ✅ | ❌ | ❌ | +| Japanese | ❌ | ❌ | ✅ | ✅ | ❌ | | German | ❌ | ❌ | ✅ | ✅ | ❌ | | Spanish | ❌ | ❌ | ✅ | ✅ | ❌ | | French | ❌ | ❌ | ✅ | ✅ | ❌ |