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 /constants | |
| parent | ba00a1c688f84edcab44bd183d6dea4e2e7ba0be (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
merge conflicts, review changes, daycare
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 |