Merge branch 'master' into fix-eventobj

1 files changed, 26 insertions, 25 deletions

diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
index 3208efe4b..ea9da5183 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
@@ -1,48 +1,48 @@
 BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104
-	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_24B10E
+BattleFrontier_BattleDomeCorridor_OnFrame: @ 824B104
+	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
+BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
 	delay 16
 	setvar VAR_TEMP_0, 1
 	frontier_get FRONTIER_DATA_LVL_MODE
 	compare VAR_RESULT, FRONTIER_LVL_OPEN
-	goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
+	goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50
 	waitmovement 0
 	opendoor 13, 3
 	waitdooranim
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50
 	waitmovement 0
 	closedoor 13, 3
 	waitdooranim
-	goto BattleFrontier_BattleDomeCorridor_EventScript_24B18F
+	goto BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom
 
-BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1
+BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
 	waitmovement 0
 	opendoor 37, 3
 	waitdooranim
-	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6
-	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2
+	applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen
+	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen
 	waitmovement 0
 	closedoor 37, 3
 	waitdooranim
-BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F
+BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom:: @ 824B18F
 	waitmovement 0
 	setvar VAR_0x8006, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
 	waitstate
 	end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50: @ 824B1A1
 	walk_up
 	walk_left
 	walk_left
@@ -57,13 +57,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50: @ 824B1AE
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50: @ 824B1B2
 	walk_left
 	walk_left
 	walk_left
@@ -77,12 +77,12 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50: @ 824B1BE
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen: @ 824B1C1
 	walk_up
 	walk_right
 	walk_right
@@ -101,13 +101,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen: @ 824B1D2
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen: @ 824B1D6
 	walk_right
 	walk_right
 	walk_right
@@ -125,12 +125,13 @@ BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen: @ 824B1E6
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9
+@ Unused
+BattleFrontier_BattleDomeCorridor_Movement_WalkToBattleRoomMidRight: @ 824B1E9
 	walk_up
 	walk_right
 	walk_right