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/map_groups.h | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'include/constants/map_groups.h')
| -rw-r--r-- | include/constants/map_groups.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index d769520ca..44fa03eda 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -206,8 +206,8 @@ #define MAP_FUCHSIA_CITY (7 | (3 << 8)) #define MAP_CINNABAR_ISLAND (8 | (3 << 8)) #define MAP_INDIGO_PLATEAU_EXTERIOR (9 | (3 << 8)) -#define MAP_SAFFRON_CITY_DUPLICATE (10 | (3 << 8)) -#define MAP_SAFFRON_CITY (11 | (3 << 8)) +#define MAP_SAFFRON_CITY (10 | (3 << 8)) +#define MAP_SAFFRON_CITY_CLASSIC (11 | (3 << 8)) #define MAP_ONE_ISLAND (12 | (3 << 8)) #define MAP_TWO_ISLAND (13 | (3 << 8)) #define MAP_THREE_ISLAND (14 | (3 << 8)) |