diff options
Diffstat (limited to 'data/maps/SSAnne_Exterior/scripts.inc')
| -rw-r--r-- | data/maps/SSAnne_Exterior/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index a8ad24173..416c98cd6 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -8,22 +8,22 @@ SSAnne_Exterior_OnTransition:: @ 816084B end SSAnne_Exterior_OnFrame:: @ 816084F - map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859 + map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_ExitSSAnne .2byte 0 -SSAnne_Exterior_160859:: @ 8160859 +SSAnne_Exterior_ExitSSAnne:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8005, 6 - call_if_le EventScript_1608A1 + call_if_le SSAnne_Exterior_WalkDown compare VAR_0x8005, 7 - call_if_ge EventScript_1608AC + call_if_ge SSAnne_Exterior_WalkInPlaceDown fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene waitstate removeobject 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1608B7 + applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 @@ -32,17 +32,17 @@ SSAnne_Exterior_160859:: @ 8160859 releaseall end -EventScript_1608A1:: @ 81608A1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1608C1 +SSAnne_Exterior_WalkDown:: @ 81608A1 + applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_WalkDown waitmovement 0 return -EventScript_1608AC:: @ 81608AC +SSAnne_Exterior_WalkInPlaceDown:: @ 81608AC applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -Movement_1608B7:: @ 81608B7 +SSAnne_Exterior_Movement_Exit:: @ 81608B7 walk_up walk_up walk_up @@ -54,7 +54,7 @@ Movement_1608B7:: @ 81608B7 walk_up step_end -Movement_1608C1:: @ 81608C1 +SSAnne_Exterior_Movement_WalkDown:: @ 81608C1 walk_down walk_down walk_down |