fix map and layout constants

1 files changed, 317 insertions, 317 deletions

diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index df0c5e99b..b7568ee7c 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -1,77 +1,77 @@
 #ifndef GUARD_CONSTANTS_LAYOUTS_H
 #define GUARD_CONSTANTS_LAYOUTS_H
 
-#define LAYOUT_PALLETTOWN_PLAYERSHOUSE_1F 1
-#define LAYOUT_PALLETTOWN_PLAYERSHOUSE_2F 2
-#define LAYOUT_PALLETTOWN_GARYSHOUSE 3
-#define LAYOUT_UNUSEDLAYOUT_82D54D8 4
-#define LAYOUT_PALLETTOWN_PROFESSOROAKSLAB 5
+#define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F 1
+#define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F 2
+#define LAYOUT_PALLET_TOWN_GARYS_HOUSE 3
+#define LAYOUT_UNUSED_LAYOUT_82D54D8 4
+#define LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB 5
 #define LAYOUT_HOUSE1 6
 #define LAYOUT_HOUSE2 7
-#define LAYOUT_POKEMONCENTER_1F 8
-#define LAYOUT_POKEMONCENTER_2F 9
+#define LAYOUT_POKEMON_CENTER_1F 8
+#define LAYOUT_POKEMON_CENTER_2F 9
 #define LAYOUT_MART 10
 #define LAYOUT_HOUSE3 11
-#define LAYOUT_CERULEANCITY_GYM 12
+#define LAYOUT_CERULEAN_CITY_GYM 12
 #define LAYOUT_HOUSE4 13
-#define LAYOUT_UNUSEDLAYOUT_82D6144 14
-#define LAYOUT_CELADONCITY_GYM 15
-#define LAYOUT_UNUSEDLAYOUT_82D6490 16
-#define LAYOUT_FIVEISLAND_RESORTGORGEOUS_HOUSE 17
-#define LAYOUT_UNUSEDLAYOUT_82D6654 18
-#define LAYOUT_UNUSEDLAYOUT_82D672C 19
-#define LAYOUT_FUCHSIACITY_GYM 20
+#define LAYOUT_UNUSED_LAYOUT_82D6144 14
+#define LAYOUT_CELADON_CITY_GYM 15
+#define LAYOUT_UNUSED_LAYOUT_82D6490 16
+#define LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE 17
+#define LAYOUT_UNUSED_LAYOUT_82D6654 18
+#define LAYOUT_UNUSED_LAYOUT_82D672C 19
+#define LAYOUT_FUCHSIA_CITY_GYM 20
 #define LAYOUT_HOUSE5 21
-#define LAYOUT_UNUSEDLAYOUT_82D6C34 24
-#define LAYOUT_VERMILIONCITY_GYM 25
-#define LAYOUT_CERULEANCITY_BIKESHOP 26
-#define LAYOUT_CELADONCITY_GAMECORNER 27
-#define LAYOUT_PEWTERCITY_GYM 28
-#define LAYOUT_FOURISLAND_LORELEISHOUSE 30
-#define LAYOUT_THREEISLAND_HOUSE1 31
-#define LAYOUT_UNUSEDLAYOUT_82D75F0 32
-#define LAYOUT_UNUSEDLAYOUT_82D7674 33
-#define LAYOUT_SAFFRONCITY_GYM 34
-#define LAYOUT_UNUSEDLAYOUT_82D7CC8 35
-#define LAYOUT_CINNABARISLAND_GYM 36
-#define LAYOUT_VIRIDIANCITY_GYM 37
-#define LAYOUT_UNUSEDLAYOUT_82D88C8 46
-#define LAYOUT_UNKNOWNMAP_00_00 47
-#define LAYOUT_UNKNOWNMAP_00_01 48
-#define LAYOUT_UNKNOWNMAP_00_02 49
-#define LAYOUT_UNKNOWNMAP_00_03 50
-#define LAYOUT_FUCHSIACITY_SAFARIZONE_ENTRANCE 51
-#define LAYOUT_UNUSEDLAYOUT_82D9B24 52
-#define LAYOUT_UNUSEDLAYOUT_82DA7C8 53
-#define LAYOUT_UNUSEDLAYOUT_82DB46C 54
-#define LAYOUT_UNUSEDLAYOUT_82DB4F0 55
-#define LAYOUT_UNUSEDLAYOUT_82DBBE0 57
-#define LAYOUT_UNUSEDLAYOUT_82DBDD8 62
-#define LAYOUT_UNUSEDLAYOUT_82DBFB8 63
-#define LAYOUT_UNUSEDLAYOUT_82DC4EC 64
-#define LAYOUT_UNUSEDLAYOUT_82DC60C 65
-#define LAYOUT_UNUSEDLAYOUT_82DC72C 66
-#define LAYOUT_UNUSEDLAYOUT_82DC84C 67
-#define LAYOUT_UNUSEDLAYOUT_82DCA70 68
-#define LAYOUT_UNUSEDLAYOUT_82DCB44 69
-#define LAYOUT_UNUSEDLAYOUT_82DCC40 70
-#define LAYOUT_UNUSEDLAYOUT_82DCCD4 71
-#define LAYOUT_UNUSEDLAYOUT_82DCD68 72
-#define LAYOUT_UNUSEDLAYOUT_82DCDFC 73
-#define LAYOUT_UNUSEDLAYOUT_82DCF00 74
-#define LAYOUT_UNUSEDLAYOUT_82DD004 75
-#define LAYOUT_UNUSEDLAYOUT_82DD0DC 77
-#define LAYOUT_PALLETTOWN 78
-#define LAYOUT_VIRIDIANCITY 79
-#define LAYOUT_PEWTERCITY 80
-#define LAYOUT_CERULEANCITY 81
-#define LAYOUT_LAVENDERTOWN 82
-#define LAYOUT_VERMILIONCITY 83
-#define LAYOUT_CELADONCITY 84
-#define LAYOUT_FUCHSIACITY 85
-#define LAYOUT_CINNABARISLAND 86
-#define LAYOUT_INDIGOPLATEAU_EXTERIOR 87
-#define LAYOUT_SAFFRONCITY 88
+#define LAYOUT_UNUSED_LAYOUT_82D6C34 24
+#define LAYOUT_VERMILION_CITY_GYM 25
+#define LAYOUT_CERULEAN_CITY_BIKE_SHOP 26
+#define LAYOUT_CELADON_CITY_GAME_CORNER 27
+#define LAYOUT_PEWTER_CITY_GYM 28
+#define LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE 30
+#define LAYOUT_THREE_ISLAND_HOUSE1 31
+#define LAYOUT_UNUSED_LAYOUT_82D75F0 32
+#define LAYOUT_UNUSED_LAYOUT_82D7674 33
+#define LAYOUT_SAFFRON_CITY_GYM 34
+#define LAYOUT_UNUSED_LAYOUT_82D7CC8 35
+#define LAYOUT_CINNABAR_ISLAND_GYM 36
+#define LAYOUT_VIRIDIAN_CITY_GYM 37
+#define LAYOUT_UNUSED_LAYOUT_82D88C8 46
+#define LAYOUT_UNKNOWN_MAP_00_00 47
+#define LAYOUT_UNKNOWN_MAP_00_01 48
+#define LAYOUT_UNKNOWN_MAP_00_02 49
+#define LAYOUT_UNKNOWN_MAP_00_03 50
+#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51
+#define LAYOUT_UNUSED_LAYOUT_82D9B24 52
+#define LAYOUT_UNUSED_LAYOUT_82DA7C8 53
+#define LAYOUT_UNUSED_LAYOUT_82DB46C 54
+#define LAYOUT_UNUSED_LAYOUT_82DB4F0 55
+#define LAYOUT_UNUSED_LAYOUT_82DBBE0 57
+#define LAYOUT_UNUSED_LAYOUT_82DBDD8 62
+#define LAYOUT_UNUSED_LAYOUT_82DBFB8 63
+#define LAYOUT_UNUSED_LAYOUT_82DC4EC 64
+#define LAYOUT_UNUSED_LAYOUT_82DC60C 65
+#define LAYOUT_UNUSED_LAYOUT_82DC72C 66
+#define LAYOUT_UNUSED_LAYOUT_82DC84C 67
+#define LAYOUT_UNUSED_LAYOUT_82DCA70 68
+#define LAYOUT_UNUSED_LAYOUT_82DCB44 69
+#define LAYOUT_UNUSED_LAYOUT_82DCC40 70
+#define LAYOUT_UNUSED_LAYOUT_82DCCD4 71
+#define LAYOUT_UNUSED_LAYOUT_82DCD68 72
+#define LAYOUT_UNUSED_LAYOUT_82DCDFC 73
+#define LAYOUT_UNUSED_LAYOUT_82DCF00 74
+#define LAYOUT_UNUSED_LAYOUT_82DD004 75
+#define LAYOUT_UNUSED_LAYOUT_82DD0DC 77
+#define LAYOUT_PALLET_TOWN 78
+#define LAYOUT_VIRIDIAN_CITY 79
+#define LAYOUT_PEWTER_CITY 80
+#define LAYOUT_CERULEAN_CITY 81
+#define LAYOUT_LAVENDER_TOWN 82
+#define LAYOUT_VERMILION_CITY 83
+#define LAYOUT_CELADON_CITY 84
+#define LAYOUT_FUCHSIA_CITY 85
+#define LAYOUT_CINNABAR_ISLAND 86
+#define LAYOUT_INDIGO_PLATEAU_EXTERIOR 87
+#define LAYOUT_SAFFRON_CITY 88
 #define LAYOUT_ROUTE1 89
 #define LAYOUT_ROUTE2 90
 #define LAYOUT_ROUTE3 91
@@ -97,274 +97,274 @@
 #define LAYOUT_ROUTE23 111
 #define LAYOUT_ROUTE24 112
 #define LAYOUT_ROUTE25 113
-#define LAYOUT_MTMOON_1F 114
-#define LAYOUT_MTMOON_B1F 115
-#define LAYOUT_MTMOON_B2F 116
-#define LAYOUT_VIRIDIANFOREST 117
+#define LAYOUT_MT_MOON_1F 114
+#define LAYOUT_MT_MOON_B1F 115
+#define LAYOUT_MT_MOON_B2F 116
+#define LAYOUT_VIRIDIAN_FOREST 117
 #define LAYOUT_SSANNE_EXTERIOR 118
 #define LAYOUT_SSANNE_1F_CORRIDOR 119
 #define LAYOUT_SSANNE_2F_CORRIDOR 120
 #define LAYOUT_SSANNE_3F_CORRIDOR 121
 #define LAYOUT_SSANNE_B1F_CORRIDOR 122
 #define LAYOUT_SSANNE_DECK 123
-#define LAYOUT_DIGLETTSCAVE_B1F 124
-#define LAYOUT_VICTORYROAD_1F 125
-#define LAYOUT_VICTORYROAD_2F 126
-#define LAYOUT_VICTORYROAD_3F 127
-#define LAYOUT_ROCKETHIDEOUT_B1F 128
-#define LAYOUT_ROCKETHIDEOUT_B2F 129
-#define LAYOUT_ROCKETHIDEOUT_B3F 130
-#define LAYOUT_ROCKETHIDEOUT_B4F 131
-#define LAYOUT_SILPHCO_1F 132
-#define LAYOUT_SILPHCO_2F 133
-#define LAYOUT_SILPHCO_3F 134
-#define LAYOUT_SILPHCO_4F 135
-#define LAYOUT_SILPHCO_5F 136
-#define LAYOUT_SILPHCO_6F 137
-#define LAYOUT_SILPHCO_7F 138
-#define LAYOUT_SILPHCO_8F 139
-#define LAYOUT_SILPHCO_9F 140
-#define LAYOUT_SILPHCO_10F 141
-#define LAYOUT_SILPHCO_11F 142
-#define LAYOUT_POKEMONMANSION_1F 143
-#define LAYOUT_POKEMONMANSION_2F 144
-#define LAYOUT_POKEMONMANSION_3F 145
-#define LAYOUT_POKEMONMANSION_B1F 146
-#define LAYOUT_SAFARIZONE_CENTER 147
-#define LAYOUT_SAFARIZONE_EAST 148
-#define LAYOUT_SAFARIZONE_NORTH 149
-#define LAYOUT_SAFARIZONE_WEST 150
-#define LAYOUT_CERULEANCAVE_1F 151
-#define LAYOUT_CERULEANCAVE_2F 152
-#define LAYOUT_CERULEANCAVE_B1F 153
-#define LAYOUT_ROCKTUNNEL_1F 154
-#define LAYOUT_ROCKTUNNEL_B1F 155
-#define LAYOUT_SEAFOAMISLANDS_1F 156
-#define LAYOUT_SEAFOAMISLANDS_B1F 157
-#define LAYOUT_SEAFOAMISLANDS_B2F 158
-#define LAYOUT_SEAFOAMISLANDS_B3F 159
-#define LAYOUT_SEAFOAMISLANDS_B4F 160
-#define LAYOUT_POKEMONTOWER_1F 161
-#define LAYOUT_POKEMONTOWER_2F 162
-#define LAYOUT_POKEMONTOWER_3F 163
-#define LAYOUT_POKEMONTOWER_4F 164
-#define LAYOUT_POKEMONTOWER_5F 165
-#define LAYOUT_POKEMONTOWER_6F 166
-#define LAYOUT_POKEMONTOWER_7F 167
-#define LAYOUT_POWERPLANT 168
-#define LAYOUT_ROUTE25_SEACOTTAGE 169
+#define LAYOUT_DIGLETTS_CAVE_B1F 124
+#define LAYOUT_VICTORY_ROAD_1F 125
+#define LAYOUT_VICTORY_ROAD_2F 126
+#define LAYOUT_VICTORY_ROAD_3F 127
+#define LAYOUT_ROCKET_HIDEOUT_B1F 128
+#define LAYOUT_ROCKET_HIDEOUT_B2F 129
+#define LAYOUT_ROCKET_HIDEOUT_B3F 130
+#define LAYOUT_ROCKET_HIDEOUT_B4F 131
+#define LAYOUT_SILPH_CO_1F 132
+#define LAYOUT_SILPH_CO_2F 133
+#define LAYOUT_SILPH_CO_3F 134
+#define LAYOUT_SILPH_CO_4F 135
+#define LAYOUT_SILPH_CO_5F 136
+#define LAYOUT_SILPH_CO_6F 137
+#define LAYOUT_SILPH_CO_7F 138
+#define LAYOUT_SILPH_CO_8F 139
+#define LAYOUT_SILPH_CO_9F 140
+#define LAYOUT_SILPH_CO_10F 141
+#define LAYOUT_SILPH_CO_11F 142
+#define LAYOUT_POKEMON_MANSION_1F 143
+#define LAYOUT_POKEMON_MANSION_2F 144
+#define LAYOUT_POKEMON_MANSION_3F 145
+#define LAYOUT_POKEMON_MANSION_B1F 146
+#define LAYOUT_SAFARI_ZONE_CENTER 147
+#define LAYOUT_SAFARI_ZONE_EAST 148
+#define LAYOUT_SAFARI_ZONE_NORTH 149
+#define LAYOUT_SAFARI_ZONE_WEST 150
+#define LAYOUT_CERULEAN_CAVE_1F 151
+#define LAYOUT_CERULEAN_CAVE_2F 152
+#define LAYOUT_CERULEAN_CAVE_B1F 153
+#define LAYOUT_ROCK_TUNNEL_1F 154
+#define LAYOUT_ROCK_TUNNEL_B1F 155
+#define LAYOUT_SEAFOAM_ISLANDS_1F 156
+#define LAYOUT_SEAFOAM_ISLANDS_B1F 157
+#define LAYOUT_SEAFOAM_ISLANDS_B2F 158
+#define LAYOUT_SEAFOAM_ISLANDS_B3F 159
+#define LAYOUT_SEAFOAM_ISLANDS_B4F 160
+#define LAYOUT_POKEMON_TOWER_1F 161
+#define LAYOUT_POKEMON_TOWER_2F 162
+#define LAYOUT_POKEMON_TOWER_3F 163
+#define LAYOUT_POKEMON_TOWER_4F 164
+#define LAYOUT_POKEMON_TOWER_5F 165
+#define LAYOUT_POKEMON_TOWER_6F 166
+#define LAYOUT_POKEMON_TOWER_7F 167
+#define LAYOUT_POWER_PLANT 168
+#define LAYOUT_ROUTE25_SEA_COTTAGE 169
 #define LAYOUT_SSANNE_KITCHEN 170
-#define LAYOUT_SSANNE_CAPTAINSOFFICE 171
-#define LAYOUT_UNDERGROUNDPATH_ENTRANCE 172
-#define LAYOUT_UNDERGROUNDPATH_EASTWESTTUNNEL 173
-#define LAYOUT_UNDERGROUNDPATH_NORTHSOUTHTUNNEL 174
-#define LAYOUT_ROUTE12_NORTHENTRANCE_1F 176
+#define LAYOUT_SSANNE_CAPTAINS_OFFICE 171
+#define LAYOUT_UNDERGROUND_PATH_ENTRANCE 172
+#define LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL 173
+#define LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL 174
+#define LAYOUT_ROUTE12_NORTH_ENTRANCE_1F 176
 #define LAYOUT_SSANNE_ROOM1 177
 #define LAYOUT_SSANNE_ROOM2 178
-#define LAYOUT_CELADONCITY_DEPARTMENTSTORE_ELEVATOR 179
-#define LAYOUT_PEWTERCITY_MUSEUM_1F 180
-#define LAYOUT_PEWTERCITY_MUSEUM_2F 181
-#define LAYOUT_CERULEANCITY_HOUSE2 182
-#define LAYOUT_CERULEANCITY_HOUSE1 183
-#define LAYOUT_CELADONCITY_CONDOMINIUMS_1F 184
-#define LAYOUT_CELADONCITY_CONDOMINIUMS_2F 185
-#define LAYOUT_CELADONCITY_CONDOMINIUMS_3F 186
-#define LAYOUT_CELADONCITY_CONDOMINIUMS_ROOF 187
-#define LAYOUT_CELADONCITY_CONDOMINIUMS_ROOFROOM 188
-#define LAYOUT_CELADONCITY_GAMECORNER_PRIZEROOM 189
-#define LAYOUT_CELADONCITY_RESTAURANT 190
-#define LAYOUT_CELADONCITY_HOTEL 191
-#define LAYOUT_CELADONCITY_DEPARTMENTSTORE_1F 192
-#define LAYOUT_CELADONCITY_DEPARTMENTSTORE_2F 193
-#define LAYOUT_CELADONCITY_DEPARTMENTSTORE_3F 194
-#define LAYOUT_CELADONCITY_DEPARTMENTSTORE_4F 195
-#define LAYOUT_CELADONCITY_DEPARTMENTSTORE_5F 196
-#define LAYOUT_CELADONCITY_DEPARTMENTSTORE_ROOF 197
-#define LAYOUT_SAFARIZONE_BUILDING 198
-#define LAYOUT_SAFARIZONE_SECRETHOUSE 199
-#define LAYOUT_FUCHSIACITY_ZOOBUILDING 200
-#define LAYOUT_FUCHSIACITY_BUILDING1 201
-#define LAYOUT_FUCHSIACITY_HOUSE2 202
-#define LAYOUT_CINNABARISLAND_POKEMONLAB_ENTRANCE 203
-#define LAYOUT_CINNABARISLAND_POKEMONLAB_LOUNGE 204
-#define LAYOUT_CINNABARISLAND_POKEMONLAB_RESEARCHROOM 205
-#define LAYOUT_CINNABARISLAND_POKEMONLAB_EXPERIMENTROOM 206
-#define LAYOUT_SAFFRONCITY_DUPLICATE 207
-#define LAYOUT_SAFFRONCITY_NORTHSOUTHENTRANCE 208
-#define LAYOUT_SAFFRONCITY_EASTWESTENTRANCE 209
-#define LAYOUT_DIGLETTSCAVE_NORTHENTRANCE 210
-#define LAYOUT_DIGLETTSCAVE_SOUTHENTRANCE 211
-#define LAYOUT_INDIGOPLATEAU_POKEMONCENTER_1F 212
-#define LAYOUT_POKEMONLEAGUE_LORELEISROOM 213
-#define LAYOUT_POKEMONLEAGUE_BRUNOSROOM 214
-#define LAYOUT_POKEMONLEAGUE_AGATHASROOM 215
-#define LAYOUT_POKEMONLEAGUE_LANCESROOM 216
-#define LAYOUT_POKEMONLEAGUE_CHAMPIONSROOM 217
-#define LAYOUT_POKEMONLEAGUE_HALLOFFAME 218
+#define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR 179
+#define LAYOUT_PEWTER_CITY_MUSEUM_1F 180
+#define LAYOUT_PEWTER_CITY_MUSEUM_2F 181
+#define LAYOUT_CERULEAN_CITY_HOUSE2 182
+#define LAYOUT_CERULEAN_CITY_HOUSE1 183
+#define LAYOUT_CELADON_CITY_CONDOMINIUMS_1F 184
+#define LAYOUT_CELADON_CITY_CONDOMINIUMS_2F 185
+#define LAYOUT_CELADON_CITY_CONDOMINIUMS_3F 186
+#define LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF 187
+#define LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM 188
+#define LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM 189
+#define LAYOUT_CELADON_CITY_RESTAURANT 190
+#define LAYOUT_CELADON_CITY_HOTEL 191
+#define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F 192
+#define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F 193
+#define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F 194
+#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_SECRET_HOUSE 199
+#define LAYOUT_FUCHSIA_CITY_ZOO_BUILDING 200
+#define LAYOUT_FUCHSIA_CITY_BUILDING1 201
+#define LAYOUT_FUCHSIA_CITY_HOUSE2 202
+#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE 203
+#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_NORTH_SOUTH_ENTRANCE 208
+#define LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE 209
+#define LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE 210
+#define LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE 211
+#define LAYOUT_INDIGO_PLATEAU_POKEMON_CENTER_1F 212
+#define LAYOUT_POKEMON_LEAGUE_LORELEIS_ROOM 213
+#define LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM 214
+#define LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM 215
+#define LAYOUT_POKEMON_LEAGUE_LANCES_ROOM 216
+#define LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM 217
+#define LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME 218
 #define LAYOUT_ROUTE21_SOUTH 219
 #define LAYOUT_ENTRANCE_2F 220
 #define LAYOUT_ROUTE2_ENTRANCE 221
-#define LAYOUT_ROUTE22_NORTHENTRANCE 222
-#define LAYOUT_ROUTE16_NORTHENTRANCE_1F 223
+#define LAYOUT_ROUTE22_NORTH_ENTRANCE 222
+#define LAYOUT_ROUTE16_NORTH_ENTRANCE_1F 223
 #define LAYOUT_ENTRANCE_1F 224
-#define LAYOUT_ROCKETHIDEOUT_ELEVATOR 225
-#define LAYOUT_SAFFRONCITY_HOUSE1_1F 226
-#define LAYOUT_SAFFRONCITY_HOUSE1_2F 227
-#define LAYOUT_SAFFRONCITY_DOJO 228
-#define LAYOUT_SILPHCO_ELEVATOR 229
-#define LAYOUT_ONEISLAND 230
-#define LAYOUT_TWOISLAND 231
-#define LAYOUT_THREEISLAND 232
-#define LAYOUT_FOURISLAND 233
-#define LAYOUT_FIVEISLAND 234
-#define LAYOUT_SEVENISLAND 235
-#define LAYOUT_SIXISLAND 236
-#define LAYOUT_ONEISLAND_KINDLEROAD 237
-#define LAYOUT_ONEISLAND_TREASUREBEACH 238
-#define LAYOUT_TWOISLAND_CAPEBRINK 239
-#define LAYOUT_THREEISLAND_BONDBRIDGE 240
-#define LAYOUT_THREEISLAND_PORT 241
-#define LAYOUT_UNKNOWNMAP_03_50 242
-#define LAYOUT_UNKNOWNMAP_03_51 243
-#define LAYOUT_UNKNOWNMAP_03_52 244
-#define LAYOUT_UNKNOWNMAP_03_53 245
-#define LAYOUT_FIVEISLAND_RESORTGORGEOUS 246
-#define LAYOUT_FIVEISLAND_WATERLABYRINTH 247
-#define LAYOUT_FIVEISLAND_MEADOW 248
-#define LAYOUT_FIVEISLAND_MEMORIALPILLAR 249
-#define LAYOUT_SIXISLAND_OUTCASTISLAND 250
-#define LAYOUT_SIXISLAND_GREENPATH 251
-#define LAYOUT_SIXISLAND_WATERPATH 252
-#define LAYOUT_SIXISLAND_RUINVALLEY 253
-#define LAYOUT_SEVENISLAND_TRAINERTOWER 254
-#define LAYOUT_SEVENISLAND_SEVAULTCANYON_ENTRANCE 255
-#define LAYOUT_SEVENISLAND_SEVAULTCANYON 256
-#define LAYOUT_SEVENISLAND_TANOBYRUINS 257
-#define LAYOUT_UNUSEDLAYOUT_833614C 258
-#define LAYOUT_UNUSEDLAYOUT_83377F0 259
-#define LAYOUT_UNUSEDLAYOUT_8338354 260
-#define LAYOUT_UNUSEDLAYOUT_8338738 261
-#define LAYOUT_UNKNOWNMAP_00_04 262
-#define LAYOUT_SAFFRONCITY_POKEMONTRAINERFANCLUB 263
-#define LAYOUT_UNUSEDLAYOUT_8338B4C 264
-#define LAYOUT_SEVENISLAND_HOUSE_ROOM2 265
-#define LAYOUT_VIRIDIANCITY_HOUSE2 266
-#define LAYOUT_UNUSEDLAYOUT_8338E90 267
-#define LAYOUT_UNUSEDLAYOUT_833902C 268
-#define LAYOUT_MTEMBER_RUBYPATH_B4F 269
-#define LAYOUT_THREEISLAND_BERRYFOREST 270
-#define LAYOUT_ONEISLAND_POKEMONCENTER_1F 271
-#define LAYOUT_TWOISLAND_JOYFULGAMECORNER 272
-#define LAYOUT_VERMILIONCITY_POKEMONFANCLUB 273
-#define LAYOUT_LAVENDERTOWN_VOLUNTEERPOKEMONHOUSE 274
-#define LAYOUT_ROUTE5_POKEMONDAYCARE 275
-#define LAYOUT_VIRIDIANCITY_HOUSE1 276
-#define LAYOUT_FOURISLAND_POKEMONDAYCARE 277
-#define LAYOUT_UNUSEDLAYOUT_833B6EC 278
-#define LAYOUT_UNUSEDLAYOUT_833BE30 279
-#define LAYOUT_MTEMBER_EXTERIOR 280
-#define LAYOUT_MTEMBER_SUMMIT 281
-#define LAYOUT_MTEMBER_SUMMITPATH_1F 282
-#define LAYOUT_MTEMBER_SUMMITPATH_2F 283
-#define LAYOUT_MTEMBER_SUMMITPATH_3F 284
+#define LAYOUT_ROCKET_HIDEOUT_ELEVATOR 225
+#define LAYOUT_SAFFRON_CITY_HOUSE1_1F 226
+#define LAYOUT_SAFFRON_CITY_HOUSE1_2F 227
+#define LAYOUT_SAFFRON_CITY_DOJO 228
+#define LAYOUT_SILPH_CO_ELEVATOR 229
+#define LAYOUT_ONE_ISLAND 230
+#define LAYOUT_TWO_ISLAND 231
+#define LAYOUT_THREE_ISLAND 232
+#define LAYOUT_FOUR_ISLAND 233
+#define LAYOUT_FIVE_ISLAND 234
+#define LAYOUT_SEVEN_ISLAND 235
+#define LAYOUT_SIX_ISLAND 236
+#define LAYOUT_ONE_ISLAND_KINDLE_ROAD 237
+#define LAYOUT_ONE_ISLAND_TREASURE_BEACH 238
+#define LAYOUT_TWO_ISLAND_CAPE_BRINK 239
+#define LAYOUT_THREE_ISLAND_BOND_BRIDGE 240
+#define LAYOUT_THREE_ISLAND_PORT 241
+#define LAYOUT_UNKNOWN_MAP_03_50 242
+#define LAYOUT_UNKNOWN_MAP_03_51 243
+#define LAYOUT_UNKNOWN_MAP_03_52 244
+#define LAYOUT_UNKNOWN_MAP_03_53 245
+#define LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS 246
+#define LAYOUT_FIVE_ISLAND_WATER_LABYRINTH 247
+#define LAYOUT_FIVE_ISLAND_MEADOW 248
+#define LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR 249
+#define LAYOUT_SIX_ISLAND_OUTCAST_ISLAND 250
+#define LAYOUT_SIX_ISLAND_GREEN_PATH 251
+#define LAYOUT_SIX_ISLAND_WATER_PATH 252
+#define LAYOUT_SIX_ISLAND_RUIN_VALLEY 253
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER 254
+#define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE 255
+#define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON 256
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS 257
+#define LAYOUT_UNUSED_LAYOUT_833614C 258
+#define LAYOUT_UNUSED_LAYOUT_83377F0 259
+#define LAYOUT_UNUSED_LAYOUT_8338354 260
+#define LAYOUT_UNUSED_LAYOUT_8338738 261
+#define LAYOUT_UNKNOWN_MAP_00_04 262
+#define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263
+#define LAYOUT_UNUSED_LAYOUT_8338B4C 264
+#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265
+#define LAYOUT_VIRIDIAN_CITY_HOUSE2 266
+#define LAYOUT_UNUSED_LAYOUT_8338E90 267
+#define LAYOUT_UNUSED_LAYOUT_833902C 268
+#define LAYOUT_MT_EMBER_RUBY_PATH_B4F 269
+#define LAYOUT_THREE_ISLAND_BERRY_FOREST 270
+#define LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F 271
+#define LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER 272
+#define LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB 273
+#define LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE 274
+#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_MT_EMBER_EXTERIOR 280
+#define LAYOUT_MT_EMBER_SUMMIT 281
+#define LAYOUT_MT_EMBER_SUMMIT_PATH_1F 282
+#define LAYOUT_MT_EMBER_SUMMIT_PATH_2F 283
+#define LAYOUT_MT_EMBER_SUMMIT_PATH_3F 284
 #define LAYOUT_SSANNE_KITCHEN3 285
-#define LAYOUT_MTEMBER_RUBYPATH_B1F 286
-#define LAYOUT_MTEMBER_RUBYPATH_B2F 287
-#define LAYOUT_MTEMBER_RUBYPATH_B3F 288
-#define LAYOUT_MTEMBER_RUBYPATH_B1F_STAIRS 289
-#define LAYOUT_MTEMBER_RUBYPATH_B2F_STAIRS 290
-#define LAYOUT_MTEMBER_RUBYPATH_B5F 291
-#define LAYOUT_SSANNE_CAPTAINSOFFICE4 292
-#define LAYOUT_FOURISLAND_ICEFALLCAVE_ENTRANCE 293
-#define LAYOUT_FOURISLAND_ICEFALLCAVE_1F 294
-#define LAYOUT_SSANNE_CAPTAINSOFFICE2 295
-#define LAYOUT_SSANNE_CAPTAINSOFFICE3 296
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_LOBBY 297
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_1F 298
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_2F 299
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_3F 300
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_4F 301
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_5F 302
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_6F 303
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_7F 304
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_8F 305
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_ROOF 306
-#define LAYOUT_SEVENISLAND_TRAINERTOWER_ELEVATOR 307
-#define LAYOUT_CERULEANCITY_HOUSE5 308
-#define LAYOUT_SSANNE_CAPTAINSOFFICE5 309
-#define LAYOUT_SIXISLAND_DOTTEDHOLE_B1F 310
-#define LAYOUT_SIXISLAND_DOTTEDHOLE_B2F 311
-#define LAYOUT_SIXISLAND_DOTTEDHOLE_B3F 312
-#define LAYOUT_SSANNE_CAPTAINSOFFICE9 313
-#define LAYOUT_SIXISLAND_DOTTEDHOLE_SAPPHIREROOM 314
+#define LAYOUT_MT_EMBER_RUBY_PATH_B1F 286
+#define LAYOUT_MT_EMBER_RUBY_PATH_B2F 287
+#define LAYOUT_MT_EMBER_RUBY_PATH_B3F 288
+#define LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS 289
+#define LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS 290
+#define LAYOUT_MT_EMBER_RUBY_PATH_B5F 291
+#define LAYOUT_SSANNE_CAPTAINS_OFFICE4 292
+#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE 293
+#define LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F 294
+#define LAYOUT_SSANNE_CAPTAINS_OFFICE2 295
+#define LAYOUT_SSANNE_CAPTAINS_OFFICE3 296
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 297
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F 298
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F 299
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F 300
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F 301
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F 302
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F 303
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F 304
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F 305
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF 306
+#define LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR 307
+#define LAYOUT_CERULEAN_CITY_HOUSE5 308
+#define LAYOUT_SSANNE_CAPTAINS_OFFICE5 309
+#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F 310
+#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F 311
+#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F 312
+#define LAYOUT_SSANNE_CAPTAINS_OFFICE9 313
+#define LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM 314
 #define LAYOUT_ISLAND_HARBOR 315
-#define LAYOUT_ONEISLAND_POKEMONCENTER_2F 316
+#define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316
 #define LAYOUT_SSANNE_1F_ROOM11 317
-#define LAYOUT_THREEISLAND_DUNSPARCETUNNEL 318
-#define LAYOUT_UNUSEDLAYOUT_83453C0 319
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ENTRANCE 320
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM1 321
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM2 322
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM3 323
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM4 324
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM5 325
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM6 326
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM7 327
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM8 328
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM9 329
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM10 330
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM11 331
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM12 332
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM13 333
-#define LAYOUT_FIVEISLAND_LOSTCAVE_ROOM14 334
-#define LAYOUT_SEVENISLAND_TANOBYRUINS_MONEANCHAMBER 335
-#define LAYOUT_SEVENISLAND_TANOBYRUINS_LIPTOOCHAMBER 336
-#define LAYOUT_SEVENISLAND_TANOBYRUINS_WEEPTHCHAMBER 337
-#define LAYOUT_SEVENISLAND_TANOBYRUINS_DILFORDCHAMBER 338
-#define LAYOUT_SEVENISLAND_TANOBYRUINS_SCUFIBCHAMBER 339
+#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318
+#define LAYOUT_UNUSED_LAYOUT_83453C0 319
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3 323
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4 324
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5 325
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6 326
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7 327
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8 328
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9 329
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10 330
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11 331
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12 332
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13 333
+#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14 334
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER 335
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER 336
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER 337
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER 338
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER 339
 #define LAYOUT_SSANNE_1F_ROOM12 340
-#define LAYOUT_SEVENISLAND_SEAVAULTCANYON_TANOBYKEY 341
-#define LAYOUT_BIRTHISLAND_EXTERIOR 342
-#define LAYOUT_NAVELROCK_EXTERIOR 343
-#define LAYOUT_NAVELROCK_1F 344
-#define LAYOUT_NAVELROCK_SUMMIT 345
-#define LAYOUT_NAVELROCK_BASE 346
-#define LAYOUT_NAVELROCK_SUMMITPATH_2F 347
-#define LAYOUT_NAVELROCK_SUMMITPATH_3F 348
-#define LAYOUT_NAVELROCK_SUMMITPATH_4F 349
-#define LAYOUT_NAVELROCK_SUMMITPATH_5F 350
-#define LAYOUT_NAVELROCK_BASEPATH_B1F 351
-#define LAYOUT_NAVELROCK_BASEPATH_B2F 352
-#define LAYOUT_NAVELROCK_BASEPATH_B3F 353
-#define LAYOUT_NAVELROCK_BASEPATH_B4F 354
-#define LAYOUT_NAVELROCK_BASEPATH_B5F 355
-#define LAYOUT_NAVELROCK_BASEPATH_B6F 356
-#define LAYOUT_NAVELROCK_BASEPATH_B7F 357
-#define LAYOUT_NAVELROCK_BASEPATH_B8F 358
-#define LAYOUT_NAVELROCK_BASEPATH_B9F 359
-#define LAYOUT_NAVELROCK_BASEPATH_B10F 360
-#define LAYOUT_NAVELROCK_BASEPATH_B11F 361
-#define LAYOUT_SEVENISLAND_TANOBYRUINS_RIXYCHAMBER 362
-#define LAYOUT_SEVENISLAND_TANOBYRUINS_VIAPOISCHAMBER 363
-#define LAYOUT_NAVELROCK_B1F 364
-#define LAYOUT_NAVELROCK_FORK 365
-#define LAYOUT_UNUSEDLAYOUT_834BC2C 366
-#define LAYOUT_UNUSEDLAYOUT_834BEB4 367
-#define LAYOUT_UNUSEDLAYOUT_834C13C 368
-#define LAYOUT_UNUSEDLAYOUT_834C3C4 369
-#define LAYOUT_UNUSEDLAYOUT_834C64C 370
-#define LAYOUT_UNUSEDLAYOUT_834C8D4 371
-#define LAYOUT_UNUSEDLAYOUT_834CB5C 372
-#define LAYOUT_UNUSEDLAYOUT_834CDE4 373
-#define LAYOUT_UNUSEDLAYOUT_834D06C 374
-#define LAYOUT_UNUSEDLAYOUT_834D2F4 375
-#define LAYOUT_UNUSEDLAYOUT_834D57C 376
-#define LAYOUT_UNUSEDLAYOUT_834D804 377
-#define LAYOUT_UNUSEDLAYOUT_834DA8C 378
-#define LAYOUT_UNUSEDLAYOUT_834DD14 379
-#define LAYOUT_UNUSEDLAYOUT_834DF9C 380
-#define LAYOUT_UNUSEDLAYOUT_834E224 381
-#define LAYOUT_SEVENISLAND_HOUSE_ROOM1 382
-#define LAYOUT_ONEISLAND_KINDLEROAD_EMBERSPA 383
+#define LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY 341
+#define LAYOUT_BIRTH_ISLAND_EXTERIOR 342
+#define LAYOUT_NAVEL_ROCK_EXTERIOR 343
+#define LAYOUT_NAVEL_ROCK_1F 344
+#define LAYOUT_NAVEL_ROCK_SUMMIT 345
+#define LAYOUT_NAVEL_ROCK_BASE 346
+#define LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F 347
+#define LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F 348
+#define LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F 349
+#define LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F 350
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B1F 351
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B2F 352
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B3F 353
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B4F 354
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B5F 355
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B6F 356
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B7F 357
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B8F 358
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B9F 359
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B10F 360
+#define LAYOUT_NAVEL_ROCK_BASE_PATH_B11F 361
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER 362
+#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER 363
+#define LAYOUT_NAVEL_ROCK_B1F 364
+#define LAYOUT_NAVEL_ROCK_FORK 365
+#define LAYOUT_UNUSED_LAYOUT_834BC2C 366
+#define LAYOUT_UNUSED_LAYOUT_834BEB4 367
+#define LAYOUT_UNUSED_LAYOUT_834C13C 368
+#define LAYOUT_UNUSED_LAYOUT_834C3C4 369
+#define LAYOUT_UNUSED_LAYOUT_834C64C 370
+#define LAYOUT_UNUSED_LAYOUT_834C8D4 371
+#define LAYOUT_UNUSED_LAYOUT_834CB5C 372
+#define LAYOUT_UNUSED_LAYOUT_834CDE4 373
+#define LAYOUT_UNUSED_LAYOUT_834D06C 374
+#define LAYOUT_UNUSED_LAYOUT_834D2F4 375
+#define LAYOUT_UNUSED_LAYOUT_834D57C 376
+#define LAYOUT_UNUSED_LAYOUT_834D804 377
+#define LAYOUT_UNUSED_LAYOUT_834DA8C 378
+#define LAYOUT_UNUSED_LAYOUT_834DD14 379
+#define LAYOUT_UNUSED_LAYOUT_834DF9C 380
+#define LAYOUT_UNUSED_LAYOUT_834E224 381
+#define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1 382
+#define LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA 383
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H