Merge 36c8fcce26 into 2f46a89b15

asm/macros/map.inc

@@ -16,6 +16,11 @@
 	.4byte \script
 	.endm
 
+	@ Terminates a list of map_script entries
+	.macro end_map_scripts
+	.byte 0
+	.endm
+
 	@ Defines an entry in a map script table (for either ON_WARP_INTO_MAP_TABLE or ON_FRAME_TABLE)
 	.macro map_script_2 var:req, compare:req, script:req
 	.2byte \var
@@ -23,6 +28,11 @@
 	.4byte \script
 	.endm
 
+	@ Terminates a list of map_script_2 entries
+	.macro end_map_script_table
+	.2byte 0
+	.endm
+
 	@ Defines an object event template for map data, to be used by a normal object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
 	.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
 	.byte \index

data/maps/AbandonedShip_CaptainsOffice/scripts.inc

@@ -1,5 +1,5 @@
 AbandonedShip_CaptainsOffice_MapScripts::
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_CaptainsOffice_EventScript_CaptSternAide::
 	lock

data/maps/AbandonedShip_Corridors_1F/scripts.inc

@@ -1,5 +1,5 @@
 AbandonedShip_Corridors_1F_MapScripts::
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Corridors_1F_EventScript_Youngster::
 	msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC

data/maps/AbandonedShip_Corridors_B1F/scripts.inc

@@ -1,7 +1,7 @@
 AbandonedShip_Corridors_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Corridors_B1F_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4

data/maps/AbandonedShip_Deck/scripts.inc

@@ -1,6 +1,6 @@
 AbandonedShip_Deck_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Deck_OnTransition:
 	setflag FLAG_LANDMARK_ABANDONED_SHIP

data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc

@@ -1,7 +1,7 @@
 AbandonedShip_HiddenFloorCorridors_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_HiddenFloorCorridors_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4

data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc

@@ -1,10 +1,10 @@
 AbandonedShip_HiddenFloorRooms_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_HiddenFloorRooms_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle
-	.2byte 0
+	end_map_script_table
 
 @ After the below calculation, VAR_TEMP_4 is the room number of the door the player entered
 @ Bottom row, left column   (Rm 1)

data/maps/AbandonedShip_Room_B1F/scripts.inc

@@ -1,3 +1,3 @@
 AbandonedShip_Room_B1F_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/AbandonedShip_Rooms2_1F/scripts.inc

@@ -1,5 +1,5 @@
 AbandonedShip_Rooms2_1F_MapScripts::
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Rooms2_1F_EventScript_Dan::
 	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan

data/maps/AbandonedShip_Rooms2_B1F/scripts.inc

@@ -1,5 +1,5 @@
 AbandonedShip_Rooms2_B1F_MapScripts::
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Rooms2_B1F_EventScript_Camper::
 	msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC

data/maps/AbandonedShip_Rooms_1F/scripts.inc

@@ -1,5 +1,5 @@
 AbandonedShip_Rooms_1F_MapScripts::
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Rooms_1F_EventScript_Gentleman::
 	msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC

data/maps/AbandonedShip_Rooms_B1F/scripts.inc

@@ -1,6 +1,6 @@
 AbandonedShip_Rooms_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_OnResume
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Rooms_B1F_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 17, 4

data/maps/AbandonedShip_Underwater1/scripts.inc

@@ -1,6 +1,6 @@
 AbandonedShip_Underwater1_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Underwater1_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 0, 10

data/maps/AbandonedShip_Underwater2/scripts.inc

@@ -1,6 +1,6 @@
 AbandonedShip_Underwater2_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume
-	.byte 0
+	end_map_scripts
 
 AbandonedShip_Underwater2_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 13, 7

data/maps/AlteringCave/scripts.inc

@@ -1,6 +1,6 @@
 AlteringCave_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
-	.byte 0
+	end_map_scripts
 
 AlteringCave_OnTransition:
 	setflag FLAG_LANDMARK_ALTERING_CAVE

data/maps/AncientTomb/scripts.inc

@@ -2,7 +2,7 @@ AncientTomb_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AncientTomb_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AncientTomb_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
-	.byte 0
+	end_map_scripts
 
 AncientTomb_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_TryRemoveRegisteel

data/maps/AquaHideout_1F/scripts.inc

@@ -1,5 +1,5 @@
 AquaHideout_1F_MapScripts::
-	.byte 0
+	end_map_scripts
 
 @ The below two entrance guards give hints about what to do to progress the story
 AquaHideout_1F_EventScript_HideoutEntranceGrunt1::

data/maps/AquaHideout_B1F/scripts.inc

@@ -1,7 +1,7 @@
 AquaHideout_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
-	.byte 0
+	end_map_scripts
 
 AquaHideout_B1F_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode

data/maps/AquaHideout_B2F/scripts.inc

@@ -1,6 +1,6 @@
 AquaHideout_B2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_OnTransition
-	.byte 0
+	end_map_scripts
 
 AquaHideout_B2F_OnTransition:
 	call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_PreventMattNoticing

data/maps/AquaHideout_UnusedRubyMap1/scripts.inc

@@ -1,3 +1,3 @@
 AquaHideout_UnusedRubyMap1_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/AquaHideout_UnusedRubyMap2/scripts.inc

@@ -1,3 +1,3 @@
 AquaHideout_UnusedRubyMap2_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/AquaHideout_UnusedRubyMap3/scripts.inc

@@ -1,3 +1,3 @@
 AquaHideout_UnusedRubyMap3_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/ArtisanCave_1F/scripts.inc

@@ -1,3 +1,3 @@
 ArtisanCave_1F_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/ArtisanCave_B1F/scripts.inc

@@ -1,6 +1,6 @@
 ArtisanCave_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
-	.byte 0
+	end_map_scripts
 
 ArtisanCave_B1F_OnTransition:
 	setflag FLAG_LANDMARK_ARTISAN_CAVE

data/maps/BattleColosseum_2P/scripts.inc

@@ -1,3 +1,3 @@
 BattleColosseum_2P_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/BattleColosseum_4P/scripts.inc

@@ -1,3 +1,3 @@
 BattleColosseum_4P_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc

@@ -7,7 +7,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_OnResume
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleArenaBattleRoom_OnResume:
 	special OffsetCameraForBattle
@@ -34,7 +34,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale::
 
 BattleFrontier_BattleArenaBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom::
 	lockall
@@ -458,7 +458,7 @@ BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2:
 
 BattleFrontier_BattleArenaBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects::
 	hideobjectat LOCALID_ARENA_BATTLE_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM

data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc

@@ -1,10 +1,10 @@
 BattleFrontier_BattleArenaCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleArenaCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom::
 	delay 16

data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattleArenaLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleArenaLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
@@ -18,7 +18,7 @@ BattleFrontier_BattleArenaLobby_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattleArenaLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattleArenaLobby_EventScript_LostChallenge
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -12,7 +12,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_OnResume
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleDomeBattleRoom_OnTransition:
 	dome_setopponentgfx
@@ -38,7 +38,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale::
 
 BattleFrontier_BattleDomeBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom::
 	lockall
@@ -457,7 +457,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle::
 
 BattleFrontier_BattleDomeBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects::
 	hideobjectat LOCALID_DOME_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM

data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc

@@ -1,10 +1,10 @@
 BattleFrontier_BattleDomeCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleDomeCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor::
 	delay 16

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -2,7 +2,7 @@ BattleFrontier_BattleDomeLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleDomeLobby_OnResume:
 	dome_initresultstree
@@ -10,7 +10,7 @@ BattleFrontier_BattleDomeLobby_OnResume:
 
 BattleFrontier_BattleDomeLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
@@ -23,7 +23,7 @@ BattleFrontier_BattleDomeLobby_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattleDomeLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_LostChallenge
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattleDomePreBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleDomePreBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
@@ -14,7 +14,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth::
 
 BattleFrontier_BattleDomePreBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom::
 	goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle

data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

@@ -7,7 +7,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleFactoryBattleRoom_OnTransition:
 	frontier_settrainers
@@ -26,7 +26,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj::
 
 BattleFrontier_BattleFactoryBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects::
 	setvar VAR_TEMP_1, 1
@@ -46,7 +46,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale::
 
 BattleFrontier_BattleFactoryBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn, MSGBOX_DEFAULT

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattleFactoryLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleFactoryLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
@@ -18,7 +18,7 @@ BattleFrontier_BattleFactoryLobby_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattleFactoryPreBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleFactoryPreBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
@@ -18,7 +18,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth::
 
 BattleFrontier_BattleFactoryPreBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom::
 	goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -7,7 +7,7 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePalaceBattleRoom_OnTransition:
 	frontier_settrainers
@@ -33,7 +33,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale::
 
 BattleFrontier_BattlePalaceBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom::
 	showobjectat LOCALID_PALACE_BATTLE_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
@@ -285,7 +285,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle::
 
 BattleFrontier_BattlePalaceBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects::
 	hideobjectat LOCALID_PALACE_BATTLE_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM

data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc

@@ -1,10 +1,10 @@
 BattleFrontier_BattlePalaceCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePalaceCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor::
 	delay 16

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattlePalaceLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePalaceLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
@@ -18,7 +18,7 @@ BattleFrontier_BattlePalaceLobby_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus

data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattlePikeCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePikeCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor::
 	delay 16
@@ -29,7 +29,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor::
 
 BattleFrontier_BattlePikeCorridor_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -1,18 +1,18 @@
 BattleFrontier_BattlePikeLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePikeLobby_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, 0, BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_LostChallenge
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1

data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattlePikeRoomFinal_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomFinal_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomFinal_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePikeRoomFinal_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom::
 	delay 16
@@ -27,7 +27,7 @@ BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer:
 
 BattleFrontier_BattlePikeRoomFinal_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1

data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc

@@ -3,11 +3,11 @@ BattleFrontier_BattlePikeRoomNormal_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomNormal_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePikeRoomNormal_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1

data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc

@@ -2,12 +2,12 @@ BattleFrontier_BattlePikeRoomWildMons_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePikeRoomWildMons_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom
 	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom::
 	setvar VAR_TEMP_0, 1
@@ -22,7 +22,7 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost::
 
 BattleFrontier_BattlePikeRoomWildMons_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1

data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc

@@ -2,7 +2,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePikeThreePathRoom_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus
@@ -10,11 +10,11 @@ BattleFrontier_BattlePikeThreePathRoom_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge
 	map_script_2 VAR_TEMP_5, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom
 	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeThreePathRoom_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1

data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc

@@ -2,13 +2,13 @@ BattleFrontier_BattlePyramidFloor_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidFloor_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidFloor_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidFloor_OnTransition
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePyramidFloor_OnFrame:
 	map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight
 	map_script_2 VAR_TEMP_PLAYING_PYRAMID_MUSIC, 0, BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic
 	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight::
 	lockall

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -1,12 +1,12 @@
 BattleFrontier_BattlePyramidLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
-	.byte 0
+	end_map_scripts
 
 @ Unused. Pyramid uses Dome's OnWarp (presumably by mistake). Their effects are identical
 BattleFrontier_BattlePyramidLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth:
 	setvar VAR_TEMP_1, 1
@@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidLobby_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus

data/maps/BattleFrontier_BattlePyramidTop/scripts.inc

@@ -3,7 +3,7 @@ BattleFrontier_BattlePyramidTop_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattlePyramidTop_OnTransition:
 	pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
@@ -12,7 +12,7 @@ BattleFrontier_BattlePyramidTop_OnTransition:
 
 BattleFrontier_BattlePyramidTop_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
@@ -42,7 +42,7 @@ BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus::
 BattleFrontier_BattlePyramidTop_OnFrame:
 	map_script_2 VAR_TEMP_PLAYING_PYRAMID_MUSIC, 0, BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic
 	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_ShowMapName
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic::
 	playbgm MUS_B_PYRAMID_TOP, FALSE

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattleTowerBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleTowerBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
@@ -14,7 +14,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects::
 
 BattleFrontier_BattleTowerBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1

data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc

@@ -1,7 +1,7 @@
 BattleFrontier_BattleTowerCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleTowerCorridor_OnLoad:
 	goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
@@ -16,7 +16,7 @@ BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor::
 
 BattleFrontier_BattleTowerCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor::
 	setvar VAR_TEMP_0, 1

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -1,11 +1,11 @@
 BattleFrontier_BattleTowerElevator_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleTowerElevator_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_EnterElevator
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerElevator_EventScript_EnterElevator::
 	setvar VAR_TEMP_0, 1
@@ -77,7 +77,7 @@ BattleFrontier_BattleTowerElevator_Movement_PlayerExit:
 
 BattleFrontier_BattleTowerElevator_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_OnWarp
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleTowerLobby_OnResume:
 	special TryHideBattleTowerReporter
@@ -26,7 +26,7 @@ BattleFrontier_BattleTowerLobby_EventScript_HideApprentice::
 
 BattleFrontier_BattleTowerLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth::
 	setvar VAR_TEMP_1, 1
@@ -39,7 +39,7 @@ BattleFrontier_BattleTowerLobby_OnFrame:
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattleTowerLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattleTowerLobby_EventScript_LostChallenge
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -8,7 +8,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleTowerMultiBattleRoom_OnTransition:
 	call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx
@@ -32,7 +32,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx::
 
 BattleFrontier_BattleTowerMultiBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM
@@ -40,7 +40,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj::
 
 BattleFrontier_BattleTowerMultiBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1

data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc

@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerMultiCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiCorridor_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleTowerMultiCorridor_OnTransition:
 	call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
@@ -31,7 +31,7 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx::
 
 BattleFrontier_BattleTowerMultiCorridor_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
@@ -42,7 +42,7 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects::
 
 BattleFrontier_BattleTowerMultiCorridor_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor::
 	lockall

data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc

@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_BattleTowerMultiPartnerRoom_OnResume:
 	pyramid_resetparty
@@ -38,7 +38,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner::
 
 BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp:
 	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH
@@ -47,7 +47,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth::
 BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom
 	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom::
 	lockall

data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_ExchangeServiceCorner_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize, MSGBOX_DEFAULT

data/maps/BattleFrontier_Lounge1/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge1_MapScripts::
-	.byte 0
+	end_map_scripts
 
 @ NPC that rates pokemon based on their IVs
 BattleFrontier_Lounge1_EventScript_Breeder::

data/maps/BattleFrontier_Lounge2/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge2_MapScripts::
-	.byte 0
+	end_map_scripts
 
 @ This NPC gives hints about a random facility or battle mode.
 @ For battle modes he gives generic advice

data/maps/BattleFrontier_Lounge3/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge3_MapScripts::
-	.byte 0
+	end_map_scripts
 
 	.set BET_AMOUNT_5,  5
 	.set BET_AMOUNT_10, 10

data/maps/BattleFrontier_Lounge4/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge4_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_Lounge4_EventScript_Woman::
 	msgbox BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring, MSGBOX_NPC

data/maps/BattleFrontier_Lounge5/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge5_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_Lounge5_EventScript_NatureGirl::
 	lock

data/maps/BattleFrontier_Lounge6/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge6_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_Lounge6_EventScript_Trader::
 	lock

data/maps/BattleFrontier_Lounge7/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge7_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_Lounge7_EventScript_LeftMoveTutor::
 	lock

data/maps/BattleFrontier_Lounge8/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Lounge8_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_Lounge8_EventScript_Man::
 	msgbox BattleFrontier_Lounge8_Text_WhatATrainerNeeds, MSGBOX_NPC

data/maps/BattleFrontier_Lounge9/scripts.inc

@@ -1,3 +1,3 @@
 BattleFrontier_Lounge9_MapScripts::
-	.byte 0
+	end_map_scripts
 

data/maps/BattleFrontier_Mart/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_Mart_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_Mart_EventScript_Clerk::
 	lock

data/maps/BattleFrontier_OutsideEast/scripts.inc

@@ -1,7 +1,7 @@
 BattleFrontier_OutsideEast_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_OnTransition
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_OutsideEast_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo

data/maps/BattleFrontier_OutsideWest/scripts.inc

@@ -1,6 +1,6 @@
 BattleFrontier_OutsideWest_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_OnTransition
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_OutsideWest_OnTransition:
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0

data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc

@@ -1,7 +1,7 @@
 BattleFrontier_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST

data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc

@@ -3,7 +3,7 @@ BattleFrontier_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
-	.byte 0
+	end_map_scripts
 
 @ The below 3 are unused and leftover from RS
 BattleFrontier_PokemonCenter_2F_EventScript_Colosseum::

data/maps/BattleFrontier_RankingHall/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_RankingHall_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_RankingHall_EventScript_TowerSinglesRecords::
 	lockall

data/maps/BattleFrontier_ReceptionGate/scripts.inc

@@ -1,7 +1,7 @@
 BattleFrontier_ReceptionGate_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_ReceptionGate_OnTransition:
 	setflag FLAG_LANDMARK_BATTLE_FRONTIER
@@ -9,7 +9,7 @@ BattleFrontier_ReceptionGate_OnTransition:
 
 BattleFrontier_ReceptionGate_OnFrame:
 	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering
-	.2byte 0
+	end_map_script_table
 
 BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering::
 	lockall

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -1,5 +1,5 @@
 BattleFrontier_ScottsHouse_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BattleFrontier_ScottsHouse_EventScript_Scott::
 	lock

data/maps/BattlePyramidSquare01/scripts.inc

@@ -1,2 +1,2 @@
 BattlePyramidSquare01_MapScripts::
-	.byte 0
+	end_map_scripts

data/maps/BirthIsland_Exterior/scripts.inc

@@ -2,7 +2,7 @@ BirthIsland_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField
-	.byte 0
+	end_map_scripts
 
 BirthIsland_Exterior_OnReturnToField:
 	special SetDeoxysRockPalette

data/maps/BirthIsland_Harbor/scripts.inc

@@ -1,5 +1,5 @@
 BirthIsland_Harbor_MapScripts::
-	.byte 0
+	end_map_scripts
 
 BirthIsland_Harbor_EventScript_Sailor::
 	lock

data/maps/CaveOfOrigin_1F/scripts.inc

@@ -1,6 +1,6 @@
 CaveOfOrigin_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_OnTransition
-	.byte 0
+	end_map_scripts
 
 CaveOfOrigin_1F_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers

data/maps/CaveOfOrigin_B1F/scripts.inc

@@ -1,5 +1,5 @@
 CaveOfOrigin_B1F_MapScripts::
-	.byte 0
+	end_map_scripts
 
 CaveOfOrigin_B1F_EventScript_Wallace::
 	lock

data/maps/CaveOfOrigin_Entrance/scripts.inc

@@ -1,6 +1,6 @@
 CaveOfOrigin_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_OnResume
-	.byte 0
+	end_map_scripts
 
 CaveOfOrigin_Entrance_OnResume:
 	setescapewarp MAP_SOOTOPOLIS_CITY, 31, 17

data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc

@@ -1,6 +1,6 @@
 CaveOfOrigin_UnusedRubySapphireMap1_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_OnTransition
-	.byte 0
+	end_map_scripts
 
 CaveOfOrigin_UnusedRubySapphireMap1_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers

data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc

@@ -1,6 +1,6 @@
 CaveOfOrigin_UnusedRubySapphireMap2_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_OnTransition
-	.byte 0
+	end_map_scripts
 
 CaveOfOrigin_UnusedRubySapphireMap2_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers

data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc

@@ -1,6 +1,6 @@
 CaveOfOrigin_UnusedRubySapphireMap3_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_OnTransition
-	.byte 0
+	end_map_scripts
 
 CaveOfOrigin_UnusedRubySapphireMap3_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers

data/maps/ContestHall/scripts.inc

@@ -4,7 +4,7 @@ ContestHall_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ContestHall_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, ContestHall_OnResume
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, ContestHall_OnReturn
-	.byte 0
+	end_map_scripts
 
 ContestHall_OnReturn:
 	special LoadLinkContestPlayerPalettes
@@ -56,11 +56,11 @@ ContestHall_EventScript_ReShowAudience::
 
 ContestHall_OnFrame:
 	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_Contest
-	.2byte 0
+	end_map_script_table
 
 ContestHall_OnWarp:
 	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_SetContestObjects
-	.2byte 0
+	end_map_script_table
 
 ContestHall_EventScript_Contest::
 	call ContestHall_EventScript_DoContest

data/maps/DesertRuins/scripts.inc

@@ -2,7 +2,7 @@ DesertRuins_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, DesertRuins_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, DesertRuins_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
-	.byte 0
+	end_map_scripts
 
 DesertRuins_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_TryRemoveRegirock

data/maps/DesertUnderpass/scripts.inc

@@ -1,6 +1,6 @@
 DesertUnderpass_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_OnTransition
-	.byte 0
+	end_map_scripts
 
 DesertUnderpass_OnTransition:
 	setflag FLAG_LANDMARK_DESERT_UNDERPASS

data/maps/DewfordTown/scripts.inc

@@ -1,6 +1,6 @@
 DewfordTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_OnTransition
-	.byte 0
+	end_map_scripts
 
 DewfordTown_OnTransition:
 	setflag FLAG_VISITED_DEWFORD_TOWN

data/maps/DewfordTown_Gym/scripts.inc

@@ -1,6 +1,6 @@
 DewfordTown_Gym_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_OnTransition
-	.byte 0
+	end_map_scripts
 
 DewfordTown_Gym_OnTransition:
 	call DewfordTown_Gym_EventScript_SetFlashLevel

data/maps/DewfordTown_Hall/scripts.inc

@@ -1,5 +1,5 @@
 DewfordTown_Hall_MapScripts::
-	.byte 0
+	end_map_scripts
 
 DewfordTown_Hall_EventScript_Girl::
 	lock

data/maps/DewfordTown_House1/scripts.inc

@@ -1,5 +1,5 @@
 DewfordTown_House1_MapScripts::
-	.byte 0
+	end_map_scripts
 
 DewfordTown_House1_EventScript_Man::
 	msgbox DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland, MSGBOX_NPC

data/maps/DewfordTown_House2/scripts.inc

@@ -1,5 +1,5 @@
 DewfordTown_House2_MapScripts::
-	.byte 0
+	end_map_scripts
 
 DewfordTown_House2_EventScript_Man::
 	lock

data/maps/DewfordTown_PokemonCenter_1F/scripts.inc

@@ -1,7 +1,7 @@
 DewfordTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
-	.byte 0
+	end_map_scripts
 
 DewfordTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_DEWFORD_TOWN

data/maps/DewfordTown_PokemonCenter_2F/scripts.inc

@@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition
-	.byte 0
+	end_map_scripts
 
 @ The below 3 are unused and leftover from RS
 DewfordTown_PokemonCenter_2F_EventScript_Colosseum::

data/maps/EverGrandeCity/scripts.inc

@@ -1,6 +1,6 @@
 EverGrandeCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_OnTransition
-	.byte 0
+	end_map_scripts
 
 EverGrandeCity_OnTransition:
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -2,7 +2,7 @@ EverGrandeCity_ChampionsRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame
-	.byte 0
+	end_map_scripts
 
 EverGrandeCity_ChampionsRoom_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
@@ -10,7 +10,7 @@ EverGrandeCity_ChampionsRoom_OnTransition:
 
 EverGrandeCity_ChampionsRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH
@@ -18,7 +18,7 @@ EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth::
 
 EverGrandeCity_ChampionsRoom_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
 	lockall

data/maps/EverGrandeCity_DrakesRoom/scripts.inc

@@ -2,12 +2,12 @@ EverGrandeCity_DrakesRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame
 	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 @ Unused, Drake uses Sidneys identical OnWarp for some reason
 EverGrandeCity_DrakesRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH
@@ -15,7 +15,7 @@ EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth::
 
 EverGrandeCity_DrakesRoom_OnFrame:
 	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor::
 	lockall

data/maps/EverGrandeCity_GlaciasRoom/scripts.inc

@@ -2,11 +2,11 @@ EverGrandeCity_GlaciasRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame
 	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp
-	.byte 0
+	end_map_scripts
 
 EverGrandeCity_GlaciasRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH
@@ -14,7 +14,7 @@ EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth::
 
 EverGrandeCity_GlaciasRoom_OnFrame:
 	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor::
 	lockall

data/maps/EverGrandeCity_Hall1/scripts.inc

@@ -1,10 +1,10 @@
 EverGrandeCity_Hall1_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_OnWarp
-	.byte 0
+	end_map_scripts
 
 EverGrandeCity_Hall1_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_Hall1_EventScript_TurnPlayerNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH

data/maps/EverGrandeCity_Hall2/scripts.inc

@@ -1,10 +1,10 @@
 EverGrandeCity_Hall2_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_OnWarp
-	.byte 0
+	end_map_scripts
 
 EverGrandeCity_Hall2_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_Hall2_EventScript_TurnPlayerNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH

data/maps/EverGrandeCity_Hall3/scripts.inc

@@ -1,10 +1,10 @@
 EverGrandeCity_Hall3_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_OnWarp
-	.byte 0
+	end_map_scripts
 
 EverGrandeCity_Hall3_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_Hall3_EventScript_TurnPlayerNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH

data/maps/EverGrandeCity_Hall4/scripts.inc

@@ -1,10 +1,10 @@
 EverGrandeCity_Hall4_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_OnWarp
-	.byte 0
+	end_map_scripts
 
 EverGrandeCity_Hall4_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_TurnPlayerNorth
-	.2byte 0
+	end_map_script_table
 
 EverGrandeCity_Hall4_EventScript_TurnPlayerNorth::
 	turnobject LOCALID_PLAYER, DIR_NORTH