diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
| commit | b0657350a43f3f91cd5e3ab8f910ab5ab78bb61c (patch) | |
| tree | 9568b4252f963e3210410880dad3b53dd3b5ab7d /include/flags.h | |
| parent | ad3a97e178b93c38b1d43f8120449b042ac23a0e (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
berry blender fix merge conflicts
Diffstat (limited to 'include/flags.h')
| -rw-r--r-- | include/flags.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/flags.h b/include/flags.h index 1cb56a7f4..31d634c59 100644 --- a/include/flags.h +++ b/include/flags.h @@ -1,8 +1,9 @@ #ifndef GUARD_FLAGS_H #define GUARD_FLAGS_H -#define FLAG_PENDING_DAYCARE_EGG 0x86 #define FLAG_340 0x340 +#define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53 +#define FLAG_PENDING_DAYCARE_EGG 0x86 #define FLAG_TRAINER_FLAG_START 0x500 |