diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-17 18:18:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 18:18:47 -0400 |
| commit | 96fd719a1906346db062daf13e1107b3c4b220ed (patch) | |
| tree | 5df2369f01325a40ca65a4f744545460e348a198 /data/maps/Route121 | |
| parent | 50e48898d2ab25b792b563825dca79d327bcb542 (diff) | |
| parent | 89bcf3cbd9ad9d3c3631159c5ba20d3660819066 (diff) | |
Merge pull request #1081 from GriffinRichards/add-localids
Add local object event ids for referenced objects
Diffstat (limited to 'data/maps/Route121')
| -rw-r--r-- | data/maps/Route121/scripts.inc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 81330b6e8..1a7591a93 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -1,3 +1,7 @@ +.set LOCALID_GRUNT_1, 12 +.set LOCALID_GRUNT_2, 13 +.set LOCALID_GRUNT_3, 14 + Route121_MapScripts:: @ 81F5DFC .byte 0 @@ -16,18 +20,18 @@ Route121_EventScript_SafariZoneSign:: @ 81F5E0F Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18 lockall playbgm MUS_AQA_0, 0 - applymovement 13, Common_Movement_WalkInPlaceRight + applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT closemessage - applymovement 12, Route121_Movement_Grunt1Exit - applymovement 13, Route121_Movement_Grunt2Exit - applymovement 14, Route121_Movement_Grunt3Exit + applymovement LOCALID_GRUNT_1, Route121_Movement_Grunt1Exit + applymovement LOCALID_GRUNT_2, Route121_Movement_Grunt2Exit + applymovement LOCALID_GRUNT_3, Route121_Movement_Grunt3Exit waitmovement 0 fadedefaultbgm - removeobject 12 - removeobject 13 - removeobject 14 + removeobject LOCALID_GRUNT_1 + removeobject LOCALID_GRUNT_2 + removeobject LOCALID_GRUNT_3 setvar VAR_ROUTE121_STATE, 1 releaseall end |