diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 18:28:07 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 18:28:07 -0400 |
| commit | 21b8fb4fbd85796df30c7211b98a2c557c35a69e (patch) | |
| tree | 78017ae602731f7401c3adb8adc01d270f0ba3d6 | |
| parent | 214d9974979ded1b471a383dc2e9477141e90d15 (diff) | |
Use map script constants
210 files changed, 386 insertions, 372 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index b372d0bb9..925e50b82 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -14,6 +14,7 @@ #include "constants/vars.h" #include "constants/metatile_labels.h" #include "constants/battle_setup.h" +#include "constants/map_scripts.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index b9e89cc05..6b904fbd3 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -14,6 +14,7 @@ #include "constants/vars.h" #include "constants/metatile_labels.h" #include "constants/battle_setup.h" +#include "constants/map_scripts.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 3b288e213..a67a11787 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F - map_script 5, AbandonedShip_Corridors_B1F_MapScript1_15E99A - map_script 1, AbandonedShip_Corridors_B1F_MapScript1_15E9A3 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_15E99A + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_15E9A3 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc index 68d872f01..8e796436e 100644 --- a/data/maps/AbandonedShip_Deck/scripts.inc +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A - map_script 3, AbandonedShip_Deck_MapScript1_15E960 + map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_15E960 .byte 0 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index d87482f3a..09ab6d059 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 - map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51 - map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51 + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 4b9b61ca0..d28e80ec8 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01 - map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07 + map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07 .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07 diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index abdb2ae8e..6cce989c1 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 - map_script 5, AbandonedShip_Rooms_B1F_MapScript1_15EA3B + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_15EA3B .byte 0 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index 52ba61136..b4bc0e6b2 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 - map_script 5, AbandonedShip_Underwater1_MapScript1_15EA5D + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_15EA5D .byte 0 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index 22113661a..d00fa1a59 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 - map_script 5, AbandonedShip_Underwater2_MapScript1_15EB3D + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_15EB3D .byte 0 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index c83b61dac..a40e856be 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -1,7 +1,7 @@ AncientTomb_MapScripts:: @ 815EFBE - map_script 5, AncientTomb_MapScript1_15EFCE - map_script 1, AncientTomb_MapScript1_15EFE0 - map_script 3, AncientTomb_MapScript1_15EFDC + map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_15EFCE + map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_15EFE0 + map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_15EFDC .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 5c173aa4d..09c381df2 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -1,5 +1,5 @@ AquaHideout_1F_MapScripts:: @ 815D7C2 - map_script 3, AquaHideout_1F_MapScript1_15D7C8 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_1F_MapScript1_15D7C8 .byte 0 AquaHideout_1F_MapScript1_15D7C8:: @ 815D7C8 diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 228587775..58334912c 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,6 +1,6 @@ AquaHideout_B1F_MapScripts:: @ 815D831 - map_script 5, AquaHideout_B1F_MapScript1_15D83C - map_script 3, AquaHideout_B1F_MapScript1_15D84A + map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_15D83C + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_15D84A .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index c9287b1f1..071c1cb31 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,5 +1,5 @@ AquaHideout_B2F_MapScripts:: @ 815D8B1 - map_script 3, AquaHideout_B2F_MapScript1_15D8B7 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_15D8B7 .byte 0 AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 1c7471cd2..039c5fa3b 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -1,5 +1,5 @@ BattleTower_BattleRoom_MapScripts:: @ 81608DB - map_script 2, BattleTower_BattleRoom_MapScript2_1608E1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_BattleRoom_MapScript2_1608E1 .byte 0 BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc index 8981a2a14..8e6296913 100644 --- a/data/maps/BattleTower_Corridor/scripts.inc +++ b/data/maps/BattleTower_Corridor/scripts.inc @@ -1,6 +1,6 @@ BattleTower_Corridor_MapScripts:: @ 8160845 - map_script 1, BattleTower_Corridor_MapScript1_160850 - map_script 2, BattleTower_Corridor_MapScript2_160881 + map_script MAP_SCRIPT_ON_LOAD, BattleTower_Corridor_MapScript1_160850 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_Corridor_MapScript2_160881 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 diff --git a/data/maps/BattleTower_Elevator/scripts.inc b/data/maps/BattleTower_Elevator/scripts.inc index f3373ee6e..ff2d947dc 100644 --- a/data/maps/BattleTower_Elevator/scripts.inc +++ b/data/maps/BattleTower_Elevator/scripts.inc @@ -1,6 +1,6 @@ BattleTower_Elevator_MapScripts:: @ 81607CF - map_script 2, BattleTower_Elevator_MapScript2_1607DA - map_script 4, BattleTower_Elevator_MapScript2_160821 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_Elevator_MapScript2_1607DA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleTower_Elevator_MapScript2_160821 .byte 0 BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index 23cf05a09..5086e0bea 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -1,8 +1,8 @@ BattleTower_Lobby_MapScripts:: @ 816027E - map_script 5, BattleTower_Lobby_MapScript1_160293 - map_script 3, BattleTower_Lobby_MapScript1_1602E8 - map_script 2, BattleTower_Lobby_MapScript2_160302 - map_script 4, BattleTower_Lobby_MapScript2_1602EE + map_script MAP_SCRIPT_ON_RESUME, BattleTower_Lobby_MapScript1_160293 + map_script MAP_SCRIPT_ON_TRANSITION, BattleTower_Lobby_MapScript1_1602E8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_Lobby_MapScript2_160302 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleTower_Lobby_MapScript2_1602EE .byte 0 BattleTower_Lobby_MapScript1_160293:: @ 8160293 diff --git a/data/maps/BattleTower_Outside/scripts.inc b/data/maps/BattleTower_Outside/scripts.inc index 4786b2213..a7a9301d4 100644 --- a/data/maps/BattleTower_Outside/scripts.inc +++ b/data/maps/BattleTower_Outside/scripts.inc @@ -1,5 +1,5 @@ BattleTower_Outside_MapScripts:: @ 8160156 - map_script 3, BattleTower_Outside_MapScript1_16015C + map_script MAP_SCRIPT_ON_TRANSITION, BattleTower_Outside_MapScript1_16015C .byte 0 BattleTower_Outside_MapScript1_16015C:: @ 816015C diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 58c6563f6..a56e5ef70 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C - map_script 3, CaveOfOrigin_1F_MapScript1_15DD72 + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_15DD72 .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index c79eb088e..26d63d804 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C - map_script 3, CaveOfOrigin_B1F_MapScript1_15DD82 + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B1F_MapScript1_15DD82 .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 diff --git a/data/maps/CaveOfOrigin_B2F/scripts.inc b/data/maps/CaveOfOrigin_B2F/scripts.inc index 66b02ee9f..6a9db478d 100644 --- a/data/maps/CaveOfOrigin_B2F/scripts.inc +++ b/data/maps/CaveOfOrigin_B2F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C - map_script 3, CaveOfOrigin_B2F_MapScript1_15DD92 + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B2F_MapScript1_15DD92 .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 diff --git a/data/maps/CaveOfOrigin_B3F/scripts.inc b/data/maps/CaveOfOrigin_B3F/scripts.inc index 8084ceb43..27701a21b 100644 --- a/data/maps/CaveOfOrigin_B3F/scripts.inc +++ b/data/maps/CaveOfOrigin_B3F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C - map_script 3, CaveOfOrigin_B3F_MapScript1_15DDA2 + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B3F_MapScript1_15DDA2 .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index 1c5ef8c67..d21093879 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -1,6 +1,6 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC - map_script 5, CaveOfOrigin_B4F_MapScript1_15DDB7 - map_script 3, CaveOfOrigin_B4F_MapScript1_15DDC5 + map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_B4F_MapScript1_15DDB7 + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B4F_MapScript1_15DDC5 .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 63c453726..cfd5d115a 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -1,7 +1,7 @@ DesertRuins_MapScripts:: @ 815CAF3 - map_script 5, DesertRuins_MapScript1_15CB03 - map_script 1, DesertRuins_MapScript1_15CB11 - map_script 3, DesertRuins_MapScript1_15CB52 + map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_15CB03 + map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_15CB11 + map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_15CB52 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index b8fd5258f..0097ba16f 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_MapScripts:: @ 814DFF8 - map_script 3, DewfordTown_MapScript1_14DFFE + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_14DFFE .byte 0 DewfordTown_MapScript1_14DFFE:: @ 814DFFE diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 993211980..5348b86f3 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_Gym_MapScripts:: @ 8153065 - map_script 3, DewfordTown_Gym_MapScript1_15306B + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_15306B .byte 0 DewfordTown_Gym_MapScript1_15306B:: @ 815306B diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index 7c8434533..e92919990 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 - map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_15301A + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_15301A .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index 554c9ef6b..3fa3bceeb 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 8153043 - map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 DewfordTown_PokemonCenter_2F_EventScript_153053:: @ 8153053 diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 298f6cbb9..9e20d9622 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapScripts:: @ 814D4D5 - map_script 3, EverGrandeCity_MapScript1_14D4DB + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_14D4DB .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 69feb09a6..2806eafd4 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF - map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF - map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5 - map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4 .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF diff --git a/data/maps/EverGrandeCity_Corridor1/scripts.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc index 60d1f7253..6be683142 100644 --- a/data/maps/EverGrandeCity_Corridor1/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor1/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C - map_script 4, EverGrandeCity_Corridor1_MapScript2_15BA12 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor1_MapScript2_15BA12 .byte 0 EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 diff --git a/data/maps/EverGrandeCity_Corridor2/scripts.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc index d74be91c4..0179f7010 100644 --- a/data/maps/EverGrandeCity_Corridor2/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor2/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor2_MapScripts:: @ 815BA21 - map_script 4, EverGrandeCity_Corridor2_MapScript2_15BA27 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor2_MapScript2_15BA27 .byte 0 EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 diff --git a/data/maps/EverGrandeCity_Corridor3/scripts.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc index 006e570ef..b67af1585 100644 --- a/data/maps/EverGrandeCity_Corridor3/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor3/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor3_MapScripts:: @ 815BA36 - map_script 4, EverGrandeCity_Corridor3_MapScript2_15BA3C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor3_MapScript2_15BA3C .byte 0 EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C diff --git a/data/maps/EverGrandeCity_Corridor4/scripts.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc index 2ae857aa8..3983722be 100644 --- a/data/maps/EverGrandeCity_Corridor4/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor4/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B - map_script 4, EverGrandeCity_Corridor4_MapScript2_15BA51 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor4_MapScript2_15BA51 .byte 0 EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 diff --git a/data/maps/EverGrandeCity_Corridor5/scripts.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc index 09ce304f6..7e823a6cf 100644 --- a/data/maps/EverGrandeCity_Corridor5/scripts.inc +++ b/data/maps/EverGrandeCity_Corridor5/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor5_MapScripts:: @ 815BA60 - map_script 4, EverGrandeCity_Corridor5_MapScript2_15BA66 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor5_MapScript2_15BA66 .byte 0 EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index e5e772e71..45f982f28 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D - map_script 2, EverGrandeCity_DrakesRoom_MapScript2_15B72C - map_script 1, EverGrandeCity_DrakesRoom_MapScript1_15B743 - map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_15B72C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_15B743 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_15B570 .byte 0 @ 815B71D diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 4d51d98a1..2f31b4945 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673 - map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_15B692 - map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9 - map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_15B683 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_15B692 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_15B683 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 6dbb3f68e..f648829a7 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84 - map_script 2, EverGrandeCity_HallOfFame_MapScript2_15BB9E - map_script 4, EverGrandeCity_HallOfFame_MapScript2_15BB8F + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_15BB9E + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_15BB8F .byte 0 EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index e36247e07..e461ddc1a 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9 - map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_15B60F - map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9 - map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_15B60F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index d45441711..0987adf18 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 - map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 9941e17e4..310efef02 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 815BC90 - map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0:: @ 815BCA0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index 26fd460eb..80067b8ea 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 - map_script 3, EverGrandeCity_PokemonLeague_MapScript1_15BA7B + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_MapScript1_15BA7B .byte 0 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 041854255..62e0ae763 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F - map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F - map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570 - map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_15B54F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B570 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B57F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 7ffa4863a..a39d7e51f 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_MapScripts:: @ 814E7E0 - map_script 3, FallarborTown_MapScript1_14E7E6 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_14E7E6 .byte 0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index 8c6bc3f44..66f810073 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_ContestLobby_MapScripts:: @ 81539C1 - map_script 3, FallarborTown_ContestLobby_MapScript1_1539C7 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_ContestLobby_MapScript1_1539C7 .byte 0 FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 46eeb0968..ed79272f3 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_House1_MapScripts:: @ 8153BAE - map_script 3, FallarborTown_House1_MapScript1_153BB4 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_House1_MapScript1_153BB4 .byte 0 FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 6a13abc15..60ec8d5c0 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 - map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_153AF9 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_153AF9 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 148b22531..eb55f493a 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8153B8C - map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 FallarborTown_PokemonCenter_2F_EventScript_153B9C:: @ 8153B9C diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index f0bd22071..ffa7fbda7 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -1,5 +1,5 @@ FieryPath_MapScripts:: @ 815D318 - map_script 3, FieryPath_MapScript1_15D31E + map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_15D31E .byte 0 FieryPath_MapScript1_15D31E:: @ 815D31E diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 19df69ccc..2616081df 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_MapScripts:: @ 814C943 - map_script 3, FortreeCity_MapScript1_14C94E - map_script 5, FortreeCity_MapScript1_14C952 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_14C94E + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_14C952 .byte 0 FortreeCity_MapScript1_14C94E:: @ 814C94E diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 965a57532..ddedbbdbc 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_Gym_MapScripts:: @ 8157ED3 - map_script 3, FortreeCity_Gym_MapScript1_157EDE - map_script 4, FortreeCity_Gym_MapScript2_157EE2 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_157EDE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_157EE2 .byte 0 FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 6110d7ba6..c080805ea 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 - map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_158017 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_158017 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index 3019dbbc0..fe58376cc 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 8158044 - map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 FortreeCity_PokemonCenter_2F_EventScript_158054:: @ 8158054 diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index c6be3feca..46877cbd4 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,7 +1,7 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD - map_script 2, GraniteCave_B1F_MapScript2_1C6BB5 - map_script 3, GraniteCave_B1F_MapScript1_1C6BBF - map_script 5, GraniteCave_B1F_MapScript1_15CBED + map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_1C6BB5 + map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_1C6BBF + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_15CBED .byte 0 GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index bea103c45..2ffdf8a8a 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -1,6 +1,6 @@ InsideOfTruck_MapScripts:: @ 815FBFF - map_script 1, InsideOfTruck_MapScript1_15FC0A - map_script 5, InsideOfTruck_MapScript1_15FC26 + map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_15FC0A + map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_15FC26 .byte 0 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index daf6962e6..1b5d84086 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -1,7 +1,7 @@ IslandCave_MapScripts:: @ 815EEB6 - map_script 5, IslandCave_MapScript1_15EEC6 - map_script 1, IslandCave_MapScript1_15EED4 - map_script 3, IslandCave_MapScript1_15EF15 + map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_15EEC6 + map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_15EED4 + map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_15EF15 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 39cf6e039..f938caa05 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,6 +1,6 @@ JaggedPass_MapScripts:: @ 815D266 - map_script 5, JaggedPass_MapScript1_15D271 - map_script 3, JaggedPass_MapScript1_15D274 + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_15D271 + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_15D274 .byte 0 JaggedPass_MapScript1_15D271:: @ 815D271 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 6a533e47d..f511ae1c7 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_MapScripts:: @ 814E4A3 - map_script 3, LavaridgeTown_MapScript1_14E4AE - map_script 2, LavaridgeTown_MapScript2_14E4E3 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_14E4AE + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_14E4E3 .byte 0 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 4131a8c0f..19bd45e1e 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 815368E - map_script 3, LavaridgeTown_Gym_1F_MapScript1_153694 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_153694 .byte 0 LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index df737a862..e3434a291 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C - map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_153912 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_153912 .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index daaeb0b93..376c13df9 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 8153944 - map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 LavaridgeTown_PokemonCenter_2F_EventScript_153954:: @ 8153954 diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index d83a8e0b3..602abb06e 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_MapScripts:: @ 814CA15 - map_script 3, LilycoveCity_MapScript1_14CA20 - map_script 1, LilycoveCity_MapScript1_14CA3F + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_14CA20 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_14CA3F .byte 0 LilycoveCity_MapScript1_14CA20:: @ 814CA20 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 9336616c3..7a09fa121 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_ContestLobby_MapScripts:: @ 8158866 - map_script 3, LilycoveCity_ContestLobby_MapScript1_158871 - map_script 2, LilycoveCity_ContestLobby_MapScript2_158877 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_158871 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_158877 .byte 0 LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 6edde5a39..e39015590 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F - map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145 .byte 0 LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index ee952b2d6..71bd92594 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 - map_script 3, LilycoveCity_Harbor_MapScript1_159899 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_159899 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 62d3e8842..9642b68b6 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_House3_MapScripts:: @ 8159BE4 - map_script 3, LilycoveCity_House3_MapScript1_159BEA + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_159BEA .byte 0 LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 23134f1ec..756a679ba 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC - map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7 - map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670 .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 66c027dd6..e03a03702 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 - map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_15932D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_15932D .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index e4554e49c..b916ffc61 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 8159367 - map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 LilycoveCity_PokemonCenter_2F_EventScript_159377:: @ 8159377 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index c0ccb0c50..538653fb2 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A - map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395 - map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412 .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index 870eeb331..d8b1ab47e 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1,8 +1,8 @@ LinkContestRoom1_MapScripts:: @ 815F580 - map_script 4, LinkContestRoom1_MapScript2_15F610 - map_script 2, LinkContestRoom1_MapScript2_15F606 - map_script 3, LinkContestRoom1_MapScript1_15F595 - map_script 5, LinkContestRoom1_MapScript1_15F5F4 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_15F610 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_15F606 + map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_15F595 + map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_15F5F4 .byte 0 LinkContestRoom1_MapScript1_15F595:: @ 815F595 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index c923770b4..afb6ce739 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,6 +1,6 @@ LittlerootTown_MapScripts:: @ 814D509 - map_script 3, LittlerootTown_MapScript1_14D514 - map_script 2, LittlerootTown_MapScript2_14D5D5 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_14D514 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_14D5D5 .byte 0 LittlerootTown_MapScript1_14D514:: @ 814D514 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 312a9ebe4..93718eb77 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B - map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_15264B - map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_15268A - map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0 + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_15264B + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_15268A + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0 .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 2f23c2747..133163ac5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -1,6 +1,6 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 - map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1527AF - map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1527DA + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1527AF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1527DA .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 2d92deb00..f776b8a79 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 - map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_152889 - map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1528C8 - map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_15290E + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_152889 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1528C8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_15290E .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index e5ed8eea2..a71baa3f5 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,6 +1,6 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 - map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_152A5B - map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_152A86 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_152A5B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_152A86 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 919405bdc..bd07100cf 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82 - map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92 - map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D - map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92 diff --git a/data/maps/MagmaHideout_B1F/scripts.inc b/data/maps/MagmaHideout_B1F/scripts.inc index 89eb5ab98..e267683c8 100644 --- a/data/maps/MagmaHideout_B1F/scripts.inc +++ b/data/maps/MagmaHideout_B1F/scripts.inc @@ -1,5 +1,5 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 - map_script 5, MagmaHideout_B1F_MapScript1_15F2AE + map_script MAP_SCRIPT_ON_RESUME, MagmaHideout_B1F_MapScript1_15F2AE .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 88e9248b6..bc07537be 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_MapScripts:: @ 814C032 - map_script 3, MauvilleCity_MapScript1_14C038 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_14C038 .byte 0 MauvilleCity_MapScript1_14C038:: @ 814C038 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 111dad2d8..e3e9ab5d9 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 - map_script 1, MauvilleCity_Gym_MapScript1_156456 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_156456 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index a65c962bc..03c22a982 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 - map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_157357 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_157357 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index a78f436a1..02d1a102a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8157392 - map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 MauvilleCity_PokemonCenter_2F_EventScript_1573A2:: @ 81573A2 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 7b092a2cd..0f8f37009 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_1R_MapScripts:: @ 815C490 - map_script 3, MeteorFalls_1F_1R_MapScript1_15C496 + map_script MAP_SCRIPT_ON_TRANSITION, MeteorFalls_1F_1R_MapScript1_15C496 .byte 0 MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 50131a67a..6aa9eff7f 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_MapScripts:: @ 814CF92 - map_script 3, MossdeepCity_MapScript1_14CF98 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_14CF98 .byte 0 MossdeepCity_MapScript1_14CF98:: @ 814CF98 diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index 3c9381cce..62aa0d7dc 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 - map_script 1, MossdeepCity_GameCorner_1F_MapScript1_15AC62 - map_script 3, MossdeepCity_GameCorner_1F_MapScript1_15AC84 - map_script 2, MossdeepCity_GameCorner_1F_MapScript2_15ACBB + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_15AC62 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_1F_MapScript1_15AC84 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_15ACBB .byte 0 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc index a338890cb..713dd1bb7 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55 - map_script 3, MossdeepCity_GameCorner_B1F_MapScript1_15AE60 - map_script 2, MossdeepCity_GameCorner_B1F_MapScript2_15AE64 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_B1F_MapScript1_15AE60 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_B1F_MapScript2_15AE64 .byte 0 MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 41b3174e5..4cf54ecb6 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 - map_script 1, MossdeepCity_Gym_MapScript1_15A4D9 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_15A4D9 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 7e53ff360..520678ec6 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 - map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index db02ec5f5..996ba0a9e 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 815A8FA - map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 MossdeepCity_PokemonCenter_2F_EventScript_15A90A:: @ 815A90A diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 9664c8ee4..c3bece5e6 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 - map_script 1, MossdeepCity_StevensHouse_MapScript1_15A9D5 - map_script 3, MossdeepCity_StevensHouse_MapScript1_15A9E9 - map_script 2, MossdeepCity_StevensHouse_MapScript2_15AA01 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_15A9D5 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_15A9E9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_15AA01 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 1d22b4779..a797a249d 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,6 +1,6 @@ MtChimney_MapScripts:: @ 815CF7C - map_script 5, MtChimney_MapScript1_15CF92 - map_script 3, MtChimney_MapScript1_15CF87 + map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_15CF92 + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_15CF87 .byte 0 MtChimney_MapScript1_15CF87:: @ 815CF87 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 98461167c..46c49089f 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA - map_script 3, MtChimney_CableCarStation_MapScript1_15C105 - map_script 2, MtChimney_CableCarStation_MapScript2_15C11D + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_15C105 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_15C11D .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 2a892c7f2..2a4d5004b 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,7 +1,7 @@ MtPyre_2F_MapScripts:: @ 815D36E - map_script 2, MtPyre_2F_MapScript2_1C6BB5 - map_script 3, MtPyre_2F_MapScript1_1C6BBF - map_script 5, MtPyre_2F_MapScript1_15D37E + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_1C6BB5 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_1C6BBF + map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_15D37E .byte 0 MtPyre_2F_MapScript1_15D37E:: @ 815D37E diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index f8b4141d7..ab8c8475e 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Exterior_MapScripts:: @ 815D486 - map_script 3, MtPyre_Exterior_MapScript1_15D48C + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_15D48C .byte 0 MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 060933978..b48bd1b6e 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Summit_MapScripts:: @ 815D4B1 - map_script 3, MtPyre_Summit_MapScript1_15D4B7 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_15D4B7 .byte 0 MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index ef5d0cbf0..6325fec67 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapScripts:: @ 815E48A - map_script 1, NewMauville_Entrance_MapScript1_15E495 - map_script 3, NewMauville_Entrance_MapScript1_15E4D8 + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_15E495 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_15E4D8 .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 733510cf0..d8744cd87 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,7 +1,7 @@ NewMauville_Inside_MapScripts:: @ 815E55F - map_script 5, NewMauville_Inside_MapScript1_15E56F - map_script 3, NewMauville_Inside_MapScript1_15E593 - map_script 1, NewMauville_Inside_MapScript1_15E59E + map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_15E56F + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_15E593 + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_15E59E .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index f67dfcd1b..c90c87e21 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,5 +1,5 @@ OldaleTown_MapScripts:: @ 814DD62 - map_script 3, OldaleTown_MapScript1_14DD68 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_14DD68 .byte 0 OldaleTown_MapScript1_14DD68:: @ 814DD68 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index ab0068068..5865a5f18 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 - map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_152F0E + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_152F0E .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index 622f50c29..b309c1548 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 8152F56 - map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 OldaleTown_PokemonCenter_2F_EventScript_152F66:: @ 8152F66 diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index a2326e1d4..4c77ce15b 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapScripts:: @ 814E8EE - map_script 3, PacifidlogTown_MapScript1_14E8F9 - map_script 5, PacifidlogTown_MapScript1_14E8FD + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_14E8F9 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_14E8FD .byte 0 PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 8b40d1926..37e0c7ade 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF - map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_154105 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_154105 .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index 2bff37736..3fd5bad3b 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8154132 - map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 @ 8154142 diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 70a91a22f..39ba495bd 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_MapScripts:: @ 814B70C - map_script 3, PetalburgCity_MapScript1_14B717 - map_script 2, PetalburgCity_MapScript2_14B73D + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_14B717 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_14B73D .byte 0 PetalburgCity_MapScript1_14B717:: @ 814B717 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 9e5c148af..578a91aa2 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 - map_script 1, PetalburgCity_Gym_MapScript1_15448C - map_script 3, PetalburgCity_Gym_MapScript1_15451B - map_script 4, PetalburgCity_Gym_MapScript2_154553 - map_script 2, PetalburgCity_Gym_MapScript2_154562 + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_15448C + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_15451B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_154553 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_154562 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 0f10265ce..a84358ca0 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 - map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_15520A + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_15520A .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index a95823736..589ae82fd 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 815528D - map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 PetalburgCity_PokemonCenter_2F_EventScript_15529D:: @ 815529D diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index da53434da..8a6be99a7 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -1,5 +1,5 @@ PetalburgWoods_MapScripts:: @ 815CC9C - map_script 3, PetalburgWoods_MapScript1_15CCA2 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgWoods_MapScript1_15CCA2 .byte 0 PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index ae8babe9a..cedac75d0 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,6 +1,6 @@ Route101_MapScripts:: @ 814E924 - map_script 3, Route101_MapScript1_14E92F - map_script 2, Route101_MapScript2_14E935 + map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_14E92F + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_14E935 .byte 0 Route101_MapScript1_14E92F:: @ 814E92F diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 3c21922bb..50a7bea09 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,5 +1,5 @@ Route103_MapScripts:: @ 814EB81 - map_script 3, Route103_MapScript1_14EB87 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_14EB87 .byte 0 Route103_MapScript1_14EB87:: @ 814EB87 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 37a815526..d3368f4d6 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,6 +1,6 @@ Route104_MapScripts:: @ 814EE8C - map_script 2, Route104_MapScript2_14EE97 - map_script 3, Route104_MapScript1_14EEA8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_14EE97 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_14EEA8 .byte 0 Route104_MapScript2_14EE97:: @ 814EE97 diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 8999173ad..13918fce6 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 - map_script 3, Route104_MrBrineysHouse_MapScript1_15BCB8 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_15BCB8 .byte 0 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 4a1bfd19f..f63bee4af 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 - map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_15BDEA + map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_15BDEA .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 37aeda214..0b00a06de 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,5 +1,5 @@ Route105_MapScripts:: @ 814F298 - map_script 1, Route105_MapScript1_14F29E + map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_14F29E .byte 0 Route105_MapScript1_14F29E:: @ 814F29E diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 1f78010e6..43cf18088 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse_MapScripts:: @ 8160DCA - map_script 3, Route109_SeashoreHouse_MapScript1_160DD0 + map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_160DD0 .byte 0 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 790192db0..2b6264c75 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,7 +1,7 @@ Route110_MapScripts:: @ 814F900 - map_script 5, Route110_MapScript1_14F910 - map_script 3, Route110_MapScript1_14F914 - map_script 2, Route110_MapScript2_14F933 + map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_14F910 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_14F914 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_14F933 .byte 0 Route110_MapScript1_14F910:: @ 814F910 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index 639e4cbf0..bc213720e 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 - map_script 3, Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE + map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index be70476e6..fa2fa8f67 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC - map_script 3, Route110_TrickHouseCorridor_MapScript1_161CF2 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_161CF2 .byte 0 Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 44e00cbd9..6cc285eb5 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 - map_script 5, Route110_TrickHouseEnd_MapScript1_16194B - map_script 3, Route110_TrickHouseEnd_MapScript1_161957 - map_script 2, Route110_TrickHouseEnd_MapScript2_16197C - map_script 4, Route110_TrickHouseEnd_MapScript2_161965 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_16194B + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_161957 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_16197C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_161965 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 491825db6..037c0e239 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -1,7 +1,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B - map_script 3, Route110_TrickHouseEntrance_MapScript1_160F3B - map_script 2, Route110_TrickHouseEntrance_MapScript2_1611CD - map_script 4, Route110_TrickHouseEntrance_MapScript2_1610B2 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_160F3B + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_1611CD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_1610B2 .byte 0 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 950392e84..55b35f0bd 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 - map_script 1, Route110_TrickHousePuzzle1_MapScript1_161CFE + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_161CFE .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index d2456d823..f5d694114 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 - map_script 5, Route110_TrickHousePuzzle2_MapScript1_161D81 - map_script 3, Route110_TrickHousePuzzle2_MapScript1_161DAE + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_161D81 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_161DAE .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 30446e7e6..869bb29f4 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD - map_script 5, Route110_TrickHousePuzzle3_MapScript1_161EC8 - map_script 3, Route110_TrickHousePuzzle3_MapScript1_161EE4 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_161EC8 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_161EE4 .byte 0 Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 87851a5cb..097047e53 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0 - map_script 3, Route110_TrickHousePuzzle5_MapScript1_1627B6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_1627B6 .byte 0 Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index da37ff54c..46b2f0f5a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 81630CD - map_script 3, Route110_TrickHousePuzzle6_MapScript1_1630D8 - map_script 4, Route110_TrickHousePuzzle6_MapScript2_1630DC + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_1630D8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_1630DC .byte 0 Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 5a87149d8..589e77983 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 816314C - map_script 5, Route110_TrickHousePuzzle7_MapScript1_163161 - map_script 3, Route110_TrickHousePuzzle7_MapScript1_163253 - map_script 1, Route110_TrickHousePuzzle7_MapScript1_16326F - map_script 2, Route110_TrickHousePuzzle7_MapScript2_16327B + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_163161 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_163253 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_16326F + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_16327B .byte 0 Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index d8fab138a..fde7d6d9b 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,6 +1,6 @@ Route111_MapScripts:: @ 814FF91 - map_script 1, Route111_MapScript1_14FF9C - map_script 3, Route111_MapScript1_14FFB9 + map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_14FF9C + map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_14FFB9 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 8c668c3e1..c3860300b 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_MapScripts:: @ 815BFD1 - map_script 3, Route111_OldLadysRestStop_MapScript1_15BFD7 + map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_15BFD7 .byte 0 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 0f51dc827..6d531b4c8 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,5 +1,5 @@ Route112_MapScripts:: @ 8150502 - map_script 3, Route112_MapScript1_150508 + map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_150508 .byte 0 Route112_MapScript1_150508:: @ 8150508 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 3561f96e3..78b4031a4 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_MapScripts:: @ 815C033 - map_script 3, Route112_CableCarStation_MapScript1_15C03E - map_script 2, Route112_CableCarStation_MapScript2_15C05E + map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_15C03E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_15C05E .byte 0 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 1fedf01fc..33393f8aa 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,6 +1,6 @@ Route113_MapScripts:: @ 81505CC - map_script 5, Route113_MapScript1_1505D7 - map_script 3, Route113_MapScript1_1505DA + map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1505D7 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1505DA .byte 0 Route113_MapScript1_1505D7:: @ 81505D7 diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 99bf58081..8a402f7eb 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A - map_script 3, Route113_GlassWorkshop_MapScript1_163550 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_163550 .byte 0 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index f191f19d8..45ac7d969 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9 - map_script 3, Route114_FossilManiacsHouse_MapScript1_15C1BF + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_15C1BF .byte 0 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 98f88e6f4..440527682 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_MapScripts:: @ 815C258 - map_script 3, Route114_LanettesHouse_MapScript1_15C25E + map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_15C25E .byte 0 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 91e4d71e1..eeeab1cb0 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,5 +1,5 @@ Route116_MapScripts:: @ 8150A31 - map_script 3, Route116_MapScript1_150A37 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_150A37 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index e380d4fd3..1bbabda4f 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE - map_script 3, Route116_TunnelersRestHouse_MapScript1_15C2E4 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_15C2E4 .byte 0 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 785987e64..1fb14e10b 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,5 +1,5 @@ Route117_MapScripts:: @ 8150D3A - map_script 3, Route117_MapScript1_150D40 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_150D40 .byte 0 Route117_MapScript1_150D40:: @ 8150D40 diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc index 9ad740b4e..a5523717b 100644 --- a/data/maps/Route117_PokemonDayCare/scripts.inc +++ b/data/maps/Route117_PokemonDayCare/scripts.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319 - map_script 3, Route117_PokemonDayCare_MapScript1_15C31F + map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_15C31F .byte 0 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index b3aaaa404..71c8d76d1 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,5 +1,5 @@ Route118_MapScripts:: @ 8150F28 - map_script 3, Route118_MapScript1_150F2E + map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_150F2E .byte 0 Route118_MapScript1_150F2E:: @ 8150F2E diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index e4d4cc6b1..8d94171ac 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 8151167 - map_script 5, Route119_MapScript1_151172 - map_script 3, Route119_MapScript1_15119B + map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_151172 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_15119B .byte 0 Route119_MapScript1_151172:: @ 8151172 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 817b01df1..8061daafb 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A - map_script 3, Route119_WeatherInstitute_1F_MapScript1_163C30 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_163C30 .byte 0 Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index c50555d31..318fa3d4f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 - map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_163CC8 .byte 0 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index c0656954d..92e199b62 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,7 +1,7 @@ Route120_MapScripts:: @ 815160E - map_script 5, Route120_MapScript1_15161E - map_script 3, Route120_MapScript1_1516DF - map_script 1, Route120_MapScript1_151686 + map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_15161E + map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1516DF + map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_151686 .byte 0 Route120_MapScript1_15161E:: @ 815161E diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 899616406..09a46c8f6 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -1,5 +1,5 @@ Route121_MapScripts:: @ 8151AFE - map_script 3, Route121_MapScript1_151B04 + map_script MAP_SCRIPT_ON_TRANSITION, Route121_MapScript1_151B04 .byte 0 Route121_MapScript1_151B04:: @ 8151B04 diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index ab2ea764a..124d9117f 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance_MapScripts:: @ 815C323 - map_script 2, Route121_SafariZoneEntrance_MapScript2_15C329 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_15C329 .byte 0 Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 21909a637..4408f9061 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,5 +1,5 @@ Route123_MapScripts:: @ 8151C53 - map_script 3, Route123_MapScript1_151C59 + map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_151C59 .byte 0 Route123_MapScript1_151C59:: @ 8151C59 diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 6010b2076..ba3389c7b 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF - map_script 3, Route123_BerryMastersHouse_MapScript1_1639E5 + map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_1639E5 .byte 0 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 50b57bf89..73e2379ed 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,5 +1,5 @@ Route124_MapScripts:: @ 8151DDF - map_script 3, Route124_MapScript1_151DE5 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_151DE5 .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index cae701368..4ce846b20 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA - map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_163E00 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_163E00 .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index a5dcc83a1..cd0dd9bbe 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,5 +1,5 @@ Route125_MapScripts:: @ 8151F1E - map_script 3, Route125_MapScript1_151F24 + map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_151F24 .byte 0 Route125_MapScript1_151F24:: @ 8151F24 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 117f71466..847d842ad 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -1,5 +1,5 @@ Route126_MapScripts:: @ 8151FFE - map_script 3, Route126_MapScript1_152004 + map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_152004 .byte 0 Route126_MapScript1_152004:: @ 8152004 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 764001fd0..11d720bb9 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,5 +1,5 @@ Route127_MapScripts:: @ 815206A - map_script 3, Route127_MapScript1_152070 + map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_152070 .byte 0 Route127_MapScript1_152070:: @ 8152070 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 98c18dd74..3a0ceb04f 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,6 +1,6 @@ Route128_MapScripts:: @ 815211B - map_script 3, Route128_MapScript1_152126 - map_script 2, Route128_MapScript2_152135 + map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_152126 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_152135 .byte 0 Route128_MapScript1_152126:: @ 8152126 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 101e1d05b..a1eb2dd53 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,5 +1,5 @@ Route130_MapScripts:: @ 81523C2 - map_script 3, Route130_MapScript1_1523C8 + map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1523C8 .byte 0 Route130_MapScript1_1523C8:: @ 81523C8 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index d544aea37..fb69bece5 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -1,5 +1,5 @@ Route131_MapScripts:: @ 815243E - map_script 3, Route131_MapScript1_152444 + map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_152444 .byte 0 Route131_MapScript1_152444:: @ 8152444 diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 506b6b78b..5a63401c0 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -1,5 +1,5 @@ Route134_MapScripts:: @ 81525B5 - map_script 5, Route134_MapScript1_1525BB + map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1525BB .byte 0 Route134_MapScript1_1525BB:: @ 81525BB diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index d7a540494..ab2f4075d 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_MapScripts:: @ 814C372 - map_script 3, RustboroCity_MapScript1_14C378 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_14C378 .byte 0 RustboroCity_MapScript1_14C378:: @ 814C378 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index a575ce7e2..36712d5f7 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 - map_script 3, RustboroCity_DevonCorp_1F_MapScript1_15740C + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_15740C .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 6dd9e716c..3d93a7ee5 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA - map_script 3, RustboroCity_DevonCorp_2F_MapScript1_1574D0 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_1574D0 .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 0fb135c7e..8f7478322 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 - map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721 - map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739 - map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_157721 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157739 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157748 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 93d1dd4c6..7837a70c3 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 - map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_157B7F + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_157B7F .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index d0ffc5435..baf96a74a 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8157BB1 - map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 RustboroCity_PokemonCenter_2F_EventScript_157BC1:: @ 8157BC1 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index c329b5509..bd37cdf9b 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,6 +1,6 @@ RusturfTunnel_MapScripts:: @ 815C745 - map_script 3, RusturfTunnel_MapScript1_15C762 - map_script 2, RusturfTunnel_MapScript2_15C750 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_15C762 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_15C750 .byte 0 RusturfTunnel_MapScript2_15C750:: @ 815C750 diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 64270aa55..18d42f009 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,5 +1,5 @@ SSTidalCorridor_MapScripts:: @ 815FC94 - map_script 2, SSTidalCorridor_MapScript2_15FC9A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_15FC9A .byte 0 SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc index ea849354b..774fa2488 100644 --- a/data/maps/SafariZone_Southeast/scripts.inc +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -1,6 +1,6 @@ SafariZone_Southeast_MapScripts:: @ 8160036 - map_script 3, SafariZone_Southeast_MapScript1_160073 - map_script 2, SafariZone_Southeast_MapScript2_160041 + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_Southeast_MapScript1_160073 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_Southeast_MapScript2_160041 .byte 0 SafariZone_Southeast_MapScript2_160041:: @ 8160041 diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc index f0ed9c005..b7aedb056 100644 --- a/data/maps/ScorchedSlab/scripts.inc +++ b/data/maps/ScorchedSlab/scripts.inc @@ -1,5 +1,5 @@ ScorchedSlab_MapScripts:: @ 815F29D - map_script 3, ScorchedSlab_MapScript1_15F2A3 + map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_15F2A3 .byte 0 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3 diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9d59279ea..cb009ed2d 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A - map_script 5, SeafloorCavern_Entrance_MapScript1_15DA50 + map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_15DA50 .byte 0 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index d7136745f..dbbcc2f4b 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room1_MapScripts:: @ 815DA61 - map_script 3, SeafloorCavern_Room1_MapScript1_15DA67 + map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room1_MapScript1_15DA67 .byte 0 SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 43e58a55e..d532d6a1f 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room3_MapScripts:: @ 815DA9C - map_script 3, SeafloorCavern_Room3_MapScript1_15DAA2 + map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room3_MapScript1_15DAA2 .byte 0 SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index 614c23b05..da4841070 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4_MapScripts:: @ 815DABF - map_script 3, SeafloorCavern_Room4_MapScript1_15DAC5 + map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room4_MapScript1_15DAC5 .byte 0 SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 27ecf62b7..ac55ac4ac 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room9_MapScripts:: @ 815DAE6 - map_script 3, SeafloorCavern_Room9_MapScript1_15DAEC + map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room9_MapScript1_15DAEC .byte 0 SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index df19f106e..fd067cea9 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -1,7 +1,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 - map_script 5, SealedChamber_OuterRoom_MapScript1_15F0D6 - map_script 3, SealedChamber_OuterRoom_MapScript1_15F0E7 - map_script 1, SealedChamber_OuterRoom_MapScript1_15F0EB + map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_15F0D6 + map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_15F0E7 + map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_15F0EB .byte 0 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index bb673b7b6..4f93a99d7 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,8 +1,8 @@ SecretBase_YellowCave4_MapScripts:: @ 815F337 - map_script 4, SecretBase_RedCave1_MapScript2_15F358 - map_script 3, SecretBase_RedCave1_MapScript1_15F34F - map_script 2, SecretBase_RedCave1_MapScript2_15F362 - map_script 5, SecretBase_RedCave1_MapScript1_15F34C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_15F358 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_15F34F + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_15F362 + map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_15F34C .byte 0 SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 14ddee8ef..ce4c765e8 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 - map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_15E05D + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_15E05D .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index d0b085d1e..96e876930 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 - map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_15E1B3 - map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_15E19D + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_15E1B3 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_15E19D .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 5d0043dd5..9de2557ca 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapScripts:: @ 815E3F3 - map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_15E3F9 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_15E3F9 .byte 0 ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index e27e3a02c..e911e838e 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_MapScripts:: @ 815E397 - map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_15E39D + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_15E39D .byte 0 ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index bd87e8562..c393dd287 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 - map_script 2, SkyPillar_2F_MapScript2_1C6BB5 - map_script 3, SkyPillar_2F_MapScript1_1C6BBF - map_script 5, SkyPillar_2F_MapScript1_15F2D9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_1C6BB5 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_1C6BBF + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_15F2D9 .byte 0 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 860f35b48..cc67e912c 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 - map_script 2, SkyPillar_4F_MapScript2_1C6BB5 - map_script 3, SkyPillar_4F_MapScript1_1C6BBF - map_script 5, SkyPillar_4F_MapScript1_15F2F5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_1C6BB5 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_1C6BBF + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_15F2F5 .byte 0 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc index ab991d845..84ea651c2 100644 --- a/data/maps/SkyPillar_Entrance/scripts.inc +++ b/data/maps/SkyPillar_Entrance/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD - map_script 3, SkyPillar_Entrance_MapScript1_15F2C3 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_15F2C3 .byte 0 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index d7d68c06a..ff6b62dc1 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_Top_MapScripts:: @ 815F302 - map_script 5, SkyPillar_Top_MapScript1_15F308 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_15F308 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 685d21c98..7baf6d9b9 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_MapScripts:: @ 814BA36 - map_script 3, SlateportCity_MapScript1_14BA3C + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_14BA3C .byte 0 SlateportCity_MapScript1_14BA3C:: @ 814BA3C diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index eb3d8f21d..db4b545c3 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_ContestLobby_MapScripts:: @ 8155411 - map_script 3, SlateportCity_ContestLobby_MapScript1_155417 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_ContestLobby_MapScript1_155417 .byte 0 SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 60c7b301f..0ddeb2fa5 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D - map_script 3, SlateportCity_Harbor_MapScript1_155F63 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_155F63 .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index e3dc3d333..85d89a2a8 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA - map_script 3, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0 .byte 0 SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index d9abd7dc9..3154193d5 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA - map_script 3, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0 .byte 0 SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index ac9c801c6..46c4a595f 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF - map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_1563C5 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_1563C5 .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index 98782b24d..a69826452 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 81563EE - map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 SlateportCity_PokemonCenter_2F_EventScript_1563FE:: @ 81563FE diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 2c90a7d5f..14609b557 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8155764 - map_script 3, SlateportCity_PokemonFanClub_MapScript1_15576A + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonFanClub_MapScript1_15576A .byte 0 SlateportCity_PokemonFanClub_MapScript1_15576A:: @ 815576A diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 19b9d8dcc..c6eefc095 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,7 +1,7 @@ SootopolisCity_MapScripts:: @ 814D07D - map_script 1, SootopolisCity_MapScript1_14D08D - map_script 3, SootopolisCity_MapScript1_14D10D - map_script 5, SootopolisCity_MapScript1_14D165 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_14D08D + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_14D10D + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_14D165 .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 5800e6b6e..2db1fbb93 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_Gym_1F_MapScripts:: @ 815AF07 - map_script 2, SootopolisCity_Gym_1F_MapScript2_15AF86 - map_script 5, SootopolisCity_Gym_1F_MapScript1_15AF22 - map_script 1, SootopolisCity_Gym_1F_MapScript1_15AF25 - map_script 3, SootopolisCity_Gym_1F_MapScript1_15AF1C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_15AF86 + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_15AF22 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_15AF25 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_15AF1C .byte 0 SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index fae9c5fc3..0f37f1014 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 - map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_15B196 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_15B196 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 0547e666f..ed5394de5 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 815B1F8 - map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 SootopolisCity_PokemonCenter_2F_EventScript_15B208:: @ 815B208 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index de2bbf697..92c36e7fb 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6 - map_script 3, SouthernIsland_Exterior_MapScript1_160ADC + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_160ADC .byte 0 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 8cb32420e..a7f82014a 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 - map_script 5, SouthernIsland_Interior_MapScript1_160B5E - map_script 3, SouthernIsland_Interior_MapScript1_160B6C + map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_160B5E + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_160B6C .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc index 464731b10..02f1ba05a 100644 --- a/data/maps/Underwater_Route134/scripts.inc +++ b/data/maps/Underwater_Route134/scripts.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapScripts:: @ 815F071 - map_script 5, Underwater_Route134_MapScript1_15F077 + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_15F077 .byte 0 Underwater_Route134_MapScript1_15F077:: @ 815F077 diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index ea48e5449..19f880c1e 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -1,7 +1,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E - map_script 5, Underwater_SeafloorCavern_MapScript1_15DA36 - map_script 3, Underwater_SeafloorCavern_MapScript1_15D9AE - map_script 1, Underwater_SeafloorCavern_MapScript1_15D9BF + map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_15DA36 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_15D9AE + map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_15D9BF .byte 0 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 5d2236507..8de83458d 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 - map_script 6, Underwater_SealedChamber_MapScript1_15F086 + map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_15F086 .byte 0 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc index bba04eec8..fd3b9dd16 100644 --- a/data/maps/Underwater_SootopolisCity/scripts.inc +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 - map_script 5, Underwater_SootopolisCity_MapScript1_15CAEA + map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_15CAEA .byte 0 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 4f75c44c1..07d0ddd27 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_MapScripts:: @ 814E854 - map_script 3, VerdanturfTown_MapScript1_14E85A + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_14E85A .byte 0 VerdanturfTown_MapScript1_14E85A:: @ 814E85A diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 9834e8a5f..5c3f4a77f 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_ContestLobby_MapScripts:: @ 8153D6A - map_script 3, VerdanturfTown_ContestLobby_MapScript1_153D70 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_ContestLobby_MapScript1_153D70 .byte 0 VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index b34525f8c..8b18a2f22 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 - map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index ec52d45a7..e7ac09e6c 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -1,7 +1,7 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8153F38 - map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88 - map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03 - map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32 + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03 + map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32 .byte 0 PacifidlogTown_PokemonCenter_2F_EventScript_153F48:: @ 8153F48 diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index a01ae96b9..d6f98f440 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,5 +1,5 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 - map_script 3, VictoryRoad_1F_MapScript1_15DE89 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_15DE89 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h new file mode 100644 index 000000000..d096edb90 --- /dev/null +++ b/include/constants/map_scripts.h @@ -0,0 +1,11 @@ +#ifndef GUARD_CONSTANTS_MAP_SCRIPTS_H +#define GUARD_CONSTANTS_MAP_SCRIPTS_H + +#define MAP_SCRIPT_ON_LOAD 1 +#define MAP_SCRIPT_ON_FRAME_TABLE 2 +#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 + +#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H diff --git a/include/script.h b/include/script.h index 17effd358..28fb54878 100644 --- a/include/script.h +++ b/include/script.h @@ -42,12 +42,12 @@ void ScriptContext1_SetupScript(const u8 *ptr); void ScriptContext1_Stop(void); void EnableBothScriptContexts(void); void ScriptContext2_RunNewScript(const u8 *ptr); -void mapheader_run_script_with_tag_x1(void); -void mapheader_run_script_with_tag_x3(void); -void mapheader_run_script_with_tag_x5(void); -void mapheader_run_script_with_tag_x6(void); -bool8 mapheader_run_first_tag2_script_list_match(void); -void mapheader_run_first_tag4_script_list_match(void); +void RunOnLoadMapScript(void); +void RunOnTransitionMapScript(void); +void RunOnResumeMapScript(void); +void RunOnDiveWarpMapScript(void); +bool8 TryRunOnFrameMapScript(void); +void TryRunOnWarpIntoMapScript(void); void ClearRamScript(void); bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId); const u8 *GetRamScript(u8 objectId, const u8 *script); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index bca856e9e..7c74debab 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -228,7 +228,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) #if DEBUG !input->input_field_1_1 && #endif - mapheader_run_first_tag2_script_list_match() == 1) + TryRunOnFrameMapScript() == TRUE) return TRUE; if (input->pressedBButton && TrySetupDiveEmergeScript() == TRUE) diff --git a/src/fieldmap.c b/src/fieldmap.c index f9b81a173..6ba284810 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -38,7 +38,7 @@ void not_trainer_hill_battle_pyramid(void) { mapheader_copy_mapdata_with_padding(&gMapHeader); sub_80BB970(gMapHeader.events); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); } void sub_8055FC0(void) @@ -47,7 +47,7 @@ void sub_8055FC0(void) sub_80BBCCC(0); sub_80BB970(gMapHeader.events); sub_8056670(); - mapheader_run_script_with_tag_x1(); + RunOnLoadMapScript(); UpdateTVScreensOnMap(gUnknown_03004870.width, gUnknown_03004870.height); } diff --git a/src/overworld.c b/src/overworld.c index 67bf498c5..072d6d1b3 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -582,7 +582,7 @@ static bool8 SetDiveWarp(u8 direction, u16 x, u16 y) } else { - mapheader_run_script_with_tag_x6(); + RunOnDiveWarpMapScript(); if (IsDummyWarp(&gFixedDiveWarp)) return FALSE; @@ -620,7 +620,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) ChooseAmbientCrySpecies(); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); not_trainer_hill_battle_pyramid(); sub_8056D38(gMapHeader.mapLayout); apply_map_tileset2_palette(gMapHeader.mapLayout); @@ -633,7 +633,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) RoamerMove(); DoCurrentWeather(); ResetFieldTasksArgs(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); ShowMapNamePopup(); } @@ -658,7 +658,7 @@ void sub_8053994(u32 a1) FlagClear(FLAG_SYS_USE_FLASH); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); - mapheader_run_script_with_tag_x3(); + RunOnTransitionMapScript(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); not_trainer_hill_battle_pyramid(); @@ -1829,7 +1829,7 @@ void sub_8054D4C(u32 a1) sub_8080750(); if (!a1) SetUpFieldTasks(); - mapheader_run_script_with_tag_x5(); + RunOnResumeMapScript(); } void sub_8054D90(void) @@ -1838,7 +1838,7 @@ void sub_8054D90(void) gTotalCameraPixelOffsetY = 0; ResetObjectEvents(); TrySpawnObjectEvents(0, 0); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } void mli4_mapscripts_and_other(void) @@ -1855,7 +1855,7 @@ void mli4_mapscripts_and_other(void) ResetInitialPlayerAvatarState(); TrySpawnObjectEvents(0, 0); ResetBerryTreeSparkleFlags(); - mapheader_run_first_tag4_script_list_match(); + TryRunOnWarpIntoMapScript(); } void sub_8054E20(void) diff --git a/src/script.c b/src/script.c index 2c6495552..cd4816a52 100644 --- a/src/script.c +++ b/src/script.c @@ -1,6 +1,7 @@ #include "global.h" #include "script.h" #include "event_data.h" +#include "constants/map_scripts.h" #define RAM_SCRIPT_MAGIC 51 #define SCRIPT_STACK_SIZE 20 @@ -256,14 +257,14 @@ static u8 *mapheader_get_tagged_pointer(u8 tag) } } -static void mapheader_run_script_by_tag(u8 tag) +static void MapHeaderRunScriptType(u8 tag) { u8 *ptr = mapheader_get_tagged_pointer(tag); if (ptr) ScriptContext2_RunNewScript(ptr); } -static u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) +static u8 *MapHeaderCheckScriptTable(u8 tag) { u8 *ptr = mapheader_get_tagged_pointer(tag); @@ -286,29 +287,29 @@ static u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag) } } -void mapheader_run_script_with_tag_x1(void) +void RunOnLoadMapScript(void) { - mapheader_run_script_by_tag(1); + MapHeaderRunScriptType(MAP_SCRIPT_ON_LOAD); } -void mapheader_run_script_with_tag_x3(void) +void RunOnTransitionMapScript(void) { - mapheader_run_script_by_tag(3); + MapHeaderRunScriptType(MAP_SCRIPT_ON_TRANSITION); } -void mapheader_run_script_with_tag_x5(void) +void RunOnResumeMapScript(void) { - mapheader_run_script_by_tag(5); + MapHeaderRunScriptType(MAP_SCRIPT_ON_RESUME); } -void mapheader_run_script_with_tag_x6(void) +void RunOnDiveWarpMapScript(void) { - mapheader_run_script_by_tag(6); + MapHeaderRunScriptType(MAP_SCRIPT_ON_DIVE_WARP); } -bool8 mapheader_run_first_tag2_script_list_match(void) +bool8 TryRunOnFrameMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(2); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_FRAME_TABLE); if (!ptr) return 0; @@ -317,9 +318,9 @@ bool8 mapheader_run_first_tag2_script_list_match(void) return 1; } -void mapheader_run_first_tag4_script_list_match(void) +void TryRunOnWarpIntoMapScript(void) { - u8 *ptr = mapheader_get_first_match_from_tagged_ptr_list(4); + u8 *ptr = MapHeaderCheckScriptTable(MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE); if (ptr) ScriptContext2_RunNewScript(ptr); } |