diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
| commit | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (patch) | |
| tree | aec3073d480a2fbc3f0221397aa5e84f85755e48 /data/scripts/maps | |
| parent | f8402b3d7408e31a085dc136967f99705c764553 (diff) | |
| parent | 3883c399912a35ca4eca3cbee7cb0c46c81e8d76 (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 |