diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
| commit | 2d4be89ee590792bcbcfdcfac17bc2827ca17151 (patch) | |
| tree | 592b831e50d1d98f3842751335278e782f9274c7 /include/constants/layouts.h | |
| parent | 0495cce90418b84dc53b5d5c9f3b2bfe46f0ed62 (diff) | |
| parent | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into union_room
Diffstat (limited to 'include/constants/layouts.h')
| -rw-r--r-- | include/constants/layouts.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/constants/layouts.h b/include/constants/layouts.h index a9d40220f..657d531e8 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -180,10 +180,10 @@ #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F 195 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F 196 #define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF 197 -#define LAYOUT_SAFARI_ZONE_BUILDING 198 +#define LAYOUT_SAFARI_ZONE_REST_HOUSE 198 #define LAYOUT_SAFARI_ZONE_SECRET_HOUSE 199 -#define LAYOUT_FUCHSIA_CITY_ZOO_BUILDING 200 -#define LAYOUT_FUCHSIA_CITY_BUILDING1 201 +#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE 200 +#define LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE 201 #define LAYOUT_FUCHSIA_CITY_HOUSE2 202 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE 203 #define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE 204 @@ -260,8 +260,8 @@ #define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275 #define LAYOUT_VIRIDIAN_CITY_HOUSE1 276 #define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277 -#define LAYOUT_UNUSED_LAYOUT_833B6EC 278 -#define LAYOUT_UNUSED_LAYOUT_833BE30 279 +#define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278 +#define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279 #define LAYOUT_MT_EMBER_EXTERIOR 280 #define LAYOUT_MT_EMBER_SUMMIT 281 #define LAYOUT_MT_EMBER_SUMMIT_PATH_1F 282 |