Merge branch 'master' into doc-routes2

1 files changed, 34 insertions, 46 deletions

diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index f649e5c40..f9f210fc0 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -1,11 +1,11 @@
 RocketHideout_Elevator_MapScripts:: @ 81614D8
 	.byte 0
 
-RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
+RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9
 	lockall
-	goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B
+	goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, RocketHideout_Elevator_EventScript_NeedKey
 	setvar VAR_0x8004, 2
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
@@ -13,83 +13,71 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
 	setvar VAR_0x8004, 2
 	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
-	case 0, EventScript_161530
-	case 1, EventScript_16153C
-	case 2, EventScript_161548
+	case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F
+	case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F
+	case 2, RocketHideout_Elevator_EventScript_FloorSelectFromB4F
 	end
 
-EventScript_161530:: @ 8161530
+RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: @ 8161530
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE
-	goto EventScript_161554
-
-EventScript_16153B:: @ 816153B
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16153C:: @ 816153C
+RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: @ 816153C
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE
-	goto EventScript_161554
-
-EventScript_161547:: @ 8161547
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_161548:: @ 8161548
+RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: @ 8161548
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE
-	goto EventScript_161554
-
-EventScript_161553:: @ 8161553
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_161554:: @ 8161554
+RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554
 	switch VAR_RESULT
-	case 0, EventScript_161591
-	case 1, EventScript_1615B9
-	case 2, EventScript_1615E1
-	case 3, EventScript_161609
-	case 127, EventScript_161609
+	case 0, RocketHideout_Elevator_EventScript_ToB1F
+	case 1, RocketHideout_Elevator_EventScript_ToB2F
+	case 2, RocketHideout_Elevator_EventScript_ToB4F
+	case 3, RocketHideout_Elevator_EventScript_ExitFloorSelect
+	case 127, RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_161591:: @ 8161591
+RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591
 	setvar VAR_0x8006, 3
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
 	compare VAR_ELEVATOR_FLOOR, 3
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 3
-	goto EventScript_161609
-
-EventScript_1615B8:: @ 81615B8
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1615B9:: @ 81615B9
+RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9
 	setvar VAR_0x8006, 2
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
 	compare VAR_ELEVATOR_FLOOR, 2
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 2
-	goto EventScript_161609
-
-EventScript_1615E0:: @ 81615E0
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1615E1:: @ 81615E1
+RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1
 	setvar VAR_0x8006, 0
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
 	compare VAR_ELEVATOR_FLOOR, 0
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 0
-	goto EventScript_161609
-
-EventScript_161608:: @ 8161608
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_161609:: @ 8161609
+RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609
 	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
-EventScript_16160E:: @ 816160E
+RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E
 	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
@@ -98,7 +86,7 @@ EventScript_16160E:: @ 816160E
 	setflag FLAG_TEMP_2
 	return
 
-EventScript_16161B:: @ 816161B
-	msgbox gUnknown_81754DD
+RocketHideout_Elevator_EventScript_NeedKey:: @ 816161B
+	msgbox RocketHideout_Elevator_Text_AppearsToNeedAKey
 	releaseall
 	end