Document Sky Pillar outside

data/maps/SkyPillar_Outside/scripts.inc

@@ -1,44 +1,44 @@
 SkyPillar_Outside_MapScripts:: @ 82392A8
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA
+	map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_OnFrame
 	.byte 0
 
 SkyPillar_Outside_OnTransition: @ 82392B8
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	call_if_eq SkyPillar_Outside_EventScript_2392CF
+	call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_ge SkyPillar_Outside_EventScript_2392D3
+	call_if_ge SkyPillar_Outside_EventScript_CheckSetAlternatingWeather
 	end
 
-SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
+SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
+SkyPillar_Outside_EventScript_CheckSetAlternatingWeather:: @ 82392D3
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	return
 
-SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
-	call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_2392E7
+SkyPillar_Outside_OnLoad: @ 82392DD
+	call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_OpenDoor
 	end
 
-SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
+SkyPillar_Outside_EventScript_OpenDoor:: @ 82392E7
 	setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0
 	setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0
 	return
 
-SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_239304
+SkyPillar_Outside_OnFrame: @ 82392FA
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_WallaceScene
 	.2byte 0
 
-SkyPillar_Outside_EventScript_239304:: @ 8239304
+SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
 	lockall
-	applymovement 1, SkyPillar_Outside_Movement_2393D3
+	applymovement 1, SkyPillar_Outside_Movement_WallaceApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_OpenedDoorToSkyPillar, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	setvar VAR_0x8004, 1  @ vertical pan
@@ -48,10 +48,10 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	special ShakeCamera
 	waitstate
 	delay 40
-	msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_EarthquakeNotMomentToWaste, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB
-	applymovement 1, SkyPillar_Outside_Movement_2393DE
+	applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar
+	applymovement 1, SkyPillar_Outside_Movement_WallaceClimbSkyPillar
 	waitmovement 0
 	setvar VAR_0x8004, 1   @ vertical pan
 	setvar VAR_0x8005, 3   @ horizontal pan
@@ -69,7 +69,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
-	msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_SYS_WEATHER_CTRL
 	setweather WEATHER_ALTERNATING
@@ -77,7 +77,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	special WaitWeather
 	waitstate
 	delay 30
-	msgbox SkyPillar_Outside_Text_23953A, MSGBOX_DEFAULT
+	msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT
 	closemessage
 	playse SE_KAIDAN
 	fadescreenswapbuffers 1
@@ -89,7 +89,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	releaseall
 	end
 
-SkyPillar_Outside_Movement_2393D3: @ 82393D3
+SkyPillar_Outside_Movement_WallaceApproachPlayer: @ 82393D3
 	walk_down
 	walk_down
 	walk_down
@@ -102,7 +102,7 @@ SkyPillar_Outside_Movement_2393D3: @ 82393D3
 	walk_right
 	step_end
 
-SkyPillar_Outside_Movement_2393DE: @ 82393DE
+SkyPillar_Outside_Movement_WallaceClimbSkyPillar: @ 82393DE
 	walk_left
 	walk_left
 	walk_left
@@ -117,7 +117,7 @@ SkyPillar_Outside_Movement_2393DE: @ 82393DE
 	walk_up
 	step_end
 
-SkyPillar_Outside_Movement_2393EB: @ 82393EB
+SkyPillar_Outside_Movement_PlayerClimbSkyPillar: @ 82393EB
 	walk_left
 	walk_left
 	walk_left
@@ -132,17 +132,17 @@ SkyPillar_Outside_Movement_2393EB: @ 82393EB
 	walk_up
 	step_end
 
-SkyPillar_Outside_EventScript_2393F8:: @ 82393F8
+SkyPillar_Outside_EventScript_Wallace:: @ 82393F8
 	end
 
-SkyPillar_Outside_EventScript_2393F9:: @ 82393F9
-	msgbox SkyPillar_Outside_Text_239402, MSGBOX_SIGN
+SkyPillar_Outside_EventScript_ClosedDoor:: @ 82393F9
+	msgbox SkyPillar_Outside_Text_DoorIsClosed, MSGBOX_SIGN
 	end
 
-SkyPillar_Outside_Text_239402: @ 8239402
+SkyPillar_Outside_Text_DoorIsClosed: @ 8239402
 	.string "The door is closed.$"
 
-SkyPillar_Outside_Text_239416: @ 8239416
+SkyPillar_Outside_Text_OpenedDoorToSkyPillar: @ 8239416
 	.string "WALLACE: Oh, my, I'm terribly sorry!\p"
 	.string "In my haste, I didn't notice that\n"
 	.string "I'd left you behind!\p"
@@ -150,16 +150,16 @@ SkyPillar_Outside_Text_239416: @ 8239416
 	.string "the SKY PILLAR.\p"
 	.string "{PLAYER}{KUN}, let's be on our way!$"
 
-SkyPillar_Outside_Text_2394BC: @ 82394BC
+SkyPillar_Outside_Text_EarthquakeNotMomentToWaste: @ 82394BC
 	.string "WALLACE: It's an earthquake!\p"
 	.string "There's not a moment to waste!\n"
 	.string "We've got to hurry!$"
 
-SkyPillar_Outside_Text_23950C: @ 823950C
+SkyPillar_Outside_Text_SituationGettingWorse: @ 823950C
 	.string "WALLACE: Hmm…\n"
 	.string "The situation is getting worse…$"
 
-SkyPillar_Outside_Text_23953A: @ 823953A
+SkyPillar_Outside_Text_GotToGoBackForSootopolis: @ 823953A
 	.string "WALLACE: This isn't good…\p"
 	.string "The weather distortion is spreading\n"
 	.string "even here…\p"