diff options
Diffstat (limited to 'data/maps/NavelRock_Top/scripts.inc')
| -rw-r--r-- | data/maps/NavelRock_Top/scripts.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 4cb110d81..c95596ff6 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_HO_OH, 1 + NavelRock_Top_MapScripts:: @ 8269113 map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_OnResume @@ -28,7 +30,7 @@ NavelRock_Top_EventScript_TryRemoveHoOh:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn - removeobject 1 + removeobject LOCALID_HO_OH return NavelRock_Top_EventScript_HoOh:: @ 826916F @@ -38,7 +40,7 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F setvar VAR_0x8004, 3 @ num loops setvar VAR_0x8005, 35 @ delay special LoopWingFlapSE - applymovement 1, NavelRock_Top_Movement_HoOhAppear + applymovement LOCALID_HO_OH, NavelRock_Top_Movement_HoOhAppear applymovement OBJ_EVENT_ID_CAMERA, NavelRock_Top_Movement_CameraPanUp waitmovement 0 delay 50 @@ -53,7 +55,7 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F setvar VAR_0x8005, 35 @ delay special LoopWingFlapSE applymovement OBJ_EVENT_ID_CAMERA, NavelRock_Top_Movement_CameraPanDown - applymovement 1, NavelRock_Top_Movement_HoOhApproach + applymovement LOCALID_HO_OH, NavelRock_Top_Movement_HoOhApproach waitmovement 0 special RemoveCameraObject setvar VAR_0x8004, SPECIES_HO_OH @@ -64,7 +66,7 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - setvar VAR_LAST_TALKED, 1 + setvar VAR_LAST_TALKED, LOCALID_HO_OH specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NavelRock_Top_EventScript_DefeatedHoOh |