diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:31:03 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:31:03 +0100 |
commit | 1b7246395d0d7e47834f3b9c4f9f016a906a9953 (patch) | |
tree | e775f8d4d5e30bbfb7ef3b5ca9dcf62171d919bb /data/scripts/maps/Route117.inc | |
parent | ba00a1c688f84edcab44bd183d6dea4e2e7ba0be (diff) | |
parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) |
merge conflicts, review changes, daycare
Diffstat (limited to 'data/scripts/maps/Route117.inc')
-rw-r--r-- | data/scripts/maps/Route117.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 23551d372..01463516b 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,7 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983 end Route117_EventScript_1F3989:: @ 81F3989 - checkflag FLAG_0x086 + checkflag FLAG_PENDING_DAYCARE_EGG goto_if 0, Route117_EventScript_1F3999 setobjectxyperm 3, 47, 6 |