diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/scripts/field_move_scripts.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/SeafloorCavern_Room9.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/SootopolisCity.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 2 | ||||
| -rw-r--r-- | data/wild_encounter.s | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index fd2ff3b01..76f2aac6b 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -116,7 +116,7 @@ Route111_EventScript_2907FB:: @ 82907FB specialvar VAR_RESULT, sub_81393FC compare_var_to_value VAR_RESULT, 1 goto_eq Route111_EventScript_290829 - special rock_smash_wild_pokemon_encounter + special RockSmashWildEncounter compare_var_to_value VAR_RESULT, 0 goto_eq Route111_EventScript_290829 waitstate diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 6f968b4d0..984d53295 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -127,7 +127,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 clearflag FLAG_0x3E6 clearflag FLAG_0x3E5 setflag FLAG_0x347 - setflag FLAG_0x053 + setflag FLAG_LEGENDARIES_IN_SOOTOPOLIS clearflag FLAG_0x3B0 clearflag FLAG_0x3B1 setflag FLAG_SYS_WEATHER_CTRL diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 33b65714b..d9eaee6eb 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -545,7 +545,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 3 - clearflag FLAG_0x053 + clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm BGM_RUNECITY delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -598,7 +598,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE waitstate clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_0x40CA, 2 - clearflag FLAG_0x053 + clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS fadenewbgm BGM_NAMINORI delay 120 clearflag FLAG_SPECIAL_FLAG_0x4000 diff --git a/data/specials.inc b/data/specials.inc index 003435ce4..19adbae4d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -181,7 +181,7 @@ gSpecials:: @ 81DBA64 def_special sub_813BF60 def_special sub_813BA60 def_special sub_813BF7C - def_special rock_smash_wild_pokemon_encounter + def_special RockSmashWildEncounter def_special GabbyAndTyGetBattleNum def_special GabbyAndTyAfterInterview def_special GabbyAndTyBeforeInterview diff --git a/data/wild_encounter.s b/data/wild_encounter.s index ddb842a76..e221c2f99 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -9,14 +9,14 @@ .incbin "baserom.gba", 0x55370c, 0x188 -gUnknown_08553894:: @ 8553894 +gBattlePyramidWildMonHeaders:: @ 8553894 .incbin "baserom.gba", 0x553894, 0x180 -gUnknown_08553A14:: @ 8553A14 +gBattlePikeWildMonHeaders:: @ 8553A14 .incbin "baserom.gba", 0x553a14, 0x64 -gUnknown_08553A78:: @ 8553A78 +gWildFeebasRoute119Data:: @ 8553A78 .incbin "baserom.gba", 0x553a78, 0x4 -gUnknown_08553A7C:: @ 8553A7C +gRoute119WaterTileData:: @ 8553A7C .incbin "baserom.gba", 0x553a7c, 0x14 |