summaryrefslogtreecommitdiff
path: root/data/maps/BirthIsland_Exterior/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/BirthIsland_Exterior/scripts.inc')
-rw-r--r--data/maps/BirthIsland_Exterior/scripts.inc17
1 files changed, 10 insertions, 7 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 8cf47bfdb..5c06e6f3a 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -1,3 +1,6 @@
+.set LOCALID_DEOXYS_ROCK, 1
+.set LOCALID_DEOXYS, 2
+
BirthIsland_Exterior_MapScripts:: @ 8267F15
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
@@ -36,7 +39,7 @@ BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 8267F6F
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
- removeobject 2
+ removeobject LOCALID_DEOXYS
return
BirthIsland_Exterior_EventScript_Triangle:: @ 8267F83
@@ -65,20 +68,20 @@ BirthIsland_Exterior_EventScript_NotSolved3:: @ 8267FBF
BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
waitse
- setfieldeffectargument 0, 1
+ setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
setfieldeffectargument 1, 58
setfieldeffectargument 2, 26
- dofieldeffect FLDEFF_65
+ dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_RG_DEOEYE, 0
- waitfieldeffect FLDEFF_65
- addobject 2
- applymovement 2, BirthIsland_Exterior_Movement_DeoxysApproach
+ waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
+ addobject LOCALID_DEOXYS
+ applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
waitmovement 0
waitse
playmoncry SPECIES_DEOXYS, 2
delay 40
waitmoncry
- setvar VAR_LAST_TALKED, 2
+ setvar VAR_LAST_TALKED, LOCALID_DEOXYS
setvar VAR_0x8004, SPECIES_DEOXYS
setvar VAR_0x8005, 30 @ level
setvar VAR_0x8006, ITEM_NONE