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 /constants | |
parent | f8402b3d7408e31a085dc136967f99705c764553 (diff) | |
parent | 3883c399912a35ca4eca3cbee7cb0c46c81e8d76 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'constants')
-rw-r--r-- | constants/flags.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/constants/flags.inc b/constants/flags.inc index 0b375f9d6..2e4b60d73 100644 --- a/constants/flags.inc +++ b/constants/flags.inc @@ -131,7 +131,7 @@ .equiv FLAG_0x083, 0x83 .equiv FLAG_0x084, 0x84 .equiv FLAG_0x085, 0x85 - .equiv FLAG_0x086, 0x86 + .equiv FLAG_PENDING_DAYCARE_EGG, 0x86 .equiv FLAG_0x087, 0x87 .equiv FLAG_0x088, 0x88 .equiv FLAG_0x089, 0x89 |