diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-10 20:20:15 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-02-10 20:20:15 -0500 |
| commit | 515dde69afea00d7eafd0693ee423fcc1ae0bac5 (patch) | |
| tree | b8c04472d094e72e87bd11a83204a3f5e6eb5500 /data/maps/NavelRock_Summit | |
| parent | a34c9d09b6b4da949ec6da6fa31b9f6eb12bdbee (diff) | |
Use more LOCALID constants
Diffstat (limited to 'data/maps/NavelRock_Summit')
| -rw-r--r-- | data/maps/NavelRock_Summit/scripts.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index d7459dcde..32b163542 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_HO_OH, 1 + NavelRock_Summit_MapScripts:: @ 8164F9F map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume @@ -28,7 +30,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return - removeobject 1 + removeobject LOCALID_HO_OH return NavelRock_Summit_EventScript_HoOh:: @ 8164FFB @@ -40,7 +42,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB setvar VAR_0x8004, 3 @ Num loops setvar VAR_0x8005, 35 @ Delay special LoopWingFlapSound - applymovement 1, Movement_HoOhAppear + applymovement LOCALID_HO_OH, Movement_HoOhAppear applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp waitmovement 0 delay 50 @@ -55,7 +57,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB setvar VAR_0x8005, 35 @ Delay special LoopWingFlapSound applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown - applymovement 1, Movement_HoOhApproach + applymovement LOCALID_HO_OH, Movement_HoOhApproach waitmovement 0 special RemoveCameraObject setvar VAR_0x8004, SPECIES_HO_OH @@ -66,7 +68,7 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - 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_Summit_EventScript_DefeatedHoOh |