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 /constants | |
| parent | 370e47beeef3f115d071161a7b2f09dcfbd2168b (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (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 |