diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
| commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
| tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /data/maps/Route117/scripts.inc | |
| parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
| parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'data/maps/Route117/scripts.inc')
| -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 |