diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
| commit | 65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch) | |
| tree | 250c345d17b8d8f910d327d98f577afddfb3a64a /data/maps/Route116 | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/maps/Route116')
| -rw-r--r-- | data/maps/Route116/scripts.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 87ff20904..d904fb9eb 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,3 +1,6 @@ +.set LOCALID_BRINEY, 11 +.set LOCALID_WANDAS_BF_OUTSIDE, 21 + Route116_MapScripts:: @ 81F2C0C map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad @@ -15,7 +18,7 @@ Route116_OnTransition: @ 81F2C1C end Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47 - setobjectxyperm 21, 38, 10 + setobjectxyperm LOCALID_WANDAS_BF_OUTSIDE, 38, 10 return Route116_OnLoad: @ 81F2C4F @@ -151,7 +154,7 @@ Route116_EventScript_Briney:: @ 81F2D84 Route116_EventScript_BrineyTrigger:: @ 81F2D95 lockall - applymovement 11, Common_Movement_WalkInPlaceFastestRight + applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT |