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/layouts.h | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'include/constants/layouts.h')
| -rw-r--r-- | include/constants/layouts.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/layouts.h b/include/constants/layouts.h index b97ef69cb..f4f2a8a29 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -71,7 +71,7 @@ #define LAYOUT_FUCHSIA_CITY 85 #define LAYOUT_CINNABAR_ISLAND 86 #define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87 -#define LAYOUT_SAFFRON_CITY 88 +#define LAYOUT_SAFFRON_CITY_CLASSIC 88 #define LAYOUT_ROUTE1 89 #define LAYOUT_ROUTE2 90 #define LAYOUT_ROUTE3 91 @@ -189,7 +189,7 @@ #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE 204 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM 205 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM 206 -#define LAYOUT_SAFFRON_CITY_DUPLICATE 207 +#define LAYOUT_SAFFRON_CITY 207 #define LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE 208 #define LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE 209 #define LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE 210 |