diff options
Diffstat (limited to 'data/maps/MarineCave_End/scripts.inc')
| -rw-r--r-- | data/maps/MarineCave_End/scripts.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index a6d894793..47bbf9aad 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,31 +1,31 @@ .set LOCALID_KYOGRE, 1 -MarineCave_End_MapScripts:: @ 823AFDF +MarineCave_End_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_OnResume map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition .byte 0 -MarineCave_End_OnResume: @ 823AFEA +MarineCave_End_OnResume: call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_TryRemoveKyogre end -MarineCave_End_EventScript_TryRemoveKyogre:: @ 823AFF4 +MarineCave_End_EventScript_TryRemoveKyogre:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject LOCALID_KYOGRE return -MarineCave_End_OnTransition: @ 823B008 +MarineCave_End_OnTransition: call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_ShowKyogre end -MarineCave_End_EventScript_ShowKyogre:: @ 823B012 +MarineCave_End_EventScript_ShowKyogre:: clearflag FLAG_HIDE_MARINE_CAVE_KYOGRE setvar VAR_TEMP_1, 1 return -MarineCave_End_EventScript_Kyogre:: @ 823B01B +MarineCave_End_EventScript_Kyogre:: lockall applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 @@ -54,18 +54,18 @@ MarineCave_End_EventScript_Kyogre:: @ 823B01B releaseall end -MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084 +MarineCave_End_EventScript_DefeatedKyogre:: setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE goto Common_EventScript_RemoveStaticPokemon end -MarineCave_End_EventScript_RanFromKyogre:: @ 823B092 +MarineCave_End_EventScript_RanFromKyogre:: setvar VAR_0x8004, SPECIES_KYOGRE goto Common_EventScript_LegendaryFlewAway end -MarineCave_End_Movement_KyogreApproach: @ 823B09D +MarineCave_End_Movement_KyogreApproach: init_affine_anim walk_down_start_affine delay_16 |