1 files changed, 15 insertions, 15 deletions
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index d4819c46a..3e876f499 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -221,22 +221,22 @@
 #define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218
 #define LAYOUT_SECRET_BASE_TREE4 219
 #define LAYOUT_SECRET_BASE_SHRUB4 220
-#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221
+#define LAYOUT_BATTLE_COLOSSEUM_2P 221
 #define LAYOUT_TRADE_CENTER 222
 #define LAYOUT_RECORD_CORNER 223
-#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224
-#define LAYOUT_LINK_CONTEST_ROOM1 225
+#define LAYOUT_BATTLE_COLOSSEUM_4P 224
+#define LAYOUT_CONTEST_HALL 225
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231
-#define LAYOUT_LINK_CONTEST_ROOM2 232
-#define LAYOUT_LINK_CONTEST_ROOM3 233
-#define LAYOUT_LINK_CONTEST_ROOM4 234
-#define LAYOUT_LINK_CONTEST_ROOM5 235
-#define LAYOUT_LINK_CONTEST_ROOM6 236
+#define LAYOUT_CONTEST_HALL_BEAUTY 232
+#define LAYOUT_CONTEST_HALL_TOUGH 233
+#define LAYOUT_CONTEST_HALL_COOL 234
+#define LAYOUT_CONTEST_HALL_SMART 235
+#define LAYOUT_CONTEST_HALL_CUTE 236
 #define LAYOUT_INSIDE_OF_TRUCK 237
 #define LAYOUT_SAFARI_ZONE_NORTHWEST 238
 #define LAYOUT_SAFARI_ZONE_NORTH 239
@@ -352,16 +352,16 @@
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY 349
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR 350
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM 351
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 352
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 353
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL 352
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL 353
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356
 #define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358
 #define LAYOUT_UNKNOWN_084693AC 359
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR 361
 #define LAYOUT_BATTLE_PYRAMID_SQUARE01 362
 #define LAYOUT_BATTLE_PYRAMID_SQUARE02 363
 #define LAYOUT_BATTLE_PYRAMID_SQUARE03 364
@@ -390,15 +390,15 @@
 #define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387
 #define LAYOUT_MIRAGE_TOWER_4F 388
 #define LAYOUT_DESERT_UNDERPASS 389
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM 390
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 391
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM 390
+#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR 391
 #define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392
 #define LAYOUT_UNION_ROOM 393
 #define LAYOUT_SAFARI_ZONE_NORTHEAST 394
 #define LAYOUT_SAFARI_ZONE_SOUTHEAST 395
 #define LAYOUT_BATTLE_FRONTIER_RANKING_HALL 396
 #define LAYOUT_BATTLE_FRONTIER_LOUNGE1 397
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER 398
+#define LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER 398
 #define LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE 399
 #define LAYOUT_ARTISAN_CAVE_B1F 400
 #define LAYOUT_ARTISAN_CAVE_1F 401