diff options
Diffstat (limited to 'data/maps/SkyPillar_Top/scripts.inc')
| -rw-r--r-- | data/maps/SkyPillar_Top/scripts.inc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 86d6cf717..acbdb4c8b 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,51 +1,51 @@ .set LOCALID_RAYQUAZA_SLEEPING, 1 -SkyPillar_Top_MapScripts:: @ 82396B8 +SkyPillar_Top_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_OnResume map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_OnWarp .byte 0 -SkyPillar_Top_OnResume: @ 82396C8 +SkyPillar_Top_OnResume: call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_TryRemoveRayquaza end -SkyPillar_Top_EventScript_TryRemoveRayquaza:: @ 82396D2 +SkyPillar_Top_EventScript_TryRemoveRayquaza:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return -SkyPillar_Top_OnTransition: @ 82396E6 +SkyPillar_Top_OnTransition: compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_Top_EventScript_SetCleanLayout compare VAR_SKY_PILLAR_STATE, 2 call_if_ge SkyPillar_Top_EventScript_TryShowRayquaza end -SkyPillar_Top_EventScript_SetCleanLayout:: @ 82396FD +SkyPillar_Top_EventScript_SetCleanLayout:: setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN setobjectmovementtype LOCALID_RAYQUAZA_SLEEPING, MOVEMENT_TYPE_FACE_DOWN return -SkyPillar_Top_EventScript_TryShowRayquaza:: @ 8239705 +SkyPillar_Top_EventScript_TryShowRayquaza:: call_if_unset FLAG_DEFEATED_RAYQUAZA, SkyPillar_Top_EventScript_ShowRayquaza return -SkyPillar_Top_EventScript_ShowRayquaza:: @ 823970F +SkyPillar_Top_EventScript_ShowRayquaza:: clearflag FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_STILL return -SkyPillar_Top_OnWarp: @ 8239713 +SkyPillar_Top_OnWarp: map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_RayquazaFaceDown .2byte 0 -SkyPillar_Top_EventScript_RayquazaFaceDown:: @ 823971D +SkyPillar_Top_EventScript_RayquazaFaceDown:: turnobject LOCALID_RAYQUAZA_SLEEPING, DIR_SOUTH end -SkyPillar_Top_EventScript_Rayquaza:: @ 8239722 +SkyPillar_Top_EventScript_Rayquaza:: lockall waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -67,24 +67,24 @@ SkyPillar_Top_EventScript_Rayquaza:: @ 8239722 releaseall end -SkyPillar_Top_EventScript_DefeatedRayquaza:: @ 8239768 +SkyPillar_Top_EventScript_DefeatedRayquaza:: setflag FLAG_DEFEATED_RAYQUAZA goto SkyPillar_Top_EventScript_DefeatedRayquaza2 end -SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771 +SkyPillar_Top_EventScript_RanFromRayquaza:: setvar VAR_0x8004, SPECIES_RAYQUAZA goto SkyPillar_Top_EventScript_RanFromRayquaza2 end -SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C +SkyPillar_Top_EventScript_DefeatedRayquaza2:: fadescreenswapbuffers FADE_TO_BLACK removeobject VAR_LAST_TALKED fadescreenswapbuffers FADE_FROM_BLACK releaseall end -SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785 +SkyPillar_Top_EventScript_RanFromRayquaza2:: fadescreenswapbuffers FADE_TO_BLACK removeobject VAR_LAST_TALKED fadescreenswapbuffers FADE_FROM_BLACK @@ -93,7 +93,7 @@ SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785 releaseall end -SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A +SkyPillar_Top_EventScript_AwakenRayquaza:: lockall fadeoutbgm 1 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp @@ -140,7 +140,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A @ Rayquaza has unusual movement frames @ See comments, or sAnimTable_Rayquaza -SkyPillar_Top_Movement_RayquazaStir: @ 823983A +SkyPillar_Top_Movement_RayquazaStir: delay_16 walk_in_place_fast_left @ Coiled, awake delay_16 @@ -159,7 +159,7 @@ SkyPillar_Top_Movement_RayquazaStir: @ 823983A delay_16 step_end -SkyPillar_Top_Movement_RayquazaFlyOff: @ 823984B +SkyPillar_Top_Movement_RayquazaFlyOff: delay_16 walk_in_place_down @ Coiled, asleep delay_8 @@ -174,18 +174,18 @@ SkyPillar_Top_Movement_RayquazaFlyOff: @ 823984B slide_up step_end -SkyPillar_Top_Movement_CameraPanUp: @ 8239858 +SkyPillar_Top_Movement_CameraPanUp: walk_slow_up walk_slow_up walk_slow_up step_end -SkyPillar_Top_Movement_CameraPanDown: @ 823985C +SkyPillar_Top_Movement_CameraPanDown: walk_slow_down walk_slow_down walk_slow_down step_end -SkyPillar_Top_Text_RayquazaFlewOff: @ 8239860 +SkyPillar_Top_Text_RayquazaFlewOff: .string "The awakened RAYQUAZA flew off…$" |