13 files changed, 24 insertions, 24 deletions
diff --git a/data/layouts/LinkContestRoom1/border.bin b/data/layouts/ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom1/border.bin
+++ b/data/layouts/ContestHall/border.bin
diff --git a/data/layouts/LinkContestRoom1/map.bin b/data/layouts/ContestHall/map.bin
index a8853f6ae..a8853f6ae 100644
--- a/data/layouts/LinkContestRoom1/map.bin
+++ b/data/layouts/ContestHall/map.bin
diff --git a/data/layouts/LinkContestRoom2/border.bin b/data/layouts/ContestHallBeauty/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom2/border.bin
+++ b/data/layouts/ContestHallBeauty/border.bin
diff --git a/data/layouts/LinkContestRoom2/map.bin b/data/layouts/ContestHallBeauty/map.bin
index 7cb63b40d..7cb63b40d 100644
--- a/data/layouts/LinkContestRoom2/map.bin
+++ b/data/layouts/ContestHallBeauty/map.bin
diff --git a/data/layouts/LinkContestRoom3/border.bin b/data/layouts/ContestHallCool/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom3/border.bin
+++ b/data/layouts/ContestHallCool/border.bin
diff --git a/data/layouts/LinkContestRoom4/map.bin b/data/layouts/ContestHallCool/map.bin
index 4e2166c19..4e2166c19 100644
--- a/data/layouts/LinkContestRoom4/map.bin
+++ b/data/layouts/ContestHallCool/map.bin
diff --git a/data/layouts/LinkContestRoom4/border.bin b/data/layouts/ContestHallCute/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom4/border.bin
+++ b/data/layouts/ContestHallCute/border.bin
diff --git a/data/layouts/LinkContestRoom6/map.bin b/data/layouts/ContestHallCute/map.bin
index 9fcec5a5e..9fcec5a5e 100644
--- a/data/layouts/LinkContestRoom6/map.bin
+++ b/data/layouts/ContestHallCute/map.bin
diff --git a/data/layouts/LinkContestRoom5/border.bin b/data/layouts/ContestHallSmart/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom5/border.bin
+++ b/data/layouts/ContestHallSmart/border.bin
diff --git a/data/layouts/LinkContestRoom5/map.bin b/data/layouts/ContestHallSmart/map.bin
index ad068fe7c..ad068fe7c 100644
--- a/data/layouts/LinkContestRoom5/map.bin
+++ b/data/layouts/ContestHallSmart/map.bin
diff --git a/data/layouts/LinkContestRoom6/border.bin b/data/layouts/ContestHallTough/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom6/border.bin
+++ b/data/layouts/ContestHallTough/border.bin
diff --git a/data/layouts/LinkContestRoom3/map.bin b/data/layouts/ContestHallTough/map.bin
index 59e9e9182..59e9e9182 100644
--- a/data/layouts/LinkContestRoom3/map.bin
+++ b/data/layouts/ContestHallTough/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 5a696d5e0..6e6f92117 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -2242,14 +2242,14 @@
       "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM1",
-      "name": "LinkContestRoom1_Layout",
+      "id": "LAYOUT_CONTEST_HALL",
+      "name": "ContestHall_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom1/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
+      "border_filepath": "data/layouts/ContestHall/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHall/map.bin"
     },
     {
       "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
@@ -2312,54 +2312,54 @@
       "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM2",
-      "name": "LinkContestRoom2_Layout",
+      "id": "LAYOUT_CONTEST_HALL_BEAUTY",
+      "name": "ContestHallBeauty_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom2/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin"
+      "border_filepath": "data/layouts/ContestHallBeauty/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallBeauty/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM3",
-      "name": "LinkContestRoom3_Layout",
+      "id": "LAYOUT_CONTEST_HALL_TOUGH",
+      "name": "ContestHallTough_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom3/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin"
+      "border_filepath": "data/layouts/ContestHallTough/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallTough/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM4",
-      "name": "LinkContestRoom4_Layout",
+      "id": "LAYOUT_CONTEST_HALL_COOL",
+      "name": "ContestHallCool_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom4/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin"
+      "border_filepath": "data/layouts/ContestHallCool/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallCool/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM5",
-      "name": "LinkContestRoom5_Layout",
+      "id": "LAYOUT_CONTEST_HALL_SMART",
+      "name": "ContestHallSmart_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom5/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin"
+      "border_filepath": "data/layouts/ContestHallSmart/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallSmart/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM6",
-      "name": "LinkContestRoom6_Layout",
+      "id": "LAYOUT_CONTEST_HALL_CUTE",
+      "name": "ContestHallCute_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom6/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin"
+      "border_filepath": "data/layouts/ContestHallCute/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallCute/map.bin"
     },
     {
       "id": "LAYOUT_INSIDE_OF_TRUCK",