diff options
152 files changed, 318 insertions, 318 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index e2887b632..05478ce75 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1193,7 +1193,7 @@ EventScript_MoveMrBrineyToRoute108:: @ 82718B3 end EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC - clearflag FLAG_DEFEATED_ELITE_4_SYDNEY + clearflag FLAG_DEFEATED_ELITE_4_SIDNEY clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 2995f48dc..cde3f0665 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,6 +1,6 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 - map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_OnTransition .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 @@ -14,7 +14,7 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC removeobject VAR_LAST_TALKED return -AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 +AquaHideout_B1F_MapScript1_OnTransition: @ 82339D0 call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3 call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7 end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index cdfe3f58e..eec2d1aeb 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,8 +1,8 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF - map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_OnTransition .byte 0 -AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 +AquaHideout_B2F_MapScript1_OnTransition: @ 8233DD5 call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF end diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index c6ae8da2a..56ec47940 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_OnTransition .byte 0 BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 4b5a8ef36..37416449b 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ BirthIsland_Exterior_MapScripts:: @ 8267F15 - map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65 map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25 .byte 0 @@ -8,7 +8,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 special sub_813B1D0 end -BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 +BirthIsland_Exterior_MapScript1_OnTransition: @ 8267F29 setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0 diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index e8d722dee..2b8092bcc 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -1,7 +1,7 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_OnTransition .byte 0 -CaveOfOrigin_1F_MapScript1_23576E: @ 823576E +CaveOfOrigin_1F_MapScript1_OnTransition: @ 823576E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index e3e296945..6a6f3898a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -1,7 +1,7 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_OnTransition .byte 0 -CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E +CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_OnTransition: @ 823577E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 417a7369a..458e9db19 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -1,8 +1,8 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_OnTransition .byte 0 -CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E +CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_OnTransition: @ 823578E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index 51d9b8654..7f7f4e58d 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -1,8 +1,8 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_OnTransition .byte 0 -CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E +CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_OnTransition: @ 823579E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index ed8acea17..24b314141 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_MapScripts:: @ 81E9507 - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_OnTransition .byte 0 -DewfordTown_MapScript1_1E950D: @ 81E950D +DewfordTown_MapScript1_OnTransition: @ 81E950D setflag FLAG_VISITED_DEWFORD_TOWN end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index eb8183585..b77744164 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_OnTransition .byte 0 -DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 +DewfordTown_Gym_MapScript1_OnTransition: @ 81FC642 call DewfordTown_Gym_EventScript_1FC648 end diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index b4f5fc4c6..f54e4d625 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E +DewfordTown_PokemonCenter_1F_MapScript1_OnTransition: @ 81FC52E setrespawn HEAL_LOCATION_DEWFORD_TOWN call DewfordTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index 58b0b63a1..e12463a6b 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_OnTransition .byte 0 DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index ffbf5a6cd..b82191622 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_MapScripts:: @ 81E7D1B - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_OnTransition .byte 0 -EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 +EverGrandeCity_MapScript1_OnTransition: @ 81E7D21 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 49411aeb4..cefea912e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,10 +1,10 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 .byte 0 -EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF +EverGrandeCity_ChampionsRoom_MapScript1_OnTransition: @ 82289FF call Common_EventScript_SetupRivalGender end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 12c6bbb77..0f6ab100d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F +EverGrandeCity_PokemonCenter_1F_MapScript1_OnTransition: @ 8229A3F setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C end diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 40408c1f8..63d7c01d5 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index 2d2d916a3..2dd8ce322 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -2,7 +2,7 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_OnTransition .byte 0 EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 1713a6d3e..5e4d6be7a 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,17 +1,17 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D .byte 0 -EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 +EverGrandeCity_SidneysRoom_MapScript1_OnTransition: @ 8227F16 setflag FLAG_MET_SCOTT_IN_EVERGRANDE setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT end EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 + call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 compare VAR_ELITE_4_STATE, 1 call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B + goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 @@ -60,7 +60,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B end EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 - setflag FLAG_DEFEATED_ELITE_4_SYDNEY + setflag FLAG_DEFEATED_ELITE_4_SIDNEY call EverGrandeCity_SidneysRoom_EventScript_2723F8 msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 50e19cfe5..a457d67b6 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,8 +1,8 @@ FallarborTown_MapScripts:: @ 81EB1FA - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_OnTransition .byte 0 -FallarborTown_MapScript1_1EB200: @ 81EB200 +FallarborTown_MapScript1_OnTransition: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN setvar VAR_LINK_CONTEST_ROOM_STATE, 0 clearflag FLAG_CONTEST_SKETCH_CREATED diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index b376f72e4..a4b7cc3a7 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -1,10 +1,10 @@ FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 .byte 0 -FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 +FallarborTown_BattleTentBattleRoom_MapScript1_OnTransition: @ 82008A9 call FallarborTown_BattleTentBattleRoom_EventScript_2008AF end diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index d34e139eb..9329d9794 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 +FallarborTown_PokemonCenter_1F_MapScript1_OnTransition: @ 8200BD8 setrespawn HEAL_LOCATION_FALLARBOR_TOWN call FallarborTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 8fce8e729..f311ae3f1 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_OnTransition .byte 0 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 347c89aa0..164d8e778 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -1,8 +1,8 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E - map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_OnTransition .byte 0 -FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 +FarawayIsland_Entrance_MapScript1_OnTransition: @ 8267C94 setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND end diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index fe180184b..9fdbf2ac8 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54 - map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98 map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F .byte 0 @@ -37,7 +37,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E removeobject VAR_LAST_TALKED return -FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 +FarawayIsland_Interior_MapScript1_OnTransition: @ 8267D72 setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0 setvar VAR_TEMP_1, 1 call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 1c464df9d..55b6d49c5 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,9 +1,9 @@ FortreeCity_MapScripts:: @ 81E25A4 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 .byte 0 -FortreeCity_MapScript1_1E25AF: @ 81E25AF +FortreeCity_MapScript1_OnTransition: @ 81E25AF setflag FLAG_VISITED_FORTREE_CITY end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 8192e2039..43e339c30 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,9 +1,9 @@ FortreeCity_Gym_MapScripts:: @ 82165AB - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA .byte 0 -FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 +FortreeCity_Gym_MapScript1_OnTransition: @ 82165B6 special RotatingGate_InitPuzzle end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 070956590..515b79a64 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 +FortreeCity_PokemonCenter_1F_MapScript1_OnTransition: @ 82173E3 setrespawn HEAL_LOCATION_FORTREE_CITY end diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index dbe2e31ec..aab27b347 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index c51a5ec26..167fd02fe 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,6 +1,6 @@ JaggedPass_MapScripts:: @ 8230656 map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 - map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C .byte 0 @@ -20,7 +20,7 @@ JaggedPass_EventScript_230685:: @ 8230685 setvar VAR_JAGGED_PASS_STATE, 1 return -JaggedPass_MapScript1_23068B: @ 823068B +JaggedPass_MapScript1_OnTransition: @ 823068B compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if_eq JaggedPass_EventScript_230697 end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index acbb3fcd2..d914bfc09 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,9 +1,9 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 .byte 0 -LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE +LavaridgeTown_MapScript1_OnTransition: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index bccd1dfef..cd7b0dc37 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_OnTransition .byte 0 -LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA +LavaridgeTown_Gym_1F_MapScript1_OnTransition: @ 81FE6FA call LavaridgeTown_Gym_1F_EventScript_1FE705 call LavaridgeTown_Gym_1F_EventScript_1FE757 end diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index d2e8d90b5..e12952066 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_OnTransition .byte 0 -LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 +LavaridgeTown_Gym_B1F_MapScript1_OnTransition: @ 81FF884 call LavaridgeTown_Gym_B1F_EventScript_1FF88F call LavaridgeTown_Gym_B1F_EventScript_1FF8DC end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 2a0cb4a1e..1820f70ea 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 +LavaridgeTown_PokemonCenter_1F_MapScript1_OnTransition: @ 81FFB05 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index b022df141..c0162e461 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_OnTransition .byte 0 LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 09fb56cfd..b4a133d18 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_MapScripts:: @ 81E2B3C - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61 .byte 0 -LilycoveCity_MapScript1_1E2B47: @ 81E2B47 +LilycoveCity_MapScript1_OnTransition: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index d5dac8bfd..fbc38bac3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 .byte 0 -LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C +LilycoveCity_ContestLobby_MapScript1_OnTransition: @ 821A21C call LilycoveCity_ContestLobby_EventScript_28CB2B call LilycoveCity_ContestLobby_EventScript_21A227 end diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 4e292a1f9..2b6aee854 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_OnTransition .byte 0 -LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D +LilycoveCity_DepartmentStoreRooftop_MapScript1_OnTransition: @ 822020D getpricereduction 3 compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 67b05c692..d96acee4a 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_OnTransition .byte 0 -LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 +LilycoveCity_Harbor_MapScript1_OnTransition: @ 821E006 setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index ad8989b4c..655d31c2c 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_House3_MapScripts:: @ 821EE3C - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_OnTransition .byte 0 -LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 +LilycoveCity_House3_MapScript1_OnTransition: @ 821EE42 random 4 copyvar VAR_TEMP_1, VAR_RESULT end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 0d8da38d5..b24212777 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD +LilycoveCity_PokemonCenter_1F_MapScript1_OnTransition: @ 821C5BD setrespawn HEAL_LOCATION_LILYCOVE_CITY goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6 end diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index 1e8035483..368b1d355 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index f83be42b9..2d4aca2b6 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_OnTransition .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 @@ -60,7 +60,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 walk_in_place_fastest_down step_end -LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D +LilycoveCity_PokemonTrainerFanClub_MapScript1_OnTransition: @ 821C80D call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index b81f35834..e6625629a 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1,7 +1,7 @@ LinkContestRoom1_MapScripts:: @ 823B781 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815 - map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F + map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803 map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B .byte 0 @@ -10,7 +10,7 @@ LinkContestRoom1_MapScript1_23B79B: @ 823B79B special sub_80F8B94 end -LinkContestRoom1_MapScript1_23B79F: @ 823B79F +LinkContestRoom1_MapScript1_OnTransition: @ 823B79F call LinkContestRoom1_EventScript_23B7AF setvar VAR_TEMP_0, 1 call LinkContestRoom1_EventScript_23B842 diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 0e0360990..71d2234be 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -1,8 +1,8 @@ MagmaHideout_1F_MapScripts:: @ 8239880 - map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886 + map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_OnTransition .byte 0 -MagmaHideout_1F_MapScript1_239886: @ 8239886 +MagmaHideout_1F_MapScript1_OnTransition: @ 8239886 setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 028075648..e3f5d4c49 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,6 +1,6 @@ MarineCave_End_MapScripts:: @ 823AFDF map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA - map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008 + map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_OnTransition .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA @@ -14,7 +14,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4 removeobject 1 return -MarineCave_End_MapScript1_23B008: @ 823B008 +MarineCave_End_MapScript1_OnTransition: @ 823B008 call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012 end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 61839d108..598e17168 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,8 +1,8 @@ MauvilleCity_MapScripts:: @ 81DF385 - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_OnTransition .byte 0 -MauvilleCity_MapScript1_1DF38B: @ 81DF38B +MauvilleCity_MapScript1_OnTransition: @ 81DF38B setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index a866e6aa4..b59354beb 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 +MauvilleCity_PokemonCenter_1F_MapScript1_OnTransition: @ 8210E66 setrespawn HEAL_LOCATION_MAUVILLE_CITY call MauvilleCity_PokemonCenter_1F_EventScript_2718DE goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index a289886a3..675fefd33 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 493cded0a..6c7026913 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,8 +1,8 @@ MossdeepCity_MapScripts:: @ 81E4A96 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_OnTransition .byte 0 -MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C +MossdeepCity_MapScript1_OnTransition: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 9dbead25e..c69369387 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A +MossdeepCity_PokemonCenter_1F_MapScript1_OnTransition: @ 822224A setrespawn HEAL_LOCATION_MOSSDEEP_CITY end diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 922c9a064..bd79c38f4 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 13bf111ba..0124c2f03 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_OnTransition .byte 0 -MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C +MossdeepCity_SpaceCenter_1F_MapScript1_OnTransition: @ 8222F4C compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 41f8af97c..b22f4f5f5 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 .byte 0 -MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 +MossdeepCity_SpaceCenter_2F_MapScript1_OnTransition: @ 8223D63 compare VAR_MOSSDEEP_STATE, 2 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index b3a704443..0c847e5cb 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0 .byte 0 @@ -12,7 +12,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E setmetatile 6, 4, 753, 1 return -MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 +MossdeepCity_StevensHouse_MapScript1_OnTransition: @ 82227A8 compare VAR_STEVENS_HOUSE_STATE, 2 call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index db1fd59ef..f6f04b0e3 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,9 +1,9 @@ MtChimney_MapScripts:: @ 822EDC1 map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 - map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_OnTransition .byte 0 -MtChimney_MapScript1_22EDCC: @ 822EDCC +MtChimney_MapScript1_OnTransition: @ 822EDCC setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 end diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 057001111..19db3183d 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,9 +1,9 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA - map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05 + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D .byte 0 -MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 +MtChimney_CableCarStation_MapScript1_OnTransition: @ 822AC05 compare VAR_CABLE_CAR_STATION_STATE, 1 call_if_eq MtChimney_CableCarStation_EventScript_22AC11 end diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index e24f8ea68..62c64e7c6 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -1,8 +1,8 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC - map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_OnTransition .byte 0 -MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 +MtPyre_Exterior_MapScript1_OnTransition: @ 8231FD2 call MtPyre_Exterior_EventScript_231FD8 end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index a0da7e907..a68404e9a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,8 +1,8 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_OnTransition .byte 0 -MtPyre_Summit_MapScript1_231FFD: @ 8231FFD +MtPyre_Summit_MapScript1_OnTransition: @ 8231FFD compare VAR_MT_PYRE_STATE, 2 call_if_eq MtPyre_Summit_EventScript_232009 end diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 8a617236c..85c6bce5f 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Bottom_MapScripts:: @ 8269255 - map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 .byte 0 -NavelRock_Bottom_MapScript1_269260: @ 8269260 +NavelRock_Bottom_MapScript1_OnTransition: @ 8269260 call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273 call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277 end diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 33bbb6391..2f4373efa 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,8 +1,8 @@ NavelRock_Exterior_MapScripts:: @ 82690B2 - map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_OnTransition .byte 0 -NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 +NavelRock_Exterior_MapScript1_OnTransition: @ 82690B8 setflag FLAG_ARRIVED_AT_NAVEL_ROCK end diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index af011e058..772076e5d 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Top_MapScripts:: @ 8269113 - map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151 .byte 0 -NavelRock_Top_MapScript1_26911E: @ 826911E +NavelRock_Top_MapScript1_OnTransition: @ 826911E call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_269131 call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_26913A end diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 15d2cb02a..ea73efd21 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,6 +1,6 @@ NewMauville_Inside_MapScripts:: @ 82373D7 map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 - map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D .byte 0 @@ -19,7 +19,7 @@ NewMauville_Inside_EventScript_237407:: @ 8237407 removeobject VAR_LAST_TALKED return -NewMauville_Inside_MapScript1_23741B: @ 823741B +NewMauville_Inside_MapScript1_OnTransition: @ 823741B setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index c68ecbd08..4bd6f2e13 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,8 +1,8 @@ OldaleTown_MapScripts:: @ 81E8EA2 - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_OnTransition .byte 0 -OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 +OldaleTown_MapScript1_OnTransition: @ 81E8EA8 call Common_EventScript_SetupRivalGender setflag FLAG_VISITED_OLDALE_TOWN call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 49452da71..c4672eea2 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 +OldaleTown_PokemonCenter_1F_MapScript1_OnTransition: @ 81FC011 setrespawn HEAL_LOCATION_OLDALE_TOWN call OldaleTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index b6795876b..de2685946 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_OnTransition .byte 0 OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 0ae0a53a8..81407ca4c 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,9 +1,9 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 .byte 0 -PacifidlogTown_MapScript1_1EBABC: @ 81EBABC +PacifidlogTown_MapScript1_OnTransition: @ 81EBABC setflag FLAG_VISITED_PACIFIDLOG_TOWN end diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 89fec7f6b..2df87679e 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 +PacifidlogTown_PokemonCenter_1F_MapScript1_OnTransition: @ 82034B2 setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN end diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index cb28d577e..f6a29c19f 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_OnTransition .byte 0 PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index a256a6547..379c7500f 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,11 +1,11 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A .byte 0 -PetalburgCity_Gym_MapScript1_20489E: @ 820489E +PetalburgCity_Gym_MapScript1_OnTransition: @ 820489E compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_2048B5 compare VAR_PETALBURG_GYM_STATE, 7 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 382847bc7..3934239fa 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 +PetalburgCity_PokemonCenter_1F_MapScript1_OnTransition: @ 82079F3 setrespawn HEAL_LOCATION_PETALBURG_CITY call PetalburgCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index 7b5f5af55..99b94ec83 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 47663e1dd..7156da3c1 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,9 +1,9 @@ Route101_MapScripts:: @ 81EBCBA - map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5 + map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB .byte 0 -Route101_MapScript1_1EBCC5: @ 81EBCC5 +Route101_MapScript1_OnTransition: @ 81EBCC5 call Route101_EventScript_2720AD end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index f711416fd..8a42adaef 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,9 +1,9 @@ Route103_MapScripts:: @ 81EC38E - map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 .byte 0 -Route103_MapScript1_1EC399: @ 81EC399 +Route103_MapScript1_OnTransition: @ 81EC399 call Common_EventScript_SetupRivalGender call Route103_EventScript_2720AD end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 1daa9e52c..ef4eb7d29 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,6 +1,6 @@ Route104_MapScripts:: @ 81ECC32 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D - map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_OnTransition .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D @@ -12,7 +12,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47 goto Route104_EventScript_1ED099 end -Route104_MapScript1_1ECC4E: @ 81ECC4E +Route104_MapScript1_OnTransition: @ 81ECC4E call Common_EventScript_SetupRivalGender call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 2b8ebe305..3442104f4 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,6 +1,6 @@ Route105_MapScripts:: @ 81EE1DB map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB - map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E + map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 .byte 0 @@ -17,7 +17,7 @@ Route105_EventScript_1EE20B:: @ 81EE20B setmetatile 9, 20, 145, 1 return -Route105_MapScript1_1EE21E: @ 81EE21E +Route105_MapScript1_OnTransition: @ 81EE21E compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route105_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index cddfbebcc..8b7537127 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,6 +1,6 @@ Route110_MapScripts:: @ 81EF269 map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_1EF27D + map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 .byte 0 @@ -8,7 +8,7 @@ Route110_MapScript1_1EF279: @ 81EF279 special UpdateCyclingRoadState end -Route110_MapScript1_1EF27D: @ 81EF27D +Route110_MapScript1_OnTransition: @ 81EF27D call Common_EventScript_SetupRivalGender call Common_EventScript_SetupRivalOnBikeGender compare VAR_CYCLING_CHALLENGE_STATE, 1 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 1d353dcdd..c5cb59518 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -1,8 +1,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_OnTransition .byte 0 -Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 +Route110_SeasideCyclingRoadSouthEntrance_MapScript1_OnTransition: @ 826EBA7 compare VAR_CYCLING_CHALLENGE_STATE, 3 call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE compare VAR_CYCLING_CHALLENGE_STATE, 2 diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index 996f9d605..19ca3d154 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_26B909 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_OnTransition .byte 0 -Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 +Route110_TrickHouseCorridor_MapScript1_OnTransition: @ 826B909 setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 3ce8cfd5e..33c3dfddf 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_26ACD0 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE .byte 0 @@ -10,7 +10,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D end -Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 +Route110_TrickHouseEnd_MapScript1_OnTransition: @ 826ACD0 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 2c8ef8cb0..d5c5058e9 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_26BBAB + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_OnTransition .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC62 end -Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB +Route110_TrickHousePuzzle2_MapScript1_OnTransition: @ 826BBAB setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index d93ef95e8..317f0a169 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_26BEFF + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_OnTransition .byte 0 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 @@ -11,7 +11,7 @@ Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 end -Route110_TrickHousePuzzle3_MapScript1_26BEFF: @ 826BEFF +Route110_TrickHousePuzzle3_MapScript1_OnTransition: @ 826BEFF setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 86b950e8a..91ed2d8a7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_26CAF6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_OnTransition .byte 0 -Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 +Route110_TrickHousePuzzle5_MapScript1_OnTransition: @ 826CAF6 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index a5b433d13..f3ac76d25 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_26DDB2 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6 .byte 0 -Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 +Route110_TrickHousePuzzle6_MapScript1_OnTransition: @ 826DDB2 special RotatingGate_InitPuzzle end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index b4bd782cf..0c0ad7ebb 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_26E198 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0 .byte 0 @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 setmetatile 7, 5, 574, 1 return -Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 +Route110_TrickHousePuzzle7_MapScript1_OnTransition: @ 826E198 compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 3755ee5e4..69b36b6d4 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,6 +1,6 @@ Route111_MapScripts:: @ 81F0CA7 map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC - map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_1F0D87 + map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 .byte 0 @@ -37,7 +37,7 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 setmetatile 20, 58, 997, 0 return -Route111_MapScript1_1F0D87: @ 81F0D87 +Route111_MapScript1_OnTransition: @ 81F0D87 setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special SetMirageTowerVisibility call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index abc3ca4cd..07934dccd 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,8 +1,8 @@ Route112_MapScripts:: @ 81F1DA8 - map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE + map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_OnTransition .byte 0 -Route112_MapScript1_1F1DAE: @ 81F1DAE +Route112_MapScript1_OnTransition: @ 81F1DAE clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index f3cdae8f9..a2a6fbbcd 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,9 +1,9 @@ Route112_CableCarStation_MapScripts:: @ 822AABE - map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_22AAC9 + map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 .byte 0 -Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 +Route112_CableCarStation_MapScript1_OnTransition: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_CABLE_CAR_STATION_STATE, 2 call_if_eq Route112_CableCarStation_EventScript_22AADD diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 6efd05d6e..61abf7a48 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,13 +1,13 @@ Route113_MapScripts:: @ 81F2153 map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E - map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1F2161 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_OnTransition .byte 0 Route113_MapScript1_1F215E: @ 81F215E setstepcallback 1 end -Route113_MapScript1_1F2161: @ 81F2161 +Route113_MapScript1_OnTransition: @ 81F2161 clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE call Route113_EventScript_1F216A end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index b03a2f228..8600c389e 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,10 +1,10 @@ Route114_MapScripts:: @ 81F252F - map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F + map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 .byte 0 -Route114_MapScript1_1F253F: @ 81F253F +Route114_MapScript1_OnTransition: @ 81F253F compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route114_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 8ab83a441..5b286e802 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,9 +1,9 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 - map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_22AF33 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 .byte 0 -Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 +Route114_FossilManiacsTunnel_MapScript1_OnTransition: @ 822AF33 call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 259cd5904..bedd9239e 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,6 +1,6 @@ Route115_MapScripts:: @ 81F2920 map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 - map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_1F2947 + map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 .byte 0 @@ -11,7 +11,7 @@ Route115_MapScript1_1F2930: @ 81F2930 call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East end -Route115_MapScript1_1F2947: @ 81F2947 +Route115_MapScript1_OnTransition: @ 81F2947 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route115_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 454201307..6aff2760b 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,10 +1,10 @@ Route116_MapScripts:: @ 81F2C0C - map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_1F2C1C + map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 .byte 0 -Route116_MapScript1_1F2C1C: @ 81F2C1C +Route116_MapScript1_OnTransition: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route116_EventScript_273D13 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 08571690f..7c327a665 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,8 +1,8 @@ Route117_MapScripts:: @ 81F397D - map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_1F3983 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_OnTransition .byte 0 -Route117_MapScript1_1F3983: @ 81F3983 +Route117_MapScript1_OnTransition: @ 81F3983 call Route117_EventScript_1F3989 end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 9c1ec46ca..1a8524908 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,10 +1,10 @@ Route118_MapScripts:: @ 81F3DBC - map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC + map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A .byte 0 -Route118_MapScript1_1F3DCC: @ 81F3DCC +Route118_MapScript1_OnTransition: @ 81F3DCC call Route118_EventScript_28CCC7 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route118_EventScript_273D13 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 22a73b74b..3849a5807 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 81F4424 map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F - map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_1F444D + map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_OnTransition .byte 0 Route119_MapScript1_1F442F: @ 81F442F @@ -14,7 +14,7 @@ Route119_EventScript_1F4439:: @ 81F4439 removeobject VAR_LAST_TALKED return -Route119_MapScript1_1F444D: @ 81F444D +Route119_MapScript1_OnTransition: @ 81F444D call Common_EventScript_SetupRivalGender call Common_EventScript_SetupRivalOnBikeGender compare VAR_WEATHER_INSTITUTE_STATE, 1 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 09ed3c4f5..14fb0a2f6 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,8 +1,8 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 - map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_26FA8C + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_OnTransition .byte 0 -Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C +Route119_WeatherInstitute_1F_MapScript1_OnTransition: @ 826FA8C compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_1F_EventScript_26FA98 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e41960fde..ddca892de 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,8 +1,8 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E - map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_26FF24 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_OnTransition .byte 0 -Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 +Route119_WeatherInstitute_2F_MapScript1_OnTransition: @ 826FF24 compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF44 compare VAR_WEATHER_INSTITUTE_STATE, 1 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index b484b064d..d9b4ea4dd 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,6 +1,6 @@ Route120_MapScripts:: @ 81F53EC map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC - map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1F54CD + map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 .byte 0 @@ -60,7 +60,7 @@ Route120_EventScript_1F54C8:: @ 81F54C8 setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT return -Route120_MapScript1_1F54CD: @ 81F54CD +Route120_MapScript1_OnTransition: @ 81F54CD call Route120_EventScript_28CCC7 call Route120_EventScript_1F54D8 end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 8e1692114..2a6ddca13 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,8 +1,8 @@ Route123_MapScripts:: @ 81F6147 - map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D + map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_OnTransition .byte 0 -Route123_MapScript1_1F614D: @ 81F614D +Route123_MapScript1_OnTransition: @ 81F614D special SetRoute123Weather end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 34e315792..f248c3967 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,8 +1,8 @@ Route124_MapScripts:: @ 81F656C - map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_OnTransition .byte 0 -Route124_MapScript1_1F6572: @ 81F6572 +Route124_MapScript1_OnTransition: @ 81F6572 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 8abcbe787..d50046585 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,10 +1,10 @@ Route125_MapScripts:: @ 81F6748 - map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758 + map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A .byte 0 -Route125_MapScript1_1F6758: @ 81F6758 +Route125_MapScript1_OnTransition: @ 81F6758 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route125_EventScript_273D13 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 71bc77b28..34199fe55 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -1,8 +1,8 @@ Route126_MapScripts:: @ 81F68C6 - map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC + map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_OnTransition .byte 0 -Route126_MapScript1_1F68CC: @ 81F68CC +Route126_MapScript1_OnTransition: @ 81F68CC call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 91fab2b61..924de6510 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,10 +1,10 @@ Route127_MapScripts:: @ 81F69D9 - map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9 + map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B .byte 0 -Route127_MapScript1_1F69E9: @ 81F69E9 +Route127_MapScript1_OnTransition: @ 81F69E9 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route127_EventScript_273D13 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index d06abe297..09ed77003 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,9 +1,9 @@ Route128_MapScripts:: @ 81F6B38 - map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43 + map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D .byte 0 -Route128_MapScript1_1F6B43: @ 81F6B43 +Route128_MapScript1_OnTransition: @ 81F6B43 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 25aa675a6..e8937c436 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,5 +1,5 @@ Route129_MapScripts:: @ 81F7284 - map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB + map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 .byte 0 @@ -11,7 +11,7 @@ Route129_MapScript1_1F7294: @ 81F7294 call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East end -Route129_MapScript1_1F72AB: @ 81F72AB +Route129_MapScript1_OnTransition: @ 81F72AB compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route129_EventScript_273D13 compare VAR_RAYQUAZA_STATE, 4 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index cdcc61550..40ec26c6c 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,8 +1,8 @@ Route130_MapScripts:: @ 81F735F - map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365 + map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_OnTransition .byte 0 -Route130_MapScript1_1F7365: @ 81F7365 +Route130_MapScript1_OnTransition: @ 81F7365 compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route130_EventScript_1F73B5 specialvar VAR_RESULT, IsMirageIslandPresent diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 0d178e969..bad42e679 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -1,8 +1,8 @@ Route131_MapScripts:: @ 81F7404 - map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_1F740A + map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_OnTransition .byte 0 -Route131_MapScript1_1F740A: @ 81F740A +Route131_MapScript1_OnTransition: @ 81F740A compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route131_EventScript_1F741F call Route131_EventScript_1F741B diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 1ba63c959..6df6019f4 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,9 +1,9 @@ RustboroCity_MapScripts:: @ 81E06BD - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B .byte 0 -RustboroCity_MapScript1_1E06C8: @ 81E06C8 +RustboroCity_MapScript1_OnTransition: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call Common_EventScript_SetupRivalGender compare VAR_RUSTBORO_STATE, 6 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 4f1971c80..a40331e16 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_21124B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_OnTransition .byte 0 -RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B +RustboroCity_DevonCorp_1F_MapScript1_OnTransition: @ 821124B call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211255 end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index fab587fb7..1df981249 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_21185D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_OnTransition .byte 0 -RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D +RustboroCity_DevonCorp_2F_MapScript1_OnTransition: @ 821185D compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 6d0a78a42..faed5fafa 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_21243D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455 map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464 .byte 0 -RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D +RustboroCity_DevonCorp_3F_MapScript1_OnTransition: @ 821243D compare VAR_DEVON_CORP_3F_STATE, 0 call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index e7bea0f0d..c3f649ebd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_214D6D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D +RustboroCity_PokemonCenter_1F_MapScript1_OnTransition: @ 8214D6D setrespawn HEAL_LOCATION_RUSTBORO_CITY call RustboroCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index fac3cb059..48b1b936d 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 8e7e2342e..8cf29b51f 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,5 +1,5 @@ RusturfTunnel_MapScripts:: @ 822CE27 - map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 .byte 0 @@ -8,7 +8,7 @@ RusturfTunnel_MapScript2_22CE32: @ 822CE32 map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE .2byte 0 -RusturfTunnel_MapScript1_22CE44: @ 822CE44 +RusturfTunnel_MapScript1_OnTransition: @ 822CE44 compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if_eq RusturfTunnel_EventScript_22CE50 end diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 75ec95d33..7dd1c2b3f 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,5 +1,5 @@ SafariZone_South_MapScripts:: @ 823D279 - map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_23D2B1 + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 .byte 0 @@ -18,7 +18,7 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E releaseall end -SafariZone_South_MapScript1_23D2B1: @ 823D2B1 +SafariZone_South_MapScript1_OnTransition: @ 823D2B1 compare VAR_SAFARI_ZONE_STATE, 2 call_if_eq SafariZone_South_EventScript_23D2BD end diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index c4ddb3a9e..1a325b5d5 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,6 +1,6 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 - map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 @@ -9,7 +9,7 @@ SecretBase_RedCave1_MapScript2_23B498: @ 823B498 map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C .2byte 0 -SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 +SecretBase_RedCave1_MapScript1_OnTransition: @ 823B4A2 call SecretBase_RedCave1_EventScript_275CE1 special SetSecretBaseOwnerGfxId special sub_80EB1AC diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 218cabc67..8cd563801 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,8 +1,8 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA - map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_OnTransition .byte 0 -ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 +ShoalCave_LowTideEntranceRoom_MapScript1_OnTransition: @ 8236DC0 special UpdateShoalTideFlag goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index f1a29b28a..a063af23d 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 - map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_236F00 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_OnTransition .byte 0 -ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 +ShoalCave_LowTideInnerRoom_MapScript1_OnTransition: @ 8236F00 goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E goto ShoalCave_LowTideInnerRoom_EventScript_236F12 diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 18ec43ad6..d5d77f834 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -1,13 +1,13 @@ SkyPillar_1F_MapScripts:: @ 8239615 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_23961B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_OnTransition .byte 0 -SkyPillar_1F_MapScript1_23961B: @ 823961B +SkyPillar_1F_MapScript1_OnTransition: @ 823961B compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_1F_EventScript_239627 + call_if_lt SkyPillar_1F_EventScript_CleanFloor end -SkyPillar_1F_EventScript_239627:: @ 8239627 +SkyPillar_1F_EventScript_CleanFloor:: @ 8239627 setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN return diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 9059bd246..db7c7763c 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,16 +1,16 @@ SkyPillar_2F_MapScripts:: @ 823962B map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_23963B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 .byte 0 -SkyPillar_2F_MapScript1_23963B: @ 823963B +SkyPillar_2F_MapScript1_OnTransition: @ 823963B compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_2F_EventScript_23964C + call_if_lt SkyPillar_2F_EventScript_CleanFloor copyvar VAR_ICE_STEP_COUNT, 0x1 end -SkyPillar_2F_EventScript_23964C:: @ 823964C +SkyPillar_2F_EventScript_CleanFloor:: @ 823964C setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index ba6a5128d..ebfa65834 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -1,13 +1,13 @@ SkyPillar_3F_MapScripts:: @ 823965B - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_239661 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_OnTransition .byte 0 -SkyPillar_3F_MapScript1_239661: @ 8239661 +SkyPillar_3F_MapScript1_OnTransition: @ 8239661 compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_3F_EventScript_23966D + call_if_lt SkyPillar_3F_EventScript_CleanFloor end -SkyPillar_3F_EventScript_23966D:: @ 823966D +SkyPillar_3F_EventScript_CleanFloor:: @ 823966D setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN return diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 355530fdc..5bb9dd131 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,16 +1,16 @@ SkyPillar_4F_MapScripts:: @ 8239671 map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_239681 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 .byte 0 -SkyPillar_4F_MapScript1_239681: @ 8239681 +SkyPillar_4F_MapScript1_OnTransition: @ 8239681 compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_4F_EventScript_239692 + call_if_lt SkyPillar_4F_EventScript_CleanFloor copyvar VAR_ICE_STEP_COUNT, 0x1 end -SkyPillar_4F_EventScript_239692:: @ 8239692 +SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index ba35e16f2..6a9a53b1c 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -1,13 +1,13 @@ SkyPillar_5F_MapScripts:: @ 82396A2 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_2396A8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_OnTransition .byte 0 -SkyPillar_5F_MapScript1_2396A8: @ 82396A8 +SkyPillar_5F_MapScript1_OnTransition: @ 82396A8 compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_5F_EventScript_2396B4 + call_if_lt SkyPillar_5F_EventScript_CleanFloor return -SkyPillar_5F_EventScript_2396B4:: @ 82396B4 +SkyPillar_5F_EventScript_CleanFloor:: @ 82396B4 setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN return diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index c4769c990..ec2d2ce72 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -1,10 +1,10 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_2392B8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_OnTransition map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA .byte 0 -SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 +SkyPillar_Outside_MapScript1_OnTransition: @ 82392B8 compare VAR_RAYQUAZA_STATE, 3 call_if_eq SkyPillar_Outside_EventScript_2392CF compare VAR_RAYQUAZA_STATE, 4 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index dccdac1b4..116bb9a95 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,6 +1,6 @@ SkyPillar_Top_MapScripts:: @ 82396B8 map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_2396E6 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 .byte 0 @@ -15,7 +15,7 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2 removeobject VAR_LAST_TALKED return -SkyPillar_Top_MapScript1_2396E6: @ 82396E6 +SkyPillar_Top_MapScript1_OnTransition: @ 82396E6 compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_Top_EventScript_2396FD compare VAR_SKY_PILLAR_STATE, 2 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 88bcb2e6c..175d25416 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,9 +1,9 @@ SlateportCity_MapScripts:: @ 81DCC61 - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_1DCC6C + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12 .byte 0 -SlateportCity_MapScript1_1DCC6C: @ 81DCC6C +SlateportCity_MapScript1_OnTransition: @ 81DCC6C setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_1DCC8D compare VAR_SLATEPORT_STATE, 1 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index a5e2a493c..d9e811559 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -1,10 +1,10 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_209970 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 .byte 0 -SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 +SlateportCity_BattleTentBattleRoom_MapScript1_OnTransition: @ 8209970 call SlateportCity_BattleTentBattleRoom_EventScript_209976 end diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 8f9f77e97..b210ebebb 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_20C983 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_OnTransition .byte 0 -SlateportCity_Harbor_MapScript1_20C983: @ 820C983 +SlateportCity_Harbor_MapScript1_OnTransition: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_SLATEPORT_HARBOR_STATE, 1 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 8c1f87e63..2957dfcd4 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_20DACA + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA +SlateportCity_PokemonCenter_1F_MapScript1_OnTransition: @ 820DACA setrespawn HEAL_LOCATION_SLATEPORT_CITY call SlateportCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index 1ddbcc0be..275ac6288 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index ad72120f9..64683b338 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MapScripts:: @ 81E565C map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_1E56EF + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB @@ -31,7 +31,7 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 setmetatile 31, 32, 592, 1 return -SootopolisCity_MapScript1_1E56EF: @ 81E56EF +SootopolisCity_MapScript1_OnTransition: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY compare VAR_RAYQUAZA_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5781 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index b9abdf656..884111783 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -2,10 +2,10 @@ SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_224E61 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_OnTransition .byte 0 -SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 +SootopolisCity_Gym_1F_MapScript1_OnTransition: @ 8224E61 setvar VAR_ICE_STEP_COUNT, 1 end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index c7ceb0a4f..0d54edd83 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D .byte 0 -SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E +SootopolisCity_MysteryEventsHouse_1F_MapScript1_OnTransition: @ 822795E setvar VAR_0x8004, 16 special CallFrontierUtilFunc compare VAR_RESULT, 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 374aa6270..9ae0c9588 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E .byte 0 -SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A +SootopolisCity_MysteryEventsHouse_B1F_MapScript1_OnTransition: @ 8227E5A special SetEReaderTrainerGfxId end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 97cb2d4d7..7b9c59208 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC +SootopolisCity_PokemonCenter_1F_MapScript1_OnTransition: @ 82264FC setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY end diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 275fe3046..f9bb11d55 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_OnTransition .byte 0 SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 958c5f546..68233d46a 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50 - map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_242A6E + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_OnTransition .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 @@ -14,7 +14,7 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A removeobject 2 return -SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E +SouthernIsland_Interior_MapScript1_OnTransition: @ 8242A6E compare VAR_ROAMER_POKEMON, 0 call_if_eq SouthernIsland_Interior_EventScript_242A8A compare VAR_ROAMER_POKEMON, 0 diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index b5a664a76..3b83b85d1 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -1,6 +1,6 @@ TerraCave_End_MapScripts:: @ 823B0B0 map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB - map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_23B0D9 + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_OnTransition .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB @@ -14,7 +14,7 @@ TerraCave_End_EventScript_23B0C5:: @ 823B0C5 removeobject 1 return -TerraCave_End_MapScript1_23B0D9: @ 823B0D9 +TerraCave_End_MapScript1_OnTransition: @ 823B0D9 call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_23B0E3 end diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc index b9e3e5910..e9acdbe03 100644 --- a/data/maps/TerraCave_Entrance/scripts.inc +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -1,8 +1,8 @@ TerraCave_Entrance_MapScripts:: @ 823B0A6 - map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_23B0AC + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_OnTransition .byte 0 -TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC +TerraCave_Entrance_MapScript1_OnTransition: @ 823B0AC setflag FLAG_ARRIVED_AT_TERRA_CAVE_ENTRANCE end diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index 9309d51f4..824194eaf 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,13 +1,13 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_23AFC7 - map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_23AFC3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_OnTransition .byte 0 -Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 +Underwater_MarineCave_MapScript1_OnTransition: @ 823AFC3 setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT end -Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 +Underwater_MarineCave_MapScript1_OnResume: @ 823AFC7 setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 end diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index 0871ae033..ebc378bf2 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,6 +1,6 @@ UnionRoom_MapScripts:: @ 823D1A6 map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 - map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5 + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_OnTransition .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 @@ -23,7 +23,7 @@ UnionRoom_MapScript1_23D1B1: @ 823D1B1 special UnionRoomSpecial end -UnionRoom_MapScript1_23D1E5: @ 823D1E5 +UnionRoom_MapScript1_OnTransition: @ 823D1E5 end UnionRoom_EventScript_23D1E6:: @ 823D1E6 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index bd2bce048..760c79494 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,8 +1,8 @@ VerdanturfTown_MapScripts:: @ 81EB566 - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_1EB56C + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_OnTransition .byte 0 -VerdanturfTown_MapScript1_1EB56C: @ 81EB56C +VerdanturfTown_MapScript1_OnTransition: @ 81EB56C setflag FLAG_VISITED_VERDANTURF_TOWN setvar VAR_LINK_CONTEST_ROOM_STATE, 0 end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 9d98e790c..f97f77242 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -1,10 +1,10 @@ VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 .byte 0 -VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A +VerdanturfTown_BattleTentBattleRoom_MapScript1_OnTransition: @ 820230A call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 end diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 474448132..e5d40b9fa 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_OnTransition map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 +VerdanturfTown_PokemonCenter_1F_MapScript1_OnTransition: @ 8202731 setrespawn HEAL_LOCATION_VERDANTURF_TOWN call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index b09335fb2..12fba9c8d 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_OnTransition .byte 0 VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 96f3c6f42..aafc13657 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,8 +1,8 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A - map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_235D80 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_OnTransition .byte 0 -VictoryRoad_1F_MapScript1_235D80: @ 8235D80 +VictoryRoad_1F_MapScript1_OnTransition: @ 8235D80 compare VAR_VICTORY_ROAD_1F_STATE, 1 call_if_eq VictoryRoad_1F_EventScript_235D97 compare VAR_VICTORY_ROAD_1F_STATE, 2 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c755493dc..816fa9e6e 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,20 +1,20 @@ -BattleFrontier_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -DewfordTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF: @ 8276ACF -FallarborTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -FortreeCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -LilycoveCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -MauvilleCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -MossdeepCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -OldaleTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -PetalburgCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -RustboroCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -SlateportCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -SootopolisCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF +BattleFrontier_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +DewfordTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +EverGrandeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +EverGrandeCity_PokemonLeague_2F_MapScript1_OnTransition: @ 8276ACF +FallarborTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +FortreeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +LavaridgeTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +LilycoveCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +MauvilleCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +MossdeepCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +OldaleTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +PacifidlogTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +PetalburgCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +RustboroCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +SlateportCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +SootopolisCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF +VerdanturfTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF call OldaleTown_PokemonCenter_2F_EventScript_276AD5 end diff --git a/include/battle_transition.h b/include/battle_transition.h index 0d6ef3c83..db06a5638 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -13,7 +13,7 @@ extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; enum // TRANSITION_MUGSHOT { - MUGSHOT_SYDNEY, + MUGSHOT_SIDNEY, MUGSHOT_PHOEBE, MUGSHOT_GLACIA, MUGSHOT_DRAKE, @@ -36,7 +36,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_WHITEFADE 9 #define B_TRANSITION_GRID_SQUARES 10 #define B_TRANSITION_SHARDS 11 -#define B_TRANSITION_SYDNEY 12 +#define B_TRANSITION_SIDNEY 12 #define B_TRANSITION_PHOEBE 13 #define B_TRANSITION_GLACIA 14 #define B_TRANSITION_DRAKE 15 diff --git a/include/constants/flags.h b/include/constants/flags.h index c56e9013d..732c68764 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1248,7 +1248,7 @@ #define FLAG_UNUSED_0x4F9 0x4F9 // Unused Flag #define FLAG_UNUSED_0x4FA 0x4FA // Unused Flag -#define FLAG_DEFEATED_ELITE_4_SYDNEY 0x4FB +#define FLAG_DEFEATED_ELITE_4_SIDNEY 0x4FB #define FLAG_DEFEATED_ELITE_4_PHOEBE 0x4FC #define FLAG_DEFEATED_ELITE_4_GLACIA 0x4FD #define FLAG_DEFEATED_ELITE_4_DRAKE 0x4FE diff --git a/src/battle_setup.c b/src/battle_setup.c index 712098773..288fdb3e9 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -793,7 +793,7 @@ static u8 GetTrainerBattleTransition(void) if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR) { if (gTrainerBattleOpponent_A == TRAINER_SIDNEY) - return B_TRANSITION_SYDNEY; + return B_TRANSITION_SIDNEY; if (gTrainerBattleOpponent_A == TRAINER_PHOEBE) return B_TRANSITION_PHOEBE; if (gTrainerBattleOpponent_A == TRAINER_GLACIA) diff --git a/src/battle_transition.c b/src/battle_transition.c index 6ad1f57d6..7edb1bd93 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -76,7 +76,7 @@ static void Phase2Task_Slice(u8 taskId); static void Phase2Task_WhiteFade(u8 taskId); static void Phase2Task_GridSquares(u8 taskId); static void Phase2Task_Shards(u8 taskId); -static void Phase2Task_Sydney(u8 taskId); +static void Phase2Task_Sidney(u8 taskId); static void Phase2Task_Phoebe(u8 taskId); static void Phase2Task_Glacia(u8 taskId); static void Phase2Task_Drake(u8 taskId); @@ -331,7 +331,7 @@ static const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] = Phase2Task_WhiteFade, // 9 Phase2Task_GridSquares, // 10 Phase2Task_Shards, // 11 - Phase2Task_Sydney, // 12 + Phase2Task_Sidney, // 12 Phase2Task_Phoebe, // 13 Phase2Task_Glacia, // 14 Phase2Task_Drake, // 15 @@ -824,7 +824,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo10 = gFieldEffectObjectPalette10, 0x1009 }; -static const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal"); +static const u16 sMugshotPal_Sidney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal"); static const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal"); static const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal"); static const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal"); @@ -834,7 +834,7 @@ static const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may static const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] = { - sMugshotPal_Sydney, + sMugshotPal_Sidney, sMugshotPal_Phoebe, sMugshotPal_Glacia, sMugshotPal_Drake, @@ -2073,9 +2073,9 @@ static void VBlankCB_Phase2_Wave(void) DmaSet(0, gScanlineEffectRegBuffers[1], ®_WIN0H, 0xA2400001); } -static void Phase2Task_Sydney(u8 taskId) +static void Phase2Task_Sidney(u8 taskId) { - gTasks[taskId].tMugshotId = MUGSHOT_SYDNEY; + gTasks[taskId].tMugshotId = MUGSHOT_SIDNEY; Phase2Task_MugShotTransition(taskId); } |