Use more LOCALID constants

This commit is contained in:
GriffinR
2021-02-10 20:20:15 -05:00
parent a34c9d09b6
commit 515dde69af
50 changed files with 372 additions and 231 deletions
+10 -7
View File
@@ -1,3 +1,6 @@
.set LOCALID_DEOXYS_ROCK, 1
.set LOCALID_DEOXYS, 2
BirthIsland_Exterior_MapScripts:: @ 8165203
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:: @ 816525D
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne EventScript_Return
removeobject 2
removeobject LOCALID_DEOXYS
return
BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
@@ -66,21 +69,21 @@ BirthIsland_Exterior_EventScript_NotSolved3:: @ 81652BE
end
BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0
addobject 2
addobject LOCALID_DEOXYS
waitse
setfieldeffectarg 0, 1
setfieldeffectarg 0, LOCALID_DEOXYS_ROCK
setfieldeffectarg 1, 56
setfieldeffectarg 2, 2
dofieldeffect 68
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_ENCOUNTER_DEOXYS, 0
waitfieldeffect 68
applymovement 2, Movement_DeoxysApproach
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
applymovement LOCALID_DEOXYS, 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