diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-22 02:28:32 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-02-25 08:01:22 -0600 |
| commit | 8816aa527d7f3adfa10988ac661b9842bf78e64b (patch) | |
| tree | 249612156dfc47186763024085985c115bc8ec5c | |
| parent | 5f7a9713134d7694120dac27bef5ac14467f2734 (diff) | |
Update map script files
271 files changed, 564 insertions, 564 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 5e8a35f98..328bff848 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5493,8 +5493,8 @@ gBattleDomeMatchNumberText15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 setvar VAR_0x8004, 4 diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index e89d72c23..e69666120 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:: @ 8237D84 - map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F - map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98 .byte 0 AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc index 1f0c0e2f2..041c54593 100644 --- a/data/maps/AbandonedShip_Deck/scripts.inc +++ b/data/maps/AbandonedShip_Deck/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck_MapScripts:: @ 823799A - map_script 3, AbandonedShip_Deck_MapScript1_2379A0 + map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0 .byte 0 AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index f8b5bcc65..1c495c377 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -1,6 +1,6 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C - map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 - map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977 + map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index f8ecc9001..1c517735e 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49 - map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index 470ae8987..05223592e 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:: @ 8237FB7 - map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD .byte 0 AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc index 7e39b1939..b957bb6be 100644 --- a/data/maps/AbandonedShip_Underwater1/scripts.inc +++ b/data/maps/AbandonedShip_Underwater1/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 8238096 - map_script 5, AbandonedShip_Underwater1_MapScript1_23809C + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C .byte 0 AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc index 17f52c691..cc000b09c 100644 --- a/data/maps/AbandonedShip_Underwater2/scripts.inc +++ b/data/maps/AbandonedShip_Underwater2/scripts.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 823895D - map_script 5, AbandonedShip_Underwater2_MapScript1_238963 + map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963 .byte 0 AbandonedShip_Underwater2_MapScript1_238963: @ 8238963 diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc index a9faddc36..185466c80 100644 --- a/data/maps/AlteringCave/scripts.inc +++ b/data/maps/AlteringCave/scripts.inc @@ -1,5 +1,5 @@ AlteringCave_MapScripts:: @ 823B177 - map_script 3, AlteringCave_MapScript1_23B17D + map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D .byte 0 AlteringCave_MapScript1_23B17D: @ 823B17D diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 9cc369fb4..8d1c029c3 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -1,7 +1,7 @@ AncientTomb_MapScripts:: @ 8238FB3 - map_script 5, AncientTomb_MapScript1_238FC3 - map_script 1, AncientTomb_MapScript1_238FF2 - map_script 3, AncientTomb_MapScript1_238FE1 + map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3 + map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2 + map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1 .byte 0 AncientTomb_MapScript1_238FC3: @ 8238FC3 diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index a74c7a33e..2995f48dc 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,6 +1,6 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 - map_script 5, AquaHideout_B1F_MapScript1_2339B2 - map_script 3, AquaHideout_B1F_MapScript1_2339D0 + map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0 .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index daa508d32..cdfe3f58e 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,5 +1,5 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF - map_script 3, AquaHideout_B2F_MapScript1_233DD5 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5 .byte 0 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc index e46737583..433991bea 100644 --- a/data/maps/ArtisanCave_B1F/scripts.inc +++ b/data/maps/ArtisanCave_B1F/scripts.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F_MapScripts:: @ 823AFAD - map_script 3, ArtisanCave_B1F_MapScript1_23AFB3 + map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3 .byte 0 ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index cec596b2d..f3a0ecfb4 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 - map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 - map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 - map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C - map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C .byte 0 BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index f83f6f339..cc362f5f0 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 - map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF .byte 0 BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 9d588b666..5df47aed1 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36 - map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55 - map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41 .byte 0 BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index e1c5991e7..e50ad9f0a 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C - map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 - map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 - map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 - map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0 .byte 0 BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index ac43ee9a4..c777f7a7a 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE - map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104 .byte 0 BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 8b01eba0a..68ecf802b 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2 - map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 - map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F - map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 6cf1c7817..3901201bb 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9 - map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 - map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204 .byte 0 BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 5ed2e97da..9c76544f6 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB - map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB - map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 - map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31 .byte 0 BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 956cede17..a9e57dde6 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8 - map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407 - map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3 .byte 0 BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 21681b70a..0049b3f58 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA - map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF - map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5 .byte 0 BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index be11039df..bdd4a9ff4 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815 - map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 - map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 - map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34 .byte 0 BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 071f61a09..d5219636c 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3 - map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9 .byte 0 BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 5d7f7aaf5..40205e9b5 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E - map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D - map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789 .byte 0 BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 1155cd67b..c7421c2c8 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771 - map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C - map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7 .byte 0 BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index ab53d4c23..51d6023c8 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 - map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 - map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3 .byte 0 BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 1c810900c..87f83371c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152 - map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E - map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 - map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE .byte 0 BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index f46760e17..5d438d8bd 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392 - map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D - map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE .byte 0 BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 4beb26724..9f2dfec16 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A - map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A - map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A - map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466 .byte 0 BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cac594516..54f11f071 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D .byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 43586bba0..723c666d8 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33 - map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 - map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 - map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA .byte 0 BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 14e1a5557..667c4847e 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 - map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735 - map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index d04fe23f2..39bb39f49 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 - map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 - map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E - map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 - map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE .byte 0 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index cf646a3d3..6e3f0c8fa 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40 - map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 - map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B .byte 0 BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 2699fe9d6..8ebb7ed25 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 - map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 - map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 - map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43 .byte 0 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index 55e21dedb..cf0a50e98 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA - map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 - map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6 .byte 0 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 545ea04b2..efab7be70 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A - map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A - map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 - map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2 .byte 0 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 3dbd5eca3..0d07f5be2 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB - map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 - map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96 .byte 0 BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 29be45230..af76ee574 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B - map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690 - map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694 - map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD - map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9 .byte 0 BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index ce0c9b3a4..0bc74b1bd 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 - map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 - map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 - map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 - map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23 .byte 0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 0d493d4e7..32ef12112 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 - map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F - map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D .byte 0 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index b2b2a8d41..926a3c109 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1 - map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7 .byte 0 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 42c6db053..c99a0de38 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 - map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index 7d3c3a2f1..c6ae8da2a 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 - map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B - map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C - map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF .byte 0 BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 89f0ee8e9..574415c4c 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA - map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9 - map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9 + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5 .byte 0 BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index a7737654b..594790ff3 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,7 +1,7 @@ BirthIsland_Exterior_MapScripts:: @ 8267F15 - map_script 3, BirthIsland_Exterior_MapScript1_267F29 - map_script 5, BirthIsland_Exterior_MapScript1_267F65 - map_script 7, BirthIsland_Exterior_MapScript1_267F25 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29 + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25 .byte 0 BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 1804e58ea..e8d722dee 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 - map_script 3, CaveOfOrigin_1F_MapScript1_23576E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E .byte 0 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc index 1a771ae82..53228f63c 100644 --- a/data/maps/CaveOfOrigin_Entrance/scripts.inc +++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 - map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F + map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F .byte 0 CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 79c00f28c..e3e296945 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 6f9812c38..417a7369a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index baa40934a..51d9b8654 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 2ae1f9e2e..75fcf061c 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -1,7 +1,7 @@ DesertRuins_MapScripts:: @ 822D95B - map_script 5, DesertRuins_MapScript1_22D96B - map_script 1, DesertRuins_MapScript1_22D989 - map_script 3, DesertRuins_MapScript1_22D9CA + map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B + map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989 + map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA .byte 0 DesertRuins_MapScript1_22D96B: @ 822D96B diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index c64597d6c..9c5e83180 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -1,5 +1,5 @@ DesertUnderpass_MapScripts:: @ 823AF37 - map_script 3, DesertUnderpass_MapScript1_23AF3D + map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D .byte 0 DesertUnderpass_MapScript1_23AF3D: @ 823AF3D diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 6c66f4860..2e283ef70 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_MapScripts:: @ 81E9507 - map_script 3, DewfordTown_MapScript1_1E950D + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D .byte 0 DewfordTown_MapScript1_1E950D: @ 81E950D diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index bafdc6c23..63279937e 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C - map_script 3, DewfordTown_Gym_MapScript1_1FC642 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642 .byte 0 DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index e21fd13af..b4f5fc4c6 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 - map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E - map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E + map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index f2a30ecd2..58b0b63a1 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 - map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 99d5ab811..ffbf5a6cd 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapScripts:: @ 81E7D1B - map_script 3, EverGrandeCity_MapScript1_1E7D21 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21 .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 31a9b91b8..49411aeb4 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF - map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF - map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05 - map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 2c0949842..a9f5835ad 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C - map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB - map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2 - map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E .byte 0 EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 7510f468f..e4a2a3694 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 - map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431 - map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448 - map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index a5b7764d7..d9a7adfe3 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall1_MapScripts:: @ 8229569 - map_script 4, EverGrandeCity_Hall1_MapScript2_22956F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F .byte 0 EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 565d68168..b831d0fd5 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall2_MapScripts:: @ 822957E - map_script 4, EverGrandeCity_Hall2_MapScript2_229584 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584 .byte 0 EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index 85d0bb2f6..d75cf95b6 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall3_MapScripts:: @ 8229593 - map_script 4, EverGrandeCity_Hall3_MapScript2_229599 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599 .byte 0 EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index 29f56829a..faf20646a 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall4_MapScripts:: @ 82295A8 - map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE .byte 0 EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index d492c28d2..e586958c2 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall5_MapScripts:: @ 82295BD - map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3 .byte 0 EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 04134d30f..f61547c14 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 822982C - map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846 - map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837 .byte 0 EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 77f951d76..4eef4ba58 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 - map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA - map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184 - map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index f63f636cd..827c08e54 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 - map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F - map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 09d382b2b..40408c1f8 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 - map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 4794fb99e..95345af5c 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 - map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD - map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD + map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 .byte 0 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index d3a77a051..2d2d916a3 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 - map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B - map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C - map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF .byte 0 EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9152254b3..f917e4bd8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 - map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D - map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E - map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16 - map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D .byte 0 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 5e06ed4cb..b59d4c220 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_MapScripts:: @ 81EB1FA - map_script 3, FallarborTown_MapScript1_1EB200 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200 .byte 0 FallarborTown_MapScript1_1EB200: @ 81EB200 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index dff1d26e0..b376f72e4 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 - map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 - map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD - map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 .byte 0 FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index f3d0a924e..327033829 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7 - map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD .byte 0 FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 1128540e9..6d7ea6be5 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66 - map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85 - map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71 .byte 0 FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c9a7ef27c..d34e139eb 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 - map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 93482e860..8fce8e729 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 7c68dd246..347c89aa0 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -1,5 +1,5 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E - map_script 3, FarawayIsland_Entrance_MapScript1_267C94 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94 .byte 0 FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index fdb13d19d..7051d376c 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,8 +1,8 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA - map_script 5, FarawayIsland_Interior_MapScript1_267D54 - map_script 3, FarawayIsland_Interior_MapScript1_267D72 - map_script 2, FarawayIsland_Interior_MapScript2_267D98 - map_script 7, FarawayIsland_Interior_MapScript1_267D0F + map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72 + map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F .byte 0 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index 3888c61ef..ddba0dc0b 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -1,5 +1,5 @@ FieryPath_MapScripts:: @ 8230F24 - map_script 3, FieryPath_MapScript1_230F2A + map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A .byte 0 FieryPath_MapScript1_230F2A: @ 8230F2A diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index d5c1ab29e..1c464df9d 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_MapScripts:: @ 81E25A4 - map_script 3, FortreeCity_MapScript1_1E25AF - map_script 5, FortreeCity_MapScript1_1E25B3 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 .byte 0 FortreeCity_MapScript1_1E25AF: @ 81E25AF diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 59cbfefa6..30cf8736a 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_Gym_MapScripts:: @ 82165AB - map_script 3, FortreeCity_Gym_MapScript1_2165B6 - map_script 4, FortreeCity_Gym_MapScript2_2165BA + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA .byte 0 FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 339cae9eb..070956590 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 - map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 - map_script 5, FortreeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index f631aa3c6..dbe2e31ec 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E - map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, FortreeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index 360b10a08..099e5a501 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,7 +1,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script 2, GraniteCave_B1F_MapScript2_2A8327 - map_script 3, GraniteCave_B1F_MapScript1_2A8331 - map_script 5, GraniteCave_B1F_MapScript1_22DC6E + map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E .byte 0 GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 858975d7a..d4f0c0b5d 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -1,6 +1,6 @@ InsideOfTruck_MapScripts:: @ 823BEDA - map_script 1, InsideOfTruck_MapScript1_23BEE5 - map_script 5, InsideOfTruck_MapScript1_23BF01 + map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5 + map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01 .byte 0 InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 33ae51f8d..cb400e817 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -1,7 +1,7 @@ IslandCave_MapScripts:: @ 8238E2A - map_script 5, IslandCave_MapScript1_238E3A - map_script 1, IslandCave_MapScript1_238E58 - map_script 3, IslandCave_MapScript1_238E99 + map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A + map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58 + map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99 .byte 0 IslandCave_MapScript1_238E3A: @ 8238E3A diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index fd9947ac4..79aaae963 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,7 +1,7 @@ JaggedPass_MapScripts:: @ 8230656 - map_script 5, JaggedPass_MapScript1_230666 - map_script 3, JaggedPass_MapScript1_23068B - map_script 1, JaggedPass_MapScript1_23069C + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B + map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C .byte 0 JaggedPass_MapScript1_230666: @ 8230666 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index aaf550d0d..3910c4978 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 - map_script 3, LavaridgeTown_MapScript1_1EA4DE - map_script 2, LavaridgeTown_MapScript2_1EA547 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 .byte 0 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 89dc30f47..06714058e 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:: @ 81FE6F4 - map_script 3, LavaridgeTown_Gym_1F_MapScript1_1FE6FA + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA .byte 0 LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index a8a6eaa54..d2e8d90b5 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E - map_script 3, LavaridgeTown_Gym_B1F_MapScript1_1FF884 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884 .byte 0 LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index f4fabbf72..2a0cb4a1e 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA - map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 - map_script 5, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 + map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index b1491f621..b022df141 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 - map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 02d88bf5a..977581f80 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_MapScripts:: @ 81E2B3C - map_script 3, LilycoveCity_MapScript1_1E2B47 - map_script 1, LilycoveCity_MapScript1_1E2B61 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47 + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61 .byte 0 LilycoveCity_MapScript1_1E2B47: @ 81E2B47 diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index ae276cf9c..83a2644d8 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 - map_script 3, LilycoveCity_ContestLobby_MapScript1_21A21C - map_script 2, LilycoveCity_ContestLobby_MapScript2_21A243 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 .byte 0 LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index d5379f96a..f1c974dd9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 - map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D .byte 0 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 899ea98f0..e62537422 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A - map_script 4, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80 .byte 0 LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index ea70156aa..67b05c692 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 - map_script 3, LilycoveCity_Harbor_MapScript1_21E006 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006 .byte 0 LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 3f5b349d2..ad8989b4c 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,5 +1,5 @@ LilycoveCity_House3_MapScripts:: @ 821EE3C - map_script 3, LilycoveCity_House3_MapScript1_21EE42 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42 .byte 0 LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 0669b7461..f568a9897 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:: @ 821973A - map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 - map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index dd0dff376..0d8da38d5 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 - map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD - map_script 5, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD + map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index f4a25f137..1e8035483 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D - map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 698ef95f2..f65d901bb 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 - map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 - map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D + map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index e756c2bc6..8d5101a95 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1,9 +1,9 @@ LinkContestRoom1_MapScripts:: @ 823B781 - map_script 4, LinkContestRoom1_MapScript2_23B81F - map_script 2, LinkContestRoom1_MapScript2_23B815 - map_script 3, LinkContestRoom1_MapScript1_23B79F - map_script 5, LinkContestRoom1_MapScript1_23B803 - map_script 7, LinkContestRoom1_MapScript1_23B79B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F + map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815 + map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F + map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B .byte 0 LinkContestRoom1_MapScript1_23B79B: @ 823B79B diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index e4b69eb13..67eab8986 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB - map_script 3, LittlerootTown_MapScript1_1E7DDB - map_script 2, LittlerootTown_MapScript2_1E7EC1 - map_script 4, LittlerootTown_MapScript2_1E7FE2 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_1E7DDB + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_1E7EC1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MapScript2_1E7FE2 .byte 0 LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 13736130f..3aba7f4a9 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:: @ 81F7755 - map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 - map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 - map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 9758ba250..087310211 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:: @ 81F83E3 - map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE - map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 8f40d7c13..ff8c965a4 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:: @ 81F88A5 - map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 - map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 - map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_1F893A + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index b946201ef..a639643a5 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:: @ 81F9296 - map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 - map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 1bf27c0bd..adfe3c387 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 - map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 - map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 - map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06 + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 56ad204a9..c67cbd447 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -1,5 +1,5 @@ MagmaHideout_1F_MapScripts:: @ 8239880 - map_script 3, MagmaHideout_1F_MapScript1_239886 + map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886 .byte 0 MagmaHideout_1F_MapScript1_239886: @ 8239886 diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index b66ab17c4..036fa7724 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,6 +1,6 @@ MarineCave_End_MapScripts:: @ 823AFDF - map_script 5, MarineCave_End_MapScript1_23AFEA - map_script 3, MarineCave_End_MapScript1_23B008 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA + map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008 .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc index 24b288050..82ff756e1 100644 --- a/data/maps/MarineCave_Entrance/scripts.inc +++ b/data/maps/MarineCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 - map_script 5, MarineCave_Entrance_MapScript1_23AFD6 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_MapScript1_23AFD6 .byte 0 MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 6c2ae69fc..344ccfa41 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_MapScripts:: @ 81DF385 - map_script 3, MauvilleCity_MapScript1_1DF38B + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B .byte 0 MauvilleCity_MapScript1_1DF38B: @ 81DF38B diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 4d555fe79..e3c3f5369 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E - map_script 1, MauvilleCity_Gym_MapScript1_20DD74 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_20DD74 .byte 0 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 1eac0efc9..a866e6aa4 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B - map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 - map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 + map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index 196d49a26..a289886a3 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 - map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 466b1ee3b..8522df0a5 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:: @ 822BD2A - map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30 + map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30 .byte 0 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 diff --git a/data/maps/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc index 94aed55d0..9f6c35a84 100644 --- a/data/maps/MirageTower_1F/scripts.inc +++ b/data/maps/MirageTower_1F/scripts.inc @@ -1,5 +1,5 @@ MirageTower_1F_MapScripts:: @ 823AD01 - map_script 3, MirageTower_1F_MapScript1_23AD07 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07 .byte 0 MirageTower_1F_MapScript1_23AD07: @ 823AD07 diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index 79f3cce2a..d22a7c6ff 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_2F_MapScripts:: @ 823AD11 - map_script 2, MirageTower_2F_MapScript2_2A8327 - map_script 3, MirageTower_2F_MapScript1_2A8331 - map_script 5, MirageTower_2F_MapScript1_23AD21 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21 .byte 0 MirageTower_2F_MapScript1_23AD21: @ 823AD21 diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index 1ec82de55..f29f542fc 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -1,7 +1,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C - map_script 2, MirageTower_3F_MapScript2_2A8327 - map_script 3, MirageTower_3F_MapScript1_2A8331 - map_script 5, MirageTower_3F_MapScript1_23AD3C + map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C .byte 0 MirageTower_3F_MapScript1_23AD3C: @ 823AD3C diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 3e2bd4cf9..b01e9cae8 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_MapScripts:: @ 81E4A96 - map_script 3, MossdeepCity_MapScript1_1E4A9C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C .byte 0 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ed10a8309..4b40cd74e 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:: @ 8224B27 - map_script 2, MossdeepCity_GameCorner_1F_MapScript2_224B41 - map_script 4, MossdeepCity_GameCorner_1F_MapScript2_224B37 - map_script 1, MossdeepCity_GameCorner_1F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 6e5b461cd..7638f6119 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 - map_script 1, MossdeepCity_Gym_MapScript1_220806 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806 .byte 0 MossdeepCity_Gym_MapScript1_220806: @ 8220806 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 28573a3c1..9dbead25e 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F - map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_22224A - map_script 5, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A + map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index e8fbb6e02..922c9a064 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 - map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 662774d64..43bd56d3a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 - map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 - map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index bfc33a10f..7ce0efef3 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 - map_script 3, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 - map_script 2, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index d66930292..e59c217d3 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 - map_script 1, MossdeepCity_StevensHouse_MapScript1_222794 - map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8 - map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0 .byte 0 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 7282ca944..38b223ab0 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,6 +1,6 @@ MtChimney_MapScripts:: @ 822EDC1 - map_script 5, MtChimney_MapScript1_22EDD2 - map_script 3, MtChimney_MapScript1_22EDCC + map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC .byte 0 MtChimney_MapScript1_22EDCC: @ 822EDCC diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 6c389e2ad..9e85729b7 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA - map_script 3, MtChimney_CableCarStation_MapScript1_22AC05 - map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index cdf2cb98b..150c08df4 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,7 +1,7 @@ MtPyre_2F_MapScripts:: @ 82310FB - map_script 2, MtPyre_2F_MapScript2_2A8327 - map_script 3, MtPyre_2F_MapScript1_2A8331 - map_script 5, MtPyre_2F_MapScript1_23110B + map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_2A8331 + map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_23110B .byte 0 MtPyre_2F_MapScript1_23110B: @ 823110B diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index fe51946dc..e24f8ea68 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC - map_script 3, MtPyre_Exterior_MapScript1_231FD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2 .byte 0 MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6b9805fbf..b7f6d73fc 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,5 +1,5 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script 3, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 83185bc4d..8a617236c 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Bottom_MapScripts:: @ 8269255 - map_script 3, NavelRock_Bottom_MapScript1_269260 - map_script 5, NavelRock_Bottom_MapScript1_269284 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260 + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 .byte 0 NavelRock_Bottom_MapScript1_269260: @ 8269260 diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 21034a4e0..33bbb6391 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,5 +1,5 @@ NavelRock_Exterior_MapScripts:: @ 82690B2 - map_script 3, NavelRock_Exterior_MapScript1_2690B8 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8 .byte 0 NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 795bcf0e5..af011e058 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,6 +1,6 @@ NavelRock_Top_MapScripts:: @ 8269113 - map_script 3, NavelRock_Top_MapScript1_26911E - map_script 5, NavelRock_Top_MapScript1_269151 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 9d0452b6b..d45661fc1 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapScripts:: @ 82372AD - map_script 1, NewMauville_Entrance_MapScript1_2372B8 - map_script 3, NewMauville_Entrance_MapScript1_2372FB + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 38bacbde3..024501820 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,7 +1,7 @@ NewMauville_Inside_MapScripts:: @ 82373D7 - map_script 5, NewMauville_Inside_MapScript1_2373E7 - map_script 3, NewMauville_Inside_MapScript1_23741B - map_script 1, NewMauville_Inside_MapScript1_23744D + map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B + map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D .byte 0 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index a635b2f5c..6f550a8b0 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,5 +1,5 @@ OldaleTown_MapScripts:: @ 81E8EA2 - map_script 3, OldaleTown_MapScript1_1E8EA8 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8 .byte 0 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 19f7d8f67..49452da71 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 - map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 - map_script 5, OldaleTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 + map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index 788157beb..b6795876b 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 - map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 6125ed386..0ae0a53a8 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 - map_script 3, PacifidlogTown_MapScript1_1EBABC - map_script 5, PacifidlogTown_MapScript1_1EBAC0 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 .byte 0 PacifidlogTown_MapScript1_1EBABC: @ 81EBABC diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index ddad843fb..89fec7f6b 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 - map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 - map_script 5, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index 0199c2215..cb28d577e 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 - map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 0253a799f..83ec1aa23 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_MapScripts:: - map_script 3, PetalburgCity_MapScript1_1DC2D7 - map_script 2, PetalburgCity_MapScript2_1DC31C + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_1DC2D7 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C .byte 0 PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 474fe0df5..09f20ecf4 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script 1, PetalburgCity_Gym_MapScript1_20489E - map_script 3, PetalburgCity_Gym_MapScript1_20492D - map_script 4, PetalburgCity_Gym_MapScript2_20498B - map_script 2, PetalburgCity_Gym_MapScript2_20499A + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 1bbeb8fad..382847bc7 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 - map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 - map_script 5, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 + map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index 38d01972a..7b5f5af55 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 - map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index ac41aaa28..1a4754374 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 - map_script 2, PetalburgCity_WallysHouse_MapScript2_204247 - map_script 4, PetalburgCity_WallysHouse_MapScript2_204234 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_204247 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_204234 .byte 0 PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index ca9d94127..8ee9ea05e 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,6 +1,6 @@ Route101_MapScripts:: @ 81EBCBA - map_script 3, Route101_MapScript1_1EBCC5 - map_script 2, Route101_MapScript2_1EBCCB + map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB .byte 0 Route101_MapScript1_1EBCC5: @ 81EBCC5 diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 798e32715..f863e6dc7 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,6 +1,6 @@ Route103_MapScripts:: @ 81EC38E - map_script 3, Route103_MapScript1_1EC399 - map_script 1, Route103_MapScript1_1EC3A4 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399 + map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 .byte 0 Route103_MapScript1_1EC399: @ 81EC399 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 7d2e06876..159fff9ab 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,6 +1,6 @@ Route104_MapScripts:: @ 81ECC32 - map_script 2, Route104_MapScript2_1ECC3D - map_script 3, Route104_MapScript1_1ECC4E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 17ed47206..ef3e92e56 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E - map_script 3, Route104_MrBrineysHouse_MapScript1_229D34 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34 .byte 0 Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index a1f070651..26dfe7f8a 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C - map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_22A352 + map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352 .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index b4213af5b..6ad11bc52 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,7 +1,7 @@ Route105_MapScripts:: @ 81EE1DB - map_script 1, Route105_MapScript1_1EE1EB - map_script 3, Route105_MapScript1_1EE21E - map_script 2, Route105_MapScript2_1EE240 + map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB + map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 .byte 0 Route105_MapScript1_1EE1EB: @ 81EE1EB diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 89e31d639..ed27e32ff 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse_MapScripts:: @ 82693F4 - map_script 3, Route109_SeashoreHouse_MapScript1_2693FA + map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA .byte 0 Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 578a19a21..1a45bee60 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,7 +1,7 @@ Route110_MapScripts:: @ 81EF269 - map_script 5, Route110_MapScript1_1EF279 - map_script 3, Route110_MapScript1_1EF27D - map_script 2, Route110_MapScript2_1EF297 + map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_1EF27D + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 .byte 0 Route110_MapScript1_1EF279: @ 81EF279 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index a993364e6..1d353dcdd 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 - map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 .byte 0 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index cf520c81f..f15c8c706 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 - map_script 3, Route110_TrickHouseCorridor_MapScript1_26B909 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_26B909 .byte 0 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 770c39768..749e6fbb2 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF - map_script 5, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script 3, Route110_TrickHouseEnd_MapScript1_26ACD0 - map_script 2, Route110_TrickHouseEnd_MapScript2_26ACF5 - map_script 4, Route110_TrickHouseEnd_MapScript2_26ACDE + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_26ACD0 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE .byte 0 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 7dc918f2d..b97c25781 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -1,7 +1,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 - map_script 3, Route110_TrickHouseEntrance_MapScript1_269A60 - map_script 2, Route110_TrickHouseEntrance_MapScript2_269CEE - map_script 4, Route110_TrickHouseEntrance_MapScript2_269BD3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3 .byte 0 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index b34a9d555..3ec5ac82c 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F - map_script 1, Route110_TrickHousePuzzle1_MapScript1_26B915 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915 .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 560d10060..0e8481734 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 - map_script 5, Route110_TrickHousePuzzle2_MapScript1_26BB7E - map_script 3, Route110_TrickHousePuzzle2_MapScript1_26BBAB + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_26BBAB .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index b26c5473d..3968adce2 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 - map_script 5, Route110_TrickHousePuzzle3_MapScript1_26BEE3 - map_script 3, Route110_TrickHousePuzzle3_MapScript1_26BEFF + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_26BEFF .byte 0 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 48ce6be8c..7f400760a 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 - map_script 3, Route110_TrickHousePuzzle5_MapScript1_26CAF6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_26CAF6 .byte 0 Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 2cb784b50..d5725bbd8 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 - map_script 3, Route110_TrickHousePuzzle6_MapScript1_26DDB2 - map_script 4, Route110_TrickHousePuzzle6_MapScript2_26DDB6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_26DDB2 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6 .byte 0 Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 3babdbd45..55fdec0fb 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 - map_script 5, Route110_TrickHousePuzzle7_MapScript1_26E0A6 - map_script 3, Route110_TrickHousePuzzle7_MapScript1_26E198 - map_script 1, Route110_TrickHousePuzzle7_MapScript1_26E1B4 - map_script 2, Route110_TrickHousePuzzle7_MapScript2_26E1C0 + map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_26E198 + map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0 .byte 0 Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c33dc6f11..754369014 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,8 +1,8 @@ Route111_MapScripts:: @ 81F0CA7 - map_script 1, Route111_MapScript1_1F0CBC - map_script 3, Route111_MapScript1_1F0D87 - map_script 4, Route111_MapScript2_1F0E46 - map_script 2, Route111_MapScript2_1F0E56 + map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC + map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_1F0D87 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 .byte 0 Route111_MapScript1_1F0CBC: @ 81F0CBC diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 23dca6f0b..9427e8692 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_MapScripts:: @ 822A916 - map_script 3, Route111_OldLadysRestStop_MapScript1_22A91C + map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C .byte 0 Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 7f479d9f2..8c624fb21 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,5 +1,5 @@ Route112_MapScripts:: @ 81F1DA8 - map_script 3, Route112_MapScript1_1F1DAE + map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE .byte 0 Route112_MapScript1_1F1DAE: @ 81F1DAE diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a430a497e..1f2f83589 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_MapScripts:: @ 822AABE - map_script 3, Route112_CableCarStation_MapScript1_22AAC9 - map_script 2, Route112_CableCarStation_MapScript2_22AAE9 + map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_22AAC9 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 .byte 0 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ac27784da..6efd05d6e 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,6 +1,6 @@ Route113_MapScripts:: @ 81F2153 - map_script 5, Route113_MapScript1_1F215E - map_script 3, Route113_MapScript1_1F2161 + map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E + map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1F2161 .byte 0 Route113_MapScript1_1F215E: @ 81F215E diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index b5b082d4d..cbe1c210e 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 - map_script 3, Route113_GlassWorkshop_MapScript1_26ED09 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09 .byte 0 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 3c07facf3..d4327a2f4 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,7 +1,7 @@ Route114_MapScripts:: @ 81F252F - map_script 3, Route114_MapScript1_1F253F - map_script 1, Route114_MapScript1_1F2561 - map_script 2, Route114_MapScript2_1F2578 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F + map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 .byte 0 Route114_MapScript1_1F253F: @ 81F253F diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 0d942e446..c6b63d8da 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_MapScripts:: @ 822AD30 - map_script 3, Route114_FossilManiacsHouse_MapScript1_22AD36 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36 .byte 0 Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index c36abfe3b..1a84082ab 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,6 +1,6 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 - map_script 3, Route114_FossilManiacsTunnel_MapScript1_22AF33 - map_script 1, Route114_FossilManiacsTunnel_MapScript1_22AF49 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_22AF33 + map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 .byte 0 Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index b54365523..1cf7ffb47 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_MapScripts:: @ 822B2C8 - map_script 3, Route114_LanettesHouse_MapScript1_22B2CE + map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE .byte 0 Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 560c360af..9cb3ea2e0 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,7 +1,7 @@ Route115_MapScripts:: @ 81F2920 - map_script 1, Route115_MapScript1_1F2930 - map_script 3, Route115_MapScript1_1F2947 - map_script 2, Route115_MapScript2_1F2969 + map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 + map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_1F2947 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 1addad5ec..fc8b49b30 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,7 +1,7 @@ Route116_MapScripts:: @ 81F2C0C - map_script 3, Route116_MapScript1_1F2C1C - map_script 1, Route116_MapScript1_1F2C4F - map_script 2, Route116_MapScript2_1F2C66 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_1F2C1C + map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 .byte 0 Route116_MapScript1_1F2C1C: @ 81F2C1C diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index 89ccdce8d..bdd22aadd 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse_MapScripts:: @ 822B850 - map_script 3, Route116_TunnelersRestHouse_MapScript1_22B856 + map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856 .byte 0 Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 4a51c17d8..08571690f 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,5 +1,5 @@ Route117_MapScripts:: @ 81F397D - map_script 3, Route117_MapScript1_1F3983 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_1F3983 .byte 0 Route117_MapScript1_1F3983: @ 81F3983 diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc index b2e9ddfaa..ea9894ffc 100644 --- a/data/maps/Route117_PokemonDayCare/scripts.inc +++ b/data/maps/Route117_PokemonDayCare/scripts.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_MapScripts:: @ 822BBB1 - map_script 3, Route117_PokemonDayCare_MapScript1_22BBB7 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7 .byte 0 Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 4e5279510..5ba60d5cd 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,7 +1,7 @@ Route118_MapScripts:: @ 81F3DBC - map_script 3, Route118_MapScript1_1F3DCC - map_script 1, Route118_MapScript1_1F3DF3 - map_script 2, Route118_MapScript2_1F3E0A + map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC + map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A .byte 0 Route118_MapScript1_1F3DCC: @ 81F3DCC diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 8356df063..91208f052 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 81F4424 - map_script 5, Route119_MapScript1_1F442F - map_script 3, Route119_MapScript1_1F444D + map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F + map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_1F444D .byte 0 Route119_MapScript1_1F442F: @ 81F442F diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 8d57356fd..09ed3c4f5 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:: @ 826FA86 - map_script 3, Route119_WeatherInstitute_1F_MapScript1_26FA8C + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_26FA8C .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 21d34eed1..7d557fdef 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:: @ 826FF1E - map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_26FF24 .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 5a29c1bb7..40c9ee09a 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,7 +1,7 @@ Route120_MapScripts:: @ 81F53EC - map_script 5, Route120_MapScript1_1F53FC - map_script 3, Route120_MapScript1_1F54CD - map_script 1, Route120_MapScript1_1F5474 + map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC + map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1F54CD + map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 .byte 0 Route120_MapScript1_1F53FC: @ 81F53FC diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index f5e2fb088..e7339f008 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB - map_script 2, Route121_SafariZoneEntrance_MapScript2_22BBC1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1 .byte 0 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 132a068e3..8e1692114 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,5 +1,5 @@ Route123_MapScripts:: @ 81F6147 - map_script 3, Route123_MapScript1_1F614D + map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D .byte 0 Route123_MapScript1_1F614D: @ 81F614D diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 3500578ef..6d4afa30a 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse_MapScripts:: @ 826F83B - map_script 3, Route123_BerryMastersHouse_MapScript1_26F841 + map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841 .byte 0 Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 9968d3a04..34e315792 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,5 +1,5 @@ Route124_MapScripts:: @ 81F656C - map_script 3, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 .byte 0 Route124_MapScript1_1F6572: @ 81F6572 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 934c6757d..250a5ba51 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28 - map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E + map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_270A2E .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index c979577d8..4812b9691 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,7 +1,7 @@ Route125_MapScripts:: @ 81F6748 - map_script 3, Route125_MapScript1_1F6758 - map_script 1, Route125_MapScript1_1F6783 - map_script 2, Route125_MapScript2_1F679A + map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758 + map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A .byte 0 Route125_MapScript1_1F6758: @ 81F6758 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 29846af22..71bc77b28 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -1,5 +1,5 @@ Route126_MapScripts:: @ 81F68C6 - map_script 3, Route126_MapScript1_1F68CC + map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 76ade14f3..7d5eee844 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,7 +1,7 @@ Route127_MapScripts:: @ 81F69D9 - map_script 3, Route127_MapScript1_1F69E9 - map_script 1, Route127_MapScript1_1F6A14 - map_script 2, Route127_MapScript2_1F6A2B + map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9 + map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 3ec3d2fe7..b12443756 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,6 +1,6 @@ Route128_MapScripts:: @ 81F6B38 - map_script 3, Route128_MapScript1_1F6B43 - map_script 2, Route128_MapScript2_1F6B4D + map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index c1bd91f0a..8aec4bc28 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,7 +1,7 @@ Route129_MapScripts:: @ 81F7284 - map_script 3, Route129_MapScript1_1F72AB - map_script 1, Route129_MapScript1_1F7294 - map_script 2, Route129_MapScript2_1F72E2 + map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB + map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 797cc302c..18dce324d 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,5 +1,5 @@ Route130_MapScripts:: @ 81F735F - map_script 3, Route130_MapScript1_1F7365 + map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365 .byte 0 Route130_MapScript1_1F7365: @ 81F7365 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 9cbd6eb6d..7f50b2273 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -1,5 +1,5 @@ Route131_MapScripts:: @ 81F7404 - map_script 3, Route131_MapScript1_1F740A + map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_1F740A .byte 0 Route131_MapScript1_1F740A: @ 81F740A diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index f6f4feee3..a941e19b5 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -1,5 +1,5 @@ Route134_MapScripts:: @ 81F7644 - map_script 5, Route134_MapScript1_1F764A + map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A .byte 0 Route134_MapScript1_1F764A: @ 81F764A diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f475f02e3..a3bd8f597 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_MapScripts:: @ 81E06BD - map_script 3, RustboroCity_MapScript1_1E06C8 - map_script 2, RustboroCity_MapScript2_1E070B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B .byte 0 RustboroCity_MapScript1_1E06C8: @ 81E06C8 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index a7a84335b..4f1971c80 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:: @ 8211245 - map_script 3, RustboroCity_DevonCorp_1F_MapScript1_21124B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_21124B .byte 0 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 1631d923d..622ea9cf7 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:: @ 8211857 - map_script 3, RustboroCity_DevonCorp_2F_MapScript1_21185D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_21185D .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 7c4557058..d53119e69 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:: @ 821242D - map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D - map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455 - map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_21243D + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index f76603dbd..e7bea0f0d 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 - map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D - map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_214D6D + map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index a1bdeba5b..fac3cb059 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE - map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 325e4186b..de0d07ec9 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,6 +1,6 @@ RusturfTunnel_MapScripts:: @ 822CE27 - map_script 3, RusturfTunnel_MapScript1_22CE44 - map_script 2, RusturfTunnel_MapScript2_22CE32 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 .byte 0 RusturfTunnel_MapScript2_22CE32: @ 822CE32 diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 20d0c72d4..ededf1e5f 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,5 +1,5 @@ SSTidalCorridor_MapScripts:: @ 823BFCF - map_script 2, SSTidalCorridor_MapScript2_23BFD5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5 .byte 0 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ab6f70f86..8ba86b3c8 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,6 +1,6 @@ SafariZone_South_MapScripts:: @ 823D279 - map_script 3, SafariZone_South_MapScript1_23D2B1 - map_script 2, SafariZone_South_MapScript2_23D284 + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_23D2B1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 .byte 0 SafariZone_South_MapScript2_23D284: @ 823D284 diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc index f83724ec5..62a546780 100644 --- a/data/maps/ScorchedSlab/scripts.inc +++ b/data/maps/ScorchedSlab/scripts.inc @@ -1,5 +1,5 @@ ScorchedSlab_MapScripts:: @ 8239291 - map_script 3, ScorchedSlab_MapScript1_239297 + map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_239297 .byte 0 ScorchedSlab_MapScript1_239297: @ 8239297 diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 13b65c722..045c0e065 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance_MapScripts:: @ 823446E - map_script 5, SeafloorCavern_Entrance_MapScript1_234474 + map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_234474 .byte 0 SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 4b461a684..71e6426fe 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -1,7 +1,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 8239106 - map_script 5, SealedChamber_OuterRoom_MapScript1_239116 - map_script 3, SealedChamber_OuterRoom_MapScript1_239127 - map_script 1, SealedChamber_OuterRoom_MapScript1_23912B + map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116 + map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_239127 + map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B .byte 0 SealedChamber_OuterRoom_MapScript1_239116: @ 8239116 diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 32da39388..cb26f924e 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,8 +1,8 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script 4, SecretBase_RedCave1_MapScript2_23B498 - map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 - map_script 2, SecretBase_RedCave1_MapScript2_23B4AE - map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE + map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index fa2aca8e0..218cabc67 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA - map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 .byte 0 ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 7a7c3e337..f1a29b28a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 - map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_236F16 - map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_236F00 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_236F00 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index d493469fa..8492afe5b 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156 - map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_23715C + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C .byte 0 ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 6e3bb63fe..74b653a5f 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA - map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_237100 + map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100 .byte 0 ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index a0b62df25..b1ec3b74a 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_1F_MapScripts:: @ 8239615 - map_script 3, SkyPillar_1F_MapScript1_23961B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_23961B .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index a0a4aeaf3..8c1424fd9 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_2F_MapScripts:: @ 823962B - map_script 2, SkyPillar_2F_MapScript2_2A8327 - map_script 3, SkyPillar_2F_MapScript1_23963B - map_script 5, SkyPillar_2F_MapScript1_239650 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_23963B + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index d78ee6266..9bc7eda27 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_3F_MapScripts:: @ 823965B - map_script 3, SkyPillar_3F_MapScript1_239661 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_239661 .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 3904e954f..254d61a59 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 - map_script 2, SkyPillar_4F_MapScript2_2A8327 - map_script 3, SkyPillar_4F_MapScript1_239681 - map_script 5, SkyPillar_4F_MapScript1_239696 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_239681 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 20478e77e..af5a5ffe1 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_5F_MapScripts:: @ 82396A2 - map_script 3, SkyPillar_5F_MapScript1_2396A8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_2396A8 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc index 09ee9eae2..40d57a485 100644 --- a/data/maps/SkyPillar_Entrance/scripts.inc +++ b/data/maps/SkyPillar_Entrance/scripts.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance_MapScripts:: @ 823929E - map_script 3, SkyPillar_Entrance_MapScript1_2392A4 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_2392A4 .byte 0 SkyPillar_Entrance_MapScript1_2392A4: @ 82392A4 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index a6e7b05cc..7b826d576 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 - map_script 3, SkyPillar_Outside_MapScript1_2392B8 - map_script 1, SkyPillar_Outside_MapScript1_2392DD - map_script 2, SkyPillar_Outside_MapScript2_2392FA + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_2392B8 + map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD + map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index de4706f84..3d031293d 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_Top_MapScripts:: @ 82396B8 - map_script 5, SkyPillar_Top_MapScript1_2396C8 - map_script 3, SkyPillar_Top_MapScript1_2396E6 - map_script 4, SkyPillar_Top_MapScript2_239713 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_2396E6 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 .byte 0 SkyPillar_Top_MapScript1_2396C8: @ 82396C8 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index efce9cde8..640725f33 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_MapScripts:: @ 81DCC61 - map_script 3, SlateportCity_MapScript1_1DCC6C - map_script 2, SlateportCity_MapScript2_1DCD12 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_1DCC6C + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12 .byte 0 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 9df0e0a6a..a5e2a493c 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 - map_script 3, SlateportCity_BattleTentBattleRoom_MapScript1_209970 - map_script 4, SlateportCity_BattleTentBattleRoom_MapScript2_20999A - map_script 2, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_209970 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 .byte 0 SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 400146b3b..27f7fa3b9 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26 - map_script 2, SlateportCity_BattleTentCorridor_MapScript2_208E5B - map_script 4, SlateportCity_BattleTentCorridor_MapScript2_208E31 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31 .byte 0 SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index bf8416295..19416c91b 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_BattleTentLobby_MapScripts:: @ 8208730 - map_script 2, SlateportCity_BattleTentLobby_MapScript2_20874F - map_script 4, SlateportCity_BattleTentLobby_MapScript2_20873B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_MapScript2_20874F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_MapScript2_20873B .byte 0 SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 138ca9859..d69842ece 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D - map_script 3, SlateportCity_Harbor_MapScript1_20C983 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_20C983 .byte 0 SlateportCity_Harbor_MapScript1_20C983: @ 820C983 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index db8cc19d7..8c1f87e63 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF - map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_20DACA - map_script 5, SlateportCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_20DACA + map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index 3138f20d6..1ddbcc0be 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 - map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SlateportCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index bfebcf055..fb7dae6c9 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MapScripts:: @ 81E565C - map_script 1, SootopolisCity_MapScript1_1E5676 - map_script 3, SootopolisCity_MapScript1_1E56EF - map_script 5, SootopolisCity_MapScript1_1E590B - map_script 2, SootopolisCity_MapScript2_1E5914 - map_script 4, SootopolisCity_MapScript2_1E58DB + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_1E56EF + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB .byte 0 SootopolisCity_MapScript1_1E5676: @ 81E5676 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index d5bb3d790..06bc91f21 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:: @ 8224E4C - map_script 2, SootopolisCity_Gym_1F_MapScript2_224ECB - map_script 5, SootopolisCity_Gym_1F_MapScript1_224E67 - map_script 1, SootopolisCity_Gym_1F_MapScript1_224E6A - map_script 3, SootopolisCity_Gym_1F_MapScript1_224E61 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_224E61 .byte 0 SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index a44615e9f..76ec3a59f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 - map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E - map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D .byte 0 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 0de8651d7..33cb5db8e 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F - map_script 3, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A - map_script 2, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E .byte 0 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 2e7e804ce..96f766f7b 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 - map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC - map_script 5, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 43d8a9d2f..275fe3046 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D - map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B - map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C - map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script 3, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF .byte 0 SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 8eb00337f..618ce864a 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior_MapScripts:: @ 82429C8 - map_script 3, SouthernIsland_Exterior_MapScript1_2429CE + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_2429CE .byte 0 SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index c5cbe0f5e..a24bc772f 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 - map_script 5, SouthernIsland_Interior_MapScript1_242A50 - map_script 3, SouthernIsland_Interior_MapScript1_242A6E + map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50 + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_242A6E .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 9e88be494..3f892315d 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -1,6 +1,6 @@ TerraCave_End_MapScripts:: @ 823B0B0 - map_script 5, TerraCave_End_MapScript1_23B0BB - map_script 3, TerraCave_End_MapScript1_23B0D9 + map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_23B0D9 .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc index b9a17701b..b9e3e5910 100644 --- a/data/maps/TerraCave_Entrance/scripts.inc +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -1,5 +1,5 @@ TerraCave_Entrance_MapScripts:: @ 823B0A6 - map_script 3, TerraCave_Entrance_MapScript1_23B0AC + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_23B0AC .byte 0 TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc index 465a6d781..e726f8566 100644 --- a/data/maps/TrainerHill_1F/scripts.inc +++ b/data/maps/TrainerHill_1F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_1F_MapScripts:: @ 8268F71 - map_script 5, TrainerHill_1F_MapScript1_2C8336 - map_script 4, TrainerHill_1F_MapScript2_2C8372 - map_script 2, TrainerHill_1F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc index ca8eeff72..dd1f356de 100644 --- a/data/maps/TrainerHill_2F/scripts.inc +++ b/data/maps/TrainerHill_2F/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_2F_MapScripts:: @ 8268F81 - map_script 5, TrainerHill_2F_MapScript1_2C8336 - map_script 4, TrainerHill_2F_MapScript2_2C8372 - map_script 2, TrainerHill_2F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc index 921a8d808..b4793f457 100644 --- a/data/maps/TrainerHill_3F/scripts.inc +++ b/data/maps/TrainerHill_3F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_3F_MapScripts:: @ 8268F91 - map_script 5, TrainerHill_3F_MapScript1_2C8336 - map_script 2, TrainerHill_3F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc index 0f710152c..66b8ed3bb 100644 --- a/data/maps/TrainerHill_4F/scripts.inc +++ b/data/maps/TrainerHill_4F/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_4F_MapScripts:: @ 8268F9C - map_script 5, TrainerHill_4F_MapScript1_2C8336 - map_script 2, TrainerHill_4F_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381 .byte 0 diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index c3a71d492..ecc48a9e9 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator_MapScripts:: @ 826934F - map_script 2, TrainerHill_Elevator_MapScript2_269355 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355 .byte 0 TrainerHill_Elevator_MapScript2_269355: @ 8269355 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 57dbbe13d..5339f49e3 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -1,9 +1,9 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC - map_script 5, TrainerHill_Entrance_MapScript1_2680D0 - map_script 7, TrainerHill_Entrance_MapScript1_26811B - map_script 3, TrainerHill_Entrance_MapScript1_2680C6 - map_script 1, TrainerHill_Entrance_MapScript1_268128 - map_script 2, TrainerHill_Entrance_MapScript2_26813E + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0 + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B + map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_MapScript1_2680C6 + map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E .byte 0 TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6 diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index b959481f2..fc1ca200f 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -1,6 +1,6 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7 - map_script 5, TrainerHill_Roof_MapScript1_2C8336 - map_script 2, TrainerHill_Roof_MapScript2_2C8381 + map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336 + map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381 .byte 0 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 463f7a0ff..99f0efcf0 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -1,5 +1,5 @@ Underwater3_MapScripts:: @ 81F7724 - map_script 5, Underwater3_MapScript1_1F772A + map_script MAP_SCRIPT_ON_RESUME, Underwater3_MapScript1_1F772A .byte 0 Underwater3_MapScript1_1F772A: @ 81F772A diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index 9d0cc373c..ea37514eb 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -1,5 +1,5 @@ Underwater5_MapScripts:: @ 81F7731 - map_script 5, Underwater5_MapScript1_1F7737 + map_script MAP_SCRIPT_ON_RESUME, Underwater5_MapScript1_1F7737 .byte 0 Underwater5_MapScript1_1F7737: @ 81F7737 diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index 047628c9c..fee91dc75 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -1,5 +1,5 @@ Underwater6_MapScripts:: @ 81F773D - map_script 5, Underwater6_MapScript1_1F7743 + map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743 .byte 0 Underwater6_MapScript1_1F7743: @ 81F7743 diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index dd757f98a..a0eba386a 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -1,5 +1,5 @@ Underwater7_MapScripts:: @ 81F7749 - map_script 5, Underwater7_MapScript1_1F774F + map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F .byte 0 Underwater7_MapScript1_1F774F: @ 81F774F diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index d6a3aa0db..9309d51f4 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,6 +1,6 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script 5, Underwater_MarineCave_MapScript1_23AFC7 - map_script 3, Underwater_MarineCave_MapScript1_23AFC3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_23AFC7 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_23AFC3 .byte 0 Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc index 786de1757..acffa23a2 100644 --- a/data/maps/Underwater_Route134/scripts.inc +++ b/data/maps/Underwater_Route134/scripts.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapScripts:: @ 82390B5 - map_script 5, Underwater_Route134_MapScript1_2390BB + map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_2390BB .byte 0 Underwater_Route134_MapScript1_2390BB: @ 82390BB diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index efd2e9438..9dc5b406a 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -1,7 +1,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B - map_script 5, Underwater_SeafloorCavern_MapScript1_2343D3 - map_script 3, Underwater_SeafloorCavern_MapScript1_23434B - map_script 1, Underwater_SeafloorCavern_MapScript1_23435C + map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3 + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_23434B + map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C .byte 0 Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index de6ed50d1..9ec884781 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 - map_script 6, Underwater_SealedChamber_MapScript1_2390CA + map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA .byte 0 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc index cbeefcb1d..d5040dba0 100644 --- a/data/maps/Underwater_SootopolisCity/scripts.inc +++ b/data/maps/Underwater_SootopolisCity/scripts.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity_MapScripts:: @ 822D94C - map_script 5, Underwater_SootopolisCity_MapScript1_22D952 + map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_22D952 .byte 0 Underwater_SootopolisCity_MapScript1_22D952: @ 822D952 diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index f71c40e3d..0871ae033 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,6 +1,6 @@ UnionRoom_MapScripts:: @ 823D1A6 - map_script 5, UnionRoom_MapScript1_23D1B1 - map_script 3, UnionRoom_MapScript1_23D1E5 + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5 .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 74aa613c7..f940af2f9 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_MapScripts:: @ 81EB566 - map_script 3, VerdanturfTown_MapScript1_1EB56C + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_1EB56C .byte 0 VerdanturfTown_MapScript1_1EB56C: @ 81EB56C diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index c5f318663..9d98e790c 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -1,7 +1,7 @@ VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA - map_script 3, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A - map_script 2, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E - map_script 4, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 .byte 0 VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index e5d7e45e9..907ef3fd6 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A - map_script 2, VerdanturfTown_BattleTentCorridor_MapScript2_202090 + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_MapScript2_202090 .byte 0 VerdanturfTown_BattleTentCorridor_MapScript2_202090: @ 8202090 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index e699e6427..f6bb194a3 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0 - map_script 2, VerdanturfTown_BattleTentLobby_MapScript2_2016EF - map_script 4, VerdanturfTown_BattleTentLobby_MapScript2_2016DB + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016EF + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_MapScript2_2016DB .byte 0 VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index da8676aec..474448132 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 - map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 - map_script 5, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 + map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index 9e93a628e..b09335fb2 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -1,8 +1,8 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 - map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B - map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C - map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script 3, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C + map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF .byte 0 VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index fdb0947d8..f5efbe38a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,5 +1,5 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A - map_script 3, VictoryRoad_1F_MapScript1_235D80 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_235D80 .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 |