summaryrefslogtreecommitdiff
path: root/data/maps/IndigoPlateau_Exterior/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/IndigoPlateau_Exterior/scripts.inc')
-rw-r--r--data/maps/IndigoPlateau_Exterior/scripts.inc79
1 files changed, 42 insertions, 37 deletions
diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc
index bc9827037..70831a754 100644
--- a/data/maps/IndigoPlateau_Exterior/scripts.inc
+++ b/data/maps/IndigoPlateau_Exterior/scripts.inc
@@ -1,3 +1,6 @@
+.equ LOCALID_RIVAL, 1
+.equ LOCALID_PROF_OAK, 2
+
IndigoPlateau_Exterior_MapScripts:: @ 816723B
map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame
@@ -6,22 +9,23 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B
IndigoPlateau_Exterior_OnTransition:: @ 8167246
setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR
compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
- call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic
+ call_if_eq IndigoPlateau_Exterior_EventScript_PlayCreditsMusic
end
-EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255
+IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255
playbgm MUS_ENDING, 0
return
IndigoPlateau_Exterior_OnFrame:: @ 816725A
- map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits
+ map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, IndigoPlateau_Exterior_EventScript_Credits
.2byte 0
-EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
- @ After beating the champion, you are warped to the main
- @ entrance of Indigo Plateau. This script starts running
- @ immediately after your walking animation.
- @ The script is timed to the music.
+
+@ After beating the champion, you are warped to the main
+@ entrance of Indigo Plateau. This script starts running
+@ immediately after your walking animation.
+@ The script is timed to the music.
+IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264
lockall
delay 105
@@ -29,60 +33,60 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
opendoor 11, 6
waitdooranim
special SpawnCameraObject
- addobject 1
- applymovement 1, Movement_167346
- applymovement OBJ_EVENT_ID_PLAYER, Movement_167337
+ addobject LOCALID_RIVAL
+ applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
+ applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
waitmovement 0
closedoor 11, 6
waitdooranim
@ Rival runs off
- applymovement OBJ_EVENT_ID_PLAYER, Movement_16731B
- applymovement 1, Movement_16733E
+ applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
+ applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
waitmovement 0
delay 100
@ Oak exits building
opendoor 11, 6
waitdooranim
- addobject 2
- applymovement 2, Movement_16735D
+ addobject LOCALID_PROF_OAK
+ applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding
waitmovement 0
closedoor 11, 6
waitdooranim
delay 160
@ Oak looks at player, then walks off
- applymovement OBJ_EVENT_ID_PLAYER, Movement_16731F
- applymovement 2, Movement_167348
+ applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
+ applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
waitmovement 0
delay 100
- applymovement OBJ_EVENT_ID_PLAYER, Movement_16732E
+
+ @ Player begin to leave
+ applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave
waitmovement 0
delay 155
-
- @ Player turns to face the League
- applymovement OBJ_EVENT_ID_PLAYER, Movement_16733C
+ applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague
waitmovement 0
delay 90
@ Player runs off
- applymovement OBJ_EVENT_ID_PLAYER, Movement_167335
+ applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround
waitmovement 0
- applymovement OBJ_EVENT_ID_PLAYER, Movement_167311
+ applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave
waitmovement 0
@ Reset the map state and roll the credits
special RemoveCameraObject
setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
- removeobject 1
- removeobject 2
+ removeobject LOCALID_RIVAL
+ removeobject LOCALID_PROF_OAK
special Special_Credits @ noreturn
waitstate
releaseall
end
-Movement_167311:: @ 8167311
+IndigoPlateau_Exterior_Movement_PlayerLeave:: @ 8167311
player_run_down
player_run_down
player_run_down
@@ -91,18 +95,19 @@ Movement_167311:: @ 8167311
player_run_down
step_end
-Movement_167318:: @ 8167318
+@ Unused
+IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: @ 8167318
walk_down
walk_down
step_end
-Movement_16731B:: @ 816731B
+IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: @ 816731B
delay_16
delay_4
walk_in_place_fastest_down
step_end
-Movement_16731F:: @ 816731F
+IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: @ 816731F
delay_8
walk_in_place_fastest_right
delay_16
@@ -119,7 +124,7 @@ Movement_16731F:: @ 816731F
walk_in_place_fastest_down
step_end
-Movement_16732E:: @ 816732E
+IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @ 816732E
walk_right
delay_16
walk_down
@@ -128,22 +133,22 @@ Movement_16732E:: @ 816732E
delay_16
step_end
-Movement_167335:: @ 8167335
+IndigoPlateau_Exterior_Movement_PlayerTurnAround:: @ 8167335
walk_in_place_fastest_down
step_end
-Movement_167337:: @ 8167337
+IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: @ 8167337
face_right
lock_facing_direction
walk_left
unlock_facing_direction
step_end
-Movement_16733C:: @ 816733C
+IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: @ 816733C
walk_in_place_fastest_up
step_end
-Movement_16733E:: @ 816733E
+IndigoPlateau_Exterior_Movement_RivalLeave:: @ 816733E
walk_fast_down
walk_fast_down
walk_fast_down
@@ -153,11 +158,11 @@ Movement_16733E:: @ 816733E
walk_fast_down
step_end
-Movement_167346:: @ 8167346
+IndigoPlateau_Exterior_Movement_RivalExitBuilding:: @ 8167346
walk_fast_down
step_end
-Movement_167348:: @ 8167348
+IndigoPlateau_Exterior_Movement_OakLeave:: @ 8167348
walk_in_place_fastest_left
delay_16
delay_16
@@ -180,6 +185,6 @@ Movement_167348:: @ 8167348
walk_down
step_end
-Movement_16735D:: @ 816735D
+IndigoPlateau_Exterior_Movement_OakExitBuilding:: @ 816735D
walk_down
step_end