Update map script files

2019-02-22 02:28:32 -05:00
parent 5f7a971313
commit 8816aa527d
271 changed files with 564 additions and 564 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More