diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:34:28 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:39:00 +0800 |
| commit | 89a377cdd3a24956ff549b0fa69a5a1cc26fe128 (patch) | |
| tree | a5279d2d7224d04f5e39b213d4c18deda54a438e /include/constants/flags.h | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'include/constants/flags.h')
| -rw-r--r-- | include/constants/flags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 7f4655d4e..a4b891aca 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -17,7 +17,7 @@ #define FLAG_WORLD_MAP_FUCHSIA_CITY 0x897 #define FLAG_WORLD_MAP_CINNABAR_ISLAND 0x898 #define FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR 0x899 -#define FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE 0x89a +#define FLAG_WORLD_MAP_SAFFRON_CITY 0x89a #define FLAG_WORLD_MAP_ONE_ISLAND 0x89b #define FLAG_WORLD_MAP_TWO_ISLAND 0x89c #define FLAG_WORLD_MAP_THREE_ISLAND 0x89d @@ -1377,7 +1377,7 @@ #define TRAINERS_FLAG_NO 0x356 #define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860 -// TODO: Find what these are +// TODO: These three are badge flags #define FLAG_UNK820 0x820 #define FLAG_UNK824 0x824 #define FLAG_UNK826 0x826 |