diff options
author | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
commit | 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch) | |
tree | f5387471637b5e9e62fa5b6a0614a935b2921118 /data/scripts/maps/Route117.inc | |
parent | 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff) | |
parent | 3c5f725de49371aced1788a21f5e53df5b498b5f (diff) |
Merge branch 'master' into decompile_data
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 40affd3fd..44c4c156c 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,7 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag 134 + checkflag FLAG_PENDING_DAYCARE_EGG goto_if 0, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 |