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/Route117 | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/maps/Route117')
| -rw-r--r-- | data/maps/Route117/scripts.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 47d8eced9..08f8d0500 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_DAYCARE_MAN, 3 + Route117_MapScripts:: @ 81F397D map_script MAP_SCRIPT_ON_TRANSITION, Route117_OnTransition .byte 0 @@ -8,7 +10,7 @@ Route117_OnTransition: @ 81F3983 Route117_EventScript_TryMoveDayCareMan:: @ 81F3989 goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan - setobjectxyperm 3, 47, 6 + setobjectxyperm LOCALID_DAYCARE_MAN, 47, 6 Route117_EventScript_StopMoveDayCareMan:: @ 81F3999 return |