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 | |
| parent | 20efe34745e3f53f6c570a063718972cc50c8a97 (diff) | |
| parent | 77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff) | |
Merge branch 'master' into main_menu
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/layouts.h | 4 | ||||
| -rw-r--r-- | include/constants/map_groups.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index b13be9d9a..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 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 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)) |