diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 19:16:45 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 19:16:57 -0500 |
| commit | 2e5bf6c9ef4f4406b1dd725e91a88cbdd10ad5c2 (patch) | |
| tree | efaa59d9de2fa1df7621d859b6c0f2ebc91ebd8b | |
| parent | 31d31d326034fde26dedaf2dadb1c608e00fb92f (diff) | |
Use map_script constants, name unique map_script labels
149 files changed, 481 insertions, 481 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 9959c058d..3598526ce 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,14 +1,14 @@ BirthIsland_Exterior_MapScripts:: @ 8165203 - map_script 3, BirthIsland_Exterior_MapScript1_165217 - map_script 5, BirthIsland_Exterior_MapScript2_165253 - map_script 7, BirthIsland_Exterior_MapScript3_165213 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField .byte 0 -BirthIsland_Exterior_MapScript3_165213:: @ 8165213 +BirthIsland_Exterior_OnReturnToField:: @ 8165213 special Special_SetDeoxysTriangleObjectPal end -BirthIsland_Exterior_MapScript1_165217:: @ 8165217 +BirthIsland_Exterior_OnTransition:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 @@ -31,7 +31,7 @@ EventScript_165243:: @ 8165243 clearflag FLAG_SYS_DEOXYS_AWAKENED return -BirthIsland_Exterior_MapScript2_165253:: @ 8165253 +BirthIsland_Exterior_OnResume:: @ 8165253 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_16525D end diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index b5e32115f..6c8aea741 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_MapScripts:: @ 8166C8F - map_script 3, CeladonCity_MapScript1_166C95 + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition .byte 0 -CeladonCity_MapScript1_166C95:: @ 8166C95 +CeladonCity_OnTransition:: @ 8166C95 setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 1a2403837..d71aa6e3d 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 - map_script 1, CeladonCity_GameCorner_MapScript1_16C64C + map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad .byte 0 -CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C +CeladonCity_GameCorner_OnLoad:: @ 816C64C checkflag FLAG_OPENED_ROCKET_HIDEOUT call_if FALSE, EventScript_16C656 end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 92bde48ad..10aedd1da 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC - map_script 3, CeladonCity_PokemonCenter_1F_MapScript1_16C5F7 - map_script 5, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -CeladonCity_PokemonCenter_1F_MapScript1_16C5F7:: @ 816C5F7 +CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 setrespawn SPAWN_CELADON_CITY end diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index 1b07679eb..cbe78efca 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F - map_script 2, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CeladonCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeladonCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, CeladonCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc index db76ddfd7..2113716e2 100644 --- a/data/maps/CeruleanCave_1F/scripts.inc +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -1,7 +1,7 @@ CeruleanCave_1F_MapScripts:: @ 81624B3 - map_script 3, CeruleanCave_1F_MapScript1_1624B9 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_1F_OnTransition .byte 0 -CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 +CeruleanCave_1F_OnTransition:: @ 81624B9 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F end diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 01e077b3c..036f564a5 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -1,9 +1,9 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE - map_script 5, CeruleanCave_B1F_MapScript1_1624C9 - map_script 3, CeruleanCave_B1F_MapScript2_1624E7 + map_script MAP_SCRIPT_ON_RESUME, CeruleanCave_B1F_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_B1F_OnTransition .byte 0 -CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 +CeruleanCave_B1F_OnResume:: @ 81624C9 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_1624D3 end @@ -15,7 +15,7 @@ EventScript_1624D3:: @ 81624D3 removeobject VAR_LAST_TALKED return -CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 +CeruleanCave_B1F_OnTransition:: @ 81624E7 checkflag FLAG_FOUGHT_MEWTWO call_if FALSE, EventScript_1624F1 end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index dd68b4bcc..539b1b2f5 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -1,8 +1,8 @@ CeruleanCity_MapScripts:: @ 8166471 - map_script 3, CeruleanCity_MapScript1_166477 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition .byte 0 -CeruleanCity_MapScript1_166477:: @ 8166477 +CeruleanCity_OnTransition:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY checkflag FLAG_GOT_SS_TICKET call_if FALSE, EventScript_166484 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index 6a67f0fe1..c3bbbbe70 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D - map_script 3, CeruleanCity_PokemonCenter_1F_MapScript1_16AA38 - map_script 5, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -CeruleanCity_PokemonCenter_1F_MapScript1_16AA38:: @ 816AA38 +CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 setrespawn SPAWN_CERULEAN_CITY end diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 3778c494d..74d3fe451 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 - map_script 2, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CeruleanCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CeruleanCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, CeruleanCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 4a971c1a5..824f0268c 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -1,9 +1,9 @@ CinnabarIsland_MapScripts:: @ 8166ED6 - map_script 3, CinnabarIsland_MapScript1_166EE1 - map_script 2, CinnabarIsland_MapScript2_166F6E + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame .byte 0 -CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 +CinnabarIsland_OnTransition:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 @@ -50,7 +50,7 @@ EventScript_166F68:: @ 8166F68 setvar VAR_0x4001, 1 return -CinnabarIsland_MapScript2_166F6E:: @ 8166F6E +CinnabarIsland_OnFrame:: @ 8166F6E map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88 map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index f2959212c..f46035e48 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B - map_script 1, CinnabarIsland_Gym_MapScript1_16D951 + map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad .byte 0 -CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 +CinnabarIsland_Gym_OnLoad:: @ 816D951 checkflag FLAG_DEFEATED_BLAINE goto_if TRUE, EventScript_16D991 checkflag FLAG_CINNABAR_GYM_QUIZ_1 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 77f003f56..b935d812e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 - map_script 3, CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2 - map_script 5, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -CinnabarIsland_PokemonCenter_1F_MapScript1_16E8E2:: @ 816E8E2 +CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 setrespawn SPAWN_CINNABAR_ISLAND end diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 828f9296a..6ca90c913 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 - map_script 2, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CinnabarIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 275161475..89b8f9f09 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -1,8 +1,8 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 - map_script 3, CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279 + map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonLab_Entrance_OnTransition .byte 0 -CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 +CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279 compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 call_if eq, EventScript_16E285 end diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc index 28bd063ac..9cf544838 100644 --- a/data/maps/DiglettsCave_B1F/scripts.inc +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -1,7 +1,7 @@ DiglettsCave_B1F_MapScripts:: @ 8160EF1 - map_script 3, DiglettsCave_B1F_MapScript1_160EF7 + map_script MAP_SCRIPT_ON_TRANSITION, DiglettsCave_B1F_OnTransition .byte 0 -DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 +DiglettsCave_B1F_OnTransition:: @ 8160EF7 setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 916cba8a1..a26723b11 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_MapScripts:: @ 8167E8E - map_script 3, FiveIsland_MapScript1_167E94 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_OnTransition .byte 0 -FiveIsland_MapScript1_167E94:: @ 8167E94 +FiveIsland_OnTransition:: @ 8167E94 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc index e288ceff6..9292c9e5e 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC - map_script 3, FiveIsland_LostCave_Entrance_MapScript1_164BF2 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_LostCave_Entrance_OnTransition .byte 0 -FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 +FiveIsland_LostCave_Entrance_OnTransition:: @ 8164BF2 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE end diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index cb7b90267..4d115868c 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -1,9 +1,9 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D - map_script 5, FiveIsland_LostCave_Room10_MapScript1_164C38 - map_script 2, FiveIsland_LostCave_Room10_MapScript2_164C48 + map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame .byte 0 -FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 +FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 checktrainerflag TRAINER_LADY_SELPHY call_if eq, EventScript_164C42 end @@ -12,7 +12,7 @@ EventScript_164C42:: @ 8164C42 setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return -FiveIsland_LostCave_Room10_MapScript2_164C48:: @ 8164C48 +FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48 map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52 .2byte 0 diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 51ddd9dd9..11283c81b 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 - map_script 1, FiveIsland_Meadow_MapScript1_168938 + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_Meadow_OnLoad .byte 0 -FiveIsland_Meadow_MapScript1_168938:: @ 8168938 +FiveIsland_Meadow_OnLoad:: @ 8168938 checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE call_if TRUE, EventScript_168983 end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index a16cb37d1..48311f359 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 - map_script 3, FiveIsland_PokemonCenter_1F_MapScript1_171CFC - map_script 5, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -FiveIsland_PokemonCenter_1F_MapScript1_171CFC:: @ 8171CFC +FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC setrespawn SPAWN_FIVE_ISLAND end diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index 5c50a6092..57590e30b 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B - map_script 2, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index a4d49de1b..b4ccfd848 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,9 +1,9 @@ FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 - map_script 4, FiveIsland_ResortGorgeous_MapScript1_1687EF - map_script 2, FiveIsland_ResortGorgeous_MapScript2_1687FE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame .byte 0 -FiveIsland_ResortGorgeous_MapScript1_1687EF:: @ 81687EF +FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9 .2byte 0 @@ -11,7 +11,7 @@ EventScript_1687F9:: @ 81687F9 turnobject 255, 2 end -FiveIsland_ResortGorgeous_MapScript2_1687FE:: @ 81687FE +FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808 .2byte 0 diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 1215fb092..62fe32a26 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -1,13 +1,13 @@ FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E - map_script 1, FiveIsland_RocketWarehouse_MapScript1_163F3D - map_script 3, FiveIsland_RocketWarehouse_MapScript2_163F39 + map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition .byte 0 -FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 +FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE end -FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D +FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D checktrainerflag TRAINER_TEAM_ROCKET_ADMIN call_if eq, EventScript_163F47 end diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 0515c29b5..bb2bbf330 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,9 +1,9 @@ FourIsland_MapScripts:: @ 8167CAE - map_script 3, FourIsland_MapScript1_167CB9 - map_script 2, FourIsland_MapScript2_167CE2 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame .byte 0 -FourIsland_MapScript1_167CB9:: @ 8167CB9 +FourIsland_OnTransition:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare VAR_MAP_SCENE_FOUR_ISLAND, 0 call_if eq, EventScript_167CCD @@ -22,7 +22,7 @@ EventScript_167CD1:: @ 8167CD1 EventScript_167CE1:: @ 8167CE1 return -FourIsland_MapScript2_167CE2:: @ 8167CE2 +FourIsland_OnFrame:: @ 8167CE2 map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC .2byte 0 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 1c3d8da1f..92bda55bf 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -1,18 +1,18 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 - map_script 5, FourIsland_IcefallCave_1F_MapScript1_163D54 - map_script 1, FourIsland_IcefallCave_1F_MapScript2_163D57 - map_script 2, FourIsland_IcefallCave_1F_MapScript3_163D5B + map_script MAP_SCRIPT_ON_RESUME, FourIsland_IcefallCave_1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, FourIsland_IcefallCave_1F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_IcefallCave_1F_OnFrame .byte 0 -FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54 +FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 setstepcallback 4 end -FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57 +FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 special Special_SetIcefallCaveCrackedIceMetatiles end -FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B +FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B map_script_2 VAR_0x4001, 1, EventScript_163D65 .2byte 0 diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 582b068ec..45d0b163e 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -1,8 +1,8 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 - map_script 3, FourIsland_IcefallCave_Back_MapScript1_163D88 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 -FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 +FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 call_if eq, EventScript_163D94 end diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc index a3c4ea616..b8bbd1102 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A - map_script 3, FourIsland_IcefallCave_Entrance_MapScript1_163D40 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Entrance_OnTransition .byte 0 -FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 +FourIsland_IcefallCave_Entrance_OnTransition:: @ 8163D40 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index 6a8915d83..a2fa3215c 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -1,8 +1,8 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E - map_script 3, FourIsland_LoreleisHouse_MapScript1_171C54 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_LoreleisHouse_OnTransition .byte 0 -FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54 +FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 special Special_ComputeLoreleiDollCollection end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index cc4cb5ffa..9f06f57ff 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA - map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 - map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, FourIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 +FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 setrespawn SPAWN_FOUR_ISLAND end diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index 08482ec27..9ae9b89ae 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D - map_script 2, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FourIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FourIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, FourIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index f66cf33e6..7f26b03f3 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_MapScripts:: @ 8166D75 - map_script 3, FuchsiaCity_MapScript1_166D7B + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_OnTransition .byte 0 -FuchsiaCity_MapScript1_166D7B:: @ 8166D7B +FuchsiaCity_OnTransition:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY checkflag FLAG_GOT_DOME_FOSSIL call_if TRUE, EventScript_166D91 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 062f93acc..b33de6d5e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 - map_script 3, FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC - map_script 5, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -FuchsiaCity_PokemonCenter_1F_MapScript1_16D6FC:: @ 816D6FC +FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC setrespawn SPAWN_FUCHSIA_CITY end diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 322dd3930..c9cd2019c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 - map_script 2, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FuchsiaCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, FuchsiaCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index e521d70d4..d02818377 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -1,8 +1,8 @@ FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 - map_script 2, FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE + map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_SafariZone_Entrance_OnFrame .byte 0 -FuchsiaCity_SafariZone_Entrance_MapScript1_16D2AE:: @ 816D2AE +FuchsiaCity_SafariZone_Entrance_OnFrame:: @ 816D2AE map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, EventScript_16D2F2 map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, EventScript_16D312 map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, EventScript_16D2C8 diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index c8bd4aa30..68701031d 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -1,9 +1,9 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B - map_script 3, IndigoPlateau_Exterior_MapScript1_167246 - map_script 2, IndigoPlateau_Exterior_MapScript2_16725A + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame .byte 0 -IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 +IndigoPlateau_Exterior_OnTransition:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic @@ -13,7 +13,7 @@ EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255 playbgm MUS_ENDING, 0 return -IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A +IndigoPlateau_Exterior_OnFrame:: @ 816725A map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits .2byte 0 diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 8d15b25fe..37fcdd37d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A - map_script 3, IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65 - map_script 5, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 +IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, 1 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index 6c2955435..15a721f76 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F - map_script 2, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, IndigoPlateau_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, IndigoPlateau_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index f290f8d14..7cbba172b 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -1,8 +1,8 @@ LavenderTown_MapScripts:: @ 816686B - map_script 3, LavenderTown_MapScript1_166871 + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_OnTransition .byte 0 -LavenderTown_MapScript1_166871:: @ 8166871 +LavenderTown_OnTransition:: @ 8166871 setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 setflag FLAG_HIDE_SS_ANNE_RIVAL diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index f7341b8f9..e43fee459 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF - map_script 3, LavenderTown_PokemonCenter_1F_MapScript1_16B0FA - map_script 5, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -LavenderTown_PokemonCenter_1F_MapScript1_16B0FA:: @ 816B0FA +LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA setrespawn SPAWN_LAVENDER_TOWN end diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 7042c66c8..7e7bc4431 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 - map_script 2, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavenderTown_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavenderTown_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, LavenderTown_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index b76eb8502..b43644467 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -1,9 +1,9 @@ MtEmber_Exterior_MapScripts:: @ 8163946 - map_script 3, MtEmber_Exterior_MapScript1_163951 - map_script 1, MtEmber_Exterior_MapScript2_163969 + map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition + map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad .byte 0 -MtEmber_Exterior_MapScript1_163951:: @ 8163951 +MtEmber_Exterior_OnTransition:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 call_if eq, EventScript_163960 @@ -14,7 +14,7 @@ EventScript_163960:: @ 8163960 setobjectmovementtype 3, 8 return -MtEmber_Exterior_MapScript2_163969:: @ 8163969 +MtEmber_Exterior_OnLoad:: @ 8163969 compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 call_if ge, EventScript_163975 end diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 4d4662e6e..102fa72a5 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -1,9 +1,9 @@ MtEmber_Summit_MapScripts:: @ 8163AFC - map_script 3, MtEmber_Summit_MapScript1_163B25 - map_script 5, MtEmber_Summit_MapScript2_163B07 + map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Summit_OnTransition + map_script MAP_SCRIPT_ON_RESUME, MtEmber_Summit_OnResume .byte 0 -MtEmber_Summit_MapScript2_163B07:: @ 8163B07 +MtEmber_Summit_OnResume:: @ 8163B07 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_163B11 end @@ -15,7 +15,7 @@ EventScript_163B11:: @ 8163B11 removeobject VAR_LAST_TALKED return -MtEmber_Summit_MapScript1_163B25:: @ 8163B25 +MtEmber_Summit_OnTransition:: @ 8163B25 checkflag FLAG_FOUGHT_MOLTRES call_if FALSE, EventScript_163B2F end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 28bc65ec9..f2c50be17 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -1,8 +1,8 @@ MtMoon_1F_MapScripts:: @ 81605E4 - map_script 3, MtMoon_1F_MapScript1_1605EA + map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_1F_OnTransition .byte 0 -MtMoon_1F_MapScript1_1605EA:: @ 81605EA +MtMoon_1F_OnTransition:: @ 81605EA setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index f0e2ff9f8..99360a55a 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -1,8 +1,8 @@ MtMoon_B2F_MapScripts:: @ 8160699 - map_script 3, MtMoon_B2F_MapScript1_16069F + map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 -MtMoon_B2F_MapScript1_16069F:: @ 816069F +MtMoon_B2F_OnTransition:: @ 816069F checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON call_if FALSE, EventScript_1606A9 end diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index dfe55b6b2..86981b393 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Base_MapScripts:: @ 81650E7 - map_script 3, NavelRock_Base_MapScript1_1650F2 - map_script 5, NavelRock_Base_MapScript2_165116 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume .byte 0 -NavelRock_Base_MapScript1_1650F2:: @ 81650F2 +NavelRock_Base_OnTransition:: @ 81650F2 checkflag FLAG_FOUGHT_LUGIA call_if TRUE, EventScript_165105 checkflag FLAG_FOUGHT_LUGIA @@ -20,7 +20,7 @@ EventScript_165109:: @ 8165109 clearflag FLAG_HIDE_LUGIA return -NavelRock_Base_MapScript2_165116:: @ 8165116 +NavelRock_Base_OnResume:: @ 8165116 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_165120 end diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 050f05518..3d2b7669f 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Summit_MapScripts:: @ 8164F9F - map_script 3, NavelRock_Summit_MapScript1_164FAA - map_script 5, NavelRock_Summit_MapScript2_164FDD + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume .byte 0 -NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA +NavelRock_Summit_OnTransition:: @ 8164FAA checkflag FLAG_FOUGHT_HO_OH call_if TRUE, EventScript_164FBD checkflag FLAG_FOUGHT_HO_OH @@ -23,7 +23,7 @@ EventScript_164FC6:: @ 8164FC6 clearflag FLAG_HIDE_HO_OH return -NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD +NavelRock_Summit_OnResume:: @ 8164FDD checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_164FE7 end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 16830e056..1c207941d 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,13 +1,13 @@ OneIsland_MapScripts:: @ 8167484 - map_script 3, OneIsland_MapScript1_16748F - map_script 2, OneIsland_MapScript2_167493 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame .byte 0 -OneIsland_MapScript1_16748F:: @ 816748F +OneIsland_OnTransition:: @ 816748F setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND end -OneIsland_MapScript2_167493:: @ 8167493 +OneIsland_OnFrame:: @ 8167493 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, EventScript_16749D .2byte 0 diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 75e74dad7..5bf27c3e5 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -1,9 +1,9 @@ OneIsland_Harbor_MapScripts:: @ 8171378 - map_script 4, OneIsland_Harbor_MapScript1_171383 - map_script 2, OneIsland_Harbor_MapScript2_171392 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_Harbor_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_Harbor_OnFrame .byte 0 -OneIsland_Harbor_MapScript1_171383:: @ 8171383 +OneIsland_Harbor_OnWarp:: @ 8171383 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17138D .2byte 0 @@ -11,7 +11,7 @@ EventScript_17138D:: @ 817138D turnobject 255, 2 end -OneIsland_Harbor_MapScript2_171392:: @ 8171392 +OneIsland_Harbor_OnFrame:: @ 8171392 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, EventScript_17139C .2byte 0 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 778f63fed..514ed9ee7 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,11 +1,11 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 - map_script 3, OneIsland_PokemonCenter_1F_MapScript1_170C4E - map_script 5, OneIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 1, OneIsland_PokemonCenter_1F_MapScript3_170C0D - map_script 2, OneIsland_PokemonCenter_1F_MapScript4_170CA7 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, OneIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame .byte 0 -OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D +OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if ge, EventScript_170C22 checkflag FLAG_SYS_CAN_LINK_WITH_RS @@ -26,7 +26,7 @@ EventScript_170C36:: @ 8170C36 setmetatile 15, 4, 859, 1 return -OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E +OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if eq, EventScript_170C73 @@ -54,7 +54,7 @@ EventScript_170C90:: @ 8170C90 setobjectmovementtype 3, 9 return -OneIsland_PokemonCenter_1F_MapScript4_170CA7:: @ 8170CA7 +OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7 map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, EventScript_170CB1 .2byte 0 diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 0948f1cee..8e03adc77 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 - map_script 2, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, OneIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 852c6425f..7f268aafe 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -1,9 +1,9 @@ PalletTown_MapScripts:: @ 816545A - map_script 3, PalletTown_MapScript1_165465 - map_script 2, PalletTown_MapScript2_1654CE + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame .byte 0 -PalletTown_MapScript1_165465:: @ 8165465 +PalletTown_OnTransition:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN call_if TRUE, EventScript_165488 @@ -38,7 +38,7 @@ EventScript_1654BD:: @ 81654BD setvar VAR_0x4002, 1 return -PalletTown_MapScript2_1654CE:: @ 81654CE +PalletTown_OnFrame:: @ 81654CE map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8 .2byte 0 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index eb1b0d890..4df205d11 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -1,8 +1,8 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 - map_script 3, PalletTown_GarysHouse_MapScript1_168D2D + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition .byte 0 -PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D +PalletTown_GarysHouse_OnTransition:: @ 8168D2D compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if lt, EventScript_168D44 compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 9a61ce24c..55f18360a 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -1,9 +1,9 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 - map_script 3, PalletTown_PlayersHouse_2F_MapScript1_168CAE - map_script 4, PalletTown_PlayersHouse_2F_MapScript2_168CBE + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_PlayersHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_PlayersHouse_2F_OnWarp .byte 0 -PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE +PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 call_if eq, EventScript_168CBA end @@ -12,7 +12,7 @@ EventScript_168CBA:: @ 8168CBA setrespawn SPAWN_PALLET_TOWN return -PalletTown_PlayersHouse_2F_MapScript2_168CBE:: @ 8168CBE +PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8 .2byte 0 diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index cd94b5929..3d805d319 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1,10 +1,10 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E - map_script 3, PalletTown_ProfessorOaksLab_MapScript1_168F8E - map_script 4, PalletTown_ProfessorOaksLab_MapScript2_168FE1 - map_script 2, PalletTown_ProfessorOaksLab_MapScript3_168FF0 + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_ProfessorOaksLab_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_ProfessorOaksLab_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_ProfessorOaksLab_OnFrame .byte 0 -PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E +PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E setflag FLAG_VISITED_OAKS_LAB compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 call_if eq, EventScript_168FC6 @@ -35,7 +35,7 @@ EventScript_168FD5:: @ 8168FD5 setobjectmovementtype 4, 7 return -PalletTown_ProfessorOaksLab_MapScript2_168FE1:: @ 8168FE1 +PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB .2byte 0 @@ -43,7 +43,7 @@ EventScript_168FEB:: @ 8168FEB turnobject 255, 2 end -PalletTown_ProfessorOaksLab_MapScript3_168FF0:: @ 8168FF0 +PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002 .2byte 0 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 8328a8f04..1a1fcf4c7 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -1,8 +1,8 @@ PewterCity_MapScripts:: @ 8165B8E - map_script 3, PewterCity_MapScript1_165B94 + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition .byte 0 -PewterCity_MapScript1_165B94:: @ 8165B94 +PewterCity_OnTransition:: @ 8165B94 setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index dfaab8a86..e4d214e67 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 - map_script 3, PewterCity_PokemonCenter_1F_MapScript1_16A76B - map_script 5, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, PewterCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -PewterCity_PokemonCenter_1F_MapScript1_16A76B:: @ 816A76B +PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B setrespawn SPAWN_PEWTER_CITY end diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 6fce8dda2..9e4447709 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 - map_script 2, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, PewterCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PewterCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PewterCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, PewterCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index e04da7f80..8753b899c 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -1,16 +1,16 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 - map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 - map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 - map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 - map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_AgathasRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_AgathasRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_AgathasRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_AgathasRoom_OnFrame .byte 0 -PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 +PokemonLeague_AgathasRoom_OnResume:: @ 8162825 setvar VAR_0x8004, 2 call EventScript_1A75D5 end -PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 +PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 checkflag FLAG_DEFEATED_AGATHA call_if TRUE, EventScript_16284B compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 @@ -25,7 +25,7 @@ EventScript_16284B:: @ 816284B call EventScript_1A7538 return -PokemonLeague_AgathasRoom_MapScript3_162851:: @ 8162851 +PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 map_script_2 VAR_0x4001, 0, EventScript_16285B .2byte 0 @@ -33,7 +33,7 @@ EventScript_16285B:: @ 816285B turnobject 255, 2 end -PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 +PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A .2byte 0 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 64bbd0614..98de24a6c 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -1,16 +1,16 @@ PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 - map_script 5, PokemonLeague_BrunosRoom_MapScript1_16269A - map_script 1, PokemonLeague_BrunosRoom_MapScript2_1626A5 - map_script 4, PokemonLeague_BrunosRoom_MapScript3_1626C6 - map_script 2, PokemonLeague_BrunosRoom_MapScript4_1626D5 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_BrunosRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_BrunosRoom_OnFrame .byte 0 -PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A +PokemonLeague_BrunosRoom_OnResume:: @ 816269A setvar VAR_0x8004, 1 call EventScript_1A75D5 end -PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 +PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5 checkflag FLAG_DEFEATED_BRUNO call_if TRUE, EventScript_1626C0 compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 @@ -25,7 +25,7 @@ EventScript_1626C0:: @ 81626C0 call EventScript_1A7538 return -PokemonLeague_BrunosRoom_MapScript3_1626C6:: @ 81626C6 +PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 map_script_2 VAR_0x4001, 0, EventScript_1626D0 .2byte 0 @@ -33,7 +33,7 @@ EventScript_1626D0:: @ 81626D0 turnobject 255, 2 end -PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 +PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF .2byte 0 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 449f0f741..4dfdf4e94 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,10 +1,10 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 - map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D - map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 - map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_ChampionsRoom_OnFrame .byte 0 -PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 +PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare VAR_STARTER_MON, 2 @@ -40,7 +40,7 @@ EventScript_162B57:: @ 8162B57 setvar VAR_0x4001, 1 return -PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D +PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D map_script_2 VAR_0x4001, 0, EventScript_162B67 .2byte 0 @@ -48,7 +48,7 @@ EventScript_162B67:: @ 8162B67 turnobject 255, 2 end -PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C +PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C map_script_2 VAR_0x4001, 0, EventScript_162B76 .2byte 0 diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 11df46047..c3556df44 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -1,9 +1,9 @@ PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C - map_script 2, PokemonLeague_HallOfFame_MapScript1_162D66 - map_script 4, PokemonLeague_HallOfFame_MapScript2_162D57 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp .byte 0 -PokemonLeague_HallOfFame_MapScript2_162D57:: @ 8162D57 +PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 map_script_2 VAR_0x4001, 0, EventScript_162D61 .2byte 0 @@ -11,7 +11,7 @@ EventScript_162D61:: @ 8162D61 turnobject 255, 2 end -PokemonLeague_HallOfFame_MapScript1_162D66:: @ 8162D66 +PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 map_script_2 VAR_0x4001, 0, EventScript_162D70 .2byte 0 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 4cadcee31..8e0a9a186 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,16 +1,16 @@ PokemonLeague_LancesRoom_MapScripts:: @ 816292D - map_script 5, PokemonLeague_LancesRoom_MapScript1_162942 - map_script 1, PokemonLeague_LancesRoom_MapScript2_16294D - map_script 4, PokemonLeague_LancesRoom_MapScript3_16296E - map_script 2, PokemonLeague_LancesRoom_MapScript4_16297D + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_LancesRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LancesRoom_OnFrame .byte 0 -PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 +PokemonLeague_LancesRoom_OnResume:: @ 8162942 setvar VAR_0x8004, 3 call EventScript_1A75D5 end -PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D +PokemonLeague_LancesRoom_OnLoad:: @ 816294D compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 call_if eq, EventScript_162962 checkflag FLAG_DEFEATED_LANCE @@ -25,7 +25,7 @@ EventScript_162968:: @ 8162968 call EventScript_1A7589 return -PokemonLeague_LancesRoom_MapScript3_16296E:: @ 816296E +PokemonLeague_LancesRoom_OnWarp:: @ 816296E map_script_2 VAR_0x4001, 0, EventScript_162978 .2byte 0 @@ -33,7 +33,7 @@ EventScript_162978:: @ 8162978 turnobject 255, 2 end -PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D +PokemonLeague_LancesRoom_OnFrame:: @ 816297D map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987 .2byte 0 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index dd337943d..cbf014bc8 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -1,17 +1,17 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C - map_script 5, PokemonLeague_LoreleisRoom_MapScript1_162586 - map_script 1, PokemonLeague_LoreleisRoom_MapScript2_162591 - map_script 3, PokemonLeague_LoreleisRoom_MapScript3_1625B2 - map_script 4, PokemonLeague_LoreleisRoom_MapScript4_1625B6 - map_script 2, PokemonLeague_LoreleisRoom_MapScript5_1625C5 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LoreleisRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LoreleisRoom_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PokemonLeague_LoreleisRoom_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_LoreleisRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LoreleisRoom_OnFrame .byte 0 -PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 +PokemonLeague_LoreleisRoom_OnResume:: @ 8162586 setvar VAR_0x8004, 0 call EventScript_1A75D5 end -PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 +PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591 checkflag FLAG_DEFEATED_LORELEI call_if TRUE, EventScript_1625AC compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 @@ -26,11 +26,11 @@ EventScript_1625AC:: @ 81625AC call EventScript_1A7538 return -PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2 +PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 setworldmapflag FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM end -PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6 +PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 map_script_2 VAR_0x4001, 0, EventScript_1625C0 .2byte 0 @@ -38,7 +38,7 @@ EventScript_1625C0:: @ 81625C0 turnobject 255, 2 end -PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 +PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF .2byte 0 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index ceb59874a..cacbe77da 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -1,14 +1,14 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 - map_script 1, PokemonMansion_1F_MapScript1_162204 - map_script 3, PokemonMansion_1F_MapScript2_16220E + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PokemonMansion_1F_OnTransition .byte 0 -PokemonMansion_1F_MapScript1_162204:: @ 8162204 +PokemonMansion_1F_OnLoad:: @ 8162204 checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7B7A end -PokemonMansion_1F_MapScript2_16220E:: @ 816220E +PokemonMansion_1F_OnTransition:: @ 816220E setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F end diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index c0bdae1e9..965993fc8 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -1,8 +1,8 @@ PokemonMansion_2F_MapScripts:: @ 8162254 - map_script 1, PokemonMansion_2F_MapScript1_16225A + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_2F_OnLoad .byte 0 -PokemonMansion_2F_MapScript1_16225A:: @ 816225A +PokemonMansion_2F_OnLoad:: @ 816225A checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7D3E end diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 6546b024e..141c63c7e 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -1,8 +1,8 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 - map_script 1, PokemonMansion_3F_MapScript1_1622A7 + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_3F_OnLoad .byte 0 -PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 +PokemonMansion_3F_OnLoad:: @ 81622A7 checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7E72 end diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 3baba4c34..7d1e70692 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -1,8 +1,8 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC - map_script 1, PokemonMansion_B1F_MapScript1_162302 + map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_B1F_OnLoad .byte 0 -PokemonMansion_B1F_MapScript1_162302:: @ 8162302 +PokemonMansion_B1F_OnLoad:: @ 8162302 checkflag FLAG_POKEMON_MANSION_SWITCH_STATE call_if TRUE, EventScript_1A7F4C end diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index dd8b16a70..35e34047e 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -1,8 +1,8 @@ PokemonTower_1F_MapScripts:: @ 8163235 - map_script 3, PokemonTower_1F_MapScript1_16323B + map_script MAP_SCRIPT_ON_TRANSITION, PokemonTower_1F_OnTransition .byte 0 -PokemonTower_1F_MapScript1_16323B:: @ 816323B +PokemonTower_1F_OnTransition:: @ 816323B setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F end diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 9255df5e0..cb9867905 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -1,9 +1,9 @@ PowerPlant_MapScripts:: @ 8163764 - map_script 5, PowerPlant_MapScript1_16376F - map_script 3, PowerPlant_MapScript2_16378D + map_script MAP_SCRIPT_ON_RESUME, PowerPlant_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, PowerPlant_OnTransition .byte 0 -PowerPlant_MapScript1_16376F:: @ 816376F +PowerPlant_OnResume:: @ 816376F checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_163779 end @@ -15,7 +15,7 @@ EventScript_163779:: @ 8163779 removeobject VAR_LAST_TALKED return -PowerPlant_MapScript2_16378D:: @ 816378D +PowerPlant_OnTransition:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_FOUGHT_ZAPDOS call_if FALSE, EventScript_1637AC diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6e2f8eeb3..ee140a736 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -1,14 +1,14 @@ RocketHideout_B1F_MapScripts:: @ 8161195 - map_script 1, RocketHideout_B1F_MapScript1_1611A0 - map_script 3, RocketHideout_B1F_MapScript2_1611AA + map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, RocketHideout_B1F_OnTransition .byte 0 -RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 +RocketHideout_B1F_OnLoad:: @ 81611A0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 call_if lt, EventScript_161233 end -RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA +RocketHideout_B1F_OnTransition:: @ 81611AA setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 20b36dd57..fca61e89b 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -1,8 +1,8 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 - map_script 1, RocketHideout_B4F_MapScript1_1612EE + map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad .byte 0 -RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE +RocketHideout_B4F_OnLoad:: @ 81612EE setvar VAR_0x4001, 0 checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 call_if eq, EventScript_161311 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 9e62817c0..854604f58 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F - map_script 3, Route10_PokemonCenter_1F_MapScript1_16FC3A - map_script 5, Route10_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, Route10_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A +Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE10 end diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index 54b5d0036..e49ddeccb 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA - map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route10_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route10_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, Route10_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index a468a579f..cdd28f02a 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -1,8 +1,8 @@ Route12_MapScripts:: @ 8168000 - map_script 5, Route12_MapScript1_168006 + map_script MAP_SCRIPT_ON_RESUME, Route12_OnResume .byte 0 -Route12_MapScript1_168006:: @ 8168006 +Route12_OnResume:: @ 8168006 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_168010 end diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index a69fbf22a..4ab510912 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -1,10 +1,10 @@ Route16_MapScripts:: @ 81680E5 - map_script 5, Route16_MapScript1_1680F5 - map_script 3, Route16_MapScript2_168103 - map_script 4, Route16_MapScript3_168113 + map_script MAP_SCRIPT_ON_RESUME, Route16_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Route16_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route16_OnWarp .byte 0 -Route16_MapScript1_1680F5:: @ 81680F5 +Route16_OnResume:: @ 81680F5 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_1680FF end @@ -13,7 +13,7 @@ EventScript_1680FF:: @ 81680FF removeobject VAR_LAST_TALKED return -Route16_MapScript2_168103:: @ 8168103 +Route16_OnTransition:: @ 8168103 compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16810F end @@ -22,7 +22,7 @@ EventScript_16810F:: @ 816810F setflag FLAG_SYS_ON_CYCLING_ROAD return -Route16_MapScript3_168113:: @ 8168113 +Route16_OnWarp:: @ 8168113 map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16811D .2byte 0 diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index ff5c43dd3..6d13a9b93 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -1,8 +1,8 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 - map_script 3, Route16_NorthEntrance_1F_MapScript1_1701C8 + map_script MAP_SCRIPT_ON_TRANSITION, Route16_NorthEntrance_1F_OnTransition .byte 0 -Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 +Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 clearflag FLAG_SYS_ON_CYCLING_ROAD checkflag FLAG_GOT_BICYCLE call_if TRUE, EventScript_1701D5 diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index b50bf30c1..f3e1f1032 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -1,9 +1,9 @@ Route18_MapScripts:: @ 81681F6 - map_script 3, Route18_MapScript1_168201 - map_script 4, Route18_MapScript2_168211 + map_script MAP_SCRIPT_ON_TRANSITION, Route18_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route18_OnWarp .byte 0 -Route18_MapScript1_168201:: @ 8168201 +Route18_OnTransition:: @ 8168201 compare VAR_MAP_SCENE_ROUTE16, 1 call_if eq, EventScript_16820D end @@ -12,7 +12,7 @@ EventScript_16820D:: @ 816820D setflag FLAG_SYS_ON_CYCLING_ROAD return -Route18_MapScript2_168211:: @ 8168211 +Route18_OnWarp:: @ 8168211 map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B .2byte 0 diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 25fe611c0..961cf9ce1 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -1,8 +1,8 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 - map_script 3, Route18_EastEntrance_1F_MapScript1_17037E + map_script MAP_SCRIPT_ON_TRANSITION, Route18_EastEntrance_1F_OnTransition .byte 0 -Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E +Route18_EastEntrance_1F_OnTransition:: @ 817037E clearflag FLAG_SYS_ON_CYCLING_ROAD checkflag FLAG_GOT_BICYCLE call_if TRUE, EventScript_17038B diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index ed827114c..df211bc3f 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -1,8 +1,8 @@ Route23_MapScripts:: @ 81684EB - map_script 3, Route23_MapScript1_1684F1 + map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition .byte 0 -Route23_MapScript1_1684F1:: @ 81684F1 +Route23_OnTransition:: @ 81684F1 clearflag FLAG_HIDE_VICTORY_ROAD_3F_BOULDER setflag FLAG_HIDE_VICTORY_ROAD_2F_BOULDER setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index bfa331bef..72837c224 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -1,8 +1,8 @@ Route25_SeaCottage_MapScripts:: @ 8170523 - map_script 3, Route25_SeaCottage_MapScript1_170529 + map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition .byte 0 -Route25_SeaCottage_MapScript1_170529:: @ 8170529 +Route25_SeaCottage_OnTransition:: @ 8170529 checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE call_if FALSE, EventScript_17053C checkflag FLAG_GOT_SS_TICKET diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 23b4162a0..4ee1acf22 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 - map_script 3, Route4_PokemonCenter_1F_MapScript1_16F744 - map_script 5, Route4_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, Route4_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 +Route4_PokemonCenter_1F_OnTransition:: @ 816F744 setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE4 end diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index bff6832da..b1f69ff32 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 - map_script 2, Route4_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, Route4_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, Route4_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, Route4_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route4_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route4_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, Route4_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index e2cfc4eb9..ffa1ed8fd 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,13 +1,13 @@ SSAnne_Exterior_MapScripts:: @ 8160840 - map_script 3, SSAnne_Exterior_MapScript1_16084B - map_script 2, SSAnne_Exterior_MapScript2_16084F + map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame .byte 0 -SSAnne_Exterior_MapScript1_16084B:: @ 816084B +SSAnne_Exterior_OnTransition:: @ 816084B setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR end -SSAnne_Exterior_MapScript2_16084F:: @ 816084F +SSAnne_Exterior_OnFrame:: @ 816084F map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859 .2byte 0 diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 9f887910a..28e8fb3e6 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -1,8 +1,8 @@ SafariZone_Center_MapScripts:: @ 8162357 - map_script 3, SafariZone_Center_MapScript1_16235D + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_Center_OnTransition .byte 0 -SafariZone_Center_MapScript1_16235D:: @ 816235D +SafariZone_Center_OnTransition:: @ 816235D setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER end diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 498557ddb..1fdc73973 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,8 +1,8 @@ SaffronCity_MapScripts:: @ 816735F - map_script 3, SaffronCity_MapScript1_167365 + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition .byte 0 -SaffronCity_MapScript1_167365:: @ 8167365 +SaffronCity_OnTransition:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY checkflag FLAG_RESCUED_MR_FUJI call_if FALSE, EventScript_167372 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index c9b2ca3a6..c9dda1809 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC - map_script 3, SaffronCity_PokemonCenter_1F_MapScript1_16EFF7 - map_script 5, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -SaffronCity_PokemonCenter_1F_MapScript1_16EFF7:: @ 816EFF7 +SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 setrespawn SPAWN_SAFFRON_CITY end diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index 7ebc68fb5..a5e05bca1 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 - map_script 2, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SaffronCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, SaffronCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index dbf2c8f3f..500d6f49f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -1,9 +1,9 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF - map_script 2, SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA - map_script 3, SaffronCity_PokemonTrainerFanClub_MapScript2_16F144 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame + map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition .byte 0 -SaffronCity_PokemonTrainerFanClub_MapScript1_16F0CA:: @ 816F0CA +SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4 .2byte 0 @@ -70,7 +70,7 @@ Movement_16F13E:: @ 816F13E step_2d step_end -SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 +SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 goto_if eq, EventScript_16F267 compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 0ea5df1b7..342e3499b 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -1,9 +1,9 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F - map_script 3, SeafoamIslands_B3F_MapScript1_162F5A - map_script 2, SeafoamIslands_B3F_MapScript2_162F98 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B3F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B3F_OnFrame .byte 0 -SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A +SeafoamIslands_B3F_OnTransition:: @ 8162F5A checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT call_if FALSE, EventScript_162F6D checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT @@ -28,7 +28,7 @@ EventScript_162F94:: @ 8162F94 setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC return -SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 +SeafoamIslands_B3F_OnFrame:: @ 8162F98 map_script_2 VAR_0x4001, 1, EventScript_162FA2 .2byte 0 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 1a25b02f8..2d9d6fd71 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -1,12 +1,12 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E - map_script 3, SeafoamIslands_B4F_MapScript1_163066 - map_script 5, SeafoamIslands_B4F_MapScript2_163048 - map_script 1, SeafoamIslands_B4F_MapScript3_1630B1 - map_script 4, SeafoamIslands_B4F_MapScript4_1630E7 - map_script 2, SeafoamIslands_B4F_MapScript5_1630F9 + map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume + map_script MAP_SCRIPT_ON_LOAD, SeafoamIslands_B4F_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SeafoamIslands_B4F_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B4F_OnFrame .byte 0 -SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 +SeafoamIslands_B4F_OnResume:: @ 8163048 checkflag FLAG_SYS_SPECIAL_WILD_BATTLE call_if TRUE, EventScript_163052 end @@ -18,7 +18,7 @@ EventScript_163052:: @ 8163052 removeobject VAR_LAST_TALKED return -SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 +SeafoamIslands_B4F_OnTransition:: @ 8163066 checkflag FLAG_FOUGHT_ARTICUNO call_if FALSE, EventScript_1630AD checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT @@ -49,7 +49,7 @@ EventScript_1630AD:: @ 81630AD clearflag FLAG_HIDE_ARTICUNO return -SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 +SeafoamIslands_B4F_OnLoad:: @ 81630B1 setvar VAR_0x4002, 0 checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if FALSE, EventScript_163169 @@ -64,7 +64,7 @@ EventScript_1630D4:: @ 81630D4 setmetatile 13, 14, 299, 0 end -SeafoamIslands_B4F_MapScript4_1630E7:: @ 81630E7 +SeafoamIslands_B4F_OnWarp:: @ 81630E7 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_1630F1 .2byte 0 @@ -73,7 +73,7 @@ EventScript_1630F1:: @ 81630F1 special Special_ForcePlayerToStartSurfing end -SeafoamIslands_B4F_MapScript5_1630F9:: @ 81630F9 +SeafoamIslands_B4F_OnFrame:: @ 81630F9 map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, EventScript_16310B map_script_2 VAR_0x4001, 1, EventScript_163121 .2byte 0 diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 92a3ceaf4..2f9606459 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_MapScripts:: @ 8167EB3 - map_script 3, SevenIsland_MapScript1_167EB9 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_OnTransition .byte 0 -SevenIsland_MapScript1_167EB9:: @ 8167EB9 +SevenIsland_OnTransition:: @ 8167EB9 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index aa4e7f1ae..e31934afa 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -1,9 +1,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A - map_script 3, SevenIsland_House_Room1_MapScript1_170895 - map_script 2, SevenIsland_House_Room1_MapScript2_1708CF + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame .byte 0 -SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 +SevenIsland_House_Room1_OnTransition:: @ 8170895 special ValidateEReaderTrainer compare VAR_RESULT, 0 call_if eq, EventScript_1708AF @@ -23,7 +23,7 @@ EventScript_1708C3:: @ 81708C3 setobjectmovementtype 1, 10 return -SevenIsland_House_Room1_MapScript2_1708CF:: @ 81708CF +SevenIsland_House_Room1_OnFrame:: @ 81708CF map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9 map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9 diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 03a64b8e6..bf8bb3030 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -1,13 +1,13 @@ SevenIsland_House_Room2_MapScripts:: @ 8170A7E - map_script 3, SevenIsland_House_Room2_MapScript1_170A89 - map_script 2, SevenIsland_House_Room2_MapScript2_170A8D + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room2_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room2_OnFrame .byte 0 -SevenIsland_House_Room2_MapScript1_170A89:: @ 8170A89 +SevenIsland_House_Room2_OnTransition:: @ 8170A89 special SetEReaderTrainerGfxId end -SevenIsland_House_Room2_MapScript2_170A8D:: @ 8170A8D +SevenIsland_House_Room2_OnFrame:: @ 8170A8D map_script_2 VAR_0x4001, 0, EventScript_170A97 .2byte 0 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 170459099..7d5a3d311 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 - map_script 3, SevenIsland_PokemonCenter_1F_MapScript1_170B94 - map_script 5, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -SevenIsland_PokemonCenter_1F_MapScript1_170B94:: @ 8170B94 +SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 setrespawn SPAWN_SEVEN_ISLAND end diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 89d97e0db..a026e7c92 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC - map_script 2, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SevenIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, SevenIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 41e452568..708541904 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC - map_script 3, SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition .byte 0 -SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 +SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index f0b8a602e..847ae472a 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 - map_script 3, SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_DilfordChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_DilfordChamber_MapScript1_164CFC:: @ 8164CFC +SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index 2a9d64e42..b982b77dd 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE - map_script 3, SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_LiptooChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_LiptooChamber_MapScript1_164CE4:: @ 8164CE4 +SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index 391a45a95..d467f79ef 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -1,8 +1,8 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF - map_script 3, SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_MoneanChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 +SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index de1c0cd97..2f3d604c3 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E - map_script 3, SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_RixyChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_RixyChamber_MapScript1_164D14:: @ 8164D14 +SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index 2cbb2d08d..dd1a73f83 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 - map_script 3, SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ScufibChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ScufibChamber_MapScript1_164D08:: @ 8164D08 +SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index ea63fa0ea..131a6ecca 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A - map_script 3, SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ViapoisChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ViapoisChamber_MapScript1_164D20:: @ 8164D20 +SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index ae8294f89..ff6c851ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -1,7 +1,7 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA - map_script 3, SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0 + map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_WeepthChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_WeepthChamber_MapScript1_164CF0:: @ 8164CF0 +SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0 call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc index af451e565..6ae4ed2be 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828 - map_script 5, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 - map_script 2, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 + map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046 .byte 0 SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 3efd6025e..e597b5ef5 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_10F_MapScripts:: @ 8161D86 - map_script 1, SilphCo_10F_MapScript1_161D8C + map_script MAP_SCRIPT_ON_LOAD, SilphCo_10F_OnLoad .byte 0 -SilphCo_10F_MapScript1_161D8C:: @ 8161D8C +SilphCo_10F_OnLoad:: @ 8161D8C checkflag FLAG_SILPH_10F_DOOR call_if FALSE, EventScript_Close10FDoor end diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 4465e16b7..9b8504ac5 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_11F_MapScripts:: @ 8161DEE - map_script 1, SilphCo_11F_MapScript1_161DF4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad .byte 0 -SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 +SilphCo_11F_OnLoad:: @ 8161DF4 checkflag FLAG_SILPH_11F_DOOR call_if FALSE, EventScript_Close11FDoor end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index ffb126808..a6ef4a1c3 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_1F_MapScripts:: @ 8161625 - map_script 3, SilphCo_1F_MapScript1_16162B + map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_1F_OnTransition .byte 0 -SilphCo_1F_MapScript1_16162B:: @ 816162B +SilphCo_1F_OnTransition:: @ 816162B setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index caafb4f23..60d2a39e2 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_2F_MapScripts:: @ 8161641 - map_script 1, SilphCo_2F_MapScript1_161647 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_2F_OnLoad .byte 0 -SilphCo_2F_MapScript1_161647:: @ 8161647 +SilphCo_2F_OnLoad:: @ 8161647 checkflag FLAG_SILPH_2F_DOOR_1 call_if FALSE, EventScript_Close2FDoor1 checkflag FLAG_SILPH_2F_DOOR_2 diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 8ce210653..c5fd6d320 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_3F_MapScripts:: @ 81616C5 - map_script 1, SilphCo_3F_MapScript1_1616CB + map_script MAP_SCRIPT_ON_LOAD, SilphCo_3F_OnLoad .byte 0 -SilphCo_3F_MapScript1_1616CB:: @ 81616CB +SilphCo_3F_OnLoad:: @ 81616CB checkflag FLAG_SILPH_3F_DOOR_1 call_if FALSE, EventScript_Close3FDoor1 checkflag FLAG_SILPH_3F_DOOR_2 diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index b5ef8541d..c72ba7ed8 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_4F_MapScripts:: @ 8161736 - map_script 1, SilphCo_4F_MapScript1_16173C + map_script MAP_SCRIPT_ON_LOAD, SilphCo_4F_OnLoad .byte 0 -SilphCo_4F_MapScript1_16173C:: @ 816173C +SilphCo_4F_OnLoad:: @ 816173C checkflag FLAG_SILPH_4F_DOOR_1 call_if FALSE, EventScript_Close4FDoor1 checkflag FLAG_SILPH_4F_DOOR_2 diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index ce1f8374b..fb9e482a5 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_5F_MapScripts:: @ 81617BE - map_script 1, SilphCo_5F_MapScript1_1617C4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_5F_OnLoad .byte 0 -SilphCo_5F_MapScript1_1617C4:: @ 81617C4 +SilphCo_5F_OnLoad:: @ 81617C4 checkflag FLAG_SILPH_5F_DOOR_1 call_if FALSE, EventScript_Close5FDoor1 checkflag FLAG_SILPH_5F_DOOR_2 diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 131d636b7..e5b1d9e7b 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_6F_MapScripts:: @ 8161881 - map_script 1, SilphCo_6F_MapScript1_161887 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_6F_OnLoad .byte 0 -SilphCo_6F_MapScript1_161887:: @ 8161887 +SilphCo_6F_OnLoad:: @ 8161887 checkflag FLAG_SILPH_6F_DOOR call_if FALSE, EventScript_Close6FDoor end diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 9c0e76620..cf2d80422 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,9 +1,9 @@ SilphCo_7F_MapScripts:: @ 8161984 - map_script 1, SilphCo_7F_MapScript1_16198F - map_script 3, SilphCo_7F_MapScript2_1619AB + map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition .byte 0 -SilphCo_7F_MapScript1_16198F:: @ 816198F +SilphCo_7F_OnLoad:: @ 816198F checkflag FLAG_SILPH_7F_DOOR_1 call_if FALSE, EventScript_Close7FDoor1 checkflag FLAG_SILPH_7F_DOOR_2 @@ -12,7 +12,7 @@ SilphCo_7F_MapScript1_16198F:: @ 816198F call_if FALSE, EventScript_Close7FDoor3 end -SilphCo_7F_MapScript2_1619AB:: @ 81619AB +SilphCo_7F_OnTransition:: @ 81619AB compare VAR_MAP_SCENE_SILPH_CO_11F, 1 call_if ge, EventScript_1619B7 end diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 1b3b81d36..5570c4be9 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_8F_MapScripts:: @ 8161C5F - map_script 1, SilphCo_8F_MapScript1_161C65 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_8F_OnLoad .byte 0 -SilphCo_8F_MapScript1_161C65:: @ 8161C65 +SilphCo_8F_OnLoad:: @ 8161C65 checkflag FLAG_SILPH_8F_DOOR call_if FALSE, EventScript_Close8FDoor end diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index fb8098d1c..919d700b0 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -1,8 +1,8 @@ SilphCo_9F_MapScripts:: @ 8161CDE - map_script 1, SilphCo_9F_MapScript1_161CE4 + map_script MAP_SCRIPT_ON_LOAD, SilphCo_9F_OnLoad .byte 0 -SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 +SilphCo_9F_OnLoad:: @ 8161CE4 checkflag FLAG_SILPH_9F_DOOR_1 call_if FALSE, EventScript_Close9FDoor1 checkflag FLAG_SILPH_9F_DOOR_2 diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 3a36d37b1..868eefbaa 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -1,8 +1,8 @@ SixIsland_MapScripts:: @ 8167ED8 - map_script 3, SixIsland_MapScript1_167EDE + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_OnTransition .byte 0 -SixIsland_MapScript1_167EDE:: @ 8167EDE +SixIsland_OnTransition:: @ 8167EDE setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND end diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index 6733f94b3..bf34536f1 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -1,7 +1,7 @@ SixIsland_AlteringCave_MapScripts:: @ 81646A4 - map_script 3, SixIsland_AlteringCave_MapScript1_1646AA + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_AlteringCave_OnTransition .byte 0 -SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA +SixIsland_AlteringCave_OnTransition:: @ 81646AA setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 2d9e52209..0dae8d853 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -1,8 +1,8 @@ SixIsland_DottedHole_1F_MapScripts:: @ 8164182 - map_script 3, SixIsland_DottedHole_1F_MapScript1_164188 + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_DottedHole_1F_OnTransition .byte 0 -SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188 +SixIsland_DottedHole_1F_OnTransition:: @ 8164188 setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 9f0d085fe..cc9a3549a 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -1,8 +1,8 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 - map_script 3, SixIsland_PatternBush_MapScript1_16455F + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PatternBush_OnTransition .byte 0 -SixIsland_PatternBush_MapScript1_16455F:: @ 816455F +SixIsland_PatternBush_OnTransition:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 compare VAR_0x4001, 50 diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 751b78f94..dd4bd695c 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,10 +1,10 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A - map_script 3, SixIsland_PokemonCenter_1F_MapScript1_171D7A - map_script 5, SixIsland_PokemonCenter_1F_MapScript2_1BC05C - map_script 2, SixIsland_PokemonCenter_1F_MapScript3_171D8D + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, SixIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 -SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A +SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if eq, EventScript_171D89 @@ -14,7 +14,7 @@ EventScript_171D89:: @ 8171D89 clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return -SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D +SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97 .2byte 0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index a261c9269..982b9b29c 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 - map_script 2, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, SixIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SixIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, SixIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 0e315cfdf..40950d560 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,8 +1,8 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 - map_script 1, SixIsland_RuinValley_MapScript1_168B59 + map_script MAP_SCRIPT_ON_LOAD, SixIsland_RuinValley_OnLoad .byte 0 -SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 +SixIsland_RuinValley_OnLoad:: @ 8168B59 checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE call_if TRUE, EventScript_168B63 end diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 718524fcf..a63d1350e 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_MapScripts:: @ 81677AD - map_script 3, ThreeIsland_MapScript1_1677B3 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 -ThreeIsland_MapScript1_1677B3:: @ 81677B3 +ThreeIsland_OnTransition:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_RESCUED_LOSTELLE call_if TRUE, EventScript_1677CB diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index f26f7edb9..2ed197683 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 - map_script 3, ThreeIsland_BerryForest_MapScript1_163C77 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 -ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 +ThreeIsland_BerryForest_OnTransition:: @ 8163C77 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 0830e168c..e4c890add 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 - map_script 3, ThreeIsland_DunsparceTunnel_MapScript1_164D2C + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition .byte 0 -ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C +ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 559b2a03c..35c7abeb3 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 - map_script 3, ThreeIsland_PokemonCenter_1F_MapScript1_17183D - map_script 5, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -ThreeIsland_PokemonCenter_1F_MapScript1_17183D:: @ 817183D +ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D setrespawn SPAWN_THREE_ISLAND end diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index dfb7db871..b51a32374 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 - map_script 2, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, ThreeIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 842bd794d..ee88d85fe 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -1,8 +1,8 @@ ThreeIsland_Port_MapScripts:: @ 8168789 - map_script 3, ThreeIsland_Port_MapScript1_16878F + map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_Port_OnTransition .byte 0 -ThreeIsland_Port_MapScript1_16878F:: @ 816878F +ThreeIsland_Port_OnTransition:: @ 816878F clearflag FLAG_SYS_PC_STORAGE_DISABLED setflag FLAG_SEVII_DETOUR_FINISHED end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 3ecbbaa87..64eeb39ca 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -1,8 +1,8 @@ TwoIsland_MapScripts:: @ 8167564 - map_script 3, TwoIsland_MapScript1_16756A + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_OnTransition .byte 0 -TwoIsland_MapScript1_16756A:: @ 816756A +TwoIsland_OnTransition:: @ 816756A setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_VISITED_TWO_ISLAND call EventScript_167576 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 53b72c2db..ff76d9419 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -1,11 +1,11 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 - map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5 - map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404 - map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B - map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame + map_script MAP_SCRIPT_ON_LOAD, TwoIsland_JoyfulGameCorner_MapScript4_1BB237 .byte 0 -TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 +TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER call_if TRUE, EventScript_1713EF end @@ -17,7 +17,7 @@ EventScript_1713EF:: @ 81713EF setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return -TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404 +TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416 map_script_2 VAR_0x406F, 8, EventScript_1BB227 .2byte 0 @@ -26,7 +26,7 @@ EventScript_171416:: @ 8171416 turnobject 255, 2 end -TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B +TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435 map_script_2 VAR_0x406F, 8, EventScript_1BB2FD diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 813b5d595..1742e15e2 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 - map_script 3, TwoIsland_PokemonCenter_1F_MapScript1_1717BF - map_script 5, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -TwoIsland_PokemonCenter_1F_MapScript1_1717BF:: @ 81717BF +TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF setrespawn SPAWN_TWO_ISLAND end diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 01954808c..84766419e 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE - map_script 2, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, TwoIsland_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc index 9137a8ad1..0604a7712 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 - map_script 3, UndergroundPath_EastWestTunnel_MapScript1_160ED9 + map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_EastWestTunnel_OnTransition .byte 0 -UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 +UndergroundPath_EastWestTunnel_OnTransition:: @ 8160ED9 setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc index 408a60fee..d5c9a4ad5 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -1,7 +1,7 @@ UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 - map_script 3, UndergroundPath_NorthSouthTunnel_MapScript1_160EBB + map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_NorthSouthTunnel_OnTransition .byte 0 -UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB +UndergroundPath_NorthSouthTunnel_OnTransition:: @ 8160EBB setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL end diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc index 0358b7d8a..2cda124c4 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnknownMap_00_04/scripts.inc @@ -1,9 +1,9 @@ UnknownMap_00_04_MapScripts:: @ 816047C - map_script 5, UnknownMap_00_04_MapScript1_160487 - map_script 3, UnknownMap_00_04_MapScript2_1604BB + map_script MAP_SCRIPT_ON_RESUME, UnknownMap_00_04_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, UnknownMap_00_04_OnTransition .byte 0 -UnknownMap_00_04_MapScript1_160487:: @ 8160487 +UnknownMap_00_04_OnResume:: @ 8160487 setflag FLAG_HIDE_UNION_ROOM_1 setflag FLAG_HIDE_UNION_ROOM_2 setflag FLAG_HIDE_UNION_ROOM_3 @@ -23,7 +23,7 @@ UnknownMap_00_04_MapScript1_160487:: @ 8160487 special UnionRoomSpecial end -UnknownMap_00_04_MapScript2_1604BB:: @ 81604BB +UnknownMap_00_04_OnTransition:: @ 81604BB end UnknownMap_00_04_EventScript_1604BC:: @ 81604BC diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index cb5186fe1..fb9b59b9f 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,9 +1,9 @@ VermilionCity_MapScripts:: @ 81668DC - map_script 3, VermilionCity_MapScript1_166906 - map_script 2, VermilionCity_MapScript2_1668E7 + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame .byte 0 -VermilionCity_MapScript2_1668E7:: @ 81668E7 +VermilionCity_OnFrame:: @ 81668E7 map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, EventScript_1668F1 .2byte 0 @@ -20,7 +20,7 @@ Movement_166903:: @ 8166903 step_11 step_end -VermilionCity_MapScript1_166906:: @ 8166906 +VermilionCity_OnTransition:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY checkflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION call_if TRUE, EventScript_166913 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index a654dea5a..edef5c0ae 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -1,9 +1,9 @@ VermilionCity_Gym_MapScripts:: @ 816B69E - map_script 1, VermilionCity_Gym_MapScript1_16B6A9 - map_script 3, VermilionCity_Gym_MapScript2_16B772 + map_script MAP_SCRIPT_ON_LOAD, VermilionCity_Gym_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_Gym_OnTransition .byte 0 -VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 +VermilionCity_Gym_OnLoad:: @ 816B6A9 checkflag FLAG_TEMP_1 call_if TRUE, EventScript_16B6BC checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES @@ -36,7 +36,7 @@ EventScript_16B717:: @ 816B717 setmetatile 7, 7, 670, 1 return -VermilionCity_Gym_MapScript2_16B772:: @ 816B772 +VermilionCity_Gym_OnTransition:: @ 816B772 call EventScript_16B778 end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index f65681dc3..bcfe4ad6e 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 - map_script 3, VermilionCity_PokemonCenter_1F_MapScript1_16B42F - map_script 5, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -VermilionCity_PokemonCenter_1F_MapScript1_16B42F:: @ 816B42F +VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F setrespawn SPAWN_VERMILION_CITY end diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index b64ac0660..9ef32bb07 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 - map_script 2, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, VermilionCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index cd77c97b1..569fce4ff 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,9 +1,9 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 - map_script 1, VictoryRoad_1F_MapScript1_160F10 - map_script 3, VictoryRoad_1F_MapScript2_160F2F + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition .byte 0 -VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 +VictoryRoad_1F_OnLoad:: @ 8160F10 compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 call_if ne, EventScript_160F1C end @@ -13,7 +13,7 @@ EventScript_160F1C:: @ 8160F1C setmetatile 12, 15, 791, 1 return -VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F +VictoryRoad_1F_OnTransition:: @ 8160F2F setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index e2018c27e..ee3367636 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -1,8 +1,8 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 - map_script 1, VictoryRoad_2F_MapScript1_160F98 + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad .byte 0 -VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 +VictoryRoad_2F_OnLoad:: @ 8160F98 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 call_if ne, EventScript_160FAF compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 6f6b4b5bd..cc4f54f13 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -1,8 +1,8 @@ VictoryRoad_3F_MapScripts:: @ 81610AA - map_script 1, VictoryRoad_3F_MapScript1_1610B0 + map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad .byte 0 -VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 +VictoryRoad_3F_OnLoad:: @ 81610B0 compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 call_if ne, EventScript_1610BC end diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index a9bc4d4b1..1f87c2146 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -1,8 +1,8 @@ ViridianCity_MapScripts:: @ 81658D3 - map_script 3, ViridianCity_MapScript1_1658D9 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition .byte 0 -ViridianCity_MapScript1_1658D9:: @ 81658D9 +ViridianCity_OnTransition:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 call_if eq, EventScript_165920 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index f16afdd2e..69ad2ef2b 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,9 +1,9 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 - map_script 1, ViridianCity_Mart_MapScript1_16A1DE - map_script 2, ViridianCity_Mart_MapScript2_16A1FB + map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame .byte 0 -ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE +ViridianCity_Mart_OnLoad:: @ 816A1DE checkflag FLAG_SYS_POKEDEX_GET goto_if FALSE, EventScript_16A1E8 end @@ -13,7 +13,7 @@ EventScript_16A1E8:: @ 816A1E8 setmetatile 1, 4, 704, 1 end -ViridianCity_Mart_MapScript2_16A1FB:: @ 816A1FB +ViridianCity_Mart_OnFrame:: @ 816A1FB map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205 .2byte 0 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 507b2bfe4..574ef9c1f 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 - map_script 3, ViridianCity_PokemonCenter_1F_MapScript1_16A2CB - map_script 5, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C .byte 0 -ViridianCity_PokemonCenter_1F_MapScript1_16A2CB:: @ 816A2CB +ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB setrespawn SPAWN_VIRIDIAN_CITY end diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 18e0018ba..4cf92b800 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 - map_script 2, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 - map_script 4, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED - map_script 1, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 - map_script 3, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED + map_script MAP_SCRIPT_ON_LOAD, ViridianCity_PokemonCenter_2F_MapScript3_1BB237 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4 .byte 0 ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index 84c22e5fb..bc6923ea6 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -1,8 +1,8 @@ ViridianForest_MapScripts:: @ 816051F - map_script 3, ViridianForest_MapScript1_160525 + map_script MAP_SCRIPT_ON_TRANSITION, ViridianForest_OnTransition .byte 0 -ViridianForest_MapScript1_160525:: @ 8160525 +ViridianForest_OnTransition:: @ 8160525 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST end diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h index 2ef3d2544..1353de360 100644 --- a/include/constants/map_scripts.h +++ b/include/constants/map_scripts.h @@ -6,7 +6,7 @@ #define MAP_SCRIPT_ON_TRANSITION 3 #define MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE 4 #define MAP_SCRIPT_ON_RESUME 5 -#define MAP_SCRIPT_ON_DIVE_WARP 6 +#define MAP_SCRIPT_ON_DIVE_WARP 6 // Unused #define MAP_SCRIPT_ON_RETURN_TO_FIELD 7 #endif // GUARD_CONSTANTS_MAP_SCRIPTS_H |