diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-18 21:45:52 +0100 |
| commit | 3de416662b5a83d96cbe010462971ed2c246d70d (patch) | |
| tree | 7070ce944c7ef2d46cde333faec6a9930d1399c2 /constants | |
| parent | f8b40754c70679bb3ec4c0611613a0658f679225 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
wild encounter, fix merge conflicts
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 |