diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-09 17:59:26 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-09 17:59:26 -0400 |
| commit | 5e0f0ca6dcf9699b5cd8252c74e4a7676470dbc4 (patch) | |
| tree | 6846118d775807ea16aba483a3dec570c906f8d3 /include/constants/layouts.h | |
| parent | 20efe34745e3f53f6c570a063718972cc50c8a97 (diff) | |
| parent | 77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff) | |
Merge branch 'master' into main_menu
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 |