Give proper names to dynamic map layouts

104 files changed, 227 insertions, 227 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index cf9590ce5..8d8b0cd68 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -636,12 +636,12 @@ SecretBase_RedCave1_Text_23B759: @ 823B759
 	.include "data/maps/RecordCorner/scripts.inc"
 	.include "data/maps/DoubleBattleColosseum/scripts.inc"
 	.include "data/maps/LinkContestRoom1/scripts.inc"
-	.include "data/maps/UnknownMap_25_29/scripts.inc"
-	.include "data/maps/UnknownMap_25_30/scripts.inc"
-	.include "data/maps/UnknownMap_25_31/scripts.inc"
-	.include "data/maps/UnknownMap_25_32/scripts.inc"
-	.include "data/maps/UnknownMap_25_33/scripts.inc"
-	.include "data/maps/UnknownMap_25_34/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc"
 	.include "data/maps/LinkContestRoom2/scripts.inc"
 	.include "data/maps/LinkContestRoom3/scripts.inc"
 	.include "data/maps/LinkContestRoom4/scripts.inc"
diff --git a/data/layouts/UnknownMap_0845A394/border.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
index f1629c020..f1629c020 100644
--- a/data/layouts/UnknownMap_0845A394/border.bin
+++ b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
index fd294d9b6..fd294d9b6 100644
--- a/data/layouts/UnknownMap_0845A394/map.bin
+++ b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
diff --git a/data/layouts/UnknownMap_08428450/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08428450/border.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
index d1277f280..d1277f280 100644
--- a/data/layouts/UnknownMap_08480DAC/map.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/Route130_MirageIsland/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnknownMap_08417FC4/border.bin
+++ b/data/layouts/Route130_MirageIsland/border.bin
diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/Route130_MirageIsland/map.bin
index 17a14a8d5..17a14a8d5 100644
--- a/data/layouts/UnknownMap_08417FC4/map.bin
+++ b/data/layouts/Route130_MirageIsland/map.bin
diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/Route131_SkyPillar/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnknownMap_0845D470/border.bin
+++ b/data/layouts/Route131_SkyPillar/border.bin
diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/Route131_SkyPillar/map.bin
index cd136de41..cd136de41 100644
--- a/data/layouts/UnknownMap_0845D470/map.bin
+++ b/data/layouts/Route131_SkyPillar/map.bin
diff --git a/data/layouts/UnknownMap_0845ECB4/border.bin b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/layouts/UnknownMap_0845ECB4/border.bin
+++ b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
index ec344933f..ec344933f 100644
--- a/data/layouts/UnknownMap_0845ECB4/map.bin
+++ b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/SkyPillar_1F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084294C4/border.bin
+++ b/data/layouts/SkyPillar_1F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/SkyPillar_1F_Clean/map.bin
index f0d9c299c..f0d9c299c 100644
--- a/data/layouts/UnknownMap_08480F54/map.bin
+++ b/data/layouts/SkyPillar_1F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/SkyPillar_2F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084294E8/border.bin
+++ b/data/layouts/SkyPillar_2F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/SkyPillar_2F_Clean/map.bin
index 908158cf4..908158cf4 100644
--- a/data/layouts/UnknownMap_084810FC/map.bin
+++ b/data/layouts/SkyPillar_2F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/SkyPillar_3F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08480DAC/border.bin
+++ b/data/layouts/SkyPillar_3F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/SkyPillar_3F_Clean/map.bin
index d033bc4d2..d033bc4d2 100644
--- a/data/layouts/UnknownMap_084812A4/map.bin
+++ b/data/layouts/SkyPillar_3F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/SkyPillar_4F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08480F54/border.bin
+++ b/data/layouts/SkyPillar_4F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/SkyPillar_4F_Clean/map.bin
index eeccae9ae..eeccae9ae 100644
--- a/data/layouts/UnknownMap_0848144C/map.bin
+++ b/data/layouts/SkyPillar_4F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/SkyPillar_5F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084810FC/border.bin
+++ b/data/layouts/SkyPillar_5F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/SkyPillar_5F_Clean/map.bin
index 8507a4932..8507a4932 100644
--- a/data/layouts/UnknownMap_084815F4/map.bin
+++ b/data/layouts/SkyPillar_5F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/SkyPillar_Top_Clean/border.bin
index e9d1c658c..e9d1c658c 100644
--- a/data/layouts/UnknownMap_08481B24/border.bin
+++ b/data/layouts/SkyPillar_Top_Clean/border.bin
diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/SkyPillar_Top_Clean/map.bin
index 2a47bca91..2a47bca91 100644
--- a/data/layouts/UnknownMap_08481B24/map.bin
+++ b/data/layouts/SkyPillar_Top_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08469200/border.bin b/data/layouts/SootopolisCity_LegendsBattle/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/layouts/UnknownMap_08469200/border.bin
+++ b/data/layouts/SootopolisCity_LegendsBattle/border.bin
diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/SootopolisCity_LegendsBattle/map.bin
index 67085fd37..67085fd37 100644
--- a/data/layouts/UnknownMap_08469200/map.bin
+++ b/data/layouts/SootopolisCity_LegendsBattle/map.bin
diff --git a/data/layouts/UnknownMap_084693AC/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnknownMap_084693AC/border.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
index 603f55c93..603f55c93 100644
--- a/data/layouts/UnknownMap_08481DBC/map.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
diff --git a/data/layouts/UnknownMap_084812A4/border.bin b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084812A4/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_29/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_0848144C/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_30/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
diff --git a/data/layouts/UnknownMap_084815F4/border.bin b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084815F4/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_31/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
diff --git a/data/layouts/UnknownMap_25_29/border.bin b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_29/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_32/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_30/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_33/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_31/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_34/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/Unknown_08428450/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_32/border.bin
+++ b/data/layouts/Unknown_08428450/border.bin
diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/Unknown_08428450/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/UnknownMap_08428450/map.bin
+++ b/data/layouts/Unknown_08428450/map.bin
diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/Unknown_084294C4/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_33/border.bin
+++ b/data/layouts/Unknown_084294C4/border.bin
diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/Unknown_084294C4/map.bin
index 37f05b971..37f05b971 100644
--- a/data/layouts/UnknownMap_084294C4/map.bin
+++ b/data/layouts/Unknown_084294C4/map.bin
diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/Unknown_084294E8/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_34/border.bin
+++ b/data/layouts/Unknown_084294E8/border.bin
diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/Unknown_084294E8/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/UnknownMap_084294E8/map.bin
+++ b/data/layouts/Unknown_084294E8/map.bin
diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/Unknown_0843E6C0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E6C0/border.bin
+++ b/data/layouts/Unknown_0843E6C0/border.bin
diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/Unknown_0843E6C0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E6C0/map.bin
+++ b/data/layouts/Unknown_0843E6C0/map.bin
diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/Unknown_0843E6E4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E6E4/border.bin
+++ b/data/layouts/Unknown_0843E6E4/border.bin
diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/Unknown_0843E6E4/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E6E4/map.bin
+++ b/data/layouts/Unknown_0843E6E4/map.bin
diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/Unknown_0843E708/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E708/border.bin
+++ b/data/layouts/Unknown_0843E708/border.bin
diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/Unknown_0843E708/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E708/map.bin
+++ b/data/layouts/Unknown_0843E708/map.bin
diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/Unknown_0843E72C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E72C/border.bin
+++ b/data/layouts/Unknown_0843E72C/border.bin
diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/Unknown_0843E72C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E72C/map.bin
+++ b/data/layouts/Unknown_0843E72C/map.bin
diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/Unknown_0843E750/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E750/border.bin
+++ b/data/layouts/Unknown_0843E750/border.bin
diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/Unknown_0843E750/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E750/map.bin
+++ b/data/layouts/Unknown_0843E750/map.bin
diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/Unknown_0843E774/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E774/border.bin
+++ b/data/layouts/Unknown_0843E774/border.bin
diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/Unknown_0843E774/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E774/map.bin
+++ b/data/layouts/Unknown_0843E774/map.bin
diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/Unknown_0843E798/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E798/border.bin
+++ b/data/layouts/Unknown_0843E798/border.bin
diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/Unknown_0843E798/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E798/map.bin
+++ b/data/layouts/Unknown_0843E798/map.bin
diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/Unknown_0843E7BC/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E7BC/border.bin
+++ b/data/layouts/Unknown_0843E7BC/border.bin
diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/Unknown_0843E7BC/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E7BC/map.bin
+++ b/data/layouts/Unknown_0843E7BC/map.bin
diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/Unknown_0843E7E0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E7E0/border.bin
+++ b/data/layouts/Unknown_0843E7E0/border.bin
diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/Unknown_0843E7E0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E7E0/map.bin
+++ b/data/layouts/Unknown_0843E7E0/map.bin
diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/Unknown_0843E804/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E804/border.bin
+++ b/data/layouts/Unknown_0843E804/border.bin
diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/Unknown_0843E804/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E804/map.bin
+++ b/data/layouts/Unknown_0843E804/map.bin
diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/Unknown_0843E828/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E828/border.bin
+++ b/data/layouts/Unknown_0843E828/border.bin
diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/Unknown_0843E828/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E828/map.bin
+++ b/data/layouts/Unknown_0843E828/map.bin
diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/Unknown_0843E84C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E84C/border.bin
+++ b/data/layouts/Unknown_0843E84C/border.bin
diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/Unknown_0843E84C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E84C/map.bin
+++ b/data/layouts/Unknown_0843E84C/map.bin
diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/Unknown_0843E870/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E870/border.bin
+++ b/data/layouts/Unknown_0843E870/border.bin
diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/Unknown_0843E870/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E870/map.bin
+++ b/data/layouts/Unknown_0843E870/map.bin
diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/Unknown_0843E894/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E894/border.bin
+++ b/data/layouts/Unknown_0843E894/border.bin
diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/Unknown_0843E894/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E894/map.bin
+++ b/data/layouts/Unknown_0843E894/map.bin
diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/Unknown_08447028/border.bin
index 9e4b3fb7a..9e4b3fb7a 100644
--- a/data/layouts/UnknownMap_08447028/border.bin
+++ b/data/layouts/Unknown_08447028/border.bin
diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/Unknown_08447028/map.bin
index 028da0526..028da0526 100644
--- a/data/layouts/UnknownMap_08447028/map.bin
+++ b/data/layouts/Unknown_08447028/map.bin
diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/Unknown_084693AC/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnknownMap_08481DBC/border.bin
+++ b/data/layouts/Unknown_084693AC/border.bin
diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/Unknown_084693AC/map.bin
index a179d8997..a179d8997 100644
--- a/data/layouts/UnknownMap_084693AC/map.bin
+++ b/data/layouts/Unknown_084693AC/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index b6e31981d..353b9a284 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -452,14 +452,14 @@
       "blockdata_filepath": "data/layouts/Route129/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08417FC4",
-      "name": "UnknownMap_08417FC4_Layout",
+      "id": "LAYOUT_ROUTE130_MIRAGE_ISLAND",
+      "name": "Route130_MirageIsland_Layout",
       "width": 80,
       "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.bin"
+      "border_filepath": "data/layouts/Route130_MirageIsland/border.bin",
+      "blockdata_filepath": "data/layouts/Route130_MirageIsland/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE131",
@@ -742,14 +742,14 @@
       "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08428450",
-      "name": "UnknownMap_08428450_Layout",
+      "id": "LAYOUT_UNKNOWN_08428450",
+      "name": "Unknown_08428450_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_08428450/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.bin"
+      "border_filepath": "data/layouts/Unknown_08428450/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_08428450/map.bin"
     },
     {
       "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE",
@@ -822,24 +822,24 @@
       "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084294C4",
-      "name": "UnknownMap_084294C4_Layout",
+      "id": "LAYOUT_UNKNOWN_084294C4",
+      "name": "Unknown_084294C4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin"
+      "border_filepath": "data/layouts/Unknown_084294C4/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084294E8",
-      "name": "UnknownMap_084294E8_Layout",
+      "id": "LAYOUT_UNKNOWN_084294E8",
+      "name": "Unknown_084294E8_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.bin"
+      "border_filepath": "data/layouts/Unknown_084294E8/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084294E8/map.bin"
     },
     {
       "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB",
@@ -1692,144 +1692,144 @@
       "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E6C0",
-      "name": "UnknownMap_0843E6C0_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E6C0",
+      "name": "Unknown_0843E6C0_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E6C0/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E6E4",
-      "name": "UnknownMap_0843E6E4_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E6E4",
+      "name": "Unknown_0843E6E4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E6E4/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E708",
-      "name": "UnknownMap_0843E708_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E708",
+      "name": "Unknown_0843E708_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E708/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E72C",
-      "name": "UnknownMap_0843E72C_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E72C",
+      "name": "Unknown_0843E72C_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E72C/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E750",
-      "name": "UnknownMap_0843E750_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E750",
+      "name": "Unknown_0843E750_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E750/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E774",
-      "name": "UnknownMap_0843E774_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E774",
+      "name": "Unknown_0843E774_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E774/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E798",
-      "name": "UnknownMap_0843E798_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E798",
+      "name": "Unknown_0843E798_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E798/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E7BC",
-      "name": "UnknownMap_0843E7BC_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E7BC",
+      "name": "Unknown_0843E7BC_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E7BC/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E7E0",
-      "name": "UnknownMap_0843E7E0_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E7E0",
+      "name": "Unknown_0843E7E0_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E7E0/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E804",
-      "name": "UnknownMap_0843E804_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E804",
+      "name": "Unknown_0843E804_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E804/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E828",
-      "name": "UnknownMap_0843E828_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E828",
+      "name": "Unknown_0843E828_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E828/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E84C",
-      "name": "UnknownMap_0843E84C_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E84C",
+      "name": "Unknown_0843E84C_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E84C/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E870",
-      "name": "UnknownMap_0843E870_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E870",
+      "name": "Unknown_0843E870_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E870/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E894",
-      "name": "UnknownMap_0843E894_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E894",
+      "name": "Unknown_0843E894_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E894/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E894/map.bin"
     },
     {
       "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE",
@@ -2252,64 +2252,64 @@
       "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_29",
-      "name": "UnknownMap_25_29_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
+      "name": "UnknownLinkContestRoom_25_29_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_29/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_30",
-      "name": "UnknownMap_25_30_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
+      "name": "UnknownLinkContestRoom_25_30_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_30/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_31",
-      "name": "UnknownMap_25_31_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
+      "name": "UnknownLinkContestRoom_25_31_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_31/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_32",
-      "name": "UnknownMap_25_32_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
+      "name": "UnknownLinkContestRoom_25_32_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_32/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_33",
-      "name": "UnknownMap_25_33_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
+      "name": "UnknownLinkContestRoom_25_33_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_33/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_34",
-      "name": "UnknownMap_25_34_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
+      "name": "UnknownLinkContestRoom_25_34_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_34/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
     },
     {
       "id": "LAYOUT_LINK_CONTEST_ROOM2",
@@ -2412,14 +2412,14 @@
       "blockdata_filepath": "data/layouts/SafariZone_South/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08447028",
-      "name": "UnknownMap_08447028_Layout",
+      "id": "LAYOUT_UNKNOWN_08447028",
+      "name": "Unknown_08447028_Layout",
       "width": 58,
       "height": 26,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "0",
-      "border_filepath": "data/layouts/UnknownMap_08447028/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.bin"
+      "border_filepath": "data/layouts/Unknown_08447028/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_08447028/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE",
@@ -3112,14 +3112,14 @@
       "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0845A394",
-      "name": "UnknownMap_0845A394_Layout",
+      "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA",
+      "name": "CaveOfOrigin_Unused_B4F_Lava_Layout",
       "width": 19,
       "height": 19,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.bin"
+      "border_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin"
     },
     {
       "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
@@ -3182,14 +3182,14 @@
       "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0845D470",
-      "name": "UnknownMap_0845D470_Layout",
+      "id": "LAYOUT_ROUTE131_SKY_PILLAR",
+      "name": "Route131_SkyPillar_Layout",
       "width": 60,
       "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.bin"
+      "border_filepath": "data/layouts/Route131_SkyPillar/border.bin",
+      "blockdata_filepath": "data/layouts/Route131_SkyPillar/map.bin"
     },
     {
       "id": "LAYOUT_SKY_PILLAR_ENTRANCE",
@@ -3252,14 +3252,14 @@
       "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0845ECB4",
-      "name": "UnknownMap_0845ECB4_Layout",
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA",
+      "name": "SeafloorCavern_Room9_Lava_Layout",
       "width": 27,
       "height": 46,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.bin"
+      "border_filepath": "data/layouts/SeafloorCavern_Room9_Lava/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room9_Lava/map.bin"
     },
     {
       "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE",
@@ -3562,14 +3562,14 @@
       "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08469200",
-      "name": "UnknownMap_08469200_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE",
+      "name": "SootopolisCity_LegendsBattle_Layout",
       "width": 60,
       "height": 60,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Sootopolis",
-      "border_filepath": "data/layouts/UnknownMap_08469200/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.bin"
+      "border_filepath": "data/layouts/SootopolisCity_LegendsBattle/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_LegendsBattle/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
@@ -3582,14 +3582,14 @@
       "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084693AC",
-      "name": "UnknownMap_084693AC_Layout",
+      "id": "LAYOUT_UNKNOWN_084693AC",
+      "name": "Unknown_084693AC_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattlePike",
-      "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.bin"
+      "border_filepath": "data/layouts/Unknown_084693AC/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084693AC/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
@@ -4312,74 +4312,74 @@
       "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08480DAC",
-      "name": "UnknownMap_08480DAC_Layout",
+      "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE",
+      "name": "LittlerootTown_ProfessorBirchsLabWithTable_Layout",
       "width": 13,
       "height": 13,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Lab",
-      "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin"
+      "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08480F54",
-      "name": "UnknownMap_08480F54_Layout",
+      "id": "LAYOUT_SKY_PILLAR_1F_CLEAN",
+      "name": "SkyPillar_1F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_1F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_1F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084810FC",
-      "name": "UnknownMap_084810FC_Layout",
+      "id": "LAYOUT_SKY_PILLAR_2F_CLEAN",
+      "name": "SkyPillar_2F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_2F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_2F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084812A4",
-      "name": "UnknownMap_084812A4_Layout",
+      "id": "LAYOUT_SKY_PILLAR_3F_CLEAN",
+      "name": "SkyPillar_3F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_3F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_3F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0848144C",
-      "name": "UnknownMap_0848144C_Layout",
+      "id": "LAYOUT_SKY_PILLAR_4F_CLEAN",
+      "name": "SkyPillar_4F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_4F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_4F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084815F4",
-      "name": "UnknownMap_084815F4_Layout",
+      "id": "LAYOUT_SKY_PILLAR_5F_CLEAN",
+      "name": "SkyPillar_5F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_5F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_5F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08481B24",
-      "name": "UnknownMap_08481B24_Layout",
+      "id": "LAYOUT_SKY_PILLAR_TOP_CLEAN",
+      "name": "SkyPillar_Top_Clean_Layout",
       "width": 27,
       "height": 24,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_Top_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_Top_Clean/map.bin"
     },
     {
       "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
@@ -4402,14 +4402,14 @@
       "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08481DBC",
-      "name": "UnknownMap_08481DBC_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED",
+      "name": "SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked_Layout",
       "width": 11,
       "height": 8,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_MysteryEventsHouse",
-      "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin"
+      "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index b47df74b8..5c762743c 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC
+	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC
+	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm 3, 5, 10
 	end
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 819d9e4f3..8ca9dcbb0 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -27,7 +27,7 @@ Route130_MapScript1_1F7365: @ 81F7365
 	end
 
 Route130_EventScript_1F73B1:: @ 81F73B1
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4
+	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
 
 Route130_EventScript_1F73B5:: @ 81F73B5
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index 700ac25f6..e709a14ef 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A
 	end
 
 Route131_EventScript_1F741B:: @ 81F741B
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470
+	setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
 	return
 
 Route131_EventScript_1F741F:: @ 81F741F
diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc
index 2230dad8d..a0b62df25 100644
--- a/data/maps/SkyPillar_1F/scripts.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B
 	end
 
 SkyPillar_1F_EventScript_239627:: @ 8239627
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54
+	setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index fa89f3893..a0a4aeaf3 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B
 	end
 
 SkyPillar_2F_EventScript_23964C:: @ 823964C
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC
+	setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN
 	return
 
 SkyPillar_2F_MapScript1_239650: @ 8239650
diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc
index 015d754eb..d78ee6266 100644
--- a/data/maps/SkyPillar_3F/scripts.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661
 	end
 
 SkyPillar_3F_EventScript_23966D:: @ 823966D
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4
+	setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
index ccab2453c..3904e954f 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681
 	end
 
 SkyPillar_4F_EventScript_239692:: @ 8239692
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C
+	setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN
 	return
 
 SkyPillar_4F_MapScript1_239696: @ 8239696
diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc
index b3e3f6605..20478e77e 100644
--- a/data/maps/SkyPillar_5F/scripts.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8
 	return
 
 SkyPillar_5F_EventScript_2396B4:: @ 82396B4
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4
+	setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index f764ea79c..4ca4c4681 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6
 	end
 
 SkyPillar_Top_EventScript_2396FD:: @ 82396FD
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24
+	setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 5e212ddfe..5666ce6cf 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800
 	return
 
 SootopolisCity_EventScript_1E5801:: @ 81E5801
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE
 	return
 
 SootopolisCity_EventScript_1E5805:: @ 81E5805
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 252bd1201..5db204293 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 3, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json
index 8f7ac0226..956a68158 100644
--- a/data/maps/UnknownMap_25_29/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_29/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_29",
-  "name": "UnknownMap_25_29",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_29",
+  "name": "UnknownLinkContestRoom_25_29",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_29/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json
index 5f321e6b5..526c6de2a 100644
--- a/data/maps/UnknownMap_25_30/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_30/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_30",
-  "name": "UnknownMap_25_30",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_30",
+  "name": "UnknownLinkContestRoom_25_30",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_30/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json
index f7b06ac42..9548c1125 100644
--- a/data/maps/UnknownMap_25_31/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_31/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_31",
-  "name": "UnknownMap_25_31",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_31",
+  "name": "UnknownLinkContestRoom_25_31",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_31/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json
index c963d0129..27411d28e 100644
--- a/data/maps/UnknownMap_25_32/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_32/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_32",
-  "name": "UnknownMap_25_32",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_32",
+  "name": "UnknownLinkContestRoom_25_32",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_32/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
index 441f767b6..1a15ae6d6 100644
--- a/data/maps/UnknownMap_25_33/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_33/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_33",
-  "name": "UnknownMap_25_33",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_33",
+  "name": "UnknownLinkContestRoom_25_33",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_33/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
index 7bdf1d226..4c90858b9 100644
--- a/data/maps/UnknownMap_25_34/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_34/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_34",
-  "name": "UnknownMap_25_34",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_34",
+  "name": "UnknownLinkContestRoom_25_34",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_34/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index e20d1adf2..4088ddbb5 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -461,12 +461,12 @@
     "RecordCorner",
     "DoubleBattleColosseum",
     "LinkContestRoom1",
-    "UnknownMap_25_29",
-    "UnknownMap_25_30",
-    "UnknownMap_25_31",
-    "UnknownMap_25_32",
-    "UnknownMap_25_33",
-    "UnknownMap_25_34",
+    "UnknownLinkContestRoom_25_29",
+    "UnknownLinkContestRoom_25_30",
+    "UnknownLinkContestRoom_25_31",
+    "UnknownLinkContestRoom_25_32",
+    "UnknownLinkContestRoom_25_33",
+    "UnknownLinkContestRoom_25_34",
     "LinkContestRoom2",
     "LinkContestRoom3",
     "LinkContestRoom4",
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index d12db9b33..d4819c46a 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -46,7 +46,7 @@
 #define LAYOUT_ROUTE127 43
 #define LAYOUT_ROUTE128 44
 #define LAYOUT_ROUTE129 45
-#define LAYOUT_UNKNOWN_MAP_08417FC4 46
+#define LAYOUT_ROUTE130_MIRAGE_ISLAND 46
 #define LAYOUT_ROUTE131 47
 #define LAYOUT_ROUTE132 48
 #define LAYOUT_ROUTE133 49
@@ -75,7 +75,7 @@
 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72
 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73
 #define LAYOUT_LILYCOVE_CITY_HOUSE2 74
-#define LAYOUT_UNKNOWN_MAP_08428450 75
+#define LAYOUT_UNKNOWN_08428450 75
 #define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76
 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77
 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78
@@ -83,8 +83,8 @@
 #define LAYOUT_HOUSE_WITH_BED 80
 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81
 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82
-#define LAYOUT_UNKNOWN_MAP_084294C4 83
-#define LAYOUT_UNKNOWN_MAP_084294E8 84
+#define LAYOUT_UNKNOWN_084294C4 83
+#define LAYOUT_UNKNOWN_084294E8 84
 #define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85
 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86
 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87
@@ -170,20 +170,20 @@
 #define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167
 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168
 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169
-#define LAYOUT_UNKNOWN_MAP_0843E6C0 170
-#define LAYOUT_UNKNOWN_MAP_0843E6E4 171
-#define LAYOUT_UNKNOWN_MAP_0843E708 172
-#define LAYOUT_UNKNOWN_MAP_0843E72C 173
-#define LAYOUT_UNKNOWN_MAP_0843E750 174
-#define LAYOUT_UNKNOWN_MAP_0843E774 175
-#define LAYOUT_UNKNOWN_MAP_0843E798 176
-#define LAYOUT_UNKNOWN_MAP_0843E7BC 177
-#define LAYOUT_UNKNOWN_MAP_0843E7E0 178
-#define LAYOUT_UNKNOWN_MAP_0843E804 179
-#define LAYOUT_UNKNOWN_MAP_0843E828 180
-#define LAYOUT_UNKNOWN_MAP_0843E84C 181
-#define LAYOUT_UNKNOWN_MAP_0843E870 182
-#define LAYOUT_UNKNOWN_MAP_0843E894 183
+#define LAYOUT_UNKNOWN_0843E6C0 170
+#define LAYOUT_UNKNOWN_0843E6E4 171
+#define LAYOUT_UNKNOWN_0843E708 172
+#define LAYOUT_UNKNOWN_0843E72C 173
+#define LAYOUT_UNKNOWN_0843E750 174
+#define LAYOUT_UNKNOWN_0843E774 175
+#define LAYOUT_UNKNOWN_0843E798 176
+#define LAYOUT_UNKNOWN_0843E7BC 177
+#define LAYOUT_UNKNOWN_0843E7E0 178
+#define LAYOUT_UNKNOWN_0843E804 179
+#define LAYOUT_UNKNOWN_0843E828 180
+#define LAYOUT_UNKNOWN_0843E84C 181
+#define LAYOUT_UNKNOWN_0843E870 182
+#define LAYOUT_UNKNOWN_0843E894 183
 #define LAYOUT_NEW_MAUVILLE_ENTRANCE 184
 #define LAYOUT_NEW_MAUVILLE_INSIDE 185
 #define LAYOUT_ABANDONED_SHIP_DECK 186
@@ -226,12 +226,12 @@
 #define LAYOUT_RECORD_CORNER 223
 #define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224
 #define LAYOUT_LINK_CONTEST_ROOM1 225
-#define LAYOUT_UNKNOWN_MAP_25_29 226
-#define LAYOUT_UNKNOWN_MAP_25_30 227
-#define LAYOUT_UNKNOWN_MAP_25_31 228
-#define LAYOUT_UNKNOWN_MAP_25_32 229
-#define LAYOUT_UNKNOWN_MAP_25_33 230
-#define LAYOUT_UNKNOWN_MAP_25_34 231
+#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
@@ -242,7 +242,7 @@
 #define LAYOUT_SAFARI_ZONE_NORTH 239
 #define LAYOUT_SAFARI_ZONE_SOUTHWEST 240
 #define LAYOUT_SAFARI_ZONE_SOUTH 241
-#define LAYOUT_UNKNOWN_MAP_08447028 242
+#define LAYOUT_UNKNOWN_08447028 242
 #define LAYOUT_ROUTE109_SEASHORE_HOUSE 243
 #define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244
 #define LAYOUT_ROUTE110_TRICK_HOUSE_END 245
@@ -312,21 +312,21 @@
 #define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309
 #define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310
 #define LAYOUT_SCORCHED_SLAB 311
-#define LAYOUT_UNKNOWN_MAP_0845A394 312
+#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA 312
 #define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313
 #define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314
 #define LAYOUT_EVER_GRANDE_CITY_HALL4 315
 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316
 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317
 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318
-#define LAYOUT_UNKNOWN_MAP_0845D470 319
+#define LAYOUT_ROUTE131_SKY_PILLAR 319
 #define LAYOUT_SKY_PILLAR_ENTRANCE 320
 #define LAYOUT_SKY_PILLAR_OUTSIDE 321
 #define LAYOUT_SKY_PILLAR_1F 322
 #define LAYOUT_SKY_PILLAR_2F 323
 #define LAYOUT_SKY_PILLAR_3F 324
 #define LAYOUT_SKY_PILLAR_4F 325
-#define LAYOUT_UNKNOWN_MAP_0845ECB4 326
+#define LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA 326
 #define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327
 #define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328
 #define LAYOUT_SAFARI_ZONE_REST_HOUSE 329
@@ -357,9 +357,9 @@
 #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_UNKNOWN_MAP_08469200 357
+#define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357
 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358
-#define LAYOUT_UNKNOWN_MAP_084693AC 359
+#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_PYRAMID_SQUARE01 362
@@ -432,15 +432,15 @@
 #define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429
 #define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430
 #define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431
-#define LAYOUT_UNKNOWN_MAP_08480DAC 432
-#define LAYOUT_UNKNOWN_MAP_08480F54 433
-#define LAYOUT_UNKNOWN_MAP_084810FC 434
-#define LAYOUT_UNKNOWN_MAP_084812A4 435
-#define LAYOUT_UNKNOWN_MAP_0848144C 436
-#define LAYOUT_UNKNOWN_MAP_084815F4 437
-#define LAYOUT_UNKNOWN_MAP_08481B24 438
+#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE 432
+#define LAYOUT_SKY_PILLAR_1F_CLEAN 433
+#define LAYOUT_SKY_PILLAR_2F_CLEAN 434
+#define LAYOUT_SKY_PILLAR_3F_CLEAN 435
+#define LAYOUT_SKY_PILLAR_4F_CLEAN 436
+#define LAYOUT_SKY_PILLAR_5F_CLEAN 437
+#define LAYOUT_SKY_PILLAR_TOP_CLEAN 438
 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439
 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440
-#define LAYOUT_UNKNOWN_MAP_08481DBC 441
+#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H
diff --git a/src/battle_pike.c b/src/battle_pike.c
index f2f2025d7..cc58b81bb 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -1337,7 +1337,7 @@ bool8 InBattlePike(void)
     return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM
         || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
         || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3
-        || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC;
+        || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_084693AC;
 }
 
 static void SetHintedRoom(void)