diff options
author | itskobold <itskobold@users.noreply.github.com> | 2017-11-19 10:50:39 +0000 |
---|---|---|
committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-19 10:50:39 +0000 |
commit | 625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (patch) | |
tree | 72fd9ebb925fe96cf83c4e7264b56af4b69e1eda /data/scripts/maps | |
parent | 370e47beeef3f115d071161a7b2f09dcfbd2168b (diff) | |
parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'data/scripts/maps')
-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 |