From 6f1d2b870c1426e7f405f3b3bc4ff2b9edb380e1 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sat, 9 Feb 2019 09:57:30 -0600
Subject: Give proper names to dynamic map layouts

---
 data/event_scripts.s                               |  12 +-
 .../CaveOfOrigin_Unused_B4F_Lava/border.bin        |   1 +
 data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin  | Bin 0 -> 724 bytes
 .../border.bin                                     |   1 +
 .../map.bin                                        | Bin 0 -> 340 bytes
 data/layouts/Route130_MirageIsland/border.bin      |   1 +
 data/layouts/Route130_MirageIsland/map.bin         |   1 +
 data/layouts/Route131_SkyPillar/border.bin         |   1 +
 data/layouts/Route131_SkyPillar/map.bin            |   1 +
 data/layouts/SeafloorCavern_Room9_Lava/border.bin  |   1 +
 data/layouts/SeafloorCavern_Room9_Lava/map.bin     |   1 +
 data/layouts/SkyPillar_1F_Clean/border.bin         |   1 +
 data/layouts/SkyPillar_1F_Clean/map.bin            |   1 +
 data/layouts/SkyPillar_2F_Clean/border.bin         |   1 +
 data/layouts/SkyPillar_2F_Clean/map.bin            |   1 +
 data/layouts/SkyPillar_3F_Clean/border.bin         |   1 +
 data/layouts/SkyPillar_3F_Clean/map.bin            |   1 +
 data/layouts/SkyPillar_4F_Clean/border.bin         |   1 +
 data/layouts/SkyPillar_4F_Clean/map.bin            |   1 +
 data/layouts/SkyPillar_5F_Clean/border.bin         |   1 +
 data/layouts/SkyPillar_5F_Clean/map.bin            |   1 +
 data/layouts/SkyPillar_Top_Clean/border.bin        |   1 +
 data/layouts/SkyPillar_Top_Clean/map.bin           |   1 +
 .../SootopolisCity_LegendsBattle/border.bin        |   1 +
 data/layouts/SootopolisCity_LegendsBattle/map.bin  |  12 +
 .../border.bin                                     | Bin 0 -> 8 bytes
 .../map.bin                                        |   2 +
 .../UnknownLinkContestRoom_25_29/border.bin        |   1 +
 data/layouts/UnknownLinkContestRoom_25_29/map.bin  |   1 +
 .../UnknownLinkContestRoom_25_30/border.bin        |   1 +
 data/layouts/UnknownLinkContestRoom_25_30/map.bin  |   1 +
 .../UnknownLinkContestRoom_25_31/border.bin        |   1 +
 data/layouts/UnknownLinkContestRoom_25_31/map.bin  |   1 +
 .../UnknownLinkContestRoom_25_32/border.bin        |   1 +
 data/layouts/UnknownLinkContestRoom_25_32/map.bin  |   1 +
 .../UnknownLinkContestRoom_25_33/border.bin        |   1 +
 data/layouts/UnknownLinkContestRoom_25_33/map.bin  |   1 +
 .../UnknownLinkContestRoom_25_34/border.bin        |   1 +
 data/layouts/UnknownLinkContestRoom_25_34/map.bin  |   1 +
 data/layouts/UnknownMap_08417FC4/border.bin        |   1 -
 data/layouts/UnknownMap_08417FC4/map.bin           |   1 -
 data/layouts/UnknownMap_08428450/border.bin        |   1 -
 data/layouts/UnknownMap_08428450/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_084294C4/border.bin        |   1 -
 data/layouts/UnknownMap_084294C4/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_084294E8/border.bin        |   1 -
 data/layouts/UnknownMap_084294E8/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E6C0/border.bin        |   1 -
 data/layouts/UnknownMap_0843E6C0/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E6E4/border.bin        |   1 -
 data/layouts/UnknownMap_0843E6E4/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E708/border.bin        |   1 -
 data/layouts/UnknownMap_0843E708/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E72C/border.bin        |   1 -
 data/layouts/UnknownMap_0843E72C/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E750/border.bin        |   1 -
 data/layouts/UnknownMap_0843E750/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E774/border.bin        |   1 -
 data/layouts/UnknownMap_0843E774/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E798/border.bin        |   1 -
 data/layouts/UnknownMap_0843E798/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E7BC/border.bin        |   1 -
 data/layouts/UnknownMap_0843E7BC/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E7E0/border.bin        |   1 -
 data/layouts/UnknownMap_0843E7E0/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E804/border.bin        |   1 -
 data/layouts/UnknownMap_0843E804/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E828/border.bin        |   1 -
 data/layouts/UnknownMap_0843E828/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E84C/border.bin        |   1 -
 data/layouts/UnknownMap_0843E84C/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E870/border.bin        |   1 -
 data/layouts/UnknownMap_0843E870/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_0843E894/border.bin        |   1 -
 data/layouts/UnknownMap_0843E894/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_08447028/border.bin        |   1 -
 data/layouts/UnknownMap_08447028/map.bin           |   3 -
 data/layouts/UnknownMap_0845A394/border.bin        |   1 -
 data/layouts/UnknownMap_0845A394/map.bin           | Bin 724 -> 0 bytes
 data/layouts/UnknownMap_0845D470/border.bin        |   1 -
 data/layouts/UnknownMap_0845D470/map.bin           |   1 -
 data/layouts/UnknownMap_0845ECB4/border.bin        |   1 -
 data/layouts/UnknownMap_0845ECB4/map.bin           |   1 -
 data/layouts/UnknownMap_08469200/border.bin        |   1 -
 data/layouts/UnknownMap_08469200/map.bin           |  12 -
 data/layouts/UnknownMap_084693AC/border.bin        | Bin 8 -> 0 bytes
 data/layouts/UnknownMap_084693AC/map.bin           | Bin 4 -> 0 bytes
 data/layouts/UnknownMap_08480DAC/border.bin        |   1 -
 data/layouts/UnknownMap_08480DAC/map.bin           | Bin 340 -> 0 bytes
 data/layouts/UnknownMap_08480F54/border.bin        |   1 -
 data/layouts/UnknownMap_08480F54/map.bin           |   1 -
 data/layouts/UnknownMap_084810FC/border.bin        |   1 -
 data/layouts/UnknownMap_084810FC/map.bin           |   1 -
 data/layouts/UnknownMap_084812A4/border.bin        |   1 -
 data/layouts/UnknownMap_084812A4/map.bin           |   1 -
 data/layouts/UnknownMap_0848144C/border.bin        |   1 -
 data/layouts/UnknownMap_0848144C/map.bin           |   1 -
 data/layouts/UnknownMap_084815F4/border.bin        |   1 -
 data/layouts/UnknownMap_084815F4/map.bin           |   1 -
 data/layouts/UnknownMap_08481B24/border.bin        |   1 -
 data/layouts/UnknownMap_08481B24/map.bin           |   1 -
 data/layouts/UnknownMap_08481DBC/border.bin        | Bin 8 -> 0 bytes
 data/layouts/UnknownMap_08481DBC/map.bin           |   2 -
 data/layouts/UnknownMap_25_29/border.bin           |   1 -
 data/layouts/UnknownMap_25_29/map.bin              |   1 -
 data/layouts/UnknownMap_25_30/border.bin           |   1 -
 data/layouts/UnknownMap_25_30/map.bin              |   1 -
 data/layouts/UnknownMap_25_31/border.bin           |   1 -
 data/layouts/UnknownMap_25_31/map.bin              |   1 -
 data/layouts/UnknownMap_25_32/border.bin           |   1 -
 data/layouts/UnknownMap_25_32/map.bin              |   1 -
 data/layouts/UnknownMap_25_33/border.bin           |   1 -
 data/layouts/UnknownMap_25_33/map.bin              |   1 -
 data/layouts/UnknownMap_25_34/border.bin           |   1 -
 data/layouts/UnknownMap_25_34/map.bin              |   1 -
 data/layouts/Unknown_08428450/border.bin           |   1 +
 data/layouts/Unknown_08428450/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_084294C4/border.bin           |   1 +
 data/layouts/Unknown_084294C4/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_084294E8/border.bin           |   1 +
 data/layouts/Unknown_084294E8/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E6C0/border.bin           |   1 +
 data/layouts/Unknown_0843E6C0/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E6E4/border.bin           |   1 +
 data/layouts/Unknown_0843E6E4/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E708/border.bin           |   1 +
 data/layouts/Unknown_0843E708/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E72C/border.bin           |   1 +
 data/layouts/Unknown_0843E72C/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E750/border.bin           |   1 +
 data/layouts/Unknown_0843E750/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E774/border.bin           |   1 +
 data/layouts/Unknown_0843E774/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E798/border.bin           |   1 +
 data/layouts/Unknown_0843E798/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E7BC/border.bin           |   1 +
 data/layouts/Unknown_0843E7BC/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E7E0/border.bin           |   1 +
 data/layouts/Unknown_0843E7E0/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E804/border.bin           |   1 +
 data/layouts/Unknown_0843E804/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E828/border.bin           |   1 +
 data/layouts/Unknown_0843E828/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E84C/border.bin           |   1 +
 data/layouts/Unknown_0843E84C/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E870/border.bin           |   1 +
 data/layouts/Unknown_0843E870/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_0843E894/border.bin           |   1 +
 data/layouts/Unknown_0843E894/map.bin              | Bin 0 -> 4 bytes
 data/layouts/Unknown_08447028/border.bin           |   1 +
 data/layouts/Unknown_08447028/map.bin              |   3 +
 data/layouts/Unknown_084693AC/border.bin           | Bin 0 -> 8 bytes
 data/layouts/Unknown_084693AC/map.bin              | Bin 0 -> 4 bytes
 data/layouts/layouts.json                          | 304 ++++++++++-----------
 .../LittlerootTown_ProfessorBirchsLab/scripts.inc  |   4 +-
 data/maps/Route130/scripts.inc                     |   2 +-
 data/maps/Route131/scripts.inc                     |   2 +-
 data/maps/SkyPillar_1F/scripts.inc                 |   2 +-
 data/maps/SkyPillar_2F/scripts.inc                 |   2 +-
 data/maps/SkyPillar_3F/scripts.inc                 |   2 +-
 data/maps/SkyPillar_4F/scripts.inc                 |   2 +-
 data/maps/SkyPillar_5F/scripts.inc                 |   2 +-
 data/maps/SkyPillar_Top/scripts.inc                |   2 +-
 data/maps/SootopolisCity/scripts.inc               |   2 +-
 .../scripts.inc                                    |   2 +-
 data/maps/UnknownLinkContestRoom_25_29/map.json    |  18 ++
 data/maps/UnknownLinkContestRoom_25_29/scripts.inc |   1 +
 data/maps/UnknownLinkContestRoom_25_30/map.json    |  18 ++
 data/maps/UnknownLinkContestRoom_25_30/scripts.inc |   1 +
 data/maps/UnknownLinkContestRoom_25_31/map.json    |  18 ++
 data/maps/UnknownLinkContestRoom_25_31/scripts.inc |   1 +
 data/maps/UnknownLinkContestRoom_25_32/map.json    |  18 ++
 data/maps/UnknownLinkContestRoom_25_32/scripts.inc |   1 +
 data/maps/UnknownLinkContestRoom_25_33/map.json    |  18 ++
 data/maps/UnknownLinkContestRoom_25_33/scripts.inc |   1 +
 data/maps/UnknownLinkContestRoom_25_34/map.json    |  18 ++
 data/maps/UnknownLinkContestRoom_25_34/scripts.inc |   1 +
 data/maps/UnknownMap_25_29/map.json                |  18 --
 data/maps/UnknownMap_25_29/scripts.inc             |   1 -
 data/maps/UnknownMap_25_30/map.json                |  18 --
 data/maps/UnknownMap_25_30/scripts.inc             |   1 -
 data/maps/UnknownMap_25_31/map.json                |  18 --
 data/maps/UnknownMap_25_31/scripts.inc             |   1 -
 data/maps/UnknownMap_25_32/map.json                |  18 --
 data/maps/UnknownMap_25_32/scripts.inc             |   1 -
 data/maps/UnknownMap_25_33/map.json                |  18 --
 data/maps/UnknownMap_25_33/scripts.inc             |   1 -
 data/maps/UnknownMap_25_34/map.json                |  18 --
 data/maps/UnknownMap_25_34/scripts.inc             |   1 -
 data/maps/map_groups.json                          |  12 +-
 include/constants/layouts.h                        |  76 +++---
 src/battle_pike.c                                  |   2 +-
 192 files changed, 397 insertions(+), 397 deletions(-)
 create mode 100644 data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
 create mode 100644 data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
 create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
 create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
 create mode 100644 data/layouts/Route130_MirageIsland/border.bin
 create mode 100644 data/layouts/Route130_MirageIsland/map.bin
 create mode 100644 data/layouts/Route131_SkyPillar/border.bin
 create mode 100644 data/layouts/Route131_SkyPillar/map.bin
 create mode 100644 data/layouts/SeafloorCavern_Room9_Lava/border.bin
 create mode 100644 data/layouts/SeafloorCavern_Room9_Lava/map.bin
 create mode 100644 data/layouts/SkyPillar_1F_Clean/border.bin
 create mode 100644 data/layouts/SkyPillar_1F_Clean/map.bin
 create mode 100644 data/layouts/SkyPillar_2F_Clean/border.bin
 create mode 100644 data/layouts/SkyPillar_2F_Clean/map.bin
 create mode 100644 data/layouts/SkyPillar_3F_Clean/border.bin
 create mode 100644 data/layouts/SkyPillar_3F_Clean/map.bin
 create mode 100644 data/layouts/SkyPillar_4F_Clean/border.bin
 create mode 100644 data/layouts/SkyPillar_4F_Clean/map.bin
 create mode 100644 data/layouts/SkyPillar_5F_Clean/border.bin
 create mode 100644 data/layouts/SkyPillar_5F_Clean/map.bin
 create mode 100644 data/layouts/SkyPillar_Top_Clean/border.bin
 create mode 100644 data/layouts/SkyPillar_Top_Clean/map.bin
 create mode 100644 data/layouts/SootopolisCity_LegendsBattle/border.bin
 create mode 100644 data/layouts/SootopolisCity_LegendsBattle/map.bin
 create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
 create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_29/border.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_29/map.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_30/border.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_30/map.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_31/border.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_31/map.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_32/border.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_32/map.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_33/border.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_33/map.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_34/border.bin
 create mode 100644 data/layouts/UnknownLinkContestRoom_25_34/map.bin
 delete mode 100644 data/layouts/UnknownMap_08417FC4/border.bin
 delete mode 100644 data/layouts/UnknownMap_08417FC4/map.bin
 delete mode 100644 data/layouts/UnknownMap_08428450/border.bin
 delete mode 100644 data/layouts/UnknownMap_08428450/map.bin
 delete mode 100644 data/layouts/UnknownMap_084294C4/border.bin
 delete mode 100644 data/layouts/UnknownMap_084294C4/map.bin
 delete mode 100644 data/layouts/UnknownMap_084294E8/border.bin
 delete mode 100644 data/layouts/UnknownMap_084294E8/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E6C0/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E6C0/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E6E4/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E6E4/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E708/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E708/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E72C/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E72C/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E750/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E750/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E774/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E774/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E798/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E798/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E7BC/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E7BC/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E7E0/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E7E0/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E804/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E804/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E828/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E828/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E84C/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E84C/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E870/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E870/map.bin
 delete mode 100644 data/layouts/UnknownMap_0843E894/border.bin
 delete mode 100644 data/layouts/UnknownMap_0843E894/map.bin
 delete mode 100644 data/layouts/UnknownMap_08447028/border.bin
 delete mode 100644 data/layouts/UnknownMap_08447028/map.bin
 delete mode 100644 data/layouts/UnknownMap_0845A394/border.bin
 delete mode 100644 data/layouts/UnknownMap_0845A394/map.bin
 delete mode 100644 data/layouts/UnknownMap_0845D470/border.bin
 delete mode 100644 data/layouts/UnknownMap_0845D470/map.bin
 delete mode 100644 data/layouts/UnknownMap_0845ECB4/border.bin
 delete mode 100644 data/layouts/UnknownMap_0845ECB4/map.bin
 delete mode 100644 data/layouts/UnknownMap_08469200/border.bin
 delete mode 100644 data/layouts/UnknownMap_08469200/map.bin
 delete mode 100644 data/layouts/UnknownMap_084693AC/border.bin
 delete mode 100644 data/layouts/UnknownMap_084693AC/map.bin
 delete mode 100644 data/layouts/UnknownMap_08480DAC/border.bin
 delete mode 100644 data/layouts/UnknownMap_08480DAC/map.bin
 delete mode 100644 data/layouts/UnknownMap_08480F54/border.bin
 delete mode 100644 data/layouts/UnknownMap_08480F54/map.bin
 delete mode 100644 data/layouts/UnknownMap_084810FC/border.bin
 delete mode 100644 data/layouts/UnknownMap_084810FC/map.bin
 delete mode 100644 data/layouts/UnknownMap_084812A4/border.bin
 delete mode 100644 data/layouts/UnknownMap_084812A4/map.bin
 delete mode 100644 data/layouts/UnknownMap_0848144C/border.bin
 delete mode 100644 data/layouts/UnknownMap_0848144C/map.bin
 delete mode 100644 data/layouts/UnknownMap_084815F4/border.bin
 delete mode 100644 data/layouts/UnknownMap_084815F4/map.bin
 delete mode 100644 data/layouts/UnknownMap_08481B24/border.bin
 delete mode 100644 data/layouts/UnknownMap_08481B24/map.bin
 delete mode 100644 data/layouts/UnknownMap_08481DBC/border.bin
 delete mode 100644 data/layouts/UnknownMap_08481DBC/map.bin
 delete mode 100644 data/layouts/UnknownMap_25_29/border.bin
 delete mode 100644 data/layouts/UnknownMap_25_29/map.bin
 delete mode 100644 data/layouts/UnknownMap_25_30/border.bin
 delete mode 100644 data/layouts/UnknownMap_25_30/map.bin
 delete mode 100644 data/layouts/UnknownMap_25_31/border.bin
 delete mode 100644 data/layouts/UnknownMap_25_31/map.bin
 delete mode 100644 data/layouts/UnknownMap_25_32/border.bin
 delete mode 100644 data/layouts/UnknownMap_25_32/map.bin
 delete mode 100644 data/layouts/UnknownMap_25_33/border.bin
 delete mode 100644 data/layouts/UnknownMap_25_33/map.bin
 delete mode 100644 data/layouts/UnknownMap_25_34/border.bin
 delete mode 100644 data/layouts/UnknownMap_25_34/map.bin
 create mode 100644 data/layouts/Unknown_08428450/border.bin
 create mode 100644 data/layouts/Unknown_08428450/map.bin
 create mode 100644 data/layouts/Unknown_084294C4/border.bin
 create mode 100644 data/layouts/Unknown_084294C4/map.bin
 create mode 100644 data/layouts/Unknown_084294E8/border.bin
 create mode 100644 data/layouts/Unknown_084294E8/map.bin
 create mode 100644 data/layouts/Unknown_0843E6C0/border.bin
 create mode 100644 data/layouts/Unknown_0843E6C0/map.bin
 create mode 100644 data/layouts/Unknown_0843E6E4/border.bin
 create mode 100644 data/layouts/Unknown_0843E6E4/map.bin
 create mode 100644 data/layouts/Unknown_0843E708/border.bin
 create mode 100644 data/layouts/Unknown_0843E708/map.bin
 create mode 100644 data/layouts/Unknown_0843E72C/border.bin
 create mode 100644 data/layouts/Unknown_0843E72C/map.bin
 create mode 100644 data/layouts/Unknown_0843E750/border.bin
 create mode 100644 data/layouts/Unknown_0843E750/map.bin
 create mode 100644 data/layouts/Unknown_0843E774/border.bin
 create mode 100644 data/layouts/Unknown_0843E774/map.bin
 create mode 100644 data/layouts/Unknown_0843E798/border.bin
 create mode 100644 data/layouts/Unknown_0843E798/map.bin
 create mode 100644 data/layouts/Unknown_0843E7BC/border.bin
 create mode 100644 data/layouts/Unknown_0843E7BC/map.bin
 create mode 100644 data/layouts/Unknown_0843E7E0/border.bin
 create mode 100644 data/layouts/Unknown_0843E7E0/map.bin
 create mode 100644 data/layouts/Unknown_0843E804/border.bin
 create mode 100644 data/layouts/Unknown_0843E804/map.bin
 create mode 100644 data/layouts/Unknown_0843E828/border.bin
 create mode 100644 data/layouts/Unknown_0843E828/map.bin
 create mode 100644 data/layouts/Unknown_0843E84C/border.bin
 create mode 100644 data/layouts/Unknown_0843E84C/map.bin
 create mode 100644 data/layouts/Unknown_0843E870/border.bin
 create mode 100644 data/layouts/Unknown_0843E870/map.bin
 create mode 100644 data/layouts/Unknown_0843E894/border.bin
 create mode 100644 data/layouts/Unknown_0843E894/map.bin
 create mode 100644 data/layouts/Unknown_08447028/border.bin
 create mode 100644 data/layouts/Unknown_08447028/map.bin
 create mode 100644 data/layouts/Unknown_084693AC/border.bin
 create mode 100644 data/layouts/Unknown_084693AC/map.bin
 create mode 100644 data/maps/UnknownLinkContestRoom_25_29/map.json
 create mode 100644 data/maps/UnknownLinkContestRoom_25_29/scripts.inc
 create mode 100644 data/maps/UnknownLinkContestRoom_25_30/map.json
 create mode 100644 data/maps/UnknownLinkContestRoom_25_30/scripts.inc
 create mode 100644 data/maps/UnknownLinkContestRoom_25_31/map.json
 create mode 100644 data/maps/UnknownLinkContestRoom_25_31/scripts.inc
 create mode 100644 data/maps/UnknownLinkContestRoom_25_32/map.json
 create mode 100644 data/maps/UnknownLinkContestRoom_25_32/scripts.inc
 create mode 100644 data/maps/UnknownLinkContestRoom_25_33/map.json
 create mode 100644 data/maps/UnknownLinkContestRoom_25_33/scripts.inc
 create mode 100644 data/maps/UnknownLinkContestRoom_25_34/map.json
 create mode 100644 data/maps/UnknownLinkContestRoom_25_34/scripts.inc
 delete mode 100644 data/maps/UnknownMap_25_29/map.json
 delete mode 100644 data/maps/UnknownMap_25_29/scripts.inc
 delete mode 100644 data/maps/UnknownMap_25_30/map.json
 delete mode 100644 data/maps/UnknownMap_25_30/scripts.inc
 delete mode 100644 data/maps/UnknownMap_25_31/map.json
 delete mode 100644 data/maps/UnknownMap_25_31/scripts.inc
 delete mode 100644 data/maps/UnknownMap_25_32/map.json
 delete mode 100644 data/maps/UnknownMap_25_32/scripts.inc
 delete mode 100644 data/maps/UnknownMap_25_33/map.json
 delete mode 100644 data/maps/UnknownMap_25_33/scripts.inc
 delete mode 100644 data/maps/UnknownMap_25_34/map.json
 delete mode 100644 data/maps/UnknownMap_25_34/scripts.inc

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/CaveOfOrigin_Unused_B4F_Lava/border.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
@@ -0,0 +1 @@
+3333
\ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
new file mode 100644
index 000000000..fd294d9b6
Binary files /dev/null and b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin differ
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
new file mode 100644
index 000000000..d1277f280
Binary files /dev/null and b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin differ
diff --git a/data/layouts/Route130_MirageIsland/border.bin b/data/layouts/Route130_MirageIsland/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route130_MirageIsland/border.bin
@@ -0,0 +1 @@
+p
p
p
p

\ No newline at end of file
diff --git a/data/layouts/Route130_MirageIsland/map.bin b/data/layouts/Route130_MirageIsland/map.bin
new file mode 100644
index 000000000..17a14a8d5
--- /dev/null
+++ b/data/layouts/Route130_MirageIsland/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp��0000000000000�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�s
00�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0r�pppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0000���
0
0
0
0
0
0
0
0
0
0
0
0
0
000�0�ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp�0
0
00����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�ppppPQppppppppppppppppppppppr�qkllmq�vppppuvppppPQprs
0
0
0�����
0
0
0
0
0
0
0
0
0
0
0
0
0
0111
0utpPQXYpppppr{{{{{{{vpppppppu�qk�qquqq|uvpp}~pu{vXYrss
0
0
0��
0
0
0
0000
0
0
0
0
0
0
015
1
0uutXYpuvpu{{�qklllmq�vppppuv��q{|||}qt�}~pppppzq|�}sss
0
0
0
0
0
0
0
0
00��4�400
0
0
0
0
0111
0uuu~�
p}~pzqqqk�klm�mq�vppp}~p�y�qqqty�ppu{{vpp�y��fsss
0
0
0
0
0
0
0
0
0
0
0���4�4�4�400
0
0
0
0
0
0
0uuug�ppuvzqqqsq{|}quqq|ppPQpppp�yyy�ppppzqq|puvpp�fsss
0
0
0
0
0
0
0
0
0
0
0��4�4�4�4�4�40
0
0
0
0
0
0uuug�uv}~��qq{�qqqt}qt�ppXYpppuvppppppuv�yy�p}~pp�fss{|||�
00
0
0
0
0
0
0�4�4�4�4�4�4�4
0
0t|||}uug�}~ppp�y�q{|||}qt�puv{vppp}~pppppp}~pppPQpppp�fs{����s0
00
0
0
0
0
0
04�4�4�4�4�4�4
0
0ut���}ug�ppppPQp�y�����y�pp}~q|ppppppppppPQppppXYppuv�f{����ss
00
00
00
0
0
0
0�4�4�4�444
0
0uut���}g�ppppXYppppppppuvppppy�ppppppppppXYpppppppp}~�n����ss{|||�0
0
0
0
0
04444t|||}uut���o�puvppppppppppp}~ppppppppppppppppppppppppuvpp��1$1$1$1�s{����{||�
0
0
0
0t||}t���}ur$1$1$1�1�p}~pppppuvppppppppppppuvpppppppppppppppp}~pp��1�1�1$1�{����{���{|22|}t��}t���}r$1$1$1�1�pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp��1�1�1$1�����{���{��22��}t��}t����$1$1$1�1�ppppppppppppppppppppuvppzt�ppppppp}~pppppppp��1�1�1$1$1$1"1
0x���{���22���}t��z
0
0 1$1$1$1�1�1�pppppppppppppppppppp}~pp��pppppppppppppppppp����1�1�1$1"1
0
0
0
0x����22����z
0
0
0
0
0 1$1$1�1�1��pppppppppppppppppppppppppppppppppppppppppppppp��1�1�1$1$11
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
01$1$1�1�1�1�ppppppppppppppppppppppppppppppppppppppppppppppp��1�1�1$1$1!11
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
011$1$1�1�1�1��ppppppppppppppppppppppppppppppppppppppppppppppp��1�1�1�1$1$1!111
0
0
0
0
0
0
0
0
0
0
0111$1$1$1$1�1�1�1�pppppppppppppppppppppppppppppppppppppppppppppppp��1�1�1�1$1$1$1$1"1
0
0
0
0
0
0
0
0
011$1$1$1$1$1$1�1�1�1�1�pppppppppppppppppppppppppppppppppppppppppppppppp����1�1�1�1$1$1$1111111111$1$1$1$1$1$1$1$1�1�1���pppppppppPQpppppppuvpppppppppppppppppppppppppppppp��1�1�1�1$1$1$1$1$1$1$1$1$1$1$1$1$1$1�1�1�1�1�1�1�1�1�ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp���1�1�1�1�1$1$1$1$1$1$1$1$1$1$1$1$1�1�1�1�1�����ppppppppXYpppr{�qqq�vpuv�qq|ppppppppppppppppppppppppp��1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1��ppppppppppppppu{{�qqqqqq�v}~qqt�pPQpppppppppppppppppppppp����������������������ppppppppppuvppp��qqqqqqqqq�vpyy�uvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~pppp�y�qqqqqqty�pppp}~ppXY�y�p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp�yyyyyy�PQpppppppppppppuvpPQpppuvppzqqq�{vp}~ppppppuvppppppppppppppXYp}~p��qq�vpppppppppXYupppppppppppp}~pXYu{v}~uv�yy�qq�vpuvpppPQ}~pppppppPQppppr{{{vppp��ty�ppppppppppp}pppppPQppppppppppzq|pp}~ppp�yyy�p}~PQpXYppu{{vpuvXYppr{�qkm�vppp��pppppppppppppppppppXYpppppppppp�y�pppppppppppppppXYuvppp��q�v}~pu{{�klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp�yy�ppp��qq{|}qqt�ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp�yy���yy�pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp
\ No newline at end of file
diff --git a/data/layouts/Route131_SkyPillar/border.bin b/data/layouts/Route131_SkyPillar/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route131_SkyPillar/border.bin
@@ -0,0 +1 @@
+p
p
p
p

\ No newline at end of file
diff --git a/data/layouts/Route131_SkyPillar/map.bin b/data/layouts/Route131_SkyPillar/map.bin
new file mode 100644
index 000000000..cd136de41
--- /dev/null
+++ b/data/layouts/Route131_SkyPillar/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut�|}��ppp��{�qs{�$1�4$1$1$1$1�4$1$1uuqu�pppppppppppppqqqqqqqqt||}qqt}u����ppppp��{�{�s$1$1$1$1$1$1$1$1t}ut}�ppppppppppppp||||||||}qqqt|}t}�ppppppppp��sqs{�$1$1$1�4$1t|}quu��pppppppppppppqqqqqt���|||}qt}��pppppppppPesq{�{��4$1$1t}qt|}u�ppppppppppppppqqt||}qqqt���|}��ppppppppppXm{�q{�{|||}qt}t|}�pppppppppppppp||}qt�|||}������ppuvpppppPQp��{�q{�����|}qu���pppppppppppppp���|}������uvpu{vp}~pppppXYpp��{|����0����|}�pppppppppppppppp��Z[��ppppp}~pzq|pppppppppPQpp����$1$1$1$1$1��Z[�ppppPQpppppppppp�pXYppppuvpppp�y�pppppppuvXYppppp�$1$1$1$1$1�pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~ppppppp�������puv�y�q|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~pp�y�PQ}~ppppppppPQpp�y�ppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp�y�}~ppuvpppppu�|ppppppppu�qq�vpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|pppppppp�yyyy�PQppppppppppppppppppppuvpppppppppppppppppuv�y�pppppppuvppPQpXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq�{vppppuvppuvXYpppppppu{vpppppPQppuv�ypppppppppppppppppppp�yyy�pppp}~uv}~pppppppu{�q|pppppXYpp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|ppppppPQpppPQppppppppppppppppppppppp}~ppppppppppppppppp�yyy�ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu�q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~�yy�pppppppppppppppppppppppppppppppppppppppppppppppppp�yy�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz�vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp���v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ�y{{{{tppp�y�p}~uvp�y�pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq�{tppppuvp}~ppuvpppppppzqq�{vppp}~uvpppu{{vppXYp}~puvpppllllmq�{{{t}~pppuv}~ppu{{vp��qqq�vpppp}~ppu�qq�{{vu{{{v}~pppqqqq�llmqq�{tppp}~ppu{�qq|uv�yyyy�ppppppPQ�yyy�qq��qqt�pppppqqqqqqq�mqqqutppppppzqqqt�}~ppppppppppppXYpppp�y�qqqt�ppppPQqqqqqqqq�llmuu{tppuv�yyy�ppppppppppppppppppppppp�yyy�pppppXYqqqqqqqqqqq���l�tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room9_Lava/border.bin b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room9_Lava/map.bin b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
new file mode 100644
index 000000000..ec344933f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2������������������2�2�2�2�2�2�2�2�2�������������������2�2�2�2�2�2�2�2�2�2�2�2��������������������2�2�2�2�2�2�2���������������������2�2�2�2�2�2�2�����������������������2�������������������������2�2�2�2�2�����������������������2�2�2�2�2�����������������������2�2�2�2�2������������������������2��������������������������2�2�2�������������������������2�2�2������������������������2�2�2�2������������������������2�2�2�2�2����������������������2����������������������222���������������������222��������������������22222��������������������22222��������������������2��������������������222������������������222�����������������

222���������������
222


������
2222222
������2222222222������
2222222 			#�����
222 			#��2222 #

��2222




��2222 #



��2222
efg

��222 #
esdrfg
��222efsd_ddrfg��222qdd_d__ddp��222qd______dp��22222es_d____d_p��22222
qdd______dp��22222222#2#2bdd_d_d_dp����222222222#2b_d_d_`a3a3#2������22222222#2a3a3a3a3a3#2222��������2222222222222����������������222222���������������������������������
\ No newline at end of file
diff --git a/data/layouts/SkyPillar_1F_Clean/border.bin b/data/layouts/SkyPillar_1F_Clean/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_1F_Clean/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/SkyPillar_1F_Clean/map.bin b/data/layouts/SkyPillar_1F_Clean/map.bin
new file mode 100644
index 000000000..f0d9c299c
--- /dev/null
+++ b/data/layouts/SkyPillar_1F_Clean/map.bin
@@ -0,0 +1 @@
+''''''''';<=''/////////CD2E//�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�289999:�2�2�2�2�2�2�2�2@AAAAB�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2IMMMMJ�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2"2#2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/SkyPillar_2F_Clean/border.bin b/data/layouts/SkyPillar_2F_Clean/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_2F_Clean/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/SkyPillar_2F_Clean/map.bin b/data/layouts/SkyPillar_2F_Clean/map.bin
new file mode 100644
index 000000000..908158cf4
--- /dev/null
+++ b/data/layouts/SkyPillar_2F_Clean/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CD2E////CL2E//5252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242
\ No newline at end of file
diff --git a/data/layouts/SkyPillar_3F_Clean/border.bin b/data/layouts/SkyPillar_3F_Clean/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_3F_Clean/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/SkyPillar_3F_Clean/map.bin b/data/layouts/SkyPillar_3F_Clean/map.bin
new file mode 100644
index 000000000..d033bc4d2
--- /dev/null
+++ b/data/layouts/SkyPillar_3F_Clean/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CL2E/CD2E/CD2E/�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�289999:�2�2�2�2�2�2�2�2@AAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2IMMMMJ�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/SkyPillar_4F_Clean/border.bin b/data/layouts/SkyPillar_4F_Clean/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_4F_Clean/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/SkyPillar_4F_Clean/map.bin b/data/layouts/SkyPillar_4F_Clean/map.bin
new file mode 100644
index 000000000..eeccae9ae
--- /dev/null
+++ b/data/layouts/SkyPillar_4F_Clean/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CD2E/CL2E/CL2E/525252525252525265252525252626266642424242424242426262426264242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242
\ No newline at end of file
diff --git a/data/layouts/SkyPillar_5F_Clean/border.bin b/data/layouts/SkyPillar_5F_Clean/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_5F_Clean/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/SkyPillar_5F_Clean/map.bin b/data/layouts/SkyPillar_5F_Clean/map.bin
new file mode 100644
index 000000000..8507a4932
--- /dev/null
+++ b/data/layouts/SkyPillar_5F_Clean/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CL2E////CD2E//�2�2�2�2�2�2�2�2�26�2�2�2�2�2�2�2�2�2�2�2�26�2�2�2�2�2�2�2�28999999:�2�2�2�2�2�2@AAAAAAB�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2IMMMMMMJ�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/SkyPillar_Top_Clean/border.bin b/data/layouts/SkyPillar_Top_Clean/border.bin
new file mode 100644
index 000000000..e9d1c658c
--- /dev/null
+++ b/data/layouts/SkyPillar_Top_Clean/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SkyPillar_Top_Clean/map.bin b/data/layouts/SkyPillar_Top_Clean/map.bin
new file mode 100644
index 000000000..2a47bca91
--- /dev/null
+++ b/data/layouts/SkyPillar_Top_Clean/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������������������������������d2d2d2�6d2d2d2�6d2d2d2�6�6�6�6�6�6�6d2d2d2�6d2d2d2�6d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m�2�2n';<='''''''''//////////j�2�2k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[���������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SootopolisCity_LegendsBattle/border.bin b/data/layouts/SootopolisCity_LegendsBattle/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/layouts/SootopolisCity_LegendsBattle/border.bin
@@ -0,0 +1 @@
+����
\ No newline at end of file
diff --git a/data/layouts/SootopolisCity_LegendsBattle/map.bin b/data/layouts/SootopolisCity_LegendsBattle/map.bin
new file mode 100644
index 000000000..67085fd37
--- /dev/null
+++ b/data/layouts/SootopolisCity_LegendsBattle/map.bin
@@ -0,0 +1,12 @@
+�����������������2��2�2��������9�����������2�2�2�2�2��������9���2�2�2�2�2�������������������2�2���9���KLM�������������������9����2���������9����2�2�2��2�2�2����	
+
��2���������2�2�2�2�2�2�2�2	
+���2��������
�������2�2�2��	
+�2�2%7'��2�2���2�2�2�2��KLM�2�2�2�2	
+�����������	
+U�����������2�2-?/���2�2��@AAAB
Z��2�2�2�����������2#$_����2�2�2�2�2�2��2�2�2�2�2�2�2�2�2����2����2�2�2���2�2�2�2�2�2�2���KLM��2�2+,_����2�2��D2E2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�@AAAAAAAB�2���
@AAF�2G\���2�2�2��2�2�2�2�2�2�2�2@AF�2�2GAAAB���2�2�����D2�������������2�2��%6'�2��bD2c����2�2�2��2�2�2�2�2�2�2�2��bD2E2c������������2�2�2�2������9�����2�2��->/�2��2�D2�����2�2�2�����������2�2�2�2�2�2�2�2�2���������D2�����������AAAAAB��2��2�2�2�2�2�2�2�2���2�2�������������D2E2���������D2������	
+��������������������D2E2�����������������D2E2�����2�����2�2�2�2�2�2���2�2��2�2�2���������2�2�2�2�2�2�2�������2����������D2E2��2�������6�2�2�2�2�2�2���2�2������2�����82�2����D2E2��2�������2�2�2�2�2�2�2�2�2�2�2��������9����2�2�2���2�2����2�2�2�2�2�2��2����2�2�2�2�2�2����@AF�2�2GAAAAAAAAB���������2�2�2�2��2�2�2�2����2�����2�T	
+B�2�2�2�2�2�2��2���2�bD2E2c�QR[RS���2�2���TA	
+���2�2�2�2��282�2�2�2�2��2;�2�2�2�2�^#$�2�2�2��D2E2��2���2��2�2�2�2� �!2�"������2�^�2#$���2�2�2�2�����2�2�2�2�^+,�2�2�2��D2E2�����2��2�2�2�2�()2)2)2*��2�2�2���^�2+,����2�2�2�2	
+�	
+�KLM^�2�2�2�2�2�2���2�2�2�2�2���n�2�2o�0q0q0q02��2�2�2�2��^�2�2�2�2��2�D2E2��
�2�
^�2�2�2�2�2�2���2�2�2�2�2���bD2E2c�q0�6q0�6q0����2�2��^�2�2�2�2���D2E2��%7'�2�%7']AAAB�2�2���2�2��D2���q0q0q0q0q0q0�6q0�6q0q0q0�����^�2�2�2�2�2�2�2�2�2�����-?/�2AAB�-?/�2����D2E2���2�2��D2���q0q0q0q0q0q0q0q0q0q0q0q0q0q0���]AB�2�2�2�2�2�2�2��2�2�2���������������2�2�2�2�2�2��2�2���2�2�2�q0q0q0q0q0q0q0q0q0q0q0q0q0q0������D2E2�KLM������2�2�2�2�������2��KLM�D2E2�������2�2�2�q0q0t||||||||||�����TB�2�2�2
��2�2�2���2�2�2�2�KL�2�2�TYZB�2�2�������D2E2�ty}����������s����^�2�2�2�2��2�2�2�2��2�2�2�2�2
�2�2�^�2�2�2�����2�2�q0q0t}������������{y���^�2�2�2�2��2���2�2�2�2%6'�2�2�^�2�2�2��k6l6l6m6�q0q0u���������������s��^�2�2�2�2�2�2�2��
�2��2�2�2�2->/�2�2�^�2�2�2�2�2�2��0123�q0q0u���������������s��]AAB�2�2�2�2�2��2���2�2AAAAB��]AAAAB���89:;�q0q0u���������������s��{|}~��2�2�2�2��2�2��2�2�2�2��������������ABw�q0q0u���������������s�TPQRS��2�2�2�2��D2��2�2���2�2���2����2�2�2������2�2�2�2�2�q0q0u���������������s�^XYZ[��2�2�2�2�2�2�2��2�2�2��2�2��2�2��2�2�2�2�2��2�2�2�2�2�2�2�2��q0q0u���������������s�^abv��D2E2��2�2�2���������2�2���KLM��2�2�2�2�2�D2E2�q0q0q0u����0�1�1����1�0����s�^�2�2�2�2�2�2�2�2�����2�2�2��2���2�2���TYZB�2�2�2�2��q0q0q0q0q0q0u���
0
0
0
0
0
001
0����s�^�2�2�2�2�2�2�2�2222�9����2��2�2�2��2�^�2�2�2�2��q0q0q0q0q0q0t}���
0
0
0
0
0
01
0����s�]B�2�2@AF�2�2

222���2��2�����^�2�2�2�2�q0t��D2E2yz����
0
0
0
0
0
0
0
0����s���D2E2��N�2�2	
+���2����2�2��2^�2�2�2�2�2�2�2�q0r��
0
0
0
0����
0
0
0
0
0
0
0
0����{yyyD2E2��N�2�2����������2]B�2�2�2�2���q0r��
0
0
0
0�����������������
04
0
0
0p�N�2�2�2�2�2��2���2��2�2���������tyyz
0����������������������
0
0
0
0
0p�V@AAAAAAB�������2��qty����yz
0
0
0
0����������������������
0
0
0
0
0p�����������������2�qqr
0����
0
0
0
0
0
0������������������������
0
0
0xyyyy�qqq���������2�qqr
0����
0
0
0
0
0
0������������������������
0
0
0
0
0
0
0
0x������������2�qqr
0
0
0��
0
0
0
0
0
0������������������������
0
0
0
0
0
0
0
0
0��pq��������2�qqr
0
0
0��
0
0
0
0
0
0���������������������������
0
0
0
0�1�1��pq��������2�qqr
0
0
0
0
0
0
0�1�1
0
0���������������������������
0
0
0
0����pqq�������2��qr
0
0
0
0
0
0
0��
0
0���������������������������
0
0
0
0����pqq�����������iiij
0
0
0���������������������������������������pqq���������������ij
0���������������������������������������p������������������r
0�����������������������������������i0i0i0i0�0�������������������iij��������������������������������qqqq����������������������qr��������������������������������q��������������������������r��������������������������qqqqqqq��������������������������r��������������������������qqqq�����������������������������r����������������������qqqqqqq������������������������������r����������������������qqqqq�������������������������������������������������������qq�����������������������������������qqqq�����������������qqqq������������������������������������qqqqqqqqqqqqqqqqqqqqq�����������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
new file mode 100644
index 000000000..f496f458e
Binary files /dev/null and b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin differ
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
new file mode 100644
index 000000000..603f55c93
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
@@ -0,0 +1,2 @@
+'
++/6666-7$%655555555556555555655555565555555555655	555555
\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_29/border.bin b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_29/map.bin b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_30/border.bin b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_30/map.bin b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_31/border.bin b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_31/map.bin b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_32/border.bin b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_32/map.bin b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_33/border.bin b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_33/map.bin b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_34/border.bin b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/UnknownLinkContestRoom_25_34/map.bin b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/UnknownMap_08417FC4/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/layouts/UnknownMap_08417FC4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-p
p
p
p

\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/UnknownMap_08417FC4/map.bin
deleted file mode 100644
index 17a14a8d5..000000000
--- a/data/layouts/UnknownMap_08417FC4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp��0000000000000�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0
00
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�s
00�0
0
0
0
0
0
0
0
0
0
0
0
0
0
0r�pppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0000���
0
0
0
0
0
0
0
0
0
0
0
0
0
000�0�ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp�0
0
00����
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0�0�ppppPQppppppppppppppppppppppr�qkllmq�vppppuvppppPQprs
0
0
0�����
0
0
0
0
0
0
0
0
0
0
0
0
0
0111
0utpPQXYpppppr{{{{{{{vpppppppu�qk�qquqq|uvpp}~pu{vXYrss
0
0
0��
0
0
0
0000
0
0
0
0
0
0
015
1
0uutXYpuvpu{{�qklllmq�vppppuv��q{|||}qt�}~pppppzq|�}sss
0
0
0
0
0
0
0
0
00��4�400
0
0
0
0
0111
0uuu~�
p}~pzqqqk�klm�mq�vppp}~p�y�qqqty�ppu{{vpp�y��fsss
0
0
0
0
0
0
0
0
0
0
0���4�4�4�400
0
0
0
0
0
0
0uuug�ppuvzqqqsq{|}quqq|ppPQpppp�yyy�ppppzqq|puvpp�fsss
0
0
0
0
0
0
0
0
0
0
0��4�4�4�4�4�40
0
0
0
0
0
0uuug�uv}~��qq{�qqqt}qt�ppXYpppuvppppppuv�yy�p}~pp�fss{|||�
00
0
0
0
0
0
0�4�4�4�4�4�4�4
0
0t|||}uug�}~ppp�y�q{|||}qt�puv{vppp}~pppppp}~pppPQpppp�fs{����s0
00
0
0
0
0
0
04�4�4�4�4�4�4
0
0ut���}ug�ppppPQp�y�����y�pp}~q|ppppppppppPQppppXYppuv�f{����ss
00
00
00
0
0
0
0�4�4�4�444
0
0uut���}g�ppppXYppppppppuvppppy�ppppppppppXYpppppppp}~�n����ss{|||�0
0
0
0
0
04444t|||}uut���o�puvppppppppppp}~ppppppppppppppppppppppppuvpp��1$1$1$1�s{����{||�
0
0
0
0t||}t���}ur$1$1$1�1�p}~pppppuvppppppppppppuvpppppppppppppppp}~pp��1�1�1$1�{����{���{|22|}t��}t���}r$1$1$1�1�pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp��1�1�1$1�����{���{��22��}t��}t����$1$1$1�1�ppppppppppppppppppppuvppzt�ppppppp}~pppppppp��1�1�1$1$1$1"1
0x���{���22���}t��z
0
0 1$1$1$1�1�1�pppppppppppppppppppp}~pp��pppppppppppppppppp����1�1�1$1"1
0
0
0
0x����22����z
0
0
0
0
0 1$1$1�1�1��pppppppppppppppppppppppppppppppppppppppppppppp��1�1�1$1$11
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
01$1$1�1�1�1�ppppppppppppppppppppppppppppppppppppppppppppppp��1�1�1$1$1!11
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
011$1$1�1�1�1��ppppppppppppppppppppppppppppppppppppppppppppppp��1�1�1�1$1$1!111
0
0
0
0
0
0
0
0
0
0
0111$1$1$1$1�1�1�1�pppppppppppppppppppppppppppppppppppppppppppppppp��1�1�1�1$1$1$1$1"1
0
0
0
0
0
0
0
0
011$1$1$1$1$1$1�1�1�1�1�pppppppppppppppppppppppppppppppppppppppppppppppp����1�1�1�1$1$1$1111111111$1$1$1$1$1$1$1$1�1�1���pppppppppPQpppppppuvpppppppppppppppppppppppppppppp��1�1�1�1$1$1$1$1$1$1$1$1$1$1$1$1$1$1�1�1�1�1�1�1�1�1�ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp���1�1�1�1�1$1$1$1$1$1$1$1$1$1$1$1$1�1�1�1�1�����ppppppppXYpppr{�qqq�vpuv�qq|ppppppppppppppppppppppppp��1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1�1��ppppppppppppppu{{�qqqqqq�v}~qqt�pPQpppppppppppppppppppppp����������������������ppppppppppuvppp��qqqqqqqqq�vpyy�uvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~pppp�y�qqqqqqty�pppp}~ppXY�y�p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp�yyyyyy�PQpppppppppppppuvpPQpppuvppzqqq�{vp}~ppppppuvppppppppppppppXYp}~p��qq�vpppppppppXYupppppppppppp}~pXYu{v}~uv�yy�qq�vpuvpppPQ}~pppppppPQppppr{{{vppp��ty�ppppppppppp}pppppPQppppppppppzq|pp}~ppp�yyy�p}~PQpXYppu{{vpuvXYppr{�qkm�vppp��pppppppppppppppppppXYpppppppppp�y�pppppppppppppppXYuvppp��q�v}~pu{{�klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp�yy�ppp��qq{|}qqt�ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp�yy���yy�pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08428450/border.bin b/data/layouts/UnknownMap_08428450/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_08428450/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/UnknownMap_08428450/map.bin
deleted file mode 100644
index ca93fa0e2..000000000
Binary files a/data/layouts/UnknownMap_08428450/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/UnknownMap_084294C4/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_084294C4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/UnknownMap_084294C4/map.bin
deleted file mode 100644
index 37f05b971..000000000
Binary files a/data/layouts/UnknownMap_084294C4/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/UnknownMap_084294E8/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_084294E8/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/UnknownMap_084294E8/map.bin
deleted file mode 100644
index ca93fa0e2..000000000
Binary files a/data/layouts/UnknownMap_084294E8/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/UnknownMap_0843E6C0/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E6C0/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/UnknownMap_0843E6C0/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E6C0/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/UnknownMap_0843E6E4/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E6E4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/UnknownMap_0843E6E4/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E6E4/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/UnknownMap_0843E708/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E708/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/UnknownMap_0843E708/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E708/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/UnknownMap_0843E72C/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E72C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/UnknownMap_0843E72C/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E72C/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/UnknownMap_0843E750/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E750/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/UnknownMap_0843E750/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E750/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/UnknownMap_0843E774/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E774/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/UnknownMap_0843E774/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E774/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/UnknownMap_0843E798/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E798/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/UnknownMap_0843E798/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E798/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/UnknownMap_0843E7BC/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E7BC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/UnknownMap_0843E7BC/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E7BC/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/UnknownMap_0843E7E0/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E7E0/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/UnknownMap_0843E7E0/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E7E0/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/UnknownMap_0843E804/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E804/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/UnknownMap_0843E804/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E804/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/UnknownMap_0843E828/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E828/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/UnknownMap_0843E828/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E828/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/UnknownMap_0843E84C/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E84C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/UnknownMap_0843E84C/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E84C/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/UnknownMap_0843E870/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E870/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/UnknownMap_0843E870/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E870/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/UnknownMap_0843E894/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/layouts/UnknownMap_0843E894/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/UnknownMap_0843E894/map.bin
deleted file mode 100644
index 22a47d94e..000000000
Binary files a/data/layouts/UnknownMap_0843E894/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/UnknownMap_08447028/border.bin
deleted file mode 100644
index 9e4b3fb7a..000000000
--- a/data/layouts/UnknownMap_08447028/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/UnknownMap_08447028/map.bin
deleted file mode 100644
index 028da0526..000000000
--- a/data/layouts/UnknownMap_08447028/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666���
�662222222222222222222222222���������
����	�	�
-�2266662����BBBB��2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2
 !"#:VcccWcSTa2
222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222�	�	�
-�IIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22���
�22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<
222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID222
2222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845A394/border.bin b/data/layouts/UnknownMap_0845A394/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/layouts/UnknownMap_0845A394/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/UnknownMap_0845A394/map.bin
deleted file mode 100644
index fd294d9b6..000000000
Binary files a/data/layouts/UnknownMap_0845A394/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/UnknownMap_0845D470/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/layouts/UnknownMap_0845D470/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-p
p
p
p

\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/UnknownMap_0845D470/map.bin
deleted file mode 100644
index cd136de41..000000000
--- a/data/layouts/UnknownMap_0845D470/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqqqqqqqqqt||}ut�|}��ppp��{�qs{�$1�4$1$1$1$1�4$1$1uuqu�pppppppppppppqqqqqqqqt||}qqt}u����ppppp��{�{�s$1$1$1$1$1$1$1$1t}ut}�ppppppppppppp||||||||}qqqt|}t}�ppppppppp��sqs{�$1$1$1�4$1t|}quu��pppppppppppppqqqqqt���|||}qt}��pppppppppPesq{�{��4$1$1t}qt|}u�ppppppppppppppqqt||}qqqt���|}��ppppppppppXm{�q{�{|||}qt}t|}�pppppppppppppp||}qt�|||}������ppuvpppppPQp��{�q{�����|}qu���pppppppppppppp���|}������uvpu{vp}~pppppXYpp��{|����0����|}�pppppppppppppppp��Z[��ppppp}~pzq|pppppppppPQpp����$1$1$1$1$1��Z[�ppppPQpppppppppp�pXYppppuvpppp�y�pppppppuvXYppppp�$1$1$1$1$1�pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~ppppppp�������puv�y�q|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~pp�y�PQ}~ppppppppPQpp�y�ppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp�y�}~ppuvpppppu�|ppppppppu�qq�vpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|pppppppp�yyyy�PQppppppppppppppppppppuvpppppppppppppppppuv�y�pppppppuvppPQpXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq�{vppppuvppuvXYpppppppu{vpppppPQppuv�ypppppppppppppppppppp�yyy�pppp}~uv}~pppppppu{�q|pppppXYpp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|ppppppPQpppPQppppppppppppppppppppppp}~ppppppppppppppppp�yyy�ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu�q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~�yy�pppppppppppppppppppppppppppppppppppppppppppppppppp�yy�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz�vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp���v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ�y{{{{tppp�y�p}~uvp�y�pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq�{tppppuvp}~ppuvpppppppzqq�{vppp}~uvpppu{{vppXYp}~puvpppllllmq�{{{t}~pppuv}~ppu{{vp��qqq�vpppp}~ppu�qq�{{vu{{{v}~pppqqqq�llmqq�{tppp}~ppu{�qq|uv�yyyy�ppppppPQ�yyy�qq��qqt�pppppqqqqqqq�mqqqutppppppzqqqt�}~ppppppppppppXYpppp�y�qqqt�ppppPQqqqqqqqq�llmuu{tppuv�yyy�ppppppppppppppppppppppp�yyy�pppppXYqqqqqqqqqqq���l�tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845ECB4/border.bin b/data/layouts/UnknownMap_0845ECB4/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/layouts/UnknownMap_0845ECB4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/UnknownMap_0845ECB4/map.bin
deleted file mode 100644
index ec344933f..000000000
--- a/data/layouts/UnknownMap_0845ECB4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-���������������������������������������������������������2�2�2�2�2�2�2�2�2�2�2������������������2�2�2�2�2�2�2�2�2�������������������2�2�2�2�2�2�2�2�2�2�2�2��������������������2�2�2�2�2�2�2���������������������2�2�2�2�2�2�2�����������������������2�������������������������2�2�2�2�2�����������������������2�2�2�2�2�����������������������2�2�2�2�2������������������������2��������������������������2�2�2�������������������������2�2�2������������������������2�2�2�2������������������������2�2�2�2�2����������������������2����������������������222���������������������222��������������������22222��������������������22222��������������������2��������������������222������������������222�����������������

222���������������
222


������
2222222
������2222222222������
2222222 			#�����
222 			#��2222 #

��2222




��2222 #



��2222
efg

��222 #
esdrfg
��222efsd_ddrfg��222qdd_d__ddp��222qd______dp��22222es_d____d_p��22222
qdd______dp��22222222#2#2bdd_d_d_dp����222222222#2b_d_d_`a3a3#2������22222222#2a3a3a3a3a3#2222��������2222222222222����������������222222���������������������������������
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08469200/border.bin b/data/layouts/UnknownMap_08469200/border.bin
deleted file mode 100644
index c07869a9f..000000000
--- a/data/layouts/UnknownMap_08469200/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/UnknownMap_08469200/map.bin
deleted file mode 100644
index 67085fd37..000000000
--- a/data/layouts/UnknownMap_08469200/map.bin
+++ /dev/null
@@ -1,12 +0,0 @@
-�����������������2��2�2��������9�����������2�2�2�2�2��������9���2�2�2�2�2�������������������2�2���9���KLM�������������������9����2���������9����2�2�2��2�2�2����	
-
��2���������2�2�2�2�2�2�2�2	
-���2��������
�������2�2�2��	
-�2�2%7'��2�2���2�2�2�2��KLM�2�2�2�2	
-�����������	
-U�����������2�2-?/���2�2��@AAAB
Z��2�2�2�����������2#$_����2�2�2�2�2�2��2�2�2�2�2�2�2�2�2����2����2�2�2���2�2�2�2�2�2�2���KLM��2�2+,_����2�2��D2E2��2�2�2�2�2�2�2�2�2�2�2�2�2�2��2�2�2��2�2�2�2�@AAAAAAAB�2���
@AAF�2G\���2�2�2��2�2�2�2�2�2�2�2@AF�2�2GAAAB���2�2�����D2�������������2�2��%6'�2��bD2c����2�2�2��2�2�2�2�2�2�2�2��bD2E2c������������2�2�2�2������9�����2�2��->/�2��2�D2�����2�2�2�����������2�2�2�2�2�2�2�2�2���������D2�����������AAAAAB��2��2�2�2�2�2�2�2�2���2�2�������������D2E2���������D2������	
-��������������������D2E2�����������������D2E2�����2�����2�2�2�2�2�2���2�2��2�2�2���������2�2�2�2�2�2�2�������2����������D2E2��2�������6�2�2�2�2�2�2���2�2������2�����82�2����D2E2��2�������2�2�2�2�2�2�2�2�2�2�2��������9����2�2�2���2�2����2�2�2�2�2�2��2����2�2�2�2�2�2����@AF�2�2GAAAAAAAAB���������2�2�2�2��2�2�2�2����2�����2�T	
-B�2�2�2�2�2�2��2���2�bD2E2c�QR[RS���2�2���TA	
-���2�2�2�2��282�2�2�2�2��2;�2�2�2�2�^#$�2�2�2��D2E2��2���2��2�2�2�2� �!2�"������2�^�2#$���2�2�2�2�����2�2�2�2�^+,�2�2�2��D2E2�����2��2�2�2�2�()2)2)2*��2�2�2���^�2+,����2�2�2�2	
-�	
-�KLM^�2�2�2�2�2�2���2�2�2�2�2���n�2�2o�0q0q0q02��2�2�2�2��^�2�2�2�2��2�D2E2��
�2�
^�2�2�2�2�2�2���2�2�2�2�2���bD2E2c�q0�6q0�6q0����2�2��^�2�2�2�2���D2E2��%7'�2�%7']AAAB�2�2���2�2��D2���q0q0q0q0q0q0�6q0�6q0q0q0�����^�2�2�2�2�2�2�2�2�2�����-?/�2AAB�-?/�2����D2E2���2�2��D2���q0q0q0q0q0q0q0q0q0q0q0q0q0q0���]AB�2�2�2�2�2�2�2��2�2�2���������������2�2�2�2�2�2��2�2���2�2�2�q0q0q0q0q0q0q0q0q0q0q0q0q0q0������D2E2�KLM������2�2�2�2�������2��KLM�D2E2�������2�2�2�q0q0t||||||||||�����TB�2�2�2
��2�2�2���2�2�2�2�KL�2�2�TYZB�2�2�������D2E2�ty}����������s����^�2�2�2�2��2�2�2�2��2�2�2�2�2
�2�2�^�2�2�2�����2�2�q0q0t}������������{y���^�2�2�2�2��2���2�2�2�2%6'�2�2�^�2�2�2��k6l6l6m6�q0q0u���������������s��^�2�2�2�2�2�2�2��
�2��2�2�2�2->/�2�2�^�2�2�2�2�2�2��0123�q0q0u���������������s��]AAB�2�2�2�2�2��2���2�2AAAAB��]AAAAB���89:;�q0q0u���������������s��{|}~��2�2�2�2��2�2��2�2�2�2��������������ABw�q0q0u���������������s�TPQRS��2�2�2�2��D2��2�2���2�2���2����2�2�2������2�2�2�2�2�q0q0u���������������s�^XYZ[��2�2�2�2�2�2�2��2�2�2��2�2��2�2��2�2�2�2�2��2�2�2�2�2�2�2�2��q0q0u���������������s�^abv��D2E2��2�2�2���������2�2���KLM��2�2�2�2�2�D2E2�q0q0q0u����0�1�1����1�0����s�^�2�2�2�2�2�2�2�2�����2�2�2��2���2�2���TYZB�2�2�2�2��q0q0q0q0q0q0u���
0
0
0
0
0
001
0����s�^�2�2�2�2�2�2�2�2222�9����2��2�2�2��2�^�2�2�2�2��q0q0q0q0q0q0t}���
0
0
0
0
0
01
0����s�]B�2�2@AF�2�2

222���2��2�����^�2�2�2�2�q0t��D2E2yz����
0
0
0
0
0
0
0
0����s���D2E2��N�2�2	
-���2����2�2��2^�2�2�2�2�2�2�2�q0r��
0
0
0
0����
0
0
0
0
0
0
0
0����{yyyD2E2��N�2�2����������2]B�2�2�2�2���q0r��
0
0
0
0�����������������
04
0
0
0p�N�2�2�2�2�2��2���2��2�2���������tyyz
0����������������������
0
0
0
0
0p�V@AAAAAAB�������2��qty����yz
0
0
0
0����������������������
0
0
0
0
0p�����������������2�qqr
0����
0
0
0
0
0
0������������������������
0
0
0xyyyy�qqq���������2�qqr
0����
0
0
0
0
0
0������������������������
0
0
0
0
0
0
0
0x������������2�qqr
0
0
0��
0
0
0
0
0
0������������������������
0
0
0
0
0
0
0
0
0��pq��������2�qqr
0
0
0��
0
0
0
0
0
0���������������������������
0
0
0
0�1�1��pq��������2�qqr
0
0
0
0
0
0
0�1�1
0
0���������������������������
0
0
0
0����pqq�������2��qr
0
0
0
0
0
0
0��
0
0���������������������������
0
0
0
0����pqq�����������iiij
0
0
0���������������������������������������pqq���������������ij
0���������������������������������������p������������������r
0�����������������������������������i0i0i0i0�0�������������������iij��������������������������������qqqq����������������������qr��������������������������������q��������������������������r��������������������������qqqqqqq��������������������������r��������������������������qqqq�����������������������������r����������������������qqqqqqq������������������������������r����������������������qqqqq�������������������������������������������������������qq�����������������������������������qqqq�����������������qqqq������������������������������������qqqqqqqqqqqqqqqqqqqqq�����������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084693AC/border.bin b/data/layouts/UnknownMap_084693AC/border.bin
deleted file mode 100644
index f496f458e..000000000
Binary files a/data/layouts/UnknownMap_084693AC/border.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/UnknownMap_084693AC/map.bin
deleted file mode 100644
index a179d8997..000000000
Binary files a/data/layouts/UnknownMap_084693AC/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/UnknownMap_08480DAC/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_08480DAC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/UnknownMap_08480DAC/map.bin
deleted file mode 100644
index d1277f280..000000000
Binary files a/data/layouts/UnknownMap_08480DAC/map.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/UnknownMap_08480F54/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_08480F54/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/UnknownMap_08480F54/map.bin
deleted file mode 100644
index f0d9c299c..000000000
--- a/data/layouts/UnknownMap_08480F54/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-''''''''';<=''/////////CD2E//�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�289999:�2�2�2�2�2�2�2�2@AAAAB�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2IMMMMJ�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2"2#2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/UnknownMap_084810FC/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_084810FC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/UnknownMap_084810FC/map.bin
deleted file mode 100644
index 908158cf4..000000000
--- a/data/layouts/UnknownMap_084810FC/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<='''';<=''//CD2E////CL2E//5252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084812A4/border.bin b/data/layouts/UnknownMap_084812A4/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_084812A4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/UnknownMap_084812A4/map.bin
deleted file mode 100644
index d033bc4d2..000000000
--- a/data/layouts/UnknownMap_084812A4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<=';<=';<='//CL2E/CD2E/CD2E/�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�289999:�2�2�2�2�2�2�2�2@AAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2AAAAAA�2�2�2�2�2�2�2�2IMMMMJ�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownMap_0848144C/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_0848144C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/UnknownMap_0848144C/map.bin
deleted file mode 100644
index eeccae9ae..000000000
--- a/data/layouts/UnknownMap_0848144C/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<=';<=';<='//CD2E/CL2E/CL2E/525252525252525265252525252626266642424242424242426262426264242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084815F4/border.bin b/data/layouts/UnknownMap_084815F4/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_084815F4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/UnknownMap_084815F4/map.bin
deleted file mode 100644
index 8507a4932..000000000
--- a/data/layouts/UnknownMap_084815F4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<='''';<=''//CL2E////CD2E//�2�2�2�2�2�2�2�2�26�2�2�2�2�2�2�2�2�2�2�2�26�2�2�2�2�2�2�2�28999999:�2�2�2�2�2�2@AAAAAAB�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2AAAAAAAA�2�2�2�2�2�2IMMMMMMJ�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/UnknownMap_08481B24/border.bin
deleted file mode 100644
index e9d1c658c..000000000
--- a/data/layouts/UnknownMap_08481B24/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-����
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/UnknownMap_08481B24/map.bin
deleted file mode 100644
index 2a47bca91..000000000
--- a/data/layouts/UnknownMap_08481B24/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-���������������������������������������������������������������������������������d2d2d2�6d2d2d2�6d2d2d2�6�6�6�6�6�6�6d2d2d2�6d2d2d2�6d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m�2�2n';<='''''''''//////////j�2�2k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[���������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/UnknownMap_08481DBC/border.bin
deleted file mode 100644
index f496f458e..000000000
Binary files a/data/layouts/UnknownMap_08481DBC/border.bin and /dev/null differ
diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/UnknownMap_08481DBC/map.bin
deleted file mode 100644
index 603f55c93..000000000
--- a/data/layouts/UnknownMap_08481DBC/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-'
-+/6666-7$%655555555556555555655555565555555555655	555555
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_25_29/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/layouts/UnknownMap_25_29/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_25_30/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/layouts/UnknownMap_25_30/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_25_31/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/layouts/UnknownMap_25_31/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_25_32/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/layouts/UnknownMap_25_32/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_25_33/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/layouts/UnknownMap_25_33/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/layouts/UnknownMap_25_34/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/layouts/UnknownMap_25_34/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/layouts/Unknown_08428450/border.bin b/data/layouts/Unknown_08428450/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Unknown_08428450/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/Unknown_08428450/map.bin b/data/layouts/Unknown_08428450/map.bin
new file mode 100644
index 000000000..ca93fa0e2
Binary files /dev/null and b/data/layouts/Unknown_08428450/map.bin differ
diff --git a/data/layouts/Unknown_084294C4/border.bin b/data/layouts/Unknown_084294C4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Unknown_084294C4/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/Unknown_084294C4/map.bin b/data/layouts/Unknown_084294C4/map.bin
new file mode 100644
index 000000000..37f05b971
Binary files /dev/null and b/data/layouts/Unknown_084294C4/map.bin differ
diff --git a/data/layouts/Unknown_084294E8/border.bin b/data/layouts/Unknown_084294E8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Unknown_084294E8/border.bin
@@ -0,0 +1 @@
+




\ No newline at end of file
diff --git a/data/layouts/Unknown_084294E8/map.bin b/data/layouts/Unknown_084294E8/map.bin
new file mode 100644
index 000000000..ca93fa0e2
Binary files /dev/null and b/data/layouts/Unknown_084294E8/map.bin differ
diff --git a/data/layouts/Unknown_0843E6C0/border.bin b/data/layouts/Unknown_0843E6C0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E6C0/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E6C0/map.bin b/data/layouts/Unknown_0843E6C0/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E6C0/map.bin differ
diff --git a/data/layouts/Unknown_0843E6E4/border.bin b/data/layouts/Unknown_0843E6E4/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E6E4/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E6E4/map.bin b/data/layouts/Unknown_0843E6E4/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E6E4/map.bin differ
diff --git a/data/layouts/Unknown_0843E708/border.bin b/data/layouts/Unknown_0843E708/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E708/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E708/map.bin b/data/layouts/Unknown_0843E708/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E708/map.bin differ
diff --git a/data/layouts/Unknown_0843E72C/border.bin b/data/layouts/Unknown_0843E72C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E72C/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E72C/map.bin b/data/layouts/Unknown_0843E72C/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E72C/map.bin differ
diff --git a/data/layouts/Unknown_0843E750/border.bin b/data/layouts/Unknown_0843E750/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E750/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E750/map.bin b/data/layouts/Unknown_0843E750/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E750/map.bin differ
diff --git a/data/layouts/Unknown_0843E774/border.bin b/data/layouts/Unknown_0843E774/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E774/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E774/map.bin b/data/layouts/Unknown_0843E774/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E774/map.bin differ
diff --git a/data/layouts/Unknown_0843E798/border.bin b/data/layouts/Unknown_0843E798/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E798/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E798/map.bin b/data/layouts/Unknown_0843E798/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E798/map.bin differ
diff --git a/data/layouts/Unknown_0843E7BC/border.bin b/data/layouts/Unknown_0843E7BC/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E7BC/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E7BC/map.bin b/data/layouts/Unknown_0843E7BC/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E7BC/map.bin differ
diff --git a/data/layouts/Unknown_0843E7E0/border.bin b/data/layouts/Unknown_0843E7E0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E7E0/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E7E0/map.bin b/data/layouts/Unknown_0843E7E0/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E7E0/map.bin differ
diff --git a/data/layouts/Unknown_0843E804/border.bin b/data/layouts/Unknown_0843E804/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E804/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E804/map.bin b/data/layouts/Unknown_0843E804/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E804/map.bin differ
diff --git a/data/layouts/Unknown_0843E828/border.bin b/data/layouts/Unknown_0843E828/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E828/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E828/map.bin b/data/layouts/Unknown_0843E828/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E828/map.bin differ
diff --git a/data/layouts/Unknown_0843E84C/border.bin b/data/layouts/Unknown_0843E84C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E84C/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E84C/map.bin b/data/layouts/Unknown_0843E84C/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E84C/map.bin differ
diff --git a/data/layouts/Unknown_0843E870/border.bin b/data/layouts/Unknown_0843E870/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E870/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E870/map.bin b/data/layouts/Unknown_0843E870/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E870/map.bin differ
diff --git a/data/layouts/Unknown_0843E894/border.bin b/data/layouts/Unknown_0843E894/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Unknown_0843E894/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_0843E894/map.bin b/data/layouts/Unknown_0843E894/map.bin
new file mode 100644
index 000000000..22a47d94e
Binary files /dev/null and b/data/layouts/Unknown_0843E894/map.bin differ
diff --git a/data/layouts/Unknown_08447028/border.bin b/data/layouts/Unknown_08447028/border.bin
new file mode 100644
index 000000000..9e4b3fb7a
--- /dev/null
+++ b/data/layouts/Unknown_08447028/border.bin
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/layouts/Unknown_08447028/map.bin b/data/layouts/Unknown_08447028/map.bin
new file mode 100644
index 000000000..028da0526
--- /dev/null
+++ b/data/layouts/Unknown_08447028/map.bin
@@ -0,0 +1,3 @@
+22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666���
�662222222222222222222222222���������
����	�	�
+�2266662����BBBB��2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2
 !"#:VcccWcSTa2
222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222�	�	�
+�IIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22���
�22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<
222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID222
2222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222
\ No newline at end of file
diff --git a/data/layouts/Unknown_084693AC/border.bin b/data/layouts/Unknown_084693AC/border.bin
new file mode 100644
index 000000000..f496f458e
Binary files /dev/null and b/data/layouts/Unknown_084693AC/border.bin differ
diff --git a/data/layouts/Unknown_084693AC/map.bin b/data/layouts/Unknown_084693AC/map.bin
new file mode 100644
index 000000000..a179d8997
Binary files /dev/null and b/data/layouts/Unknown_084693AC/map.bin differ
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/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json
new file mode 100644
index 000000000..956a68158
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_29/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_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,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
@@ -0,0 +1 @@
+
diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json
new file mode 100644
index 000000000..526c6de2a
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_30/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_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,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
@@ -0,0 +1 @@
+
diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json
new file mode 100644
index 000000000..9548c1125
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_31/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_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,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
@@ -0,0 +1 @@
+
diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json
new file mode 100644
index 000000000..27411d28e
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_32/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_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,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
@@ -0,0 +1 @@
+
diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
new file mode 100644
index 000000000..1a15ae6d6
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_33/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_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,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
@@ -0,0 +1 @@
+
diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
new file mode 100644
index 000000000..4c90858b9
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_34/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_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,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
@@ -0,0 +1 @@
+
diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json
deleted file mode 100644
index 8f7ac0226..000000000
--- a/data/maps/UnknownMap_25_29/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_MAP_25_29",
-  "name": "UnknownMap_25_29",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_29",
-  "music": "MUS_NIBI",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownMap_25_29/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_29/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json
deleted file mode 100644
index 5f321e6b5..000000000
--- a/data/maps/UnknownMap_25_30/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_MAP_25_30",
-  "name": "UnknownMap_25_30",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_30",
-  "music": "MUS_NIBI",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownMap_25_30/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_30/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json
deleted file mode 100644
index f7b06ac42..000000000
--- a/data/maps/UnknownMap_25_31/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_MAP_25_31",
-  "name": "UnknownMap_25_31",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_31",
-  "music": "MUS_NIBI",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownMap_25_31/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_31/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json
deleted file mode 100644
index c963d0129..000000000
--- a/data/maps/UnknownMap_25_32/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_MAP_25_32",
-  "name": "UnknownMap_25_32",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_32",
-  "music": "MUS_NIBI",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownMap_25_32/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_32/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json
deleted file mode 100644
index 441f767b6..000000000
--- a/data/maps/UnknownMap_25_33/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_MAP_25_33",
-  "name": "UnknownMap_25_33",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_33",
-  "music": "MUS_NIBI",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownMap_25_33/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_33/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json
deleted file mode 100644
index 7bdf1d226..000000000
--- a/data/maps/UnknownMap_25_34/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_UNKNOWN_MAP_25_34",
-  "name": "UnknownMap_25_34",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_34",
-  "music": "MUS_NIBI",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownMap_25_34/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
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)
-- 
cgit v1.2.3