summaryrefslogtreecommitdiff
path: root/data/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'data/layouts')
-rw-r--r--data/layouts/AbandonedShip_CaptainsOffice/border.bin1
-rw-r--r--data/layouts/AbandonedShip_CaptainsOffice/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_CaptainsOffice/map.binbin0 -> 126 bytes
-rw-r--r--data/layouts/AbandonedShip_Corridors_1F/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Corridors_1F/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Corridors_1F/map.bin3
-rw-r--r--data/layouts/AbandonedShip_Corridors_B1F/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Corridors_B1F/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Corridors_B1F/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Deck/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Deck/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Deck/map.bin1
-rw-r--r--data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin1
-rw-r--r--data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin1
-rw-r--r--data/layouts/AbandonedShip_HiddenFloorRooms/border.bin1
-rw-r--r--data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_HiddenFloorRooms/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Room_B1F/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Room_B1F/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Room_B1F/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms2_1F/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms2_1F/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Rooms2_1F/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms2_B1F/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms2_B1F/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Rooms2_B1F/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms_1F/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms_1F/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Rooms_1F/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms_B1F/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Rooms_B1F/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Rooms_B1F/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Underwater1/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Underwater1/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Underwater1/map.bin1
-rw-r--r--data/layouts/AbandonedShip_Underwater2/border.bin1
-rw-r--r--data/layouts/AbandonedShip_Underwater2/layout.inc15
-rw-r--r--data/layouts/AbandonedShip_Underwater2/map.bin1
-rw-r--r--data/layouts/AlteringCave/border.bin1
-rw-r--r--data/layouts/AlteringCave/layout.inc15
-rw-r--r--data/layouts/AlteringCave/map.bin1
-rw-r--r--data/layouts/AncientTomb/border.bin1
-rw-r--r--data/layouts/AncientTomb/layout.inc15
-rw-r--r--data/layouts/AncientTomb/map.binbin0 -> 1122 bytes
-rw-r--r--data/layouts/AquaHideout_1F/border.bin1
-rw-r--r--data/layouts/AquaHideout_1F/layout.inc15
-rw-r--r--data/layouts/AquaHideout_1F/map.bin55
-rw-r--r--data/layouts/AquaHideout_B1F/border.bin1
-rw-r--r--data/layouts/AquaHideout_B1F/layout.inc15
-rw-r--r--data/layouts/AquaHideout_B1F/map.bin83
-rw-r--r--data/layouts/AquaHideout_B2F/border.bin1
-rw-r--r--data/layouts/AquaHideout_B2F/layout.inc15
-rw-r--r--data/layouts/AquaHideout_B2F/map.bin51
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap1/border.bin1
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap1/layout.inc15
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap1/map.binbin0 -> 1680 bytes
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap2/border.bin1
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap2/layout.inc15
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap2/map.bin95
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap3/border.bin1
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap3/layout.inc15
-rw-r--r--data/layouts/AquaHideout_UnusedRubyMap3/map.bin49
-rw-r--r--data/layouts/ArtisanCave_1F/border.bin1
-rw-r--r--data/layouts/ArtisanCave_1F/layout.inc15
-rw-r--r--data/layouts/ArtisanCave_1F/map.bin1
-rw-r--r--data/layouts/ArtisanCave_B1F/border.bin1
-rw-r--r--data/layouts/ArtisanCave_B1F/layout.inc15
-rw-r--r--data/layouts/ArtisanCave_B1F/map.bin1
-rw-r--r--data/layouts/BattleElevator/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleElevator/layout.inc15
-rw-r--r--data/layouts/BattleElevator/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattleArenaBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattleArenaCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleArenaCorridor/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattleArenaLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleArenaLobby/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleArenaLobby/map.bin3
-rw-r--r--data/layouts/BattleFrontier_BattleDomeBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin2
-rw-r--r--data/layouts/BattleFrontier_BattleDomeCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleDomeCorridor/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattleDomeLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleDomeLobby/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleDomeLobby/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.binbin0 -> 144 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.binbin0 -> 312 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryLobby/map.bin2
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin2
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceCorridor/map.binbin0 -> 476 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePalaceLobby/map.bin7
-rw-r--r--data/layouts/BattleFrontier_BattlePikeCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePikeCorridor/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePikeLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeLobby/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePikeLobby/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin2
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidLobby/map.bin2
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidTop/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidTop/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidTop/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattleTowerBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin1
-rw-r--r--data/layouts/BattleFrontier_BattleTowerCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleTowerCorridor/map.binbin0 -> 170 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerCorridor2/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleTowerCorridor2/map.binbin0 -> 170 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerLobby/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleTowerLobby/map.binbin0 -> 500 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.binbin0 -> 630 bytes
-rw-r--r--data/layouts/BattleFrontier_Lounge1/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_Lounge1/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_Lounge1/map.bin1
-rw-r--r--data/layouts/BattleFrontier_Lounge2/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_Lounge2/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_Lounge2/map.bin1
-rw-r--r--data/layouts/BattleFrontier_OutsideEast/border.bin1
-rw-r--r--data/layouts/BattleFrontier_OutsideEast/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_OutsideEast/map.binbin0 -> 10368 bytes
-rw-r--r--data/layouts/BattleFrontier_OutsideWest/border.bin1
-rw-r--r--data/layouts/BattleFrontier_OutsideWest/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_OutsideWest/map.binbin0 -> 8064 bytes
-rw-r--r--data/layouts/BattleFrontier_RankingHall/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_RankingHall/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_RankingHall/map.bin64
-rw-r--r--data/layouts/BattleFrontier_ReceptionGate/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_ReceptionGate/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_ReceptionGate/map.binbin0 -> 252 bytes
-rw-r--r--data/layouts/BattleFrontier_ScottsHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_ScottsHouse/layout.inc15
-rw-r--r--data/layouts/BattleFrontier_ScottsHouse/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare01/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare01/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare01/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare02/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare02/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare02/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare03/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare03/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare03/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare04/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare04/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare04/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare05/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare05/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare05/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare06/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare06/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare06/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare07/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare07/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare07/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare08/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare08/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare08/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare09/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare09/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare09/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare10/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare10/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare10/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare11/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare11/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare11/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare12/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare12/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare12/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare13/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare13/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare13/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare14/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare14/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare14/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare15/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare15/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare15/map.bin1
-rw-r--r--data/layouts/BattlePyramidSquare16/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattlePyramidSquare16/layout.inc15
-rw-r--r--data/layouts/BattlePyramidSquare16/map.bin1
-rw-r--r--data/layouts/BattleTentBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleTentBattleRoom/layout.inc15
-rw-r--r--data/layouts/BattleTentBattleRoom/map.binbin0 -> 180 bytes
-rw-r--r--data/layouts/BattleTentCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleTentCorridor/layout.inc15
-rw-r--r--data/layouts/BattleTentCorridor/map.bin1
-rw-r--r--data/layouts/BattleTentLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleTentLobby/layout.inc15
-rw-r--r--data/layouts/BattleTentLobby/map.bin2
-rw-r--r--data/layouts/BirthIsland_Exterior/border.bin1
-rw-r--r--data/layouts/BirthIsland_Exterior/layout.inc15
-rw-r--r--data/layouts/BirthIsland_Exterior/map.binbin0 -> 1800 bytes
-rw-r--r--data/layouts/CableCarStation/border.bin1
-rw-r--r--data/layouts/CableCarStation/layout.inc15
-rw-r--r--data/layouts/CableCarStation/map.binbin0 -> 312 bytes
-rw-r--r--data/layouts/CaveOfOrigin_1F/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_1F/layout.inc15
-rw-r--r--data/layouts/CaveOfOrigin_1F/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B1F/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B1F/layout.inc15
-rw-r--r--data/layouts/CaveOfOrigin_B1F/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_Entrance/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_Entrance/layout.inc15
-rw-r--r--data/layouts/CaveOfOrigin_Entrance/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc15
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc15
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc15
-rw-r--r--data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin1
-rw-r--r--data/layouts/DesertRuins/border.bin1
-rw-r--r--data/layouts/DesertRuins/layout.inc15
-rw-r--r--data/layouts/DesertRuins/map.binbin0 -> 1122 bytes
-rw-r--r--data/layouts/DesertUnderpass/border.bin1
-rw-r--r--data/layouts/DesertUnderpass/layout.inc15
-rw-r--r--data/layouts/DesertUnderpass/map.bin1
-rw-r--r--data/layouts/DewfordTown/border.bin1
-rw-r--r--data/layouts/DewfordTown/layout.inc15
-rw-r--r--data/layouts/DewfordTown/map.bin2
-rw-r--r--data/layouts/DewfordTown_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/DewfordTown_Gym/layout.inc15
-rw-r--r--data/layouts/DewfordTown_Gym/map.binbin0 -> 1008 bytes
-rw-r--r--data/layouts/DewfordTown_Hall/border.bin1
-rw-r--r--data/layouts/DewfordTown_Hall/layout.inc15
-rw-r--r--data/layouts/DewfordTown_Hall/map.binbin0 -> 306 bytes
-rw-r--r--data/layouts/DoubleBattleColosseum/border.bin1
-rw-r--r--data/layouts/DoubleBattleColosseum/layout.inc15
-rw-r--r--data/layouts/DoubleBattleColosseum/map.bin1
-rw-r--r--data/layouts/EverGrandeCity/border.bin1
-rw-r--r--data/layouts/EverGrandeCity/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/EverGrandeCity_ChampionsRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_ChampionsRoom/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_ChampionsRoom/map.binbin0 -> 338 bytes
-rw-r--r--data/layouts/EverGrandeCity_DrakesRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_DrakesRoom/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_DrakesRoom/map.bin2
-rw-r--r--data/layouts/EverGrandeCity_GlaciasRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_GlaciasRoom/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_GlaciasRoom/map.bin2
-rw-r--r--data/layouts/EverGrandeCity_Hall4/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_Hall4/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_Hall4/map.bin1
-rw-r--r--data/layouts/EverGrandeCity_HallOfFame/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_HallOfFame/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_HallOfFame/map.bin1
-rw-r--r--data/layouts/EverGrandeCity_PhoebesRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_PhoebesRoom/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_PhoebesRoom/map.bin2
-rw-r--r--data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin1
-rw-r--r--data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin2
-rw-r--r--data/layouts/EverGrandeCity_ShortHall/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_ShortHall/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_ShortHall/map.bin1
-rw-r--r--data/layouts/EverGrandeCity_SidneysRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_SidneysRoom/layout.inc15
-rw-r--r--data/layouts/EverGrandeCity_SidneysRoom/map.bin2
-rw-r--r--data/layouts/FallarborTown/border.bin1
-rw-r--r--data/layouts/FallarborTown/layout.inc15
-rw-r--r--data/layouts/FallarborTown/map.bin1
-rw-r--r--data/layouts/FallarborTown_LeftoverRSContestHall/border.bin1
-rw-r--r--data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc15
-rw-r--r--data/layouts/FallarborTown_LeftoverRSContestHall/map.bin1
-rw-r--r--data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin1
-rw-r--r--data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc15
-rw-r--r--data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin1
-rw-r--r--data/layouts/FarawayIsland_Entrance/border.bin1
-rw-r--r--data/layouts/FarawayIsland_Entrance/layout.inc15
-rw-r--r--data/layouts/FarawayIsland_Entrance/map.binbin0 -> 3128 bytes
-rw-r--r--data/layouts/FarawayIsland_Interior/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/FarawayIsland_Interior/layout.inc15
-rw-r--r--data/layouts/FarawayIsland_Interior/map.binbin0 -> 1508 bytes
-rw-r--r--data/layouts/FieryPath/border.bin1
-rw-r--r--data/layouts/FieryPath/layout.inc15
-rw-r--r--data/layouts/FieryPath/map.bin10
-rw-r--r--data/layouts/FortreeCity/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/FortreeCity/layout.inc15
-rw-r--r--data/layouts/FortreeCity/map.bin1
-rw-r--r--data/layouts/FortreeCity_DecorationShop/border.bin1
-rw-r--r--data/layouts/FortreeCity_DecorationShop/layout.inc15
-rw-r--r--data/layouts/FortreeCity_DecorationShop/map.bin1
-rw-r--r--data/layouts/FortreeCity_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/FortreeCity_Gym/layout.inc15
-rw-r--r--data/layouts/FortreeCity_Gym/map.binbin0 -> 1000 bytes
-rw-r--r--data/layouts/FortreeCity_House1/border.bin1
-rw-r--r--data/layouts/FortreeCity_House1/layout.inc15
-rw-r--r--data/layouts/FortreeCity_House1/map.bin1
-rw-r--r--data/layouts/FortreeCity_House2/border.bin1
-rw-r--r--data/layouts/FortreeCity_House2/layout.inc15
-rw-r--r--data/layouts/FortreeCity_House2/map.bin1
-rw-r--r--data/layouts/GraniteCave_1F/border.bin1
-rw-r--r--data/layouts/GraniteCave_1F/layout.inc15
-rw-r--r--data/layouts/GraniteCave_1F/map.bin5
-rw-r--r--data/layouts/GraniteCave_B1F/border.bin1
-rw-r--r--data/layouts/GraniteCave_B1F/layout.inc15
-rw-r--r--data/layouts/GraniteCave_B1F/map.bin10
-rw-r--r--data/layouts/GraniteCave_B2F/border.bin1
-rw-r--r--data/layouts/GraniteCave_B2F/layout.inc15
-rw-r--r--data/layouts/GraniteCave_B2F/map.bin2
-rw-r--r--data/layouts/GraniteCave_StevensRoom/border.bin1
-rw-r--r--data/layouts/GraniteCave_StevensRoom/layout.inc15
-rw-r--r--data/layouts/GraniteCave_StevensRoom/map.bin4
-rw-r--r--data/layouts/Harbor/border.bin1
-rw-r--r--data/layouts/Harbor/layout.inc15
-rw-r--r--data/layouts/Harbor/map.bin1
-rw-r--r--data/layouts/House1/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/House1/layout.inc15
-rw-r--r--data/layouts/House1/map.bin1
-rw-r--r--data/layouts/House2/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/House2/layout.inc15
-rw-r--r--data/layouts/House2/map.bin1
-rw-r--r--data/layouts/House3/border.bin1
-rw-r--r--data/layouts/House3/layout.inc15
-rw-r--r--data/layouts/House3/map.bin1
-rw-r--r--data/layouts/House4/border.bin1
-rw-r--r--data/layouts/House4/layout.inc15
-rw-r--r--data/layouts/House4/map.bin1
-rw-r--r--data/layouts/HouseWithBed/border.bin1
-rw-r--r--data/layouts/HouseWithBed/layout.inc15
-rw-r--r--data/layouts/HouseWithBed/map.bin1
-rw-r--r--data/layouts/InsideOfTruck/border.bin1
-rw-r--r--data/layouts/InsideOfTruck/layout.inc15
-rw-r--r--data/layouts/InsideOfTruck/map.bin2
-rw-r--r--data/layouts/IslandCave/border.bin1
-rw-r--r--data/layouts/IslandCave/layout.inc15
-rw-r--r--data/layouts/IslandCave/map.binbin0 -> 1122 bytes
-rw-r--r--data/layouts/IslandHarbor/border.bin1
-rw-r--r--data/layouts/IslandHarbor/layout.inc15
-rw-r--r--data/layouts/IslandHarbor/map.bin1
-rw-r--r--data/layouts/JaggedPass/border.bin1
-rw-r--r--data/layouts/JaggedPass/layout.inc15
-rw-r--r--data/layouts/JaggedPass/map.binbin0 -> 2760 bytes
-rw-r--r--data/layouts/LavaridgeTown/border.bin1
-rw-r--r--data/layouts/LavaridgeTown/layout.inc15
-rw-r--r--data/layouts/LavaridgeTown/map.bin3
-rw-r--r--data/layouts/LavaridgeTown_Gym_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LavaridgeTown_Gym_1F/layout.inc15
-rw-r--r--data/layouts/LavaridgeTown_Gym_1F/map.bin3
-rw-r--r--data/layouts/LavaridgeTown_Gym_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LavaridgeTown_Gym_B1F/layout.inc15
-rw-r--r--data/layouts/LavaridgeTown_Gym_B1F/map.bin6
-rw-r--r--data/layouts/LavaridgeTown_HerbShop/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LavaridgeTown_HerbShop/layout.inc15
-rw-r--r--data/layouts/LavaridgeTown_HerbShop/map.bin1
-rw-r--r--data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin1
-rw-r--r--data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc15
-rw-r--r--data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin1
-rw-r--r--data/layouts/LilycoveCity/border.bin1
-rw-r--r--data/layouts/LilycoveCity/layout.inc15
-rw-r--r--data/layouts/LilycoveCity/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/LilycoveCity_ContestHall/border.bin1
-rw-r--r--data/layouts/LilycoveCity_ContestHall/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_ContestHall/map.bin3
-rw-r--r--data/layouts/LilycoveCity_ContestLobby/border.bin1
-rw-r--r--data/layouts/LilycoveCity_ContestLobby/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_ContestLobby/map.bin1
-rw-r--r--data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin1
-rw-r--r--data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin1
-rw-r--r--data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStoreElevator/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_1F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_2F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_2F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_3F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_3F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_4F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_4F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_5F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_5F/map.binbin0 -> 288 bytes
-rw-r--r--data/layouts/LilycoveCity_House2/border.bin1
-rw-r--r--data/layouts/LilycoveCity_House2/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_House2/map.bin1
-rw-r--r--data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin1
-rw-r--r--data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin1
-rw-r--r--data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin1
-rw-r--r--data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin1
-rw-r--r--data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc15
-rw-r--r--data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin2
-rw-r--r--data/layouts/LinkContestRoom1/border.bin1
-rw-r--r--data/layouts/LinkContestRoom1/layout.inc15
-rw-r--r--data/layouts/LinkContestRoom1/map.bin1
-rw-r--r--data/layouts/LinkContestRoom2/border.bin1
-rw-r--r--data/layouts/LinkContestRoom2/layout.inc15
-rw-r--r--data/layouts/LinkContestRoom2/map.bin1
-rw-r--r--data/layouts/LinkContestRoom3/border.bin1
-rw-r--r--data/layouts/LinkContestRoom3/layout.inc15
-rw-r--r--data/layouts/LinkContestRoom3/map.bin1
-rw-r--r--data/layouts/LinkContestRoom4/border.bin1
-rw-r--r--data/layouts/LinkContestRoom4/layout.inc15
-rw-r--r--data/layouts/LinkContestRoom4/map.bin1
-rw-r--r--data/layouts/LinkContestRoom5/border.bin1
-rw-r--r--data/layouts/LinkContestRoom5/layout.inc15
-rw-r--r--data/layouts/LinkContestRoom5/map.bin1
-rw-r--r--data/layouts/LinkContestRoom6/border.bin1
-rw-r--r--data/layouts/LinkContestRoom6/layout.inc15
-rw-r--r--data/layouts/LinkContestRoom6/map.bin1
-rw-r--r--data/layouts/LittlerootTown/border.bin1
-rw-r--r--data/layouts/LittlerootTown/layout.inc15
-rw-r--r--data/layouts/LittlerootTown/map.bin3
-rw-r--r--data/layouts/LittlerootTown_BrendansHouse_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc15
-rw-r--r--data/layouts/LittlerootTown_BrendansHouse_1F/map.bin1
-rw-r--r--data/layouts/LittlerootTown_BrendansHouse_2F/border.bin1
-rw-r--r--data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc15
-rw-r--r--data/layouts/LittlerootTown_BrendansHouse_2F/map.bin1
-rw-r--r--data/layouts/LittlerootTown_MaysHouse_1F/border.bin1
-rw-r--r--data/layouts/LittlerootTown_MaysHouse_1F/layout.inc15
-rw-r--r--data/layouts/LittlerootTown_MaysHouse_1F/map.bin1
-rw-r--r--data/layouts/LittlerootTown_MaysHouse_2F/border.bin1
-rw-r--r--data/layouts/LittlerootTown_MaysHouse_2F/layout.inc15
-rw-r--r--data/layouts/LittlerootTown_MaysHouse_2F/map.bin2
-rw-r--r--data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin1
-rw-r--r--data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc15
-rw-r--r--data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin5
-rw-r--r--data/layouts/MagmaHideout_1F/border.bin1
-rw-r--r--data/layouts/MagmaHideout_1F/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_1F/map.binbin0 -> 2812 bytes
-rw-r--r--data/layouts/MagmaHideout_2F_1R/border.bin1
-rw-r--r--data/layouts/MagmaHideout_2F_1R/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_2F_1R/map.bin2
-rw-r--r--data/layouts/MagmaHideout_2F_2R/border.bin1
-rw-r--r--data/layouts/MagmaHideout_2F_2R/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_2F_2R/map.bin5
-rw-r--r--data/layouts/MagmaHideout_2F_3R/border.bin1
-rw-r--r--data/layouts/MagmaHideout_2F_3R/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_2F_3R/map.bin1
-rw-r--r--data/layouts/MagmaHideout_3F_1R/border.bin1
-rw-r--r--data/layouts/MagmaHideout_3F_1R/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_3F_1R/map.bin1
-rw-r--r--data/layouts/MagmaHideout_3F_2R/border.bin1
-rw-r--r--data/layouts/MagmaHideout_3F_2R/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_3F_2R/map.bin7
-rw-r--r--data/layouts/MagmaHideout_3F_3R/border.bin1
-rw-r--r--data/layouts/MagmaHideout_3F_3R/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_3F_3R/map.bin1
-rw-r--r--data/layouts/MagmaHideout_4F/border.bin1
-rw-r--r--data/layouts/MagmaHideout_4F/layout.inc15
-rw-r--r--data/layouts/MagmaHideout_4F/map.bin1
-rw-r--r--data/layouts/MarineCave_End/border.bin1
-rw-r--r--data/layouts/MarineCave_End/layout.inc15
-rw-r--r--data/layouts/MarineCave_End/map.bin14
-rw-r--r--data/layouts/MarineCave_Entrance/border.bin1
-rw-r--r--data/layouts/MarineCave_Entrance/layout.inc15
-rw-r--r--data/layouts/MarineCave_Entrance/map.bin7
-rw-r--r--data/layouts/Mart/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Mart/layout.inc15
-rw-r--r--data/layouts/Mart/map.bin3
-rw-r--r--data/layouts/MauvilleCity/border.bin1
-rw-r--r--data/layouts/MauvilleCity/layout.inc15
-rw-r--r--data/layouts/MauvilleCity/map.binbin0 -> 1600 bytes
-rw-r--r--data/layouts/MauvilleCity_BikeShop/border.bin1
-rw-r--r--data/layouts/MauvilleCity_BikeShop/layout.inc15
-rw-r--r--data/layouts/MauvilleCity_BikeShop/map.bin2
-rw-r--r--data/layouts/MauvilleCity_GameCorner/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MauvilleCity_GameCorner/layout.inc15
-rw-r--r--data/layouts/MauvilleCity_GameCorner/map.bin3
-rw-r--r--data/layouts/MauvilleCity_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MauvilleCity_Gym/layout.inc15
-rw-r--r--data/layouts/MauvilleCity_Gym/map.binbin0 -> 420 bytes
-rw-r--r--data/layouts/MeteorFalls_1F_1R/border.bin1
-rw-r--r--data/layouts/MeteorFalls_1F_1R/layout.inc15
-rw-r--r--data/layouts/MeteorFalls_1F_1R/map.bin1
-rw-r--r--data/layouts/MeteorFalls_1F_2R/border.bin1
-rw-r--r--data/layouts/MeteorFalls_1F_2R/layout.inc15
-rw-r--r--data/layouts/MeteorFalls_1F_2R/map.bin2
-rw-r--r--data/layouts/MeteorFalls_B1F_1R/border.bin1
-rw-r--r--data/layouts/MeteorFalls_B1F_1R/layout.inc15
-rw-r--r--data/layouts/MeteorFalls_B1F_1R/map.bin6
-rw-r--r--data/layouts/MeteorFalls_B1F_2R/border.bin1
-rw-r--r--data/layouts/MeteorFalls_B1F_2R/layout.inc15
-rw-r--r--data/layouts/MeteorFalls_B1F_2R/map.bin1
-rw-r--r--data/layouts/MeteorFalls_StevensCave/border.bin1
-rw-r--r--data/layouts/MeteorFalls_StevensCave/layout.inc15
-rw-r--r--data/layouts/MeteorFalls_StevensCave/map.bin21
-rw-r--r--data/layouts/MirageTower_1F/border.bin1
-rw-r--r--data/layouts/MirageTower_1F/layout.inc15
-rw-r--r--data/layouts/MirageTower_1F/map.bin3
-rw-r--r--data/layouts/MirageTower_2F/border.bin1
-rw-r--r--data/layouts/MirageTower_2F/layout.inc15
-rw-r--r--data/layouts/MirageTower_2F/map.bin3
-rw-r--r--data/layouts/MirageTower_3F/border.bin1
-rw-r--r--data/layouts/MirageTower_3F/layout.inc15
-rw-r--r--data/layouts/MirageTower_3F/map.bin6
-rw-r--r--data/layouts/MirageTower_4F/border.bin1
-rw-r--r--data/layouts/MirageTower_4F/layout.inc15
-rw-r--r--data/layouts/MirageTower_4F/map.bin2
-rw-r--r--data/layouts/MossdeepCity/border.bin1
-rw-r--r--data/layouts/MossdeepCity/layout.inc15
-rw-r--r--data/layouts/MossdeepCity/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/MossdeepCity_GameCorner_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MossdeepCity_GameCorner_1F/layout.inc15
-rw-r--r--data/layouts/MossdeepCity_GameCorner_1F/map.bin53
-rw-r--r--data/layouts/MossdeepCity_GameCorner_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MossdeepCity_GameCorner_B1F/layout.inc15
-rw-r--r--data/layouts/MossdeepCity_GameCorner_B1F/map.bin2
-rw-r--r--data/layouts/MossdeepCity_Gym/border.bin1
-rw-r--r--data/layouts/MossdeepCity_Gym/layout.inc15
-rw-r--r--data/layouts/MossdeepCity_Gym/map.bin40
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_1F/border.bin1
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc15
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_1F/map.binbin0 -> 320 bytes
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_2F/border.bin1
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc15
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_2F/map.binbin0 -> 320 bytes
-rw-r--r--data/layouts/MossdeepCity_StevensHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MossdeepCity_StevensHouse/layout.inc15
-rw-r--r--data/layouts/MossdeepCity_StevensHouse/map.bin1
-rw-r--r--data/layouts/MtChimney/border.bin1
-rw-r--r--data/layouts/MtChimney/layout.inc15
-rw-r--r--data/layouts/MtChimney/map.bin1
-rw-r--r--data/layouts/MtPyre_1F/border.bin1
-rw-r--r--data/layouts/MtPyre_1F/layout.inc15
-rw-r--r--data/layouts/MtPyre_1F/map.bin1
-rw-r--r--data/layouts/MtPyre_2F/border.bin1
-rw-r--r--data/layouts/MtPyre_2F/layout.inc15
-rw-r--r--data/layouts/MtPyre_2F/map.bin1
-rw-r--r--data/layouts/MtPyre_3F/border.bin1
-rw-r--r--data/layouts/MtPyre_3F/layout.inc15
-rw-r--r--data/layouts/MtPyre_3F/map.bin1
-rw-r--r--data/layouts/MtPyre_4F/border.bin1
-rw-r--r--data/layouts/MtPyre_4F/layout.inc15
-rw-r--r--data/layouts/MtPyre_4F/map.bin1
-rw-r--r--data/layouts/MtPyre_5F/border.bin1
-rw-r--r--data/layouts/MtPyre_5F/layout.inc15
-rw-r--r--data/layouts/MtPyre_5F/map.bin1
-rw-r--r--data/layouts/MtPyre_6F/border.bin1
-rw-r--r--data/layouts/MtPyre_6F/layout.inc15
-rw-r--r--data/layouts/MtPyre_6F/map.bin1
-rw-r--r--data/layouts/MtPyre_Exterior/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MtPyre_Exterior/layout.inc15
-rw-r--r--data/layouts/MtPyre_Exterior/map.binbin0 -> 3876 bytes
-rw-r--r--data/layouts/MtPyre_Summit/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MtPyre_Summit/layout.inc15
-rw-r--r--data/layouts/MtPyre_Summit/map.binbin0 -> 3700 bytes
-rw-r--r--data/layouts/NavelRock_B1F/border.bin1
-rw-r--r--data/layouts/NavelRock_B1F/layout.inc15
-rw-r--r--data/layouts/NavelRock_B1F/map.bin1
-rw-r--r--data/layouts/NavelRock_Bottom/border.bin1
-rw-r--r--data/layouts/NavelRock_Bottom/layout.inc15
-rw-r--r--data/layouts/NavelRock_Bottom/map.bin1
-rw-r--r--data/layouts/NavelRock_Entrance/border.bin1
-rw-r--r--data/layouts/NavelRock_Entrance/layout.inc15
-rw-r--r--data/layouts/NavelRock_Entrance/map.bin1
-rw-r--r--data/layouts/NavelRock_Exterior/border.bin1
-rw-r--r--data/layouts/NavelRock_Exterior/layout.inc15
-rw-r--r--data/layouts/NavelRock_Exterior/map.binbin0 -> 1008 bytes
-rw-r--r--data/layouts/NavelRock_Fork/border.bin1
-rw-r--r--data/layouts/NavelRock_Fork/layout.inc15
-rw-r--r--data/layouts/NavelRock_Fork/map.bin1
-rw-r--r--data/layouts/NavelRock_LadderRoom1/border.bin1
-rw-r--r--data/layouts/NavelRock_LadderRoom1/layout.inc15
-rw-r--r--data/layouts/NavelRock_LadderRoom1/map.bin1
-rw-r--r--data/layouts/NavelRock_LadderRoom2/border.bin1
-rw-r--r--data/layouts/NavelRock_LadderRoom2/layout.inc15
-rw-r--r--data/layouts/NavelRock_LadderRoom2/map.bin1
-rw-r--r--data/layouts/NavelRock_Top/border.bin1
-rw-r--r--data/layouts/NavelRock_Top/layout.inc15
-rw-r--r--data/layouts/NavelRock_Top/map.bin1
-rw-r--r--data/layouts/NewMauville_Entrance/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/NewMauville_Entrance/layout.inc15
-rw-r--r--data/layouts/NewMauville_Entrance/map.bin1
-rw-r--r--data/layouts/NewMauville_Inside/border.bin1
-rw-r--r--data/layouts/NewMauville_Inside/layout.inc15
-rw-r--r--data/layouts/NewMauville_Inside/map.bin1
-rw-r--r--data/layouts/OldaleTown/border.bin1
-rw-r--r--data/layouts/OldaleTown/layout.inc15
-rw-r--r--data/layouts/OldaleTown/map.bin1
-rw-r--r--data/layouts/PacifidlogTown/border.bin1
-rw-r--r--data/layouts/PacifidlogTown/layout.inc15
-rw-r--r--data/layouts/PacifidlogTown/map.bin6
-rw-r--r--data/layouts/PacifidlogTown_House1/border.bin1
-rw-r--r--data/layouts/PacifidlogTown_House1/layout.inc15
-rw-r--r--data/layouts/PacifidlogTown_House1/map.bin1
-rw-r--r--data/layouts/PacifidlogTown_House2/border.bin1
-rw-r--r--data/layouts/PacifidlogTown_House2/layout.inc15
-rw-r--r--data/layouts/PacifidlogTown_House2/map.bin1
-rw-r--r--data/layouts/PetalburgCity/border.bin1
-rw-r--r--data/layouts/PetalburgCity/layout.inc15
-rw-r--r--data/layouts/PetalburgCity/map.bin4
-rw-r--r--data/layouts/PetalburgCity_Gym/border.bin1
-rw-r--r--data/layouts/PetalburgCity_Gym/layout.inc15
-rw-r--r--data/layouts/PetalburgCity_Gym/map.bin10
-rw-r--r--data/layouts/PetalburgWoods/border.bin1
-rw-r--r--data/layouts/PetalburgWoods/layout.inc15
-rw-r--r--data/layouts/PetalburgWoods/map.bin1
-rw-r--r--data/layouts/PokemonCenter_1F/border.bin1
-rw-r--r--data/layouts/PokemonCenter_1F/layout.inc15
-rw-r--r--data/layouts/PokemonCenter_1F/map.bin1
-rw-r--r--data/layouts/PokemonCenter_2F/border.bin1
-rw-r--r--data/layouts/PokemonCenter_2F/layout.inc15
-rw-r--r--data/layouts/PokemonCenter_2F/map.bin1
-rw-r--r--data/layouts/RecordCorner/border.bin1
-rw-r--r--data/layouts/RecordCorner/layout.inc15
-rw-r--r--data/layouts/RecordCorner/map.bin1
-rw-r--r--data/layouts/Route101/border.bin1
-rw-r--r--data/layouts/Route101/layout.inc15
-rw-r--r--data/layouts/Route101/map.bin1
-rw-r--r--data/layouts/Route102/border.bin1
-rw-r--r--data/layouts/Route102/layout.inc15
-rw-r--r--data/layouts/Route102/map.bin1
-rw-r--r--data/layouts/Route103/border.bin1
-rw-r--r--data/layouts/Route103/layout.inc15
-rw-r--r--data/layouts/Route103/map.bin1
-rw-r--r--data/layouts/Route104/border.bin1
-rw-r--r--data/layouts/Route104/layout.inc15
-rw-r--r--data/layouts/Route104/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/Route104_MrBrineysHouse/border.bin1
-rw-r--r--data/layouts/Route104_MrBrineysHouse/layout.inc15
-rw-r--r--data/layouts/Route104_MrBrineysHouse/map.bin1
-rw-r--r--data/layouts/Route104_PrettyPetalFlowerShop/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route104_PrettyPetalFlowerShop/layout.inc15
-rw-r--r--data/layouts/Route104_PrettyPetalFlowerShop/map.binbin0 -> 270 bytes
-rw-r--r--data/layouts/Route104_Prototype/border.bin1
-rw-r--r--data/layouts/Route104_Prototype/layout.inc15
-rw-r--r--data/layouts/Route104_Prototype/map.bin1
-rw-r--r--data/layouts/Route105/border.bin1
-rw-r--r--data/layouts/Route105/layout.inc15
-rw-r--r--data/layouts/Route105/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/Route106/border.bin1
-rw-r--r--data/layouts/Route106/layout.inc15
-rw-r--r--data/layouts/Route106/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/Route107/border.bin1
-rw-r--r--data/layouts/Route107/layout.inc15
-rw-r--r--data/layouts/Route107/map.binbin0 -> 2400 bytes
-rw-r--r--data/layouts/Route108/border.bin1
-rw-r--r--data/layouts/Route108/layout.inc15
-rw-r--r--data/layouts/Route108/map.bin1
-rw-r--r--data/layouts/Route109/border.bin1
-rw-r--r--data/layouts/Route109/layout.inc15
-rw-r--r--data/layouts/Route109/map.binbin0 -> 5040 bytes
-rw-r--r--data/layouts/Route109_SeashoreHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route109_SeashoreHouse/layout.inc15
-rw-r--r--data/layouts/Route109_SeashoreHouse/map.bin3
-rw-r--r--data/layouts/Route110/border.bin1
-rw-r--r--data/layouts/Route110/layout.inc15
-rw-r--r--data/layouts/Route110/map.binbin0 -> 8000 bytes
-rw-r--r--data/layouts/Route110_SeasideCyclingRoadEntrance/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc15
-rw-r--r--data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin1
-rw-r--r--data/layouts/Route110_TrickHouseCorridor/border.bin1
-rw-r--r--data/layouts/Route110_TrickHouseCorridor/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHouseCorridor/map.bin1
-rw-r--r--data/layouts/Route110_TrickHouseEnd/border.bin1
-rw-r--r--data/layouts/Route110_TrickHouseEnd/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHouseEnd/map.bin1
-rw-r--r--data/layouts/Route110_TrickHouseEntrance/border.bin1
-rw-r--r--data/layouts/Route110_TrickHouseEntrance/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHouseEntrance/map.bin1
-rw-r--r--data/layouts/Route110_TrickHousePuzzle1/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle1/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle1/map.bin2
-rw-r--r--data/layouts/Route110_TrickHousePuzzle2/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle2/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle2/map.bin2
-rw-r--r--data/layouts/Route110_TrickHousePuzzle3/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle3/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle3/map.bin2
-rw-r--r--data/layouts/Route110_TrickHousePuzzle4/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle4/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle4/map.bin2
-rw-r--r--data/layouts/Route110_TrickHousePuzzle5/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle5/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle5/map.bin2
-rw-r--r--data/layouts/Route110_TrickHousePuzzle6/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle6/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle6/map.bin2
-rw-r--r--data/layouts/Route110_TrickHousePuzzle7/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle7/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle7/map.bin2
-rw-r--r--data/layouts/Route110_TrickHousePuzzle8/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_TrickHousePuzzle8/layout.inc15
-rw-r--r--data/layouts/Route110_TrickHousePuzzle8/map.bin2
-rw-r--r--data/layouts/Route111/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route111/layout.inc15
-rw-r--r--data/layouts/Route111/map.binbin0 -> 11200 bytes
-rw-r--r--data/layouts/Route112/border.bin1
-rw-r--r--data/layouts/Route112/layout.inc15
-rw-r--r--data/layouts/Route112/map.binbin0 -> 4800 bytes
-rw-r--r--data/layouts/Route113/border.bin1
-rw-r--r--data/layouts/Route113/layout.inc15
-rw-r--r--data/layouts/Route113/map.binbin0 -> 4000 bytes
-rw-r--r--data/layouts/Route114/border.bin1
-rw-r--r--data/layouts/Route114/layout.inc15
-rw-r--r--data/layouts/Route114/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/Route114_FossilManiacsHouse/border.bin1
-rw-r--r--data/layouts/Route114_FossilManiacsHouse/layout.inc15
-rw-r--r--data/layouts/Route114_FossilManiacsHouse/map.bin1
-rw-r--r--data/layouts/Route114_FossilManiacsTunnel/border.bin1
-rw-r--r--data/layouts/Route114_FossilManiacsTunnel/layout.inc15
-rw-r--r--data/layouts/Route114_FossilManiacsTunnel/map.bin1
-rw-r--r--data/layouts/Route114_LanettesHouse/border.bin1
-rw-r--r--data/layouts/Route114_LanettesHouse/layout.inc15
-rw-r--r--data/layouts/Route114_LanettesHouse/map.bin2
-rw-r--r--data/layouts/Route115/border.bin1
-rw-r--r--data/layouts/Route115/layout.inc15
-rw-r--r--data/layouts/Route115/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/Route116/border.bin1
-rw-r--r--data/layouts/Route116/layout.inc15
-rw-r--r--data/layouts/Route116/map.binbin0 -> 4000 bytes
-rw-r--r--data/layouts/Route116_TunnelersRestHouse/border.bin1
-rw-r--r--data/layouts/Route116_TunnelersRestHouse/layout.inc15
-rw-r--r--data/layouts/Route116_TunnelersRestHouse/map.bin1
-rw-r--r--data/layouts/Route117/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route117/layout.inc15
-rw-r--r--data/layouts/Route117/map.bin10
-rw-r--r--data/layouts/Route117_PokemonDayCare/border.bin1
-rw-r--r--data/layouts/Route117_PokemonDayCare/layout.inc15
-rw-r--r--data/layouts/Route117_PokemonDayCare/map.bin2
-rw-r--r--data/layouts/Route118/border.bin1
-rw-r--r--data/layouts/Route118/layout.inc15
-rw-r--r--data/layouts/Route118/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/Route119/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route119/layout.inc15
-rw-r--r--data/layouts/Route119/map.binbin0 -> 11200 bytes
-rw-r--r--data/layouts/Route119_WeatherInstitute_1F/border.bin1
-rw-r--r--data/layouts/Route119_WeatherInstitute_1F/layout.inc15
-rw-r--r--data/layouts/Route119_WeatherInstitute_1F/map.bin1
-rw-r--r--data/layouts/Route119_WeatherInstitute_2F/border.bin1
-rw-r--r--data/layouts/Route119_WeatherInstitute_2F/layout.inc15
-rw-r--r--data/layouts/Route119_WeatherInstitute_2F/map.bin1
-rw-r--r--data/layouts/Route120/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route120/layout.inc15
-rw-r--r--data/layouts/Route120/map.binbin0 -> 8000 bytes
-rw-r--r--data/layouts/Route121/border.bin1
-rw-r--r--data/layouts/Route121/layout.inc15
-rw-r--r--data/layouts/Route121/map.bin1
-rw-r--r--data/layouts/Route121_SafariZoneEntrance/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route121_SafariZoneEntrance/layout.inc15
-rw-r--r--data/layouts/Route121_SafariZoneEntrance/map.bin1
-rw-r--r--data/layouts/Route122/border.bin1
-rw-r--r--data/layouts/Route122/layout.inc15
-rw-r--r--data/layouts/Route122/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/Route123/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route123/layout.inc15
-rw-r--r--data/layouts/Route123/map.bin2
-rw-r--r--data/layouts/Route124/border.bin1
-rw-r--r--data/layouts/Route124/layout.inc15
-rw-r--r--data/layouts/Route124/map.binbin0 -> 12800 bytes
-rw-r--r--data/layouts/Route124_DivingTreasureHuntersHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc15
-rw-r--r--data/layouts/Route124_DivingTreasureHuntersHouse/map.bin1
-rw-r--r--data/layouts/Route125/border.bin1
-rw-r--r--data/layouts/Route125/layout.inc15
-rw-r--r--data/layouts/Route125/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/Route126/border.bin1
-rw-r--r--data/layouts/Route126/layout.inc15
-rw-r--r--data/layouts/Route126/map.binbin0 -> 12800 bytes
-rw-r--r--data/layouts/Route127/border.bin1
-rw-r--r--data/layouts/Route127/layout.inc15
-rw-r--r--data/layouts/Route127/map.binbin0 -> 12800 bytes
-rw-r--r--data/layouts/Route128/border.bin1
-rw-r--r--data/layouts/Route128/layout.inc15
-rw-r--r--data/layouts/Route128/map.binbin0 -> 9600 bytes
-rw-r--r--data/layouts/Route129/border.bin1
-rw-r--r--data/layouts/Route129/layout.inc15
-rw-r--r--data/layouts/Route129/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/Route130/border.bin1
-rw-r--r--data/layouts/Route130/layout.inc15
-rw-r--r--data/layouts/Route130/map.bin1
-rw-r--r--data/layouts/Route131/border.bin1
-rw-r--r--data/layouts/Route131/layout.inc15
-rw-r--r--data/layouts/Route131/map.bin1
-rw-r--r--data/layouts/Route132/border.bin1
-rw-r--r--data/layouts/Route132/layout.inc15
-rw-r--r--data/layouts/Route132/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/Route133/border.bin1
-rw-r--r--data/layouts/Route133/layout.inc15
-rw-r--r--data/layouts/Route133/map.bin1
-rw-r--r--data/layouts/Route134/border.bin1
-rw-r--r--data/layouts/Route134/layout.inc15
-rw-r--r--data/layouts/Route134/map.binbin0 -> 6400 bytes
-rw-r--r--data/layouts/RustboroCity/border.bin1
-rw-r--r--data/layouts/RustboroCity/layout.inc15
-rw-r--r--data/layouts/RustboroCity/map.binbin0 -> 4800 bytes
-rw-r--r--data/layouts/RustboroCity_CuttersHouse/border.bin1
-rw-r--r--data/layouts/RustboroCity_CuttersHouse/layout.inc15
-rw-r--r--data/layouts/RustboroCity_CuttersHouse/map.bin1
-rw-r--r--data/layouts/RustboroCity_DevonCorp_1F/border.bin1
-rw-r--r--data/layouts/RustboroCity_DevonCorp_1F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_DevonCorp_1F/map.bin1
-rw-r--r--data/layouts/RustboroCity_DevonCorp_2F/border.bin1
-rw-r--r--data/layouts/RustboroCity_DevonCorp_2F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_DevonCorp_2F/map.bin1
-rw-r--r--data/layouts/RustboroCity_DevonCorp_3F/border.bin1
-rw-r--r--data/layouts/RustboroCity_DevonCorp_3F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_DevonCorp_3F/map.bin1
-rw-r--r--data/layouts/RustboroCity_Flat1_1F/border.bin1
-rw-r--r--data/layouts/RustboroCity_Flat1_1F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_Flat1_1F/map.bin1
-rw-r--r--data/layouts/RustboroCity_Flat1_2F/border.bin1
-rw-r--r--data/layouts/RustboroCity_Flat1_2F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_Flat1_2F/map.bin1
-rw-r--r--data/layouts/RustboroCity_Flat2_1F/border.bin1
-rw-r--r--data/layouts/RustboroCity_Flat2_1F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_Flat2_1F/map.binbin0 -> 252 bytes
-rw-r--r--data/layouts/RustboroCity_Flat2_2F/border.bin1
-rw-r--r--data/layouts/RustboroCity_Flat2_2F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_Flat2_2F/map.binbin0 -> 252 bytes
-rw-r--r--data/layouts/RustboroCity_Flat2_3F/border.bin1
-rw-r--r--data/layouts/RustboroCity_Flat2_3F/layout.inc15
-rw-r--r--data/layouts/RustboroCity_Flat2_3F/map.binbin0 -> 252 bytes
-rw-r--r--data/layouts/RustboroCity_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/RustboroCity_Gym/layout.inc15
-rw-r--r--data/layouts/RustboroCity_Gym/map.bin2
-rw-r--r--data/layouts/RustboroCity_House/border.bin1
-rw-r--r--data/layouts/RustboroCity_House/layout.inc15
-rw-r--r--data/layouts/RustboroCity_House/map.bin1
-rw-r--r--data/layouts/RustboroCity_House1/border.bin1
-rw-r--r--data/layouts/RustboroCity_House1/layout.inc15
-rw-r--r--data/layouts/RustboroCity_House1/map.bin1
-rw-r--r--data/layouts/RustboroCity_PokemonSchool/border.bin1
-rw-r--r--data/layouts/RustboroCity_PokemonSchool/layout.inc15
-rw-r--r--data/layouts/RustboroCity_PokemonSchool/map.binbin0 -> 264 bytes
-rw-r--r--data/layouts/RusturfTunnel/border.bin1
-rw-r--r--data/layouts/RusturfTunnel/layout.inc15
-rw-r--r--data/layouts/RusturfTunnel/map.bin2
-rw-r--r--data/layouts/SSTidalCorridor/border.bin1
-rw-r--r--data/layouts/SSTidalCorridor/layout.inc15
-rw-r--r--data/layouts/SSTidalCorridor/map.bin1
-rw-r--r--data/layouts/SSTidalLowerDeck/border.bin1
-rw-r--r--data/layouts/SSTidalLowerDeck/layout.inc15
-rw-r--r--data/layouts/SSTidalLowerDeck/map.bin1
-rw-r--r--data/layouts/SSTidalRooms/border.bin1
-rw-r--r--data/layouts/SSTidalRooms/layout.inc15
-rw-r--r--data/layouts/SSTidalRooms/map.bin1
-rw-r--r--data/layouts/SafariZone_North/border.bin1
-rw-r--r--data/layouts/SafariZone_North/layout.inc15
-rw-r--r--data/layouts/SafariZone_North/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/SafariZone_Northeast/border.bin1
-rw-r--r--data/layouts/SafariZone_Northeast/layout.inc15
-rw-r--r--data/layouts/SafariZone_Northeast/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/SafariZone_Northwest/border.bin1
-rw-r--r--data/layouts/SafariZone_Northwest/layout.inc15
-rw-r--r--data/layouts/SafariZone_Northwest/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/SafariZone_RestHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SafariZone_RestHouse/layout.inc15
-rw-r--r--data/layouts/SafariZone_RestHouse/map.bin1
-rw-r--r--data/layouts/SafariZone_South/border.bin1
-rw-r--r--data/layouts/SafariZone_South/layout.inc15
-rw-r--r--data/layouts/SafariZone_South/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/SafariZone_Southeast/border.bin1
-rw-r--r--data/layouts/SafariZone_Southeast/layout.inc15
-rw-r--r--data/layouts/SafariZone_Southeast/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/SafariZone_Southwest/border.bin1
-rw-r--r--data/layouts/SafariZone_Southwest/layout.inc15
-rw-r--r--data/layouts/SafariZone_Southwest/map.binbin0 -> 3200 bytes
-rw-r--r--data/layouts/ScorchedSlab/border.bin1
-rw-r--r--data/layouts/ScorchedSlab/layout.inc15
-rw-r--r--data/layouts/ScorchedSlab/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Entrance/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Entrance/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Entrance/map.bin11
-rw-r--r--data/layouts/SeafloorCavern_Room1/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room1/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room1/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room2/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room2/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room2/map.bin7
-rw-r--r--data/layouts/SeafloorCavern_Room3/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room3/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room3/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room4/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room4/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room4/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room5/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room5/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room5/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room6/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room6/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room6/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room7/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room7/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room7/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room8/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room8/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room8/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room9/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room9/layout.inc15
-rw-r--r--data/layouts/SeafloorCavern_Room9/map.bin1
-rw-r--r--data/layouts/SealedChamber_InnerRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SealedChamber_InnerRoom/layout.inc15
-rw-r--r--data/layouts/SealedChamber_InnerRoom/map.bin1
-rw-r--r--data/layouts/SealedChamber_OuterRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SealedChamber_OuterRoom/layout.inc15
-rw-r--r--data/layouts/SealedChamber_OuterRoom/map.bin11
-rw-r--r--data/layouts/SecretBase_BlueCave1/border.bin1
-rw-r--r--data/layouts/SecretBase_BlueCave1/layout.inc15
-rw-r--r--data/layouts/SecretBase_BlueCave1/map.bin50
-rw-r--r--data/layouts/SecretBase_BlueCave2/border.bin1
-rw-r--r--data/layouts/SecretBase_BlueCave2/layout.inc15
-rw-r--r--data/layouts/SecretBase_BlueCave2/map.bin57
-rw-r--r--data/layouts/SecretBase_BlueCave3/border.bin1
-rw-r--r--data/layouts/SecretBase_BlueCave3/layout.inc15
-rw-r--r--data/layouts/SecretBase_BlueCave3/map.bin51
-rw-r--r--data/layouts/SecretBase_BlueCave4/border.bin1
-rw-r--r--data/layouts/SecretBase_BlueCave4/layout.inc15
-rw-r--r--data/layouts/SecretBase_BlueCave4/map.bin57
-rw-r--r--data/layouts/SecretBase_BrownCave1/border.bin1
-rw-r--r--data/layouts/SecretBase_BrownCave1/layout.inc15
-rw-r--r--data/layouts/SecretBase_BrownCave1/map.bin54
-rw-r--r--data/layouts/SecretBase_BrownCave2/border.bin1
-rw-r--r--data/layouts/SecretBase_BrownCave2/layout.inc15
-rw-r--r--data/layouts/SecretBase_BrownCave2/map.bin56
-rw-r--r--data/layouts/SecretBase_BrownCave3/border.bin1
-rw-r--r--data/layouts/SecretBase_BrownCave3/layout.inc15
-rw-r--r--data/layouts/SecretBase_BrownCave3/map.bin69
-rw-r--r--data/layouts/SecretBase_BrownCave4/border.bin1
-rw-r--r--data/layouts/SecretBase_BrownCave4/layout.inc15
-rw-r--r--data/layouts/SecretBase_BrownCave4/map.bin70
-rw-r--r--data/layouts/SecretBase_RedCave1/border.bin1
-rw-r--r--data/layouts/SecretBase_RedCave1/layout.inc15
-rw-r--r--data/layouts/SecretBase_RedCave1/map.bin51
-rw-r--r--data/layouts/SecretBase_RedCave2/border.bin1
-rw-r--r--data/layouts/SecretBase_RedCave2/layout.inc15
-rw-r--r--data/layouts/SecretBase_RedCave2/map.bin42
-rw-r--r--data/layouts/SecretBase_RedCave3/border.bin1
-rw-r--r--data/layouts/SecretBase_RedCave3/layout.inc15
-rw-r--r--data/layouts/SecretBase_RedCave3/map.bin47
-rw-r--r--data/layouts/SecretBase_RedCave4/border.bin1
-rw-r--r--data/layouts/SecretBase_RedCave4/layout.inc15
-rw-r--r--data/layouts/SecretBase_RedCave4/map.bin56
-rw-r--r--data/layouts/SecretBase_Shrub1/border.bin1
-rw-r--r--data/layouts/SecretBase_Shrub1/layout.inc15
-rw-r--r--data/layouts/SecretBase_Shrub1/map.bin53
-rw-r--r--data/layouts/SecretBase_Shrub2/border.bin1
-rw-r--r--data/layouts/SecretBase_Shrub2/layout.inc15
-rw-r--r--data/layouts/SecretBase_Shrub2/map.bin57
-rw-r--r--data/layouts/SecretBase_Shrub3/border.bin1
-rw-r--r--data/layouts/SecretBase_Shrub3/layout.inc15
-rw-r--r--data/layouts/SecretBase_Shrub3/map.bin65
-rw-r--r--data/layouts/SecretBase_Shrub4/border.bin1
-rw-r--r--data/layouts/SecretBase_Shrub4/layout.inc15
-rw-r--r--data/layouts/SecretBase_Shrub4/map.bin69
-rw-r--r--data/layouts/SecretBase_Tree1/border.bin1
-rw-r--r--data/layouts/SecretBase_Tree1/layout.inc15
-rw-r--r--data/layouts/SecretBase_Tree1/map.bin56
-rw-r--r--data/layouts/SecretBase_Tree2/border.bin1
-rw-r--r--data/layouts/SecretBase_Tree2/layout.inc15
-rw-r--r--data/layouts/SecretBase_Tree2/map.bin48
-rw-r--r--data/layouts/SecretBase_Tree3/border.bin1
-rw-r--r--data/layouts/SecretBase_Tree3/layout.inc15
-rw-r--r--data/layouts/SecretBase_Tree3/map.bin63
-rw-r--r--data/layouts/SecretBase_Tree4/border.bin1
-rw-r--r--data/layouts/SecretBase_Tree4/layout.inc15
-rw-r--r--data/layouts/SecretBase_Tree4/map.bin77
-rw-r--r--data/layouts/SecretBase_YellowCave1/border.bin1
-rw-r--r--data/layouts/SecretBase_YellowCave1/layout.inc15
-rw-r--r--data/layouts/SecretBase_YellowCave1/map.bin57
-rw-r--r--data/layouts/SecretBase_YellowCave2/border.bin1
-rw-r--r--data/layouts/SecretBase_YellowCave2/layout.inc15
-rw-r--r--data/layouts/SecretBase_YellowCave2/map.bin56
-rw-r--r--data/layouts/SecretBase_YellowCave3/border.bin1
-rw-r--r--data/layouts/SecretBase_YellowCave3/layout.inc15
-rw-r--r--data/layouts/SecretBase_YellowCave3/map.bin63
-rw-r--r--data/layouts/SecretBase_YellowCave4/border.bin1
-rw-r--r--data/layouts/SecretBase_YellowCave4/layout.inc15
-rw-r--r--data/layouts/SecretBase_YellowCave4/map.bin80
-rw-r--r--data/layouts/ShoalCave_HighTideEntranceRoom/border.bin1
-rw-r--r--data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc15
-rw-r--r--data/layouts/ShoalCave_HighTideEntranceRoom/map.bin1
-rw-r--r--data/layouts/ShoalCave_HighTideInnerRoom/border.bin1
-rw-r--r--data/layouts/ShoalCave_HighTideInnerRoom/layout.inc15
-rw-r--r--data/layouts/ShoalCave_HighTideInnerRoom/map.bin1
-rw-r--r--data/layouts/ShoalCave_LowTideEntranceRoom/border.bin1
-rw-r--r--data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc15
-rw-r--r--data/layouts/ShoalCave_LowTideEntranceRoom/map.bin3
-rw-r--r--data/layouts/ShoalCave_LowTideIceRoom/border.bin1
-rw-r--r--data/layouts/ShoalCave_LowTideIceRoom/layout.inc15
-rw-r--r--data/layouts/ShoalCave_LowTideIceRoom/map.bin1
-rw-r--r--data/layouts/ShoalCave_LowTideInnerRoom/border.bin1
-rw-r--r--data/layouts/ShoalCave_LowTideInnerRoom/layout.inc15
-rw-r--r--data/layouts/ShoalCave_LowTideInnerRoom/map.bin2
-rw-r--r--data/layouts/ShoalCave_LowTideLowerRoom/border.bin1
-rw-r--r--data/layouts/ShoalCave_LowTideLowerRoom/layout.inc15
-rw-r--r--data/layouts/ShoalCave_LowTideLowerRoom/map.bin4
-rw-r--r--data/layouts/ShoalCave_LowTideStairsRoom/border.bin1
-rw-r--r--data/layouts/ShoalCave_LowTideStairsRoom/layout.inc15
-rw-r--r--data/layouts/ShoalCave_LowTideStairsRoom/map.bin1
-rw-r--r--data/layouts/SingleBattleColosseum/border.bin1
-rw-r--r--data/layouts/SingleBattleColosseum/layout.inc15
-rw-r--r--data/layouts/SingleBattleColosseum/map.bin1
-rw-r--r--data/layouts/SkyPillar_1F/border.bin1
-rw-r--r--data/layouts/SkyPillar_1F/layout.inc15
-rw-r--r--data/layouts/SkyPillar_1F/map.bin1
-rw-r--r--data/layouts/SkyPillar_2F/border.bin1
-rw-r--r--data/layouts/SkyPillar_2F/layout.inc15
-rw-r--r--data/layouts/SkyPillar_2F/map.bin1
-rw-r--r--data/layouts/SkyPillar_3F/border.bin1
-rw-r--r--data/layouts/SkyPillar_3F/layout.inc15
-rw-r--r--data/layouts/SkyPillar_3F/map.bin1
-rw-r--r--data/layouts/SkyPillar_4F/border.bin1
-rw-r--r--data/layouts/SkyPillar_4F/layout.inc15
-rw-r--r--data/layouts/SkyPillar_4F/map.bin1
-rw-r--r--data/layouts/SkyPillar_5F/border.bin1
-rw-r--r--data/layouts/SkyPillar_5F/layout.inc15
-rw-r--r--data/layouts/SkyPillar_5F/map.bin1
-rw-r--r--data/layouts/SkyPillar_Entrance/border.bin1
-rw-r--r--data/layouts/SkyPillar_Entrance/layout.inc15
-rw-r--r--data/layouts/SkyPillar_Entrance/map.bin1
-rw-r--r--data/layouts/SkyPillar_Outside/border.bin1
-rw-r--r--data/layouts/SkyPillar_Outside/layout.inc15
-rw-r--r--data/layouts/SkyPillar_Outside/map.bin1
-rw-r--r--data/layouts/SkyPillar_Top/border.bin1
-rw-r--r--data/layouts/SkyPillar_Top/layout.inc15
-rw-r--r--data/layouts/SkyPillar_Top/map.bin1
-rw-r--r--data/layouts/SlateportCity/border.bin1
-rw-r--r--data/layouts/SlateportCity/layout.inc15
-rw-r--r--data/layouts/SlateportCity/map.binbin0 -> 4800 bytes
-rw-r--r--data/layouts/SlateportCity_OceanicMuseum_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc15
-rw-r--r--data/layouts/SlateportCity_OceanicMuseum_1F/map.bin2
-rw-r--r--data/layouts/SlateportCity_OceanicMuseum_2F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc15
-rw-r--r--data/layouts/SlateportCity_OceanicMuseum_2F/map.bin1
-rw-r--r--data/layouts/SlateportCity_PokemonFanClub/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SlateportCity_PokemonFanClub/layout.inc15
-rw-r--r--data/layouts/SlateportCity_PokemonFanClub/map.binbin0 -> 308 bytes
-rw-r--r--data/layouts/SlateportCity_SternsShipyard_1F/border.bin1
-rw-r--r--data/layouts/SlateportCity_SternsShipyard_1F/layout.inc15
-rw-r--r--data/layouts/SlateportCity_SternsShipyard_1F/map.bin7
-rw-r--r--data/layouts/SlateportCity_SternsShipyard_2F/border.bin1
-rw-r--r--data/layouts/SlateportCity_SternsShipyard_2F/layout.inc15
-rw-r--r--data/layouts/SlateportCity_SternsShipyard_2F/map.bin1
-rw-r--r--data/layouts/SootopolisCity/border.bin1
-rw-r--r--data/layouts/SootopolisCity/layout.inc15
-rw-r--r--data/layouts/SootopolisCity/map.bin12
-rw-r--r--data/layouts/SootopolisCity_Gym_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SootopolisCity_Gym_1F/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_Gym_1F/map.binbin0 -> 884 bytes
-rw-r--r--data/layouts/SootopolisCity_Gym_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SootopolisCity_Gym_B1F/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_Gym_B1F/map.bin1
-rw-r--r--data/layouts/SootopolisCity_House1/border.bin1
-rw-r--r--data/layouts/SootopolisCity_House1/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_House1/map.bin1
-rw-r--r--data/layouts/SootopolisCity_House2/border.bin1
-rw-r--r--data/layouts/SootopolisCity_House2/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_House2/map.bin1
-rw-r--r--data/layouts/SootopolisCity_House3/border.bin1
-rw-r--r--data/layouts/SootopolisCity_House3/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_House3/map.bin1
-rw-r--r--data/layouts/SootopolisCity_LotadAndSeedotHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin1
-rw-r--r--data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin1
-rw-r--r--data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc15
-rw-r--r--data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin2
-rw-r--r--data/layouts/SouthernIsland_Exterior/border.bin1
-rw-r--r--data/layouts/SouthernIsland_Exterior/layout.inc15
-rw-r--r--data/layouts/SouthernIsland_Exterior/map.bin1
-rw-r--r--data/layouts/SouthernIsland_Interior/border.bin1
-rw-r--r--data/layouts/SouthernIsland_Interior/layout.inc15
-rw-r--r--data/layouts/SouthernIsland_Interior/map.bin1
-rw-r--r--data/layouts/TerraCave_End/border.bin1
-rw-r--r--data/layouts/TerraCave_End/layout.inc15
-rw-r--r--data/layouts/TerraCave_End/map.bin9
-rw-r--r--data/layouts/TerraCave_Entrance/border.bin1
-rw-r--r--data/layouts/TerraCave_Entrance/layout.inc15
-rw-r--r--data/layouts/TerraCave_Entrance/map.bin33
-rw-r--r--data/layouts/TradeCenter/border.bin1
-rw-r--r--data/layouts/TradeCenter/layout.inc15
-rw-r--r--data/layouts/TradeCenter/map.bin2
-rw-r--r--data/layouts/TrainerHill_1F/border.bin1
-rw-r--r--data/layouts/TrainerHill_1F/layout.inc15
-rw-r--r--data/layouts/TrainerHill_1F/map.bin2
-rw-r--r--data/layouts/TrainerHill_2F/border.bin1
-rw-r--r--data/layouts/TrainerHill_2F/layout.inc15
-rw-r--r--data/layouts/TrainerHill_2F/map.bin2
-rw-r--r--data/layouts/TrainerHill_3F/border.bin1
-rw-r--r--data/layouts/TrainerHill_3F/layout.inc15
-rw-r--r--data/layouts/TrainerHill_3F/map.bin2
-rw-r--r--data/layouts/TrainerHill_4F/border.bin1
-rw-r--r--data/layouts/TrainerHill_4F/layout.inc15
-rw-r--r--data/layouts/TrainerHill_4F/map.bin2
-rw-r--r--data/layouts/TrainerHill_Entrance/border.bin1
-rw-r--r--data/layouts/TrainerHill_Entrance/layout.inc15
-rw-r--r--data/layouts/TrainerHill_Entrance/map.bin2
-rw-r--r--data/layouts/TrainerHill_Roof/border.bin1
-rw-r--r--data/layouts/TrainerHill_Roof/layout.inc15
-rw-r--r--data/layouts/TrainerHill_Roof/map.bin1
-rw-r--r--data/layouts/Underwater1/border.bin1
-rw-r--r--data/layouts/Underwater1/layout.inc15
-rw-r--r--data/layouts/Underwater1/map.bin17
-rw-r--r--data/layouts/Underwater2/border.bin1
-rw-r--r--data/layouts/Underwater2/layout.inc15
-rw-r--r--data/layouts/Underwater2/map.bin35
-rw-r--r--data/layouts/Underwater3/border.bin1
-rw-r--r--data/layouts/Underwater3/layout.inc15
-rw-r--r--data/layouts/Underwater3/map.bin1
-rw-r--r--data/layouts/Underwater4/border.bin1
-rw-r--r--data/layouts/Underwater4/layout.inc15
-rw-r--r--data/layouts/Underwater4/map.bin1
-rw-r--r--data/layouts/Underwater5/border.bin1
-rw-r--r--data/layouts/Underwater5/layout.inc15
-rw-r--r--data/layouts/Underwater5/map.bin1
-rw-r--r--data/layouts/Underwater6/border.bin1
-rw-r--r--data/layouts/Underwater6/layout.inc15
-rw-r--r--data/layouts/Underwater6/map.bin1
-rw-r--r--data/layouts/Underwater7/border.bin1
-rw-r--r--data/layouts/Underwater7/layout.inc15
-rw-r--r--data/layouts/Underwater7/map.bin1
-rw-r--r--data/layouts/Underwater_MarineCave/border.bin1
-rw-r--r--data/layouts/Underwater_MarineCave/layout.inc15
-rw-r--r--data/layouts/Underwater_MarineCave/map.bin1
-rw-r--r--data/layouts/Underwater_Route134/border.bin1
-rw-r--r--data/layouts/Underwater_Route134/layout.inc15
-rw-r--r--data/layouts/Underwater_Route134/map.bin2
-rw-r--r--data/layouts/Underwater_SeafloorCavern/border.bin1
-rw-r--r--data/layouts/Underwater_SeafloorCavern/layout.inc15
-rw-r--r--data/layouts/Underwater_SeafloorCavern/map.bin2
-rw-r--r--data/layouts/Underwater_SealedChamber/border.bin1
-rw-r--r--data/layouts/Underwater_SealedChamber/layout.inc15
-rw-r--r--data/layouts/Underwater_SealedChamber/map.bin1
-rw-r--r--data/layouts/Underwater_SootopolisCity/border.bin1
-rw-r--r--data/layouts/Underwater_SootopolisCity/layout.inc15
-rw-r--r--data/layouts/Underwater_SootopolisCity/map.bin2
-rw-r--r--data/layouts/UnionRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/UnionRoom/layout.inc15
-rw-r--r--data/layouts/UnionRoom/map.bin11
-rw-r--r--data/layouts/UnknownMap_08417FC4/border.bin1
-rw-r--r--data/layouts/UnknownMap_08417FC4/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08417FC4/map.bin1
-rw-r--r--data/layouts/UnknownMap_08428450/border.bin1
-rw-r--r--data/layouts/UnknownMap_08428450/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08428450/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_084294C4/border.bin1
-rw-r--r--data/layouts/UnknownMap_084294C4/layout.inc15
-rw-r--r--data/layouts/UnknownMap_084294C4/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_084294E8/border.bin1
-rw-r--r--data/layouts/UnknownMap_084294E8/layout.inc15
-rw-r--r--data/layouts/UnknownMap_084294E8/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E6C0/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E6C0/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E6C0/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E6E4/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E6E4/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E6E4/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E708/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E708/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E708/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E72C/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E72C/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E72C/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E750/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E750/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E750/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E774/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E774/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E774/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E798/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E798/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E798/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E7BC/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E7BC/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E7BC/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E7E0/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E7E0/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E7E0/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E804/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E804/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E804/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E828/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E828/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E828/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E84C/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E84C/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E84C/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E870/border.bin1
-rw-r--r--data/layouts/UnknownMap_0843E870/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E870/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_0843E894/border.bin1
-rwxr-xr-xdata/layouts/UnknownMap_0843E894/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0843E894/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_08447028/border.bin1
-rw-r--r--data/layouts/UnknownMap_08447028/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08447028/map.bin3
-rw-r--r--data/layouts/UnknownMap_0845A394/border.bin1
-rw-r--r--data/layouts/UnknownMap_0845A394/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0845A394/map.binbin0 -> 724 bytes
-rw-r--r--data/layouts/UnknownMap_0845D470/border.bin1
-rw-r--r--data/layouts/UnknownMap_0845D470/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0845D470/map.bin1
-rw-r--r--data/layouts/UnknownMap_0845ECB4/border.bin1
-rw-r--r--data/layouts/UnknownMap_0845ECB4/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0845ECB4/map.bin1
-rw-r--r--data/layouts/UnknownMap_08469200/border.bin1
-rw-r--r--data/layouts/UnknownMap_08469200/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08469200/map.bin12
-rw-r--r--data/layouts/UnknownMap_084693AC/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/UnknownMap_084693AC/layout.inc15
-rw-r--r--data/layouts/UnknownMap_084693AC/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_08470BD8/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/UnknownMap_08470BD8/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08470BD8/map.binbin0 -> 11200 bytes
-rw-r--r--data/layouts/UnknownMap_08480DAC/border.bin1
-rw-r--r--data/layouts/UnknownMap_08480DAC/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08480DAC/map.binbin0 -> 340 bytes
-rw-r--r--data/layouts/UnknownMap_08480F54/border.bin1
-rw-r--r--data/layouts/UnknownMap_08480F54/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08480F54/map.bin1
-rw-r--r--data/layouts/UnknownMap_084810FC/border.bin1
-rw-r--r--data/layouts/UnknownMap_084810FC/layout.inc15
-rw-r--r--data/layouts/UnknownMap_084810FC/map.bin1
-rw-r--r--data/layouts/UnknownMap_084812A4/border.bin1
-rw-r--r--data/layouts/UnknownMap_084812A4/layout.inc15
-rw-r--r--data/layouts/UnknownMap_084812A4/map.bin1
-rw-r--r--data/layouts/UnknownMap_0848144C/border.bin1
-rw-r--r--data/layouts/UnknownMap_0848144C/layout.inc15
-rw-r--r--data/layouts/UnknownMap_0848144C/map.bin1
-rw-r--r--data/layouts/UnknownMap_084815F4/border.bin1
-rw-r--r--data/layouts/UnknownMap_084815F4/layout.inc15
-rw-r--r--data/layouts/UnknownMap_084815F4/map.bin1
-rw-r--r--data/layouts/UnknownMap_08481B24/border.bin1
-rw-r--r--data/layouts/UnknownMap_08481B24/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08481B24/map.bin1
-rw-r--r--data/layouts/UnknownMap_08481DBC/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/UnknownMap_08481DBC/layout.inc15
-rw-r--r--data/layouts/UnknownMap_08481DBC/map.bin2
-rw-r--r--data/layouts/UnknownMap_25_29/border.bin1
-rw-r--r--data/layouts/UnknownMap_25_29/layout.inc15
-rw-r--r--data/layouts/UnknownMap_25_29/map.bin1
-rw-r--r--data/layouts/UnknownMap_25_30/border.bin1
-rw-r--r--data/layouts/UnknownMap_25_30/layout.inc15
-rw-r--r--data/layouts/UnknownMap_25_30/map.bin1
-rw-r--r--data/layouts/UnknownMap_25_31/border.bin1
-rw-r--r--data/layouts/UnknownMap_25_31/layout.inc15
-rw-r--r--data/layouts/UnknownMap_25_31/map.bin1
-rw-r--r--data/layouts/UnknownMap_25_32/border.bin1
-rw-r--r--data/layouts/UnknownMap_25_32/layout.inc15
-rw-r--r--data/layouts/UnknownMap_25_32/map.bin1
-rw-r--r--data/layouts/UnknownMap_25_33/border.bin1
-rw-r--r--data/layouts/UnknownMap_25_33/layout.inc15
-rw-r--r--data/layouts/UnknownMap_25_33/map.bin1
-rw-r--r--data/layouts/UnknownMap_25_34/border.bin1
-rw-r--r--data/layouts/UnknownMap_25_34/layout.inc15
-rw-r--r--data/layouts/UnknownMap_25_34/map.bin1
-rw-r--r--data/layouts/VerdanturfTown/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/VerdanturfTown/layout.inc15
-rw-r--r--data/layouts/VerdanturfTown/map.binbin0 -> 800 bytes
-rw-r--r--data/layouts/VerdanturfTown_BattleTentBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc15
-rw-r--r--data/layouts/VerdanturfTown_BattleTentBattleRoom/map.binbin0 -> 234 bytes
-rw-r--r--data/layouts/VerdanturfTown_WandasHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/VerdanturfTown_WandasHouse/layout.inc15
-rw-r--r--data/layouts/VerdanturfTown_WandasHouse/map.binbin0 -> 272 bytes
-rw-r--r--data/layouts/VictoryRoad_1F/border.bin1
-rw-r--r--data/layouts/VictoryRoad_1F/layout.inc15
-rw-r--r--data/layouts/VictoryRoad_1F/map.bin10
-rw-r--r--data/layouts/VictoryRoad_B1F/border.bin1
-rw-r--r--data/layouts/VictoryRoad_B1F/layout.inc15
-rw-r--r--data/layouts/VictoryRoad_B1F/map.bin25
-rw-r--r--data/layouts/VictoryRoad_B2F/border.bin1
-rw-r--r--data/layouts/VictoryRoad_B2F/layout.inc15
-rw-r--r--data/layouts/VictoryRoad_B2F/map.bin1
1323 files changed, 9524 insertions, 0 deletions
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/border.bin b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
new file mode 100644
index 000000000..d9e122ef2
--- /dev/null
+++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_CaptainsOffice_MapBorder::
+ .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
+
+AbandonedShip_CaptainsOffice_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
+
+ .align 2
+AbandonedShip_CaptainsOffice_Layout::
+ .4byte 0x9
+ .4byte 0x7
+ .4byte AbandonedShip_CaptainsOffice_MapBorder
+ .4byte AbandonedShip_CaptainsOffice_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/map.bin b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
new file mode 100644
index 000000000..c9097fa63
--- /dev/null
+++ b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
Binary files differ
diff --git a/data/layouts/AbandonedShip_Corridors_1F/border.bin b/data/layouts/AbandonedShip_Corridors_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
new file mode 100644
index 000000000..d5fd22578
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_1F_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
+
+AbandonedShip_Corridors_1F_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
+
+ .align 2
+AbandonedShip_Corridors_1F_Layout::
+ .4byte 0x12
+ .4byte 0xc
+ .4byte AbandonedShip_Corridors_1F_MapBorder
+ .4byte AbandonedShip_Corridors_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Corridors_1F/map.bin b/data/layouts/AbandonedShip_Corridors_1F/map.bin
new file mode 100644
index 000000000..5ef5ca949
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_1F/map.bin
@@ -0,0 +1,3 @@
+ ��� �� � ������22222
+2 6�62222222
+2 622222222222222222�62012222201111222220122222011112222201222220111122222012222201111222�62%#&2222%�$"#&2222-+6.2222-�2,*+6.2�622222222222222222𲡐22222𲡐22222222 \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Corridors_B1F/border.bin b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
new file mode 100644
index 000000000..7299aa6f8
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_B1F_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
+
+AbandonedShip_Corridors_B1F_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Corridors_B1F_Layout::
+ .4byte 0xd
+ .4byte 0xa
+ .4byte AbandonedShip_Corridors_B1F_MapBorder
+ .4byte AbandonedShip_Corridors_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Corridors_B1F/map.bin b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
new file mode 100644
index 000000000..24b1a7b61
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
@@ -0,0 +1 @@
+!!011112!!011)�011112)�011�2�011112�2�01122%#$"�&22%#$22-+6,*�2.22-+6,2222222222222222222222222�62222222222222�62220111111122222011111112 \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Deck/border.bin b/data/layouts/AbandonedShip_Deck/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/AbandonedShip_Deck/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc
new file mode 100644
index 000000000..7f0baaaec
--- /dev/null
+++ b/data/layouts/AbandonedShip_Deck/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Deck_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Deck/border.bin"
+
+AbandonedShip_Deck_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Deck/map.bin"
+
+ .align 2
+AbandonedShip_Deck_Layout::
+ .4byte 0x17
+ .4byte 0x15
+ .4byte AbandonedShip_Deck_MapBorder
+ .4byte AbandonedShip_Deck_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AbandonedShip_Deck/map.bin b/data/layouts/AbandonedShip_Deck/map.bin
new file mode 100644
index 000000000..67cdde3d7
--- /dev/null
+++ b/data/layouts/AbandonedShip_Deck/map.bin
@@ -0,0 +1 @@
+(((`(`(((((b`(((((((((((`(''`(eif(b`((�(((((((`('/`(((((b`('�(�(ef(`(/'hiiiiij`(''�('�((((`(*/������`(//�(/�((((`(�* ]]]��2�hiiiiiiii(((`(((33�*2*2�2*2�2��������ef(hiiiiif(2(2ei ��������(((������񯣔�����������((( ]]]��2�񯣔��2�]]]]]]]](((33*2*2��2*2�2*2��2*2�2�*2*2*2*2*2*2*2((((�((�(2(2(2(2�(2(2(2�(2�(2(2(2(2iiiiiiiiiiiif(2(2eiiiiiii������������񯣔������������������� 񯣔 ������������������� 󏡶 �������������������4��4����������������������������������������������������������������������������pppppppp��������������� \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
new file mode 100644
index 000000000..0ee7aa755
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorCorridors_MapBorder::
+ .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
+
+AbandonedShip_HiddenFloorCorridors_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
+
+ .align 2
+AbandonedShip_HiddenFloorCorridors_Layout::
+ .4byte 0xd
+ .4byte 0xb
+ .4byte AbandonedShip_HiddenFloorCorridors_MapBorder
+ .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
new file mode 100644
index 000000000..a4637ccbe
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
@@ -0,0 +1 @@
+ �  �� ������2222222222222�622422222242222220111111122񨅦201111111222220111111122222%#$"#$"#&22��-36,*36,*+6.22V��2222222222GVx2222222222 \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
new file mode 100644
index 000000000..bf2f758d7
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorRooms_MapBorder::
+ .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
+
+AbandonedShip_HiddenFloorRooms_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
+
+ .align 2
+AbandonedShip_HiddenFloorRooms_Layout::
+ .4byte 0x2c
+ .4byte 0xf
+ .4byte AbandonedShip_HiddenFloorRooms_MapBorder
+ .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
new file mode 100644
index 000000000..b63eeabe6
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
@@ -0,0 +1 @@
+6''''�c�'''''76'''''���'''''76'''''�c�'''''7>////��6�/////?>/////��2�/////GF/////��6�/////?>h;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2665;2𭦀;2;2;2;2ON:2;2;2;2;2;2;2g2;2;2𭦀;2?>=28282828282a282828282�6?>�682a2^6_682b񃉘82828282;2;2<28282b6828282828282񃉘82?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>�682^6_6828282828282`282?>=2`2828282828282828282a282?>�682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a282828282�6?6''''''''''''76'''''''''''''76'''''''''''''7>////////////?>/////////////?>/////////////?>:2g2;2;2;2;25;2;2;2;2;2?>:2;2;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2g2;2;2;2;2;2;2𭦀;2?>=282828282a2828282V6W682?>=28282828282`2828282b682�6?>�682828282V6W6828282񃉘82?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>�682`2828282828282828282?>=2V6W682828282828282828282?>=28282828282828282828282�6?>=282828282d2e282828282�6?>=2^6_6828282d2e2828282a282?>=2`282b68282d2e282828282a2? \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Room_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc
new file mode 100644
index 000000000..fdd5b395d
--- /dev/null
+++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Room_B1F_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
+
+AbandonedShip_Room_B1F_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Room_B1F_Layout::
+ .4byte 0x9
+ .4byte 0x8
+ .4byte AbandonedShip_Room_B1F_MapBorder
+ .4byte AbandonedShip_Room_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Room_B1F/map.bin b/data/layouts/AbandonedShip_Room_B1F/map.bin
new file mode 100644
index 000000000..cb8393eb2
--- /dev/null
+++ b/data/layouts/AbandonedShip_Room_B1F/map.bin
@@ -0,0 +1 @@
+6'''''''7>///////?>:2;2;2;2;2;2;2?>=282a282828282?>=2`28282828282?>=282828282a282?>=2828282828282?>=28282d2e282b? \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms2_1F/border.bin b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
new file mode 100644
index 000000000..d15652cc0
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_1F_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
+
+AbandonedShip_Rooms2_1F_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms2_1F_Layout::
+ .4byte 0x9
+ .4byte 0x11
+ .4byte AbandonedShip_Rooms2_1F_MapBorder
+ .4byte AbandonedShip_Rooms2_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Rooms2_1F/map.bin b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
new file mode 100644
index 000000000..c897ce8a0
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
@@ -0,0 +1 @@
+6@k�c�''7>Hs��6�//?>PQ:2;2;2;2;2?>XY=282828282?>2;2<28282a282?>=2828282828282?>=282b82a28282?>=2828282828282?=26'''=2'''7>///=2///?>:2;2;2<2;2;2;2?>=2828282828282?>=2VW82a28282?>=2^_a2828282?>=2828282828282?>=28282d2e28282? \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/border.bin b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
new file mode 100644
index 000000000..d99e43f47
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_B1F_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
+
+AbandonedShip_Rooms2_B1F_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms2_B1F_Layout::
+ .4byte 0x12
+ .4byte 0x8
+ .4byte AbandonedShip_Rooms2_B1F_MapBorder
+ .4byte AbandonedShip_Rooms2_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/map.bin b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
new file mode 100644
index 000000000..7865bb69d
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
@@ -0,0 +1 @@
+6@AB''''76@AB'CDE7>HIJ////?>HIJ/KLM?>PQ:2;2;2;2;2GFPQ:2;2;2TU?>XY=282VW�6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=28282828282�6?>�6828282828282?>�682828282`282?>=28282d2e282b?>=28282d2e28282? \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms_1F/border.bin b/data/layouts/AbandonedShip_Rooms_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
new file mode 100644
index 000000000..63e4a716a
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_1F_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
+
+AbandonedShip_Rooms_1F_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms_1F_Layout::
+ .4byte 0x12
+ .4byte 0x11
+ .4byte AbandonedShip_Rooms_1F_MapBorder
+ .4byte AbandonedShip_Rooms_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Rooms_1F/map.bin b/data/layouts/AbandonedShip_Rooms_1F/map.bin
new file mode 100644
index 000000000..20529b3df
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_1F/map.bin
@@ -0,0 +1 @@
+6''�c�''76@k�c�''7>//��6�//?>Hs��6�//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=2828282�6?>�682828282a282?>:2;2<282828282?>=2828282828282?>=2828282`28282?>=2b8282828282?>�6828282828282?>=2828282a28282?>=2828282828282?=26@AB'''E76'''=2CDE7>HIJ////?>///=2KLM?>PQ:2;2;2;2;2GF:2;2;2<2;2TU?>XY=282`28282ON=282828282\]?>:2;2<2b828282;2;2<282828282;2;2?>=2828282828282?>=2VW828282�6?>=2a28282828282?>=2^_82828282?>�68282d2e28282?>=28282d2e28282? \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms_B1F/border.bin b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
new file mode 100644
index 000000000..ab688d668
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_B1F_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
+
+AbandonedShip_Rooms_B1F_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms_B1F_Layout::
+ .4byte 0x1b
+ .4byte 0x8
+ .4byte AbandonedShip_Rooms_B1F_MapBorder
+ .4byte AbandonedShip_Rooms_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Rooms_B1F/map.bin b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
new file mode 100644
index 000000000..b18509507
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
@@ -0,0 +1 @@
+6@k���mE@k�c�''@k���mE7>Hs��2�uMHs��6�//Hs��2�uM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<2828282�6:2;2<28282;2;2?>=2VW828282�6=2�����82=28282a2828282?>=2^_82`28282=2�pVp�82=2`2828282b82?>�6828282828282=2�VGV�82=28282828282�6? \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc
new file mode 100644
index 000000000..8fa1b1485
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater1/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Underwater1_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
+
+AbandonedShip_Underwater1_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
+
+ .align 2
+AbandonedShip_Underwater1_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte AbandonedShip_Underwater1_MapBorder
+ .4byte AbandonedShip_Underwater1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Underwater1/map.bin b/data/layouts/AbandonedShip_Underwater1/map.bin
new file mode 100644
index 000000000..2c73cfe86
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater1/map.bin
@@ -0,0 +1 @@
+����������������󒦮󒦮󒦮󕫺󒭈󛵾󀈢󒦮�2󀈢󀈢󀈢󒭈󀈢󀉼󞹒󒭜󀈢󀈢󀈢󕱶�2󀈬󆒒�2�2 \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc
new file mode 100644
index 000000000..feea82d16
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater2/layout.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Underwater2_MapBorder::
+ .incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
+
+AbandonedShip_Underwater2_MapBlockdata::
+ .incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
+
+ .align 2
+AbandonedShip_Underwater2_Layout::
+ .4byte 0x15
+ .4byte 0x7
+ .4byte AbandonedShip_Underwater2_MapBorder
+ .4byte AbandonedShip_Underwater2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/AbandonedShip_Underwater2/map.bin b/data/layouts/AbandonedShip_Underwater2/map.bin
new file mode 100644
index 000000000..9dbd5c71a
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater2/map.bin
@@ -0,0 +1 @@
+�������������������������2�����������������󒦮󒦮󒦮󒦮󒦮󒦸󘰞󒦮�2󀉼󞹒󘰞󒦮󒦮󒦮󒦮󒦮󒦮󒭈󀈢󀈢󀉞󒦮󒦮󒦸󘰞󒦮󒦮󒭈󀈢󀈢󀈢󒦮󒦮󒦮󒦮󒦮󒦮󒦮�2�2󀈢󀈢󛵠󘰞󒦮󒦮󒦮󒦮󒦮󕫺�2�2󀈢󀈢 \ No newline at end of file
diff --git a/data/layouts/AlteringCave/border.bin b/data/layouts/AlteringCave/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/AlteringCave/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc
new file mode 100644
index 000000000..9f03e7d87
--- /dev/null
+++ b/data/layouts/AlteringCave/layout.inc
@@ -0,0 +1,15 @@
+AlteringCave_MapBorder::
+ .incbin "data/layouts/AlteringCave/border.bin"
+
+AlteringCave_MapBlockdata::
+ .incbin "data/layouts/AlteringCave/map.bin"
+
+ .align 2
+AlteringCave_Layout::
+ .4byte 0x20
+ .4byte 0x18
+ .4byte AlteringCave_MapBorder
+ .4byte AlteringCave_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/AlteringCave/map.bin b/data/layouts/AlteringCave/map.bin
new file mode 100644
index 000000000..38bec91fa
--- /dev/null
+++ b/data/layouts/AlteringCave/map.bin
@@ -0,0 +1 @@
+f222f222ff6662222226662222226662f2222222222222######"f22222222#######"2222222 !B!B!B!B!B!B"P22222222BBBBBBP22𩒊𬗌222222fP222BBBBBB22𩓚񄿒�22222ffPf2BBBBBB22񁺚񄿒񄾌222222222BBBBB22񁺚񄿒񄿜222222222222񚡚񄿒񄿜22f2222222222222222f22񚢪񝧢�22222Pf22222222222222222P2222222222f22222222222222222####"22222222222222222 ##################"22222222666666222222226666662222222 #666666###"2<22#XYZ## \ No newline at end of file
diff --git a/data/layouts/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/layouts/AncientTomb/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc
new file mode 100644
index 000000000..ad173f936
--- /dev/null
+++ b/data/layouts/AncientTomb/layout.inc
@@ -0,0 +1,15 @@
+AncientTomb_MapBorder::
+ .incbin "data/layouts/AncientTomb/border.bin"
+
+AncientTomb_MapBlockdata::
+ .incbin "data/layouts/AncientTomb/map.bin"
+
+ .align 2
+AncientTomb_Layout::
+ .4byte 0x11
+ .4byte 0x21
+ .4byte AncientTomb_MapBorder
+ .4byte AncientTomb_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/AncientTomb/map.bin b/data/layouts/AncientTomb/map.bin
new file mode 100644
index 000000000..406cf7279
--- /dev/null
+++ b/data/layouts/AncientTomb/map.bin
Binary files differ
diff --git a/data/layouts/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AquaHideout_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc
new file mode 100644
index 000000000..5508a668b
--- /dev/null
+++ b/data/layouts/AquaHideout_1F/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_1F_MapBorder::
+ .incbin "data/layouts/AquaHideout_1F/border.bin"
+
+AquaHideout_1F_MapBlockdata::
+ .incbin "data/layouts/AquaHideout_1F/map.bin"
+
+ .align 2
+AquaHideout_1F_Layout::
+ .4byte 0x1c
+ .4byte 0x1e
+ .4byte AquaHideout_1F_MapBorder
+ .4byte AquaHideout_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AquaHideout_1F/map.bin b/data/layouts/AquaHideout_1F/map.bin
new file mode 100644
index 000000000..2330fe015
--- /dev/null
+++ b/data/layouts/AquaHideout_1F/map.bin
@@ -0,0 +1,55 @@
+STST��� [\21$#![\0!21!!��2�"
+cd:292)2)2)2cd82)2:292)2)2�2)2�2)2'
+
+!!! k2l2�2(2(2(2(2k2l2�2(2(2(2(2(2(2(2(2(27
+
+2)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2)2
+
+'//�2(2(2]iiiiiiiiii^�2(2(2(2(2(2
+
+/'/�2(2(2`q1q1q1q1q1q1q1q1q1q1��2(2(2(2(2(2
+
+'/񶎢(2(2`q1p1p1p1p1p1p1p1p1q1��2(2(2(2(2(2
+
+/񶎢(2(2(2hiiiiiiiiii��2(2(2(2(2
+
+)2�2(2(2(2(2*2*2*2*2*2*2*2*2*2*2*2*2�2(2(2(2(2'
+
+)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2/
+
+)2(2(2]iiiiiif(2(2eiiiiii^�2(2'
+
+)2(2(2`t||||||񯣔||||||���2(2/
+
+)2(2(2`u��������������s��2(2*2
+
+)2(2(2`u�pppppppppppp�s��2(2(2
+
+�2�2(2`u�pppppppppppp�s��2(2(2
+
+���2�u�pppppppppppp�sy�2(2(2
+
+���2*瑽滲滲滲tpppppr滲滲滲滲滲*�2(2(2
+
+)2*2�2((B滲滲滲uypppxs滲滲滲滲滲((2㺝
+
+)2(2(2�t|||}�ppp�{||||���2��
+
+)2(2(2`u�����ppp������s��2��
+
+)2(2(2`u�pppppppppppp�s��2*2*2
+
+�2�2(2`u�pppppppppppp�s��2(2(2
+
+���2`u�pppppppppppp�s�񄺜�2
+
+���2�u�pppppppppppp�sy�2��
+
+)2*2�2*瑽滲滲滲滲tpppr滲滲滲滲滲滲*�2��
+
+)2(2(2((B滲滲滲滲uypxs滲(B(B(B(B(B((2*2*2
+
+mmmmmmmmou�g�snmmmmmmmmm
+
+qqqqqqqqu�����sqqqqqqqqq
+�llllllll�lllll�lllllllll� \ No newline at end of file
diff --git a/data/layouts/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc
new file mode 100644
index 000000000..0889e548a
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_B1F_MapBorder::
+ .incbin "data/layouts/AquaHideout_B1F/border.bin"
+
+AquaHideout_B1F_MapBlockdata::
+ .incbin "data/layouts/AquaHideout_B1F/map.bin"
+
+ .align 2
+AquaHideout_B1F_Layout::
+ .4byte 0x33
+ .4byte 0x18
+ .4byte AquaHideout_B1F_MapBorder
+ .4byte AquaHideout_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AquaHideout_B1F/map.bin b/data/layouts/AquaHideout_B1F/map.bin
new file mode 100644
index 000000000..97efacec8
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/map.bin
@@ -0,0 +1,83 @@
+�������������������������������� 01!��2�
+11��2�!����
+!!��2�!!
+
+��!!!����
+����ST8292)2�2)2�2
+9292�2)2�2)2����
+')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�2��7��
+
+)2�2)2�2cd2)2(2(2(2(2(2
+)2(2(2(2(2�2*2*2��7
+)2�2(2(2(2�2(2
+
+)2*2�2(2(2*2*2��7
+
+)2(2(2(2k2l2�2(2(2(2(2(2(2  2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 
+)2�2(2(2�2(2(2�2(2
+
+)2(2(2(22A2B2222(2(2(2�������������+,-.
+�iiiiiii^
+
+)2(2(2(2IJ222(2(2(2
+��$#$!!!
+0013456
+
+`񬿦񗝞񗝞�2�
+
+)2(2(2(2222A2B22(2(2(2
+���3�7�7�魿�66
+828292;<=>
+
+hiiiiiii�
+
+)2(2(2(2222IJ(2(2(2
+�3�3�3򯍋�鼵�3�3�3
+)263(2CDEF
+
+)2�2(2(2�2(2(2�2(2
+
+)2(2(2(2222222(2(2(2
+�3�3�3�3�3���3􃸋
+)2(2(2KLMN
+
+�iiiiiii^
+  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 �3�3�3�3�3�3�3�3�3�3 )2(2(2(2UV)2
+
+`񬿦񗝞񗝞�2�
+�����������������������)2�2(2(2(2(2(2
+
+hiiiiiii�
+
+!!!!!!!!!!!!! !!!!!!!!!!  2Y2Y2Y2Y2Y2Y2 
+)2�2(2(2�2(2(2�2(2
+
+)2)2)2)2)2)2)2)2)2)2)2)2)22)222222222�3�������
+�iiiiiii^
+
+)2(2�2(2(2(2(2(2(2(2(2(2(2(2(2�3  222���7 !!!!!!!
+
+`񬿦񗝞񗝞�2�
+
+�iiiiiiiiiiiii^�222���D322222)2)2
+
+hiiiiiii�
+
+`񬿦񗝞񗝞񗝞񗝞񗝞�2�222222222222222(2(2
+
+)2�2(2(2�2(2(2�2(2
+
+`�2O1O1O1O1O1O1O1O1O1O1O1O1�2A2B2222A2B2�3�322222(2(2
+  2Y2Y2Y2Y2Y2Y2Y2Y2 
+hiiiiiiiiiiiii�2IJ222IJ��22222(2�2
+���������
+)2*2�2*2*2*2*2*2*2*2*2*2*2*2*2222222222222222(2(2
+ !!!!!!!!!   2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 �������������������������������� !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file
diff --git a/data/layouts/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AquaHideout_B2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc
new file mode 100644
index 000000000..9e335e5d9
--- /dev/null
+++ b/data/layouts/AquaHideout_B2F/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_B2F_MapBorder::
+ .incbin "data/layouts/AquaHideout_B2F/border.bin"
+
+AquaHideout_B2F_MapBlockdata::
+ .incbin "data/layouts/AquaHideout_B2F/map.bin"
+
+ .align 2
+AquaHideout_B2F_Layout::
+ .4byte 0x22
+ .4byte 0x18
+ .4byte AquaHideout_B2F_MapBorder
+ .4byte AquaHideout_B2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AquaHideout_B2F/map.bin b/data/layouts/AquaHideout_B2F/map.bin
new file mode 100644
index 000000000..2e843a8e4
--- /dev/null
+++ b/data/layouts/AquaHideout_B2F/map.bin
@@ -0,0 +1,51 @@
+ST������+,-.+,-.222 [\01��2�
+!!��2�3456!!3456!!!
+�����cd8292�2)2�2
+)2)2�2)2�2;<=>)2)2;<=>)2)2)2
+
+!��2�!
+k2l2�2(2(2(2(2
+)2(2(2(2(2CDEF�2(2CDEF�2(2(2
+
+)2�2)2�2)2
+)2(2(2(2(2(2(2
+)2(2(2(2(2KLMN�2(2KLMN�2(2(2
+
+)2(2(2(2(2
+)2(2(22A2B22
+)2(2(2(2(2(2UV�2(2(2(2UV�2(2(2(2
+
+)2(2(2
+)2(2(22IJ
+)2(2㺝(2(2*2*2�2(2(2(2*2*2�2(2(2(2
+
+)2//(2
+)2(2(22222
+)2(2���2(2㺝(2(2㺝(2㺝(2(2(2
+
+)277/�2
+)2�2(22222
+)2(2���20���2(2��2��񅈾(2
+  2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 )2(2*2*2�282���2(2��:2���2(2(2
+������������)2(2(2(2(2(2*2*2�2(2*2*2�2*2*2�2(2(2
+
+!!!!! 012!!!!
+)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2
+
+)2)2)2)2)228292:2)2)2)2)2
+)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2 
+)2(2(2(2(2(2(2(2(2(2(2�2(2 )2(2(2�2(2(2(2'2Y2Y2Y2Y2Y2Y2Y2Y2
+)2(2(2(2(2(2(2(2(2(2(2(2(2)2(2(2(2(2(2'/��������
+
+�iiiiiiiiiiif )2(2(2(2(2(2/// !!!!!!!!
+
+�������������2�iiiiiii^2)2)2)2)2)2)2)2)2
+
+�VVVVVVVVppp������������2(2(2(2(2(2(2�2(2
+
+�GGGGGGGVVVVVVVVppppp�y�2(2(2(2(2
+
+�GGGGGGGGGGGGGGVVVVVp�*2�2(2(2(2(2''//
+
+�GGGGGGGGGGGGGGGGGGVp���2(2(2(2(2//)2�2
+ �GGGGGGGGGGGGGGGGGGVp���2Y2Y2Y2Y2 2 2 2Y2 �GGGGGGGGGGGGGGGGGGVp�b�������� �iiiiiiiiiiiiiiiiiiiiij !!!!!!!!  \ No newline at end of file
diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/border.bin b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc
new file mode 100644
index 000000000..05862b275
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap1_MapBorder::
+ .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin"
+
+AquaHideout_UnusedRubyMap1_MapBlockdata::
+ .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin"
+
+ .align 2
+AquaHideout_UnusedRubyMap1_Layout::
+ .4byte 0x1c
+ .4byte 0x1e
+ .4byte AquaHideout_UnusedRubyMap1_MapBorder
+ .4byte AquaHideout_UnusedRubyMap1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/map.bin b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin
new file mode 100644
index 000000000..52c2d57eb
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin
Binary files differ
diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/border.bin b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc
new file mode 100644
index 000000000..e9e08ab97
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap2_MapBorder::
+ .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin"
+
+AquaHideout_UnusedRubyMap2_MapBlockdata::
+ .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin"
+
+ .align 2
+AquaHideout_UnusedRubyMap2_Layout::
+ .4byte 0x3e
+ .4byte 0x18
+ .4byte AquaHideout_UnusedRubyMap2_MapBorder
+ .4byte AquaHideout_UnusedRubyMap2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/map.bin b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin
new file mode 100644
index 000000000..1406dde5d
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin
@@ -0,0 +1,95 @@
+��������������� 01!��2�
+01��2�!!!!!!!󮧷󮧷
+
+��!!!����
+����ST���ST8292)2�2)2�2
+8292�2)2�2)2)2)2)2)2)2)2󼊳󶀯//
+
+��)2)2)2����
+
+!��2�[\01!!
+��2�[\
+)2(2(2(2(2(2
+)2(2(2(2(22A2B222(2(2*2*2󼊳77
+
+�󿆎(2�2��7��
+
+)2�2)2�2cd8292)2)2
+'�2)2�2cd
+)2(2(2(2(2(2
+)2(2(2(2(22IJ2(2(2(2(2*2*2*2*2
+
+)2*2�2(2(2*2*2��7
+
+)2(2(2(2k2l2(2�2(2(2
+/�2(2(2k2l2
+)2(2(2(2�2(2
+)2(2(2(2(222222(2(2(2�2(2(2(2(2
+
+)2�2(2(2�2(2(2�2(2
+
+)2(2(2(2(2(2(2(2(2(2
+'�2(2(2(2(2
+)22A2B222  2Y2Y2Y2Y2Y2Y2Y2Y22Y2Y2Y2Y2Y2Y2Y2Y2 
+�mmmmmmmo
+
+)2(2(2(2(2(2(2�2(2(2
+/6�2(2(2(2(2
+)22IJ2�����������������
+vq0q0q0q0q0q0q0w
+  2Y2Y2Y2Y2Y2Y2Y2Y2Y2 )2񝯾(2(2(2
+)222222
+��$#$!!
+001!󮧷󮧷
+
+~yyyyyyy
+����������)2(2(2(2(2(2
+)2(2(2(2(2(2
+�7�7�3���3�
+828292)2����
+
+)2�2(2(2�2(2(2�2(2
+ !!!!!!!!!!  2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2 �3�3�3���鼵�3�3
+)2(2(2(2*2*2��
+
+�mmmmmmmo
++,-.���������3�3�3�3�3�3��3�2
+)2(2�2(2(2�2*2*2
+
+vq0q0q0q0q0q0q0w
+
+345601
+0011!! �3�3�3�3�3�3�3�3�3  2Y2Y2Y2Y2Y2Y2Y2 
+~yyyyyyy
+
+;<=>8292
+82829292)2)2�����������������
+)2�2(2(2�2(2(2�2(2
+
+CDEF)2�2
+)2(2�2(2(2(2 !!!!!!!!! !!!!!!!!
+
+�mmmmmmmo
+
+KLMN)2(2
+)2(2(2(2(2(22)2)2)2)2)2)2)2)2)22)2)2)2)2)2)2)2)2
+
+vq0q0q0q0q0q0q0w
+
+)2UV)2�2(2  2Y2Y2Y2Y2Y2Y2Y2Y22�3222222222222(2(2
+
+~yyyyyyy
+
+)2)2)2)2(2(2����������  2A2B222@2B2�3�32(2(2
+
+)2�2(2(2�2(2(2�2(2
+
+)2(2(2(2󮧷
+!!!!!!!!! �2IJ22HJ��2(2(2
+  2Y2Y2Y2Y2Y2Y2Y2Y2 
+)2(2󮧷��
+)2)2)2)2)2)2)2)2)222222222222222(2�2
+���������
+󮧷󶀯(2(2
+)2(2�2(2(2(2(2(2(2(22222222222222(2(2
+ !!!!!!!!!  �7�7�7�7��  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 ������������������������������� !!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file
diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/border.bin b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc
new file mode 100644
index 000000000..44b35666f
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap3_MapBorder::
+ .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin"
+
+AquaHideout_UnusedRubyMap3_MapBlockdata::
+ .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin"
+
+ .align 2
+AquaHideout_UnusedRubyMap3_Layout::
+ .4byte 0x22
+ .4byte 0x18
+ .4byte AquaHideout_UnusedRubyMap3_MapBorder
+ .4byte AquaHideout_UnusedRubyMap3_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/map.bin b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin
new file mode 100644
index 000000000..68afb0063
--- /dev/null
+++ b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin
@@ -0,0 +1,49 @@
+ST������|}~|}~ [\01��2�
+!!��2�3456!!3456!!!
+�����cd8292�2)2�2
+)2)2�2)2�2;<=>)2)2;<=>)2)2)2
+
+��2�! k2l2�2(2(2(2(2
+)2(2(2(2(2CDEF(2(2CDEF�2(2(2
+
+'�2)2�2)22)2(2(2(2(2(2(2
+)2(2(2(2(2KLMN(2(2KLMN񅈾(2
+
+/(2(2(2(22A2B222(2(2(2
+)2㺝(2(2(2UV�2(2(2(2UV�2(2(2(2
+
+/(2(2(2(22IJ2(2(2(2
+)2��2�2(2(2(2(2(2(2(2*2*2�2(2(2(2
+
+)2(2(2(2(222222(2(2(2
+)2��:2�2(2(2(2(2(2(2㺝(2㺝(2(2
+
+)2(2(2(2(222222(2(2(2
+)2*2*2�2(2(2(2(2(2(2(2��2���2(2
+  2Y22Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2Y22(2(2��:2���2(2
+��������������������(2(2*2*2�2*2*2�2(2
+
+01
+!!!!!!!!!!
+!!!!!!!! (2(2(2(2(2(2(2(2(2
+
+8292
+)2)2)2)2)2)2)2)2)2)2 )2)2)2)2)2)2)2)22(2(2(2(2(22Y2Y2Y2 
+)2(2
+)2(2(2(2(2(2(2(2�2(2)2(2�2(2(2(2(2(2(2(2(2(2(2(2���
+)2�2
+)2(2(2(2(2(2(2(2(2(2 �iiiiiiiiiiii^ !!!
+
+)2(2
+)2(2(2(2piiiif2��������������2)2)2)2
+
+)2(2 )2(2(2(2`�������pppppVVVVVV�b�2(2�2(2
+
+)2(2)2(2(2(2`�ppppppVVVVVGGGGGV�b�2(2(2(2
+
+)2(2 )2(2(2(2x�pppVVVGGGGGGGGGGV�b�2(2(2(2
+
+)2(22)2(2(2(2*2�pVVGGGGGGGGGGGGGV�b�2(2(2(2
+
+)2(2(2(2(2(2(2��VGGGGGGGGGGGGGGGV�b�2(2(2(2
+  2Y2Y2Y2Y2Y22`�VGGGGGGGGGGGGGGGV�b{3(2(2(2 ������`�VGGGGGGGGGGGGGGGV�b��� !!!!!! hiiiiiiiiiiiiiiiiiiij !!!  \ No newline at end of file
diff --git a/data/layouts/ArtisanCave_1F/border.bin b/data/layouts/ArtisanCave_1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ArtisanCave_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc
new file mode 100644
index 000000000..b32eef422
--- /dev/null
+++ b/data/layouts/ArtisanCave_1F/layout.inc
@@ -0,0 +1,15 @@
+ArtisanCave_1F_MapBorder::
+ .incbin "data/layouts/ArtisanCave_1F/border.bin"
+
+ArtisanCave_1F_MapBlockdata::
+ .incbin "data/layouts/ArtisanCave_1F/map.bin"
+
+ .align 2
+ArtisanCave_1F_Layout::
+ .4byte 0x15
+ .4byte 0x16
+ .4byte ArtisanCave_1F_MapBorder
+ .4byte ArtisanCave_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ArtisanCave_1F/map.bin b/data/layouts/ArtisanCave_1F/map.bin
new file mode 100644
index 000000000..2009f24f4
--- /dev/null
+++ b/data/layouts/ArtisanCave_1F/map.bin
@@ -0,0 +1 @@
+666666666666666666666666666666666666666666666666666666666666666666?262666666262666666262666666262666666226666662266666626U266666622262226666662226222666666 6 6 6"22U22  6 6 6666666666"22222 666666666666"222 6666666666662<2666666666666 6XYZ 6666666666666 6 6 6 6 6 6 6666666666666 6 6 6 6 6 6 6 6 6666666666666666666666666666 \ No newline at end of file
diff --git a/data/layouts/ArtisanCave_B1F/border.bin b/data/layouts/ArtisanCave_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ArtisanCave_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc
new file mode 100644
index 000000000..2640303e3
--- /dev/null
+++ b/data/layouts/ArtisanCave_B1F/layout.inc
@@ -0,0 +1,15 @@
+ArtisanCave_B1F_MapBorder::
+ .incbin "data/layouts/ArtisanCave_B1F/border.bin"
+
+ArtisanCave_B1F_MapBlockdata::
+ .incbin "data/layouts/ArtisanCave_B1F/map.bin"
+
+ .align 2
+ArtisanCave_B1F_Layout::
+ .4byte 0x2e
+ .4byte 0x36
+ .4byte ArtisanCave_B1F_MapBorder
+ .4byte ArtisanCave_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ArtisanCave_B1F/map.bin b/data/layouts/ArtisanCave_B1F/map.bin
new file mode 100644
index 000000000..c5ce45c52
--- /dev/null
+++ b/data/layouts/ArtisanCave_B1F/map.bin
@@ -0,0 +1 @@
+22222666666666666666666666666666666666666222226666666666666666666666666666666666666222266'6622226'666666662222666666622222266222222266662222'226666666'2222222222222222266662222 6 6"2662222  B B"222222222266662222662U222 "222222222666622226622222222222222 BB"2222222266662222 6 6"222222  B B B B B B B B B BBB B B B B B B"222266662222 2 6"22222   6 6 6 6"BBBBBBBBBBBB"22266662222U2222   6"B"2266662222U222266B2266662222U222266B2266662222222266B222222222222266662222'2222'66B22  6 6 6 6"2222266662222222  6 6 6B2  " ""2222666622222  6 6666BB B B B B B BU"222666622222  6 6 6 6 6BBBBBBBBBBU    6 6 6 66622222  B B B B BBBB             6 6 6 6 6"6622222BBBBBBBB     "   " " " "6622222BUBBUUU662222222222BBUBBUUU6622222BBBBBBU        662222222222BBBBBBUBBBBBBBB6666666662222222222BBBBBBBUB         2222222222BBBBBBBBB        22222BBBBBBBBB22266666  2222222222BBBBBBBBB226     62222222222BUBBBBBB2226     2222 6 6"2222BBBBBBBB'       6    2222 6"62222BBBBBBBBB  "     62222 2" 6" 6"222BUBBBBBBBBU6666622222U6222BBBBBBBBUBBBBBBBBB62222U6U222BBBBBB66666622226622  B B2222222BBBBBB662222U622BB22BB2226U22226622BBBBBBB22BB2226666662222U22B22BB22266666622222222B22222B       66666622222222B22222B'        66666622222222U2222U6        6666662222222222222266U6        66666622222222222222'U66U66222222222222222666622222222222222222666622222222U222222222666666622222<22222222222226666666666666666666662222 XYZ             6666666666666666666662222                      6666666666666666662222  6  6  6  6  6  6   6                       666622222666666666666666666666666666666666666666662222266666666666666666666666666666666666666666 \ No newline at end of file
diff --git a/data/layouts/BattleElevator/border.bin b/data/layouts/BattleElevator/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleElevator/border.bin
Binary files differ
diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc
new file mode 100644
index 000000000..374af9ffa
--- /dev/null
+++ b/data/layouts/BattleElevator/layout.inc
@@ -0,0 +1,15 @@
+BattleElevator_MapBorder::
+ .incbin "data/layouts/BattleElevator/border.bin"
+
+BattleElevator_MapBlockdata::
+ .incbin "data/layouts/BattleElevator/map.bin"
+
+ .align 2
+BattleElevator_Layout::
+ .4byte 0x5
+ .4byte 0x7
+ .4byte BattleElevator_MapBorder
+ .4byte BattleElevator_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleElevator/map.bin b/data/layouts/BattleElevator/map.bin
new file mode 100644
index 000000000..16dfe34ab
--- /dev/null
+++ b/data/layouts/BattleElevator/map.bin
@@ -0,0 +1 @@
+(***,011148999<\2]2]2]2]2d2e2e2e2e2d2e2e2e2e2d2O2W2e2e2 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc
new file mode 100644
index 000000000..89f799d84
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin"
+
+BattleFrontier_BattleArenaBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattleArenaBattleRoom_Layout::
+ .4byte 0x10
+ .4byte 0xb
+ .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder
+ .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleArena
+
diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin
new file mode 100644
index 000000000..526de2248
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin
@@ -0,0 +1 @@
+PPQPPQPPPPUPPUPPXXYXXYXXXX]XX]XX``a``a````e``e``22222222222222222222(2)2*2+2,2-2.2/22222}2}2}2}20212223242526272}2}2}2}222228292:2;2<2=2>2?22222u2u2v2w2@2A2B2C2D2E2F2G2u2v2u2u2 2 2 2 2H2I2J2K2L2M2N2O2 2 2 2 222222'2'222'2'2222222222222222222222 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc
new file mode 100644
index 000000000..8961ed778
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaCorridor_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin"
+
+BattleFrontier_BattleArenaCorridor_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin"
+
+ .align 2
+BattleFrontier_BattleArenaCorridor_Layout::
+ .4byte 0x12
+ .4byte 0xe
+ .4byte BattleFrontier_BattleArenaCorridor_MapBorder
+ .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleArena
+
diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin
new file mode 100644
index 000000000..1b124b610
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin
@@ -0,0 +1 @@
+VWWVWW�����鬢WkWWk^__^__�����鬫_s__sf6g6g6f6g6g6�����鬵6g6{6g6g6{6�������舁�n������舭on������������on������������on������������onoVWWVWWWWkWWknonoVWWVWWWWkWWknono^__^____s__snonof6g6g6f6g6g6g6g6{6g6g6{6nont2222222222222z22o2�222222���222222� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/border.bin b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc
new file mode 100644
index 000000000..305fcc0d9
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaLobby_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin"
+
+BattleFrontier_BattleArenaLobby_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin"
+
+ .align 2
+BattleFrontier_BattleArenaLobby_Layout::
+ .4byte 0x10
+ .4byte 0xd
+ .4byte BattleFrontier_BattleArenaLobby_MapBorder
+ .4byte BattleFrontier_BattleArenaLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleArena
+
diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/map.bin b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin
new file mode 100644
index 000000000..2792d7979
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin
@@ -0,0 +1,3 @@
+P6Q6P6P6P6P6S6X6R6P6P6P6P6U6P6P6X6Y666Z6[6S6\6R6Z6[666]6X6X6`6a666b6c6T6d6a6b6c666e6`6`6FFFFFFF�FFFFFFFFFFFFFFFFFFFFFFFFFFFF#FFFFFF$FFF�FFF���2%FFFFFF&F2�4����� 2FFFFFF 2��2��
+2 2 22222'222 22 2��2222 2㺝�2 2 22222��2222 2�2�2�2222222�22222222222222�
+222222𵦒�2222222� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc
new file mode 100644
index 000000000..a4991ae0c
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin"
+
+BattleFrontier_BattleDomeBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattleDomeBattleRoom_Layout::
+ .4byte 0x14
+ .4byte 0xa
+ .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder
+ .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleDome
+
diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin
new file mode 100644
index 000000000..ffb450f3c
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin
@@ -0,0 +1,2 @@
+��������������������������������������������������������������������������������  �������      �������      ������� !"#$%&      �������()*+,-.      0123456       
+   89:;<=>>    \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc
new file mode 100644
index 000000000..7f3c93b82
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeCorridor_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin"
+
+BattleFrontier_BattleDomeCorridor_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin"
+
+ .align 2
+BattleFrontier_BattleDomeCorridor_Layout::
+ .4byte 0x30
+ .4byte 0x7
+ .4byte BattleFrontier_BattleDomeCorridor_MapBorder
+ .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleDome
+
diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin
new file mode 100644
index 000000000..2a9c49675
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin
@@ -0,0 +1 @@
+ABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLQRSSUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTYZ[[]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\DBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBHA@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@AI@A@A@A@A@A@A@A@A@A@A@A=>@A@A@A@A@A@A@A@A@A@A@A@ \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/border.bin b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc
new file mode 100644
index 000000000..2553e7098
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeLobby_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin"
+
+BattleFrontier_BattleDomeLobby_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin"
+
+ .align 2
+BattleFrontier_BattleDomeLobby_Layout::
+ .4byte 0x17
+ .4byte 0x11
+ .4byte BattleFrontier_BattleDomeLobby_MapBorder
+ .4byte BattleFrontier_BattleDomeLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleDome
+
diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/map.bin b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin
new file mode 100644
index 000000000..655c6a39c
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin
@@ -0,0 +1 @@
+%&%&%&  -.  -.    -.  -.   567     567    34     34  $; <$$; <$DBCBCBCBCBCBCBCBCBCBCBCHA@A@A@A@A@A@A@A@A@A@A@I@��A@A@A@A@A@A@A@Aqr@AHA��@A@A@��s��@A@A@yzI@I@���@tuv@A{A@`ab@���HA�����I|}~�����hijI�����I@CB���BCTA@A@CB���BCTAHA@A@A@A@A@A@A@A@A@A@A@�����@A@A@A@A@A@A@A���������A@A@A@A@A@A@A@����'��@A@A@A@A@A@A@A������/��A@A@A@A@=>A@A@������ \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc
new file mode 100644
index 000000000..8c0fe2ce5
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomePreBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin"
+
+BattleFrontier_BattleDomePreBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattleDomePreBattleRoom_Layout::
+ .4byte 0x9
+ .4byte 0x8
+ .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder
+ .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleDome
+
diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin
new file mode 100644
index 000000000..49f40213a
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc
new file mode 100644
index 000000000..21ba6a015
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin"
+
+BattleFrontier_BattleFactoryBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattleFactoryBattleRoom_Layout::
+ .4byte 0xd
+ .4byte 0xc
+ .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder
+ .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFactory
+
diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin
new file mode 100644
index 000000000..feffbf038
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc
new file mode 100644
index 000000000..cc0a33611
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryLobby_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin"
+
+BattleFrontier_BattleFactoryLobby_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin"
+
+ .align 2
+BattleFrontier_BattleFactoryLobby_Layout::
+ .4byte 0x13
+ .4byte 0xc
+ .4byte BattleFrontier_BattleFactoryLobby_MapBorder
+ .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFactory
+
diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin
new file mode 100644
index 000000000..66037e302
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin
@@ -0,0 +1,2 @@
+#""#"""#"""#""#$()$(%)$(%)$()$�����*+,�����*+,9<S234KTUVK234S<<A:`S\3]3^3LO;I22a-.=3202;/-432432 4!_1 4!3323322XYZ22532222PQR273243222222222222222228332222222222222222@4322222222 
+  H \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc
new file mode 100644
index 000000000..fc4fc49bc
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryPreBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin"
+
+BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattleFactoryPreBattleRoom_Layout::
+ .4byte 0x11
+ .4byte 0xe
+ .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder
+ .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFactory
+
diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
new file mode 100644
index 000000000..15e97cb30
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
@@ -0,0 +1,2 @@
+���01����B���R%&'JRR���=>?-./ //=>?]^_*+,*+,ABCOMN234234DEFS\UVSSSHIJS`abcd��Dhijkl3��L4PQ33PQXY Z[4&'4 XY&'3&'3 
+ \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc
new file mode 100644
index 000000000..3d9acc3c4
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin"
+
+BattleFrontier_BattlePalaceBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattlePalaceBattleRoom_Layout::
+ .4byte 0xf
+ .4byte 0xa
+ .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder
+ .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BattlePalace
+
diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin
new file mode 100644
index 000000000..58d0a581f
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin
@@ -0,0 +1 @@
+K2L2?6K2L2?6K2L2?6K2L2?6H6I2JM2N2G6M2N2G6M2N2G6M2N2G6P6Q2RU2V2O6U2V2O6U2V2O6U2V2O6����1�1�1�1X2Y6Z6[6\6]6^6�1�12222&2�`6a6b6c6d6e6f6��12222&2�1hijklmn��12222��pqrstuv��12222��xyz{|}~��12222�����������12222�ppppppppp��� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc
new file mode 100644
index 000000000..2d16216c5
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceCorridor_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin"
+
+BattleFrontier_BattlePalaceCorridor_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin"
+
+ .align 2
+BattleFrontier_BattlePalaceCorridor_Layout::
+ .4byte 0x11
+ .4byte 0xe
+ .4byte BattleFrontier_BattlePalaceCorridor_MapBorder
+ .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BattlePalace
+
diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin
new file mode 100644
index 000000000..f2bc6aca4
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc
new file mode 100644
index 000000000..f9a1dad7b
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceLobby_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin"
+
+BattleFrontier_BattlePalaceLobby_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin"
+
+ .align 2
+BattleFrontier_BattlePalaceLobby_Layout::
+ .4byte 0x19
+ .4byte 0xc
+ .4byte BattleFrontier_BattlePalaceLobby_MapBorder
+ .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePalace
+
diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin
new file mode 100644
index 000000000..cda8ff10e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin
@@ -0,0 +1,7 @@
+ 
+  
+   
+    
+    
+   
+   6   6 2 2 2 6 2 2 2 2 6666 2 6 2 2 2 6 2  6 6   666 6 2��� 6666 2 666 6 2  6 666 6626 66��� 6#6$6%66 6626 666 6 !@A���+,- !@A�)*����)*����1�����"�1�����"�� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc
new file mode 100644
index 000000000..1d6d21778
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeCorridor_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin"
+
+BattleFrontier_BattlePikeCorridor_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin"
+
+ .align 2
+BattleFrontier_BattlePikeCorridor_Layout::
+ .4byte 0xe
+ .4byte 0x8
+ .4byte BattleFrontier_BattlePikeCorridor_MapBorder
+ .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
+
diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin
new file mode 100644
index 000000000..5e02c145b
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin
@@ -0,0 +1 @@
+����������������������������񷟘򉻬񷞰񽨴�6��������$���2��%����󱙌�2,󴟞�2�2�2,󴞄󴞄򭪂򧤌2􀶸�22󴚊򧠒򧠦�22�2􀶸�2�22򧠒򧠦�2򧤌�2�2�2󴚊򧠒�2 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/border.bin b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc
new file mode 100644
index 000000000..3a5cd3538
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeLobby_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin"
+
+BattleFrontier_BattlePikeLobby_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin"
+
+ .align 2
+BattleFrontier_BattlePikeLobby_Layout::
+ .4byte 0xb
+ .4byte 0xd
+ .4byte BattleFrontier_BattlePikeLobby_MapBorder
+ .4byte BattleFrontier_BattlePikeLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
+
diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/map.bin b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin
new file mode 100644
index 000000000..4cbdfb405
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin
@@ -0,0 +1 @@
+񕧚�6�񉓒񏝖񕧚񃋐��6�񡻢񨅦�6��6*+,�����(�)2342��2�20�1:3;3<32�2283�293򰱸򪨈 �2 󡽄򪥔�22򪥔 3!3"3򪥔2�22 �22򪥔�22�2 2 󡽄 򪥔�2 򪨈 �22򪨈򪥔򪨈�22󡽘 򪥔򪥔򪥔�2 򪥨󡽄2�2�2�22򪨈򪥨򪥔 333 򪥔�2 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc
new file mode 100644
index 000000000..466ad0ff4
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom1_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin"
+
+BattleFrontier_BattlePikeRandomRoom1_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin"
+
+ .align 2
+BattleFrontier_BattlePikeRandomRoom1_Layout::
+ .4byte 0x9
+ .4byte 0x8
+ .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder
+ .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
+
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin
new file mode 100644
index 000000000..142150cbe
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin
@@ -0,0 +1 @@
+���������������������񺣲�6���򢣼󸬰򕂔󸭘򢩂�2,�2�2�2,󴞄򭪂󴞬�2􃶜򧠒򭪂3􀶸�23򧠒򭪂-�2�2�2-򧠒 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc
new file mode 100644
index 000000000..1c7fb35d4
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom2_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin"
+
+BattleFrontier_BattlePikeRandomRoom2_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin"
+
+ .align 2
+BattleFrontier_BattlePikeRandomRoom2_Layout::
+ .4byte 0x5
+ .4byte 0x8
+ .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder
+ .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
+
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin
new file mode 100644
index 000000000..27a6e52aa
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin
@@ -0,0 +1 @@
+񒢘񘫌񆏾񮏪񛱞򃲸򉻬�652���52=@3A3B3=�2H3I3J3�242P3Q3R3�2<X3Y3Z3� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc
new file mode 100644
index 000000000..ce17a0bf6
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom3_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin"
+
+BattleFrontier_BattlePikeRandomRoom3_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
+
+ .align 2
+BattleFrontier_BattlePikeRandomRoom3_Layout::
+ .4byte 0x9
+ .4byte 0x14
+ .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder
+ .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
+
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin
new file mode 100644
index 000000000..8ce7f1c37
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin
@@ -0,0 +1 @@
+���������������������񺣲�6���򢣼󷞀򕂔󷞨�󱙌��2�2�2�󴞄42�2 3�2�2�2 3󽭊>��򧠒�2���72 3 3󽭊�2 3 3�2>�������򧤂 3 3 3 3 3 3 3󽩆��������42 3 3 3 3 3 3�2 3>�������2�3�2 3 3 3 3 3�2 3>�2�������72�2 3 3 3 3 3�2 3>�������2�3 3󴞄󴞄󴞢 3>�3�2�2�23��󱙌�2�2�2󴞄 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc
new file mode 100644
index 000000000..d7a082d13
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeThreePathRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin"
+
+BattleFrontier_BattlePikeThreePathRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattlePikeThreePathRoom_Layout::
+ .4byte 0xd
+ .4byte 0xb
+ .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder
+ .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
+
diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin
new file mode 100644
index 000000000..9618fe22a
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin
@@ -0,0 +1 @@
+���������������������������6�������������6��2��6��2��6��2��6��2�2�2��2�2�2��2�2�2�󱛄�2�2󴟼�2�2󴟼�2�2󴚞򧠒򧠒򧠒򧠒򧠒򧠒򭪂򧠒򧠒򧠒򧠒򧠒򧠦򧠒򧠒򧠒򧠒򧠒򧠒򭪂�23򧠒򧠒3򧠒򧠒򭪂�2-􆼚􊁜-򧠒򧠒 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc
new file mode 100644
index 000000000..a65e7928b
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePointExchangeServiceCorner_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin"
+
+BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
+
+ .align 2
+BattleFrontier_BattlePointExchangeServiceCorner_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
new file mode 100644
index 000000000..62d5761e0
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
@@ -0,0 +1,2 @@
+��������������������� 
+�����������  �����������������������������������������������������������������������������������������������mno���������uvw���� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc
new file mode 100644
index 000000000..a9e779ddb
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidEmptySquare_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin"
+
+BattleFrontier_BattlePyramidEmptySquare_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
+
+ .align 2
+BattleFrontier_BattlePyramidEmptySquare_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder
+ .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin
new file mode 100644
index 000000000..7c224d524
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/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� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc
new file mode 100644
index 000000000..28575776a
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidLobby_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin"
+
+BattleFrontier_BattlePyramidLobby_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
+
+ .align 2
+BattleFrontier_BattlePyramidLobby_Layout::
+ .4byte 0xf
+ .4byte 0x12
+ .4byte BattleFrontier_BattlePyramidLobby_MapBorder
+ .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin
new file mode 100644
index 000000000..32f23d3de
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin
@@ -0,0 +1,2 @@
+FF F
+FFFFFFFF F!F"FFFFFFFFFFFFF(F)F*FFFFFFFFFFFFFF0FFFFFF+FFFFF+FF0FFFFFF3FF F B F3FF0FFFBBF BF B B B B BF B1FBBBBB B B B B B B B B BBBB B B B B B B B B B B B B B B B B B BFFF#F$B%FFFF B B B B B BFFF#F$B%FFFF B B BFFF#F$B%FFFFFFF���FF�#F$B%FFFFFF���FF�#F$B%FFFFF&F��� B B�繠罛翨 B B B B.B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B肂腂臖 B B B B B B \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/border.bin b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc
new file mode 100644
index 000000000..4657c37a3
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidTop_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin"
+
+BattleFrontier_BattlePyramidTop_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin"
+
+ .align 2
+BattleFrontier_BattlePyramidTop_Layout::
+ .4byte 0x22
+ .4byte 0x17
+ .4byte BattleFrontier_BattlePyramidTop_MapBorder
+ .4byte BattleFrontier_BattlePyramidTop_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/map.bin b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin
new file mode 100644
index 000000000..dba9cf1b0
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin
@@ -0,0 +1 @@
+}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}����������������������������������;;;;;;;;;;;;;;;xyz{|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;�����;;;;;;;;;;;;;;;;;;;;;;;;;;;;;�����;;;;;;;;;;;;;;;;;;;;;;;;;;;;;�����;;;;;;;;;;;;;;;;;;;;;;;;;;;;;�橞欱汢�;;;;;;;;;;;;;;;;;;;;;;;;;;;;8b9b@BABBB9b:b;;;;;;;;;;;;;;;;;;;;;;;;;8B9B@bAb@BIBJBAbBb9B:B;;;;;;;;;;;CCCCCCCCCC8b9b@BABHbAbPQRAbBbABBB9bFbCCCCCCCCCKKKKKKKKLBMB@bAbHBAB@bIbXbYbXbIbBbABBBAbBbMBNBKKKKKKKSSSSSSTU@BAB@bIb@BIBPZZQZZRIBBBAbBbABBBUVSSSSS[[[[\]@AHBAB@bIb@BIBXBXBXBYBXBXBXBIBBBIbBbABBBAB]^[[[[[\]@A@AHBAB@bIbPZZZZQZZZZRIbBbIBBBIBAB]^[\^@A@AHA@BAB@bIbXbXbXbXbXbYbXbXbXbXbXbIbBbIBBBIBIBAB^@B@AHAHA@BABPZZZZZZQZZZZZZRIBBBIBIBIBBHAHAHA@AHBABXBXBXBXBXBXBXBYBXBXBXBXBXBXBXBIBBBIBIBIBIHAHA@AHAPZZZZZZZZZZZZZZZZZRIBIBIBI@A@AHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIBIHAHAHAPZZZZZZZZZZZZZZZZZZZZZRIBIBIHAHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIHAHAPZZZZZZZZZZZZZZZZZZZZZZZZZRIBI \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc
new file mode 100644
index 000000000..3d498239a
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin"
+
+BattleFrontier_BattleTowerBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattleTowerBattleRoom_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder
+ .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin
new file mode 100644
index 000000000..42d99b5a6
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin
@@ -0,0 +1 @@
+///LMMN///?77TU2U2V77?G<2<2<2<2<2<2<2<2;2:2H2B2I2J2B2K2:2:2;2:2D2P2Q2R2S2E2:2:2;2:2D2X2Y2Z2[2E2:2:2;2:2D2`2a2b2c2E2:2:2~2:2@2C21292C2A2:2>2:2:2:222:2:2:2F \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc
new file mode 100644
index 000000000..56335aa23
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerCorridor_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin"
+
+BattleFrontier_BattleTowerCorridor_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin"
+
+ .align 2
+BattleFrontier_BattleTowerCorridor_Layout::
+ .4byte 0x11
+ .4byte 0x5
+ .4byte BattleFrontier_BattleTowerCorridor_MapBorder
+ .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin
new file mode 100644
index 000000000..0b0803f91
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc
new file mode 100644
index 000000000..7dba3777c
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerCorridor2_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin"
+
+BattleFrontier_BattleTowerCorridor2_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin"
+
+ .align 2
+BattleFrontier_BattleTowerCorridor2_Layout::
+ .4byte 0x11
+ .4byte 0x5
+ .4byte BattleFrontier_BattleTowerCorridor2_MapBorder
+ .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin
new file mode 100644
index 000000000..87e93b640
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/border.bin b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc
new file mode 100644
index 000000000..790ff3bcd
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerLobby_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin"
+
+BattleFrontier_BattleTowerLobby_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin"
+
+ .align 2
+BattleFrontier_BattleTowerLobby_Layout::
+ .4byte 0x19
+ .4byte 0xa
+ .4byte BattleFrontier_BattleTowerLobby_MapBorder
+ .4byte BattleFrontier_BattleTowerLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/map.bin b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin
new file mode 100644
index 000000000..77926803a
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc
new file mode 100644
index 000000000..df5615873
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerMultiBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin"
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
+
+ .align 2
+BattleFrontier_BattleTowerMultiBattleRoom_Layout::
+ .4byte 0x15
+ .4byte 0xf
+ .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder
+ .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
new file mode 100644
index 000000000..b0a58e016
--- /dev/null
+++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_Lounge1/border.bin b/data/layouts/BattleFrontier_Lounge1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge1/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc
new file mode 100644
index 000000000..c25b3b2a0
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge1/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge1_MapBorder::
+ .incbin "data/layouts/BattleFrontier_Lounge1/border.bin"
+
+BattleFrontier_Lounge1_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_Lounge1/map.bin"
+
+ .align 2
+BattleFrontier_Lounge1_Layout::
+ .4byte 0xd
+ .4byte 0x8
+ .4byte BattleFrontier_Lounge1_MapBorder
+ .4byte BattleFrontier_Lounge1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_Lounge1/map.bin b/data/layouts/BattleFrontier_Lounge1/map.bin
new file mode 100644
index 000000000..11ae8d6ee
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge1/map.bin
@@ -0,0 +1 @@
+��������������������������3������3�����󃤏򽞣򽜃򽚕򽗗򽜃򽚁�3󀢋󀟫�3�󀢋󀟫󀟵�3򽗗򽗗򽚕򽞣򽜃򽜍󙃏򽗗򽗗�󀢋󀟫󀜅򂷱򽗗򽗗򽗗򽗗�3 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_Lounge2/border.bin b/data/layouts/BattleFrontier_Lounge2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge2/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc
new file mode 100644
index 000000000..b735b4994
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge2/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge2_MapBorder::
+ .incbin "data/layouts/BattleFrontier_Lounge2/border.bin"
+
+BattleFrontier_Lounge2_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_Lounge2/map.bin"
+
+ .align 2
+BattleFrontier_Lounge2_Layout::
+ .4byte 0x9
+ .4byte 0xa
+ .4byte BattleFrontier_Lounge2_MapBorder
+ .4byte BattleFrontier_Lounge2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_Lounge2/map.bin b/data/layouts/BattleFrontier_Lounge2/map.bin
new file mode 100644
index 000000000..f5f1745b1
--- /dev/null
+++ b/data/layouts/BattleFrontier_Lounge2/map.bin
@@ -0,0 +1 @@
+��������������������������������������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_OutsideEast/border.bin b/data/layouts/BattleFrontier_OutsideEast/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideEast/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc
new file mode 100644
index 000000000..ddaf20446
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideEast/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_OutsideEast_MapBorder::
+ .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin"
+
+BattleFrontier_OutsideEast_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin"
+
+ .align 2
+BattleFrontier_OutsideEast_Layout::
+ .4byte 0x48
+ .4byte 0x48
+ .4byte BattleFrontier_OutsideEast_MapBorder
+ .4byte BattleFrontier_OutsideEast_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BattleFrontierOutsideEast
+
diff --git a/data/layouts/BattleFrontier_OutsideEast/map.bin b/data/layouts/BattleFrontier_OutsideEast/map.bin
new file mode 100644
index 000000000..b073c4585
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideEast/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_OutsideWest/border.bin b/data/layouts/BattleFrontier_OutsideWest/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideWest/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc
new file mode 100644
index 000000000..a506e554f
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideWest/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_OutsideWest_MapBorder::
+ .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin"
+
+BattleFrontier_OutsideWest_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin"
+
+ .align 2
+BattleFrontier_OutsideWest_Layout::
+ .4byte 0x38
+ .4byte 0x48
+ .4byte BattleFrontier_OutsideWest_MapBorder
+ .4byte BattleFrontier_OutsideWest_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BattleFrontierOutsideWest
+
diff --git a/data/layouts/BattleFrontier_OutsideWest/map.bin b/data/layouts/BattleFrontier_OutsideWest/map.bin
new file mode 100644
index 000000000..d43111bda
--- /dev/null
+++ b/data/layouts/BattleFrontier_OutsideWest/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_RankingHall/border.bin b/data/layouts/BattleFrontier_RankingHall/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_RankingHall/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc
new file mode 100644
index 000000000..d7615e693
--- /dev/null
+++ b/data/layouts/BattleFrontier_RankingHall/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_RankingHall_MapBorder::
+ .incbin "data/layouts/BattleFrontier_RankingHall/border.bin"
+
+BattleFrontier_RankingHall_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_RankingHall/map.bin"
+
+ .align 2
+BattleFrontier_RankingHall_Layout::
+ .4byte 0x35
+ .4byte 0xf
+ .4byte BattleFrontier_RankingHall_MapBorder
+ .4byte BattleFrontier_RankingHall_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontierRankingHall
+
diff --git a/data/layouts/BattleFrontier_RankingHall/map.bin b/data/layouts/BattleFrontier_RankingHall/map.bin
new file mode 100644
index 000000000..df32e0665
--- /dev/null
+++ b/data/layouts/BattleFrontier_RankingHall/map.bin
@@ -0,0 +1,64 @@
+(((((00000((((($88888%(((((00000&'2222222&'00000$88888%A2 2
+2 2
+22
+2 2
+2 2F2$88888%2222222I222222222N22222222&' 2 2
+22
+2 2
+2&'((("# 2 2
+2 2
+2 2
+2 2
+2 2
+2"#(((&' 2
+2 22 2
+2 2&'+22222222220P02222222222222220Q0222222222232 2
+22
+2 2
+22
+2 2
+2$8X8% 2 2
+2 2 2K2L2M2 2 2
+2 2
+2$8Y8% 2 2
+22
+2 2
+22
+2 2
+2+22222222222222222222STU2222222222222222222232 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2[2\2]2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+22222222222222222222222222222222222222,2-2
+2 2
+2.2/2
+2 2
+2 2
+2 2
+2 2
+2 2
+2
+2;2
+2;2
+2;2
+242522226272222222222222C22C22C22
+2 2
+200 2
+2 \ No newline at end of file
diff --git a/data/layouts/BattleFrontier_ReceptionGate/border.bin b/data/layouts/BattleFrontier_ReceptionGate/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/layouts/BattleFrontier_ReceptionGate/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc
new file mode 100644
index 000000000..3dd4aeaa5
--- /dev/null
+++ b/data/layouts/BattleFrontier_ReceptionGate/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_ReceptionGate_MapBorder::
+ .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin"
+
+BattleFrontier_ReceptionGate_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin"
+
+ .align 2
+BattleFrontier_ReceptionGate_Layout::
+ .4byte 0x9
+ .4byte 0xe
+ .4byte BattleFrontier_ReceptionGate_MapBorder
+ .4byte BattleFrontier_ReceptionGate_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_ReceptionGate/map.bin b/data/layouts/BattleFrontier_ReceptionGate/map.bin
new file mode 100644
index 000000000..2b75ea851
--- /dev/null
+++ b/data/layouts/BattleFrontier_ReceptionGate/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_ScottsHouse/border.bin b/data/layouts/BattleFrontier_ScottsHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleFrontier_ScottsHouse/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc
new file mode 100644
index 000000000..f08737109
--- /dev/null
+++ b/data/layouts/BattleFrontier_ScottsHouse/layout.inc
@@ -0,0 +1,15 @@
+BattleFrontier_ScottsHouse_MapBorder::
+ .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin"
+
+BattleFrontier_ScottsHouse_MapBlockdata::
+ .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin"
+
+ .align 2
+BattleFrontier_ScottsHouse_Layout::
+ .4byte 0x6
+ .4byte 0x8
+ .4byte BattleFrontier_ScottsHouse_MapBorder
+ .4byte BattleFrontier_ScottsHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/BattleFrontier_ScottsHouse/map.bin b/data/layouts/BattleFrontier_ScottsHouse/map.bin
new file mode 100644
index 000000000..8844e94dd
--- /dev/null
+++ b/data/layouts/BattleFrontier_ScottsHouse/map.bin
@@ -0,0 +1 @@
+�������������������������������������������򂷱� \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare01/border.bin b/data/layouts/BattlePyramidSquare01/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare01/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc
new file mode 100644
index 000000000..fe710cc40
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare01/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare01_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare01/border.bin"
+
+BattlePyramidSquare01_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare01/map.bin"
+
+ .align 2
+BattlePyramidSquare01_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare01_MapBorder
+ .4byte BattlePyramidSquare01_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare01/map.bin b/data/layouts/BattlePyramidSquare01/map.bin
new file mode 100644
index 000000000..586ccbdbd
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare01/map.bin
@@ -0,0 +1 @@
+岯岯岯岯岯岯岯岯岯岯岯岯岯岯a岯岯`tj岯岯s岯岯s岯岯岯岯s岯岯s岯嶣岯岯s岯岯s岯岯htr岯岯q岯岯岯岯岯岯岯岯岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare02/border.bin b/data/layouts/BattlePyramidSquare02/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare02/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc
new file mode 100644
index 000000000..6aa5b7aa9
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare02/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare02_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare02/border.bin"
+
+BattlePyramidSquare02_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare02/map.bin"
+
+ .align 2
+BattlePyramidSquare02_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare02_MapBorder
+ .4byte BattlePyramidSquare02_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare02/map.bin b/data/layouts/BattlePyramidSquare02/map.bin
new file mode 100644
index 000000000..5a9b8d4ce
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare02/map.bin
@@ -0,0 +1 @@
+岯岯htttj岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯a岯岯岯岯岯a岯s岯岯�岯岯q岯s岯岯岯岯岯岯岯s岯岯岯岯岯岯岯ptj岯hj岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare03/border.bin b/data/layouts/BattlePyramidSquare03/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare03/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc
new file mode 100644
index 000000000..4da41f9e9
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare03/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare03_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare03/border.bin"
+
+BattlePyramidSquare03_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare03/map.bin"
+
+ .align 2
+BattlePyramidSquare03_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare03_MapBorder
+ .4byte BattlePyramidSquare03_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare03/map.bin b/data/layouts/BattlePyramidSquare03/map.bin
new file mode 100644
index 000000000..903b8a49b
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare03/map.bin
@@ -0,0 +1 @@
+岯岯岯岯岯岯岯岯岯a岯岯岯岯岯岯岯s岯岯岯岯a岯岯s岯岯岯岯q岯hkj岯岯岯岯岯岯岯岯岯岯岯a岯岯`ttttr岯嶣q岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare04/border.bin b/data/layouts/BattlePyramidSquare04/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare04/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc
new file mode 100644
index 000000000..c298ee6f4
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare04/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare04_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare04/border.bin"
+
+BattlePyramidSquare04_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare04/map.bin"
+
+ .align 2
+BattlePyramidSquare04_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare04_MapBorder
+ .4byte BattlePyramidSquare04_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare04/map.bin b/data/layouts/BattlePyramidSquare04/map.bin
new file mode 100644
index 000000000..32a264546
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare04/map.bin
@@ -0,0 +1 @@
+岯岯岯岯岯岯岯岯岯`ttttj岯岯s岯岯岯岯岯岯岯q岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯a岯岯岯岯岯岯岯q岯岯岯岯嶣岯岯岯岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare05/border.bin b/data/layouts/BattlePyramidSquare05/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare05/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc
new file mode 100644
index 000000000..87ce53274
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare05/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare05_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare05/border.bin"
+
+BattlePyramidSquare05_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare05/map.bin"
+
+ .align 2
+BattlePyramidSquare05_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare05_MapBorder
+ .4byte BattlePyramidSquare05_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare05/map.bin b/data/layouts/BattlePyramidSquare05/map.bin
new file mode 100644
index 000000000..d6c5a6897
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare05/map.bin
@@ -0,0 +1 @@
+岯岯岯岯岯岯岯岯岯hb岯岯岯岯岯岯岯s岯岯a岯岯岯岯s岯岯s岯岯岯岯s岯岯s岯岯岯岯q岯岯s岯岯岯岯�岯岯pj岯岯岯岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare06/border.bin b/data/layouts/BattlePyramidSquare06/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare06/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc
new file mode 100644
index 000000000..bcaeb89b0
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare06/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare06_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare06/border.bin"
+
+BattlePyramidSquare06_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare06/map.bin"
+
+ .align 2
+BattlePyramidSquare06_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare06_MapBorder
+ .4byte BattlePyramidSquare06_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare06/map.bin b/data/layouts/BattlePyramidSquare06/map.bin
new file mode 100644
index 000000000..c30533aab
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare06/map.bin
@@ -0,0 +1 @@
+岯岯岯岯岯岯岯岯岯a岯hj岯a岯岯s岯岯岯岯q岯岯q岯岯岯岯岯岯岯岯岯�岯岯a岯岯a岯岯岯岯s岯岯q岯hj岯q岯岯岯岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare07/border.bin b/data/layouts/BattlePyramidSquare07/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare07/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc
new file mode 100644
index 000000000..bb469b3c8
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare07/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare07_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare07/border.bin"
+
+BattlePyramidSquare07_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare07/map.bin"
+
+ .align 2
+BattlePyramidSquare07_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare07_MapBorder
+ .4byte BattlePyramidSquare07_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare07/map.bin b/data/layouts/BattlePyramidSquare07/map.bin
new file mode 100644
index 000000000..25f9c1529
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare07/map.bin
@@ -0,0 +1 @@
+�岯a岯岯岯岯岯岯岯s岯岯a岯a岯hr岯岯q岯s岯岯岯岯岯岯岯q岯岯岯岯岯a岯岯httttr岯a岯岯岯岯岯岯岯s岯岯岯岯岯岯岯q \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare08/border.bin b/data/layouts/BattlePyramidSquare08/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare08/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc
new file mode 100644
index 000000000..df88b710f
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare08/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare08_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare08/border.bin"
+
+BattlePyramidSquare08_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare08/map.bin"
+
+ .align 2
+BattlePyramidSquare08_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare08_MapBorder
+ .4byte BattlePyramidSquare08_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare08/map.bin b/data/layouts/BattlePyramidSquare08/map.bin
new file mode 100644
index 000000000..86a830696
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare08/map.bin
@@ -0,0 +1 @@
+岯岯ttttj岯岯岯岯岯岯岯岯岯s岯岯岯岯岯岯as岯岯�岯岯岯ss岯岯岯岯岯岯ss岯岯岯岯岯岯sq岯岯岯岯岯岯q岯岯httj�岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare09/border.bin b/data/layouts/BattlePyramidSquare09/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare09/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc
new file mode 100644
index 000000000..2869d9ac2
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare09/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare09_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare09/border.bin"
+
+BattlePyramidSquare09_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare09/map.bin"
+
+ .align 2
+BattlePyramidSquare09_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare09_MapBorder
+ .4byte BattlePyramidSquare09_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare09/map.bin b/data/layouts/BattlePyramidSquare09/map.bin
new file mode 100644
index 000000000..e4f648704
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare09/map.bin
@@ -0,0 +1 @@
+岯岯a岯岯岯岯岯岯`r岯岯a岯岯岯q岯岯hr岯岯岯岯岯岯�岯岯岯岯a岯岯岯岯岯a`r岯岯a岯`rq岯岯`r岯q岯�岯岯q岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare10/border.bin b/data/layouts/BattlePyramidSquare10/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare10/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc
new file mode 100644
index 000000000..2ba8e8124
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare10/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare10_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare10/border.bin"
+
+BattlePyramidSquare10_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare10/map.bin"
+
+ .align 2
+BattlePyramidSquare10_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare10_MapBorder
+ .4byte BattlePyramidSquare10_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare10/map.bin b/data/layouts/BattlePyramidSquare10/map.bin
new file mode 100644
index 000000000..4aa7fd771
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare10/map.bin
@@ -0,0 +1 @@
+岯岯岯岯htj岯岯岯岯岯岯岯岯岯岯hj岯htj岯岯岯岯岯岯岯岯岯htj嶣htj岯岯岯岯岯岯岯岯岯htj岯岯岯岯岯岯岯岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare11/border.bin b/data/layouts/BattlePyramidSquare11/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare11/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc
new file mode 100644
index 000000000..190bddf10
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare11/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare11_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare11/border.bin"
+
+BattlePyramidSquare11_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare11/map.bin"
+
+ .align 2
+BattlePyramidSquare11_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare11_MapBorder
+ .4byte BattlePyramidSquare11_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare11/map.bin b/data/layouts/BattlePyramidSquare11/map.bin
new file mode 100644
index 000000000..f393f51e5
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare11/map.bin
@@ -0,0 +1 @@
+岯岯岯岯岯hj岯岯岯`j岯岯岯岯岯岯s岯岯a岯岯htr岯岯ptb岯岯岯��岯岯q岯岯a岯岯岯岯�岯hr岯岯岯岯岯岯岯岯岯hj岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare12/border.bin b/data/layouts/BattlePyramidSquare12/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare12/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc
new file mode 100644
index 000000000..199f66ace
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare12/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare12_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare12/border.bin"
+
+BattlePyramidSquare12_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare12/map.bin"
+
+ .align 2
+BattlePyramidSquare12_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare12_MapBorder
+ .4byte BattlePyramidSquare12_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare12/map.bin b/data/layouts/BattlePyramidSquare12/map.bin
new file mode 100644
index 000000000..64dd96955
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare12/map.bin
@@ -0,0 +1 @@
+htj岯htj�岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯hj岯httj岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯htttttj岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare13/border.bin b/data/layouts/BattlePyramidSquare13/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare13/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc
new file mode 100644
index 000000000..351b04227
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare13/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare13_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare13/border.bin"
+
+BattlePyramidSquare13_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare13/map.bin"
+
+ .align 2
+BattlePyramidSquare13_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare13_MapBorder
+ .4byte BattlePyramidSquare13_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare13/map.bin b/data/layouts/BattlePyramidSquare13/map.bin
new file mode 100644
index 000000000..5fc1485a7
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare13/map.bin
@@ -0,0 +1 @@
+a岯岯岯a岯岯岯s岯a岯s岯a岯q岯q岯s岯s岯岯岯岯岯q岯q岯�岯�岯嶣岯岯岯s岯s岯a�a岯q岯s岯q岯s岯岯岯q岯岯岯q岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare14/border.bin b/data/layouts/BattlePyramidSquare14/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare14/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc
new file mode 100644
index 000000000..653ad161b
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare14/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare14_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare14/border.bin"
+
+BattlePyramidSquare14_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare14/map.bin"
+
+ .align 2
+BattlePyramidSquare14_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare14_MapBorder
+ .4byte BattlePyramidSquare14_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare14/map.bin b/data/layouts/BattlePyramidSquare14/map.bin
new file mode 100644
index 000000000..21655a872
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare14/map.bin
@@ -0,0 +1 @@
+岯e岯e岯e岯e岯岯岯岯岯岯岯岯e岯e岯e岯e岯岯岯岯�岯岯岯岯岯e岯e岯e岯e岯岯岯岯岯岯岯岯e岯e岯e岯e岯岯岯岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare15/border.bin b/data/layouts/BattlePyramidSquare15/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare15/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc
new file mode 100644
index 000000000..24090c671
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare15/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare15_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare15/border.bin"
+
+BattlePyramidSquare15_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare15/map.bin"
+
+ .align 2
+BattlePyramidSquare15_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare15_MapBorder
+ .4byte BattlePyramidSquare15_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare15/map.bin b/data/layouts/BattlePyramidSquare15/map.bin
new file mode 100644
index 000000000..ccbd87d9a
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare15/map.bin
@@ -0,0 +1 @@
+岯岯岯e岯岯岯e岯e岯岯岯e岯岯岯岯岯e岯岯岯e岯e岯岯�e岯岯岯岯岯e岯岯岯e岯e岯岯岯e岯岯岯岯岯e岯岯岯e岯e岯岯岯e岯岯 \ No newline at end of file
diff --git a/data/layouts/BattlePyramidSquare16/border.bin b/data/layouts/BattlePyramidSquare16/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare16/border.bin
Binary files differ
diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc
new file mode 100644
index 000000000..67187b9bf
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare16/layout.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare16_MapBorder::
+ .incbin "data/layouts/BattlePyramidSquare16/border.bin"
+
+BattlePyramidSquare16_MapBlockdata::
+ .incbin "data/layouts/BattlePyramidSquare16/map.bin"
+
+ .align 2
+BattlePyramidSquare16_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte BattlePyramidSquare16_MapBorder
+ .4byte BattlePyramidSquare16_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePyramid
+
diff --git a/data/layouts/BattlePyramidSquare16/map.bin b/data/layouts/BattlePyramidSquare16/map.bin
new file mode 100644
index 000000000..601eb526e
--- /dev/null
+++ b/data/layouts/BattlePyramidSquare16/map.bin
@@ -0,0 +1 @@
+岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯嶣岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯岯 \ No newline at end of file
diff --git a/data/layouts/BattleTentBattleRoom/border.bin b/data/layouts/BattleTentBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleTentBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc
new file mode 100644
index 000000000..4f9a8e626
--- /dev/null
+++ b/data/layouts/BattleTentBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+BattleTentBattleRoom_MapBorder::
+ .incbin "data/layouts/BattleTentBattleRoom/border.bin"
+
+BattleTentBattleRoom_MapBlockdata::
+ .incbin "data/layouts/BattleTentBattleRoom/map.bin"
+
+ .align 2
+BattleTentBattleRoom_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte BattleTentBattleRoom_MapBorder
+ .4byte BattleTentBattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTent
+
diff --git a/data/layouts/BattleTentBattleRoom/map.bin b/data/layouts/BattleTentBattleRoom/map.bin
new file mode 100644
index 000000000..92a738d5e
--- /dev/null
+++ b/data/layouts/BattleTentBattleRoom/map.bin
Binary files differ
diff --git a/data/layouts/BattleTentCorridor/border.bin b/data/layouts/BattleTentCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleTentCorridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc
new file mode 100644
index 000000000..9abcdefa4
--- /dev/null
+++ b/data/layouts/BattleTentCorridor/layout.inc
@@ -0,0 +1,15 @@
+BattleTentCorridor_MapBorder::
+ .incbin "data/layouts/BattleTentCorridor/border.bin"
+
+BattleTentCorridor_MapBlockdata::
+ .incbin "data/layouts/BattleTentCorridor/map.bin"
+
+ .align 2
+BattleTentCorridor_Layout::
+ .4byte 0x5
+ .4byte 0x8
+ .4byte BattleTentCorridor_MapBorder
+ .4byte BattleTentCorridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTent
+
diff --git a/data/layouts/BattleTentCorridor/map.bin b/data/layouts/BattleTentCorridor/map.bin
new file mode 100644
index 000000000..4cd270b21
--- /dev/null
+++ b/data/layouts/BattleTentCorridor/map.bin
@@ -0,0 +1 @@
+6b6c6d66 jkl +*+*#:;:;$;:;:#:;:;$;:;:#%; \ No newline at end of file
diff --git a/data/layouts/BattleTentLobby/border.bin b/data/layouts/BattleTentLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleTentLobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc
new file mode 100644
index 000000000..a3216370f
--- /dev/null
+++ b/data/layouts/BattleTentLobby/layout.inc
@@ -0,0 +1,15 @@
+BattleTentLobby_MapBorder::
+ .incbin "data/layouts/BattleTentLobby/border.bin"
+
+BattleTentLobby_MapBlockdata::
+ .incbin "data/layouts/BattleTentLobby/map.bin"
+
+ .align 2
+BattleTentLobby_Layout::
+ .4byte 0xd
+ .4byte 0xa
+ .4byte BattleTentLobby_MapBorder
+ .4byte BattleTentLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTent
+
diff --git a/data/layouts/BattleTentLobby/map.bin b/data/layouts/BattleTentLobby/map.bin
new file mode 100644
index 000000000..9ff37dc2c
--- /dev/null
+++ b/data/layouts/BattleTentLobby/map.bin
@@ -0,0 +1,2 @@
+666b6c6d6666
+ `a jkl fg2hi 22 22 2no2p 22222 w6"2xyz{2|}~6'�22����2����&22�22�2�2�2�22�2�2�2�222�2222222222222�222222222220(2222./222( \ No newline at end of file
diff --git a/data/layouts/BirthIsland_Exterior/border.bin b/data/layouts/BirthIsland_Exterior/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/BirthIsland_Exterior/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc
new file mode 100644
index 000000000..17dc4f0fb
--- /dev/null
+++ b/data/layouts/BirthIsland_Exterior/layout.inc
@@ -0,0 +1,15 @@
+BirthIsland_Exterior_MapBorder::
+ .incbin "data/layouts/BirthIsland_Exterior/border.bin"
+
+BirthIsland_Exterior_MapBlockdata::
+ .incbin "data/layouts/BirthIsland_Exterior/map.bin"
+
+ .align 2
+BirthIsland_Exterior_Layout::
+ .4byte 0x1e
+ .4byte 0x1e
+ .4byte BirthIsland_Exterior_MapBorder
+ .4byte BirthIsland_Exterior_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Dewford
+
diff --git a/data/layouts/BirthIsland_Exterior/map.bin b/data/layouts/BirthIsland_Exterior/map.bin
new file mode 100644
index 000000000..38dfe77a8
--- /dev/null
+++ b/data/layouts/BirthIsland_Exterior/map.bin
Binary files differ
diff --git a/data/layouts/CableCarStation/border.bin b/data/layouts/CableCarStation/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/CableCarStation/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc
new file mode 100644
index 000000000..1113f89f2
--- /dev/null
+++ b/data/layouts/CableCarStation/layout.inc
@@ -0,0 +1,15 @@
+CableCarStation_MapBorder::
+ .incbin "data/layouts/CableCarStation/border.bin"
+
+CableCarStation_MapBlockdata::
+ .incbin "data/layouts/CableCarStation/map.bin"
+
+ .align 2
+CableCarStation_Layout::
+ .4byte 0xd
+ .4byte 0xc
+ .4byte CableCarStation_MapBorder
+ .4byte CableCarStation_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/CableCarStation/map.bin b/data/layouts/CableCarStation/map.bin
new file mode 100644
index 000000000..93db9d5f0
--- /dev/null
+++ b/data/layouts/CableCarStation/map.bin
Binary files differ
diff --git a/data/layouts/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_1F/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc
new file mode 100644
index 000000000..616af1655
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_1F/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_1F_MapBorder::
+ .incbin "data/layouts/CaveOfOrigin_1F/border.bin"
+
+CaveOfOrigin_1F_MapBlockdata::
+ .incbin "data/layouts/CaveOfOrigin_1F/map.bin"
+
+ .align 2
+CaveOfOrigin_1F_Layout::
+ .4byte 0x17
+ .4byte 0x17
+ .4byte CaveOfOrigin_1F_MapBorder
+ .4byte CaveOfOrigin_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/CaveOfOrigin_1F/map.bin b/data/layouts/CaveOfOrigin_1F/map.bin
new file mode 100644
index 000000000..c3c5e7abf
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_1F/map.bin
@@ -0,0 +1 @@
+)))))))))))))))))))))"33333333))))3333333 ")))))))*3333()))))) ""33)))))))))))))33  ""3*333)))))))) 33  ""3"3))*33333=333  33  ""3"*33333333333  33  "$""33333333322$ 33  "3"""33333222$333 33  "3"""3333$3333333 3$ "3"""333$33333333( 3 "3"""333 3333333333  3 "3"""333 3333333333  3 "3"""333()333)))  3 "*""33333()))*333   3 ""3""3333333333333   3 ""3"$33333333333$  3 ""3"3$3333;33333$3  3 ""3$3$22289:222$2$ 3 "$3$222222222222$33 $"3"33222223332222$ 3"3$22$33333$222$3332$3$222222222222222222$333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc
new file mode 100644
index 000000000..5850f15c9
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_B1F_MapBorder::
+ .incbin "data/layouts/CaveOfOrigin_B1F/border.bin"
+
+CaveOfOrigin_B1F_MapBlockdata::
+ .incbin "data/layouts/CaveOfOrigin_B1F/map.bin"
+
+ .align 2
+CaveOfOrigin_B1F_Layout::
+ .4byte 0x13
+ .4byte 0x13
+ .4byte CaveOfOrigin_B1F_MapBorder
+ .4byte CaveOfOrigin_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/CaveOfOrigin_B1F/map.bin b/data/layouts/CaveOfOrigin_B1F/map.bin
new file mode 100644
index 000000000..1fb2d71bb
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/map.bin
@@ -0,0 +1 @@
+)))))))))))))))))3)))))))))))))3 "3"333))@))333H3 "*3)*33A333()3( "3*333333333(3 H"3M333)))333 3& ""3"33*#0#(33N3  ""33*0###0(3 3 H"3"3"####### 3 3  ""3"3"0##0##0 3H3& "3M3"####### 3 3  ""3"3$30###0$33N3&H"3"33$3#0#$333 3  "M3$33$3$3$3$3$333$3  "$3$3333333$3$ "3332222222$233N3 "3$22223332222$3 "333333$222$333333N$222222232222222$ \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Entrance/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc
new file mode 100644
index 000000000..11e230ce3
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_Entrance_MapBorder::
+ .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin"
+
+CaveOfOrigin_Entrance_MapBlockdata::
+ .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin"
+
+ .align 2
+CaveOfOrigin_Entrance_Layout::
+ .4byte 0x13
+ .4byte 0x1a
+ .4byte CaveOfOrigin_Entrance_MapBorder
+ .4byte CaveOfOrigin_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/CaveOfOrigin_Entrance/map.bin b/data/layouts/CaveOfOrigin_Entrance/map.bin
new file mode 100644
index 000000000..4bbffd109
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Entrance/map.bin
@@ -0,0 +1 @@
+3333333333333333333333333))))))3333333)))*)))3())3333")))*333())) 3333"")))-./))3 (333"""3)5637) 3 3 33*""3"33333333  3( 33"3""3"33333333  33  33"3""3"33333333  33  33"3""3"33333333 (3 (**"3"33333333 3 3 3 "3"3"3"33333333 3 3 3 "3"3"3"33333333 3( 3 "3"3"3"33333333 33  3 "3"3"3"33333333 33 ( "*3"3"33333333 33 3  ""33"3"33333333 33 3  ""33"3"33333333 3$3  ""3*3"33333333 3 33  ""3"33"33333333 3 33  ""3"33"333#3333 3 33  "%"33$289:2$3 33  "3"$22233322$33  "3"3333$222$33333  "3$22222222222222$ $222222233322222$ \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc
new file mode 100644
index 000000000..294bf786a
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap1_MapBorder::
+ .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin"
+
+CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata::
+ .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin"
+
+ .align 2
+CaveOfOrigin_UnusedRubySapphireMap1_Layout::
+ .4byte 0x17
+ .4byte 0x17
+ .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder
+ .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
new file mode 100644
index 000000000..0ffbdaaa0
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
@@ -0,0 +1 @@
+33))))))))))))))))33333"33)))3333))) 33333"33"333())))*333 (33)*33"3))))))))3( 33"33)*3"))))))(3  33"33"333""3333<33( 3  33"3*333""3333333  3  33"3"3333%%333333  3  33"3"333333%23333  3  33"*)))333%333  2 33""3")(333"33   3 33""3""=3( 333""33   3 33""3""33  33*"33   3 33""3""33 ())**33   3 33""3""33())))*333   3 33""3""33333333333  ( 33""3"%333333333% 3  33""3"3%3333333%3 3  33""3%3%2222222%2%3  33"%3%2222222222%32% 33"3%23322222233 33 33%33%22%333333%22%2%333%2222222222222222%3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
new file mode 100644
index 000000000..4117717f2
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
@@ -0,0 +1 @@
+#### \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc
new file mode 100644
index 000000000..c3a05f75f
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap2_MapBorder::
+ .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin"
+
+CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata::
+ .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin"
+
+ .align 2
+CaveOfOrigin_UnusedRubySapphireMap2_Layout::
+ .4byte 0x15
+ .4byte 0x15
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
new file mode 100644
index 000000000..4c1fd5ab8
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
@@ -0,0 +1 @@
+)))))###))))##)"#####()))*))())*# "#))))))))*##()))) "#"##))))))))))##  "#"##"))))))))(#  "*)*"33333333( #  ""#")*333333333  % ""#""333223333   # ""#""33%##%333   %""#""33 ####%33    #""#""<33 #####"33    #""#"%22%#####"33    #"%%2#####)*33    #"#"##"#)))*3333   ("#"##"#"=33333332  # "#"##%"333333%#  # "#"###"%222222%2%( "#"###%22222222%###  "#%222##222222##  %222#%22%######%22% ####%222222222222222% \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc
new file mode 100644
index 000000000..cbc5c052a
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap3_MapBorder::
+ .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin"
+
+CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata::
+ .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin"
+
+ .align 2
+CaveOfOrigin_UnusedRubySapphireMap3_Layout::
+ .4byte 0x13
+ .4byte 0x15
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
new file mode 100644
index 000000000..ea574b224
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
@@ -0,0 +1 @@
+)))))))))))))))))")))3333)))333 ""333())))*333()) ""33)))))))))33  ""33")))))))(3  ""3*"3333333( 3  "$"*333333=33  $ "3"""3322233   3 "3"""3$333$3   3 "3"""3 33333"$  3 "3"""3(3333" 3  3 "3"""33(33* 3  3 "*""333 33"$3 ( ""3""333())* 33 3  ""3"$3<33333 2$3  ""3$"333333  333  ""33"$222222$ 333  ""33$22222222$333  "$2233332222222$ "333$2222$3222222$$2222222222$3333333 \ No newline at end of file
diff --git a/data/layouts/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/layouts/DesertRuins/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc
new file mode 100644
index 000000000..4d6e7571a
--- /dev/null
+++ b/data/layouts/DesertRuins/layout.inc
@@ -0,0 +1,15 @@
+DesertRuins_MapBorder::
+ .incbin "data/layouts/DesertRuins/border.bin"
+
+DesertRuins_MapBlockdata::
+ .incbin "data/layouts/DesertRuins/map.bin"
+
+ .align 2
+DesertRuins_Layout::
+ .4byte 0x11
+ .4byte 0x21
+ .4byte DesertRuins_MapBorder
+ .4byte DesertRuins_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/DesertRuins/map.bin b/data/layouts/DesertRuins/map.bin
new file mode 100644
index 000000000..406cf7279
--- /dev/null
+++ b/data/layouts/DesertRuins/map.bin
Binary files differ
diff --git a/data/layouts/DesertUnderpass/border.bin b/data/layouts/DesertUnderpass/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/DesertUnderpass/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc
new file mode 100644
index 000000000..9a17a128e
--- /dev/null
+++ b/data/layouts/DesertUnderpass/layout.inc
@@ -0,0 +1,15 @@
+DesertUnderpass_MapBorder::
+ .incbin "data/layouts/DesertUnderpass/border.bin"
+
+DesertUnderpass_MapBlockdata::
+ .incbin "data/layouts/DesertUnderpass/map.bin"
+
+ .align 2
+DesertUnderpass_Layout::
+ .4byte 0x8b
+ .4byte 0x17
+ .4byte DesertUnderpass_MapBorder
+ .4byte DesertUnderpass_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/DesertUnderpass/map.bin b/data/layouts/DesertUnderpass/map.bin
new file mode 100644
index 000000000..2f82e9357
--- /dev/null
+++ b/data/layouts/DesertUnderpass/map.bin
@@ -0,0 +1 @@
+ ##" #" !!" !!"##" #" #" ####" ####" #" #" "#"������ ###" # #�� #" "#"������ # #"#" #"�� ###" "�� ######"##��' # " " '��� #�������#"#"' "������������#"���h������������������������������������������ ####" ##" ##" #"������������ #q���������##"##"< # #"#" " # "#" " ##" #####" ##"##"�� ###"�� q��������#"#"#XYZ# ##"#"#" #" " ###" " #"#" # #" #"" ###"  #""��� ###q�����p######" ##"  #01##"##" 0#101#####"#####" ####" #### #01######q�� 0##101##q���p#"" ######" #######"  ##"##" #"#" ##########" #####"#q�###### "####################" ##########" #############" #"" " #####" #" ########" ##############" #### ######" #####" ##" ##" ##"  ##" #" ###" # ####" ######"" # " ##"��#"'���� ## ##"##" # #"#" # "#########" ########" ##"#" #"### ##### #"##### " ##"####"#" #####" ###### # ##"### ##"#" ## ######" "### " ###"#"#"#" # #" #" #"#" ## #####" ##" # " #" ###"### ## " #"##"#"#"###" ##"##" #####" ##" #"## # # #"#" #"#" ############# \ No newline at end of file
diff --git a/data/layouts/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin
new file mode 100644
index 000000000..281762f5b
--- /dev/null
+++ b/data/layouts/DewfordTown/border.bin
@@ -0,0 +1 @@
+CCCC \ No newline at end of file
diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc
new file mode 100644
index 000000000..28ccdc43c
--- /dev/null
+++ b/data/layouts/DewfordTown/layout.inc
@@ -0,0 +1,15 @@
+DewfordTown_MapBorder::
+ .incbin "data/layouts/DewfordTown/border.bin"
+
+DewfordTown_MapBlockdata::
+ .incbin "data/layouts/DewfordTown/map.bin"
+
+ .align 2
+DewfordTown_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte DewfordTown_MapBorder
+ .4byte DewfordTown_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Dewford
+
diff --git a/data/layouts/DewfordTown/map.bin b/data/layouts/DewfordTown/map.bin
new file mode 100644
index 000000000..e8a1154e8
--- /dev/null
+++ b/data/layouts/DewfordTown/map.bin
@@ -0,0 +1,2 @@
+C 2 2 2$1$1$1$1$1%pzCCC92C92C$1$1$1$1$1%pzC:CCCC:$1$1$1$1$1%pzC92CC:C92'%&$1$1$1$1$1%pz5CC:C92:C$1$1$1$1$1$1$19292%pzCC92CC92:$1$1$1$1$1$1 2 2%pz:::CCC$1$1$1$1$1$1$1%p�yy�:::$12222$1$1%pppp�yyy$1PQRS$1$1%&%pppppppp$1XYZ[$1$1$1$1$1$1(2)2)2pppppp$1 ab
+$1$1$1$1$101111111$1$1$1$1$1$1$1$1$1$1$1>111=1$1 2 2 2 2$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1222222$1$1$1$1$192$1$1$1$1"####$$1$1$1$1$1%&C$1$1$1$1+,-�./2$1$1$1$1$1$1�92C$1$1$1$1345�67$1$1$1$1$1$1$1C:92$1$1$1;2<2=�>?2$1$1$1$1$1929292:92C92$1$1$1$1$1$1$1$1$1$1�49292:CC�CCC9292929292929292929292CC92CC92 \ No newline at end of file
diff --git a/data/layouts/DewfordTown_Gym/border.bin b/data/layouts/DewfordTown_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/border.bin
Binary files differ
diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc
new file mode 100644
index 000000000..bbada5bdc
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/layout.inc
@@ -0,0 +1,15 @@
+DewfordTown_Gym_MapBorder::
+ .incbin "data/layouts/DewfordTown_Gym/border.bin"
+
+DewfordTown_Gym_MapBlockdata::
+ .incbin "data/layouts/DewfordTown_Gym/map.bin"
+
+ .align 2
+DewfordTown_Gym_Layout::
+ .4byte 0x12
+ .4byte 0x1c
+ .4byte DewfordTown_Gym_MapBorder
+ .4byte DewfordTown_Gym_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_DewfordGym
+
diff --git a/data/layouts/DewfordTown_Gym/map.bin b/data/layouts/DewfordTown_Gym/map.bin
new file mode 100644
index 000000000..43cd6e64a
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/map.bin
Binary files differ
diff --git a/data/layouts/DewfordTown_Hall/border.bin b/data/layouts/DewfordTown_Hall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/DewfordTown_Hall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc
new file mode 100644
index 000000000..bd9cd03ae
--- /dev/null
+++ b/data/layouts/DewfordTown_Hall/layout.inc
@@ -0,0 +1,15 @@
+DewfordTown_Hall_MapBorder::
+ .incbin "data/layouts/DewfordTown_Hall/border.bin"
+
+DewfordTown_Hall_MapBlockdata::
+ .incbin "data/layouts/DewfordTown_Hall/map.bin"
+
+ .align 2
+DewfordTown_Hall_Layout::
+ .4byte 0x11
+ .4byte 0x9
+ .4byte DewfordTown_Hall_MapBorder
+ .4byte DewfordTown_Hall_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/DewfordTown_Hall/map.bin b/data/layouts/DewfordTown_Hall/map.bin
new file mode 100644
index 000000000..5fd13209d
--- /dev/null
+++ b/data/layouts/DewfordTown_Hall/map.bin
Binary files differ
diff --git a/data/layouts/DoubleBattleColosseum/border.bin b/data/layouts/DoubleBattleColosseum/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/DoubleBattleColosseum/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc
new file mode 100644
index 000000000..61d112c1e
--- /dev/null
+++ b/data/layouts/DoubleBattleColosseum/layout.inc
@@ -0,0 +1,15 @@
+DoubleBattleColosseum_MapBorder::
+ .incbin "data/layouts/DoubleBattleColosseum/border.bin"
+
+DoubleBattleColosseum_MapBlockdata::
+ .incbin "data/layouts/DoubleBattleColosseum/map.bin"
+
+ .align 2
+DoubleBattleColosseum_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte DoubleBattleColosseum_MapBorder
+ .4byte DoubleBattleColosseum_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_CableClub
+
diff --git a/data/layouts/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin
new file mode 100644
index 000000000..77606e818
--- /dev/null
+++ b/data/layouts/DoubleBattleColosseum/map.bin
@@ -0,0 +1 @@
+hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2`2U2U2b2c2U2U2a2U2�2���2U2T2U2U2d2e2U2U2V2U2�2���2U2`2U2U2f2g2U2U2a2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2!2!2 \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/EverGrandeCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc
new file mode 100644
index 000000000..16c02fbaa
--- /dev/null
+++ b/data/layouts/EverGrandeCity/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_MapBorder::
+ .incbin "data/layouts/EverGrandeCity/border.bin"
+
+EverGrandeCity_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity/map.bin"
+
+ .align 2
+EverGrandeCity_Layout::
+ .4byte 0x28
+ .4byte 0x50
+ .4byte EverGrandeCity_MapBorder
+ .4byte EverGrandeCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_EverGrande
+
diff --git a/data/layouts/EverGrandeCity/map.bin b/data/layouts/EverGrandeCity/map.bin
new file mode 100644
index 000000000..33b271d5d
--- /dev/null
+++ b/data/layouts/EverGrandeCity/map.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
new file mode 100644
index 000000000..dad4c7ef3
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_ChampionsRoom_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin"
+
+EverGrandeCity_ChampionsRoom_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin"
+
+ .align 2
+EverGrandeCity_ChampionsRoom_Layout::
+ .4byte 0xd
+ .4byte 0xd
+ .4byte EverGrandeCity_ChampionsRoom_MapBorder
+ .4byte EverGrandeCity_ChampionsRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
+
diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/map.bin b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
new file mode 100644
index 000000000..a234307b5
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
new file mode 100644
index 000000000..9c140d49d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_DrakesRoom_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin"
+
+EverGrandeCity_DrakesRoom_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin"
+
+ .align 2
+EverGrandeCity_DrakesRoom_Layout::
+ .4byte 0xd
+ .4byte 0xe
+ .4byte EverGrandeCity_DrakesRoom_MapBorder
+ .4byte EverGrandeCity_DrakesRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
+
diff --git a/data/layouts/EverGrandeCity_DrakesRoom/map.bin b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
new file mode 100644
index 000000000..3b5248d98
--- /dev/null
+++ b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      񈄔񈄔񈇰򋳀񈄔񈄔�2��򘇈񁺮񋉖񎒈�2����򘇈񚢪񠬮񦹈�2����򘇈񳊺񹔾񿠈�2����򘇈񚥊򑽎񦹈�2����򘇈񚦚򪥞񦹈�2��󌛤򘇈򽃾󆒦󉕈򘈶򳵌󀈢󀈢󀈢󀈢󀈢󀈢2222222222222�����򘇈�2�����HIHI�򰯘�2�HIHI \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
new file mode 100644
index 000000000..bcd610d8c
--- /dev/null
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_GlaciasRoom_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin"
+
+EverGrandeCity_GlaciasRoom_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin"
+
+ .align 2
+EverGrandeCity_GlaciasRoom_Layout::
+ .4byte 0xd
+ .4byte 0xe
+ .4byte EverGrandeCity_GlaciasRoom_MapBorder
+ .4byte EverGrandeCity_GlaciasRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
+
diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/map.bin b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
new file mode 100644
index 000000000..2d7db7377
--- /dev/null
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      r2r2r2r2r2�2�2�2r2r2r2r2r2�v�2�2p2s2s2s2t2�2�2wu}~�2�2x2y2z2{2|2�2�2}���2�2�2ଂ솫�2�2���q�2�2x2�2�2�2|2�2�2�����2�2x2𓮼�2|2�2�2��𸪄�2�2𩒞𲡆𵣨�2𦌪𯛺𬗂𬗂𬗂𬗂𬗂�22222222222222������2�2�2�����HIHI�𜽸�2�HIHI \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_Hall4/border.bin b/data/layouts/EverGrandeCity_Hall4/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Hall4/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc
new file mode 100644
index 000000000..464fc8998
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Hall4/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_Hall4_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_Hall4/border.bin"
+
+EverGrandeCity_Hall4_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_Hall4/map.bin"
+
+ .align 2
+EverGrandeCity_Hall4_Layout::
+ .4byte 0xb
+ .4byte 0x22
+ .4byte EverGrandeCity_Hall4_MapBorder
+ .4byte EverGrandeCity_Hall4_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
+
diff --git a/data/layouts/EverGrandeCity_Hall4/map.bin b/data/layouts/EverGrandeCity_Hall4/map.bin
new file mode 100644
index 000000000..580ae095a
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Hall4/map.bin
@@ -0,0 +1 @@
+����D����     E     󘰲󘰲󘰲󘰲󘰲󘰨󕫰󕫰󕫰󕫰󕫰����󱙌�2��������􊁜�2�����J��􊁜�2��J�����􊁜�2�����J��􊁜�2��J�����􊁜�2�����J��􊁜�2��J�����􊁜�2��������􊁜�2�����J��􊁜�2��J�����􊁜�2��������􊁜�2��������􊁜�2�����J��􊁜�2��J�����􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2�����J��􊁜�2��J�����􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2���� \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
new file mode 100644
index 000000000..deaa4429d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_HallOfFame_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin"
+
+EverGrandeCity_HallOfFame_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin"
+
+ .align 2
+EverGrandeCity_HallOfFame_Layout::
+ .4byte 0xf
+ .4byte 0x11
+ .4byte EverGrandeCity_HallOfFame_MapBorder
+ .4byte EverGrandeCity_HallOfFame_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_CableClub
+
diff --git a/data/layouts/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin
new file mode 100644
index 000000000..1df9e4804
--- /dev/null
+++ b/data/layouts/EverGrandeCity_HallOfFame/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�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2���2�2�2�2�2�2�2�2�2�2�2�2�2��6�2�2�2�6 \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
new file mode 100644
index 000000000..b02d5c312
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PhoebesRoom_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin"
+
+EverGrandeCity_PhoebesRoom_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin"
+
+ .align 2
+EverGrandeCity_PhoebesRoom_Layout::
+ .4byte 0xd
+ .4byte 0xe
+ .4byte EverGrandeCity_PhoebesRoom_MapBorder
+ .4byte EverGrandeCity_PhoebesRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
+
diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/map.bin b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
new file mode 100644
index 000000000..2e75b706c
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      B2B2B2B2B2X2X2X2B2B2B2B2B2EF\2\2@2C2C2C2D2\2\2GAMN\2\2H2I2J2K2L2\2\2O@UV\2\2P2Q2R2S2T2\2\2WA]^\2\2H2Y2Z2[2L2\2\2WBef\2\2H2a2b2c2L2\2\2gCm2n2\2\2h2k2k2k2l2\2\2o2`2j2i2i2i2i2i2i2i2i2i2i2i2i22222222222222�����\2\2\2�����HIHI�d2d2d2�HIHI \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc
new file mode 100644
index 000000000..d84e6449f
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PokemonLeague_1F_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin"
+
+EverGrandeCity_PokemonLeague_1F_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin"
+
+ .align 2
+EverGrandeCity_PokemonLeague_1F_Layout::
+ .4byte 0x13
+ .4byte 0xc
+ .4byte EverGrandeCity_PokemonLeague_1F_MapBorder
+ .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonCenter
+
diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin
new file mode 100644
index 000000000..6bab68102
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin
@@ -0,0 +1,2 @@
+  JK   ����     "#RSI�򘇈�Hs2*+2[Q$22򭪠򰯢22P}2)2t2u2!!!!Y<2@2@2@2@2@2@2@2X!!! 222222%2@2@20232@2@2@2g2222D2 2@2@2@2@2@2@2@2v2{2{2w2@2@2@2@2@2@2'2�2�222@2@2@202{2�2�2{232@2@2@2@2^2
+2�6塀2@2@2@282|2�2�2|2;2@2@2@2&2f𐩺2@2@2@2@2@2~2|2|22@2@2@2=>@2'2 2@2@2&2@2@2@2@2@2A2B2@2@2@2@2EF42'2 2^2^2=>42@2@2@2@2@2@2@2@22&242@2'2(ffEF&2@2@2@222@2@2@2@2@2@2@27 \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_ShortHall/border.bin b/data/layouts/EverGrandeCity_ShortHall/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortHall/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc
new file mode 100644
index 000000000..2159c894d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortHall/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_ShortHall_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin"
+
+EverGrandeCity_ShortHall_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin"
+
+ .align 2
+EverGrandeCity_ShortHall_Layout::
+ .4byte 0xb
+ .4byte 0xd
+ .4byte EverGrandeCity_ShortHall_MapBorder
+ .4byte EverGrandeCity_ShortHall_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
+
diff --git a/data/layouts/EverGrandeCity_ShortHall/map.bin b/data/layouts/EverGrandeCity_ShortHall/map.bin
new file mode 100644
index 000000000..75812b238
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortHall/map.bin
@@ -0,0 +1 @@
+����D����HIHI E HIHI󘰲󘰲󘰲󘰲󘰲󘰨󕫰󕫰󕫰󕫰󕫰����󱙌�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2��������􊁜�2���� \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
new file mode 100644
index 000000000..86ffa16a1
--- /dev/null
+++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_SidneysRoom_MapBorder::
+ .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin"
+
+EverGrandeCity_SidneysRoom_MapBlockdata::
+ .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin"
+
+ .align 2
+EverGrandeCity_SidneysRoom_Layout::
+ .4byte 0xd
+ .4byte 0xe
+ .4byte EverGrandeCity_SidneysRoom_MapBorder
+ .4byte EverGrandeCity_SidneysRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
+
diff --git a/data/layouts/EverGrandeCity_SidneysRoom/map.bin b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
new file mode 100644
index 000000000..ebca00c5c
--- /dev/null
+++ b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      22222(2(2(222222>,2,222222,2,2,2,222222,2,2%&,2,2 2!2"2#2$2,2,2'%?:,2,22)2*2+22,2,2'?-.,2,221222322,2,2/-=262,2,282;2;2;2<2,2,27252922222222222222222222222222�����,2,2,2�����HIHI�424242�HIHI \ No newline at end of file
diff --git a/data/layouts/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin
new file mode 100644
index 000000000..23e2a92e5
--- /dev/null
+++ b/data/layouts/FallarborTown/border.bin
@@ -0,0 +1 @@
+klst \ No newline at end of file
diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc
new file mode 100644
index 000000000..7f0894903
--- /dev/null
+++ b/data/layouts/FallarborTown/layout.inc
@@ -0,0 +1,15 @@
+FallarborTown_MapBorder::
+ .incbin "data/layouts/FallarborTown/border.bin"
+
+FallarborTown_MapBlockdata::
+ .incbin "data/layouts/FallarborTown/map.bin"
+
+ .align 2
+FallarborTown_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte FallarborTown_MapBorder
+ .4byte FallarborTown_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fallarbor
+
diff --git a/data/layouts/FallarborTown/map.bin b/data/layouts/FallarborTown/map.bin
new file mode 100644
index 000000000..950a54761
--- /dev/null
+++ b/data/layouts/FallarborTown/map.bin
@@ -0,0 +1 @@
+yyyyyiiiiiiiiiiiiijiiiiiiiiiiiijziiiiij"##$��JKLMNjziiiiijz����󄜢RSTUVzi����jzi�����2y2Z[\]^q2q2PQRSzii����y2#6bcdef#6y2XYZ[q2q2q2y2y2y2y2#6jklmn#6y2�ab�y2y2𾵎y2y2y2y2y2�2�2�2y2y2y2y2�2�2y2y2y2y2y2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2y2y2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2y2y2𾵎𾵎y2y2y2y2y2�2�2y2y2𾵎𾵎y2y2y2y2y2y2y2y2y2y2y2y2�2�2y2򔿈񚥨y2y2y2y2y2y2y2y2y2 3!3y2y2�2�2y20123y2�2y2%3&3'3y2}2~2(3)3y2y2�2�2y289:;22y2-3.3/3y2����y2𿁸�2y2�AB�6t6y2536373y2����y2y2�2�2�2�2�2y2�22l2y2y2y2y2����y2y2�2�2�2�2�2y22s6t6k222�2y2y2y2y2y2y2y2y2y2222l6kllklk2222222222st6sts6t6 \ No newline at end of file
diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc
new file mode 100644
index 000000000..66acc546b
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc
@@ -0,0 +1,15 @@
+FallarborTown_LeftoverRSContestHall_MapBorder::
+ .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin"
+
+FallarborTown_LeftoverRSContestHall_MapBlockdata::
+ .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin"
+
+ .align 2
+FallarborTown_LeftoverRSContestHall_Layout::
+ .4byte 0x15
+ .4byte 0x12
+ .4byte FallarborTown_LeftoverRSContestHall_MapBorder
+ .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin
new file mode 100644
index 000000000..d65e7c489
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin
@@ -0,0 +1 @@
+/////////////////////nnn���bbbbbbbbbbbbbbbbbbbbb 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2(2`2`2              f2`2*2(2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2*2(2`2`2$%2%2hiiiiiiij%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2�2qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q2�2q2qq2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2*2(2`2`2$%2%2xyyk2l2m2yyz%2%2&f2`2*2(2`2`222222s2t2u222222f2`2*2(2`2`26s2t2u26f2`2*2(2`2`2�2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2*2(2`2J2`2`2J2`2`2`2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R6`2`2R6`2`2`2`2`2`2`2R6`2`2R6`2*2 \ No newline at end of file
diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc
new file mode 100644
index 000000000..3ad232728
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc
@@ -0,0 +1,15 @@
+FallarborTown_LeftoverRSContestLobby_MapBorder::
+ .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin"
+
+FallarborTown_LeftoverRSContestLobby_MapBlockdata::
+ .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin"
+
+ .align 2
+FallarborTown_LeftoverRSContestLobby_Layout::
+ .4byte 0xf
+ .4byte 0x7
+ .4byte FallarborTown_LeftoverRSContestLobby_MapBorder
+ .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin
new file mode 100644
index 000000000..87407546a
--- /dev/null
+++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin
@@ -0,0 +1 @@
+[\]��N��M������cde�bVb�bb�bTb 2!2!2�󘰼�2�U2!2!2!2!2!2"2(2`2`2�����f2`2�`2`2`292(2`2`2�2_2_2_2_2g2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2�`292(2`2`2`2`2`2`2`2`2`2`2`2A2 \ No newline at end of file
diff --git a/data/layouts/FarawayIsland_Entrance/border.bin b/data/layouts/FarawayIsland_Entrance/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/FarawayIsland_Entrance/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc
new file mode 100644
index 000000000..c7d6bef91
--- /dev/null
+++ b/data/layouts/FarawayIsland_Entrance/layout.inc
@@ -0,0 +1,15 @@
+FarawayIsland_Entrance_MapBorder::
+ .incbin "data/layouts/FarawayIsland_Entrance/border.bin"
+
+FarawayIsland_Entrance_MapBlockdata::
+ .incbin "data/layouts/FarawayIsland_Entrance/map.bin"
+
+ .align 2
+FarawayIsland_Entrance_Layout::
+ .4byte 0x22
+ .4byte 0x2e
+ .4byte FarawayIsland_Entrance_MapBorder
+ .4byte FarawayIsland_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/FarawayIsland_Entrance/map.bin b/data/layouts/FarawayIsland_Entrance/map.bin
new file mode 100644
index 000000000..389f6b0cd
--- /dev/null
+++ b/data/layouts/FarawayIsland_Entrance/map.bin
Binary files differ
diff --git a/data/layouts/FarawayIsland_Interior/border.bin b/data/layouts/FarawayIsland_Interior/border.bin
new file mode 100644
index 000000000..addb5d6ce
--- /dev/null
+++ b/data/layouts/FarawayIsland_Interior/border.bin
Binary files differ
diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc
new file mode 100644
index 000000000..787dd53c9
--- /dev/null
+++ b/data/layouts/FarawayIsland_Interior/layout.inc
@@ -0,0 +1,15 @@
+FarawayIsland_Interior_MapBorder::
+ .incbin "data/layouts/FarawayIsland_Interior/border.bin"
+
+FarawayIsland_Interior_MapBlockdata::
+ .incbin "data/layouts/FarawayIsland_Interior/map.bin"
+
+ .align 2
+FarawayIsland_Interior_Layout::
+ .4byte 0x1d
+ .4byte 0x1a
+ .4byte FarawayIsland_Interior_MapBorder
+ .4byte FarawayIsland_Interior_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fortree
+
diff --git a/data/layouts/FarawayIsland_Interior/map.bin b/data/layouts/FarawayIsland_Interior/map.bin
new file mode 100644
index 000000000..847295734
--- /dev/null
+++ b/data/layouts/FarawayIsland_Interior/map.bin
Binary files differ
diff --git a/data/layouts/FieryPath/border.bin b/data/layouts/FieryPath/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/FieryPath/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc
new file mode 100644
index 000000000..c129ae715
--- /dev/null
+++ b/data/layouts/FieryPath/layout.inc
@@ -0,0 +1,15 @@
+FieryPath_MapBorder::
+ .incbin "data/layouts/FieryPath/border.bin"
+
+FieryPath_MapBlockdata::
+ .incbin "data/layouts/FieryPath/map.bin"
+
+ .align 2
+FieryPath_Layout::
+ .4byte 0x23
+ .4byte 0x26
+ .4byte FieryPath_MapBorder
+ .4byte FieryPath_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/FieryPath/map.bin b/data/layouts/FieryPath/map.bin
new file mode 100644
index 000000000..5928fb173
--- /dev/null
+++ b/data/layouts/FieryPath/map.bin
@@ -0,0 +1,10 @@
+qqqq{ttttttt|qqqq{ttttttttttt|qqqqqqqqqr{ttt|qpqqqqr{tttttttt|qpqqqqqqqq{z{333|pqqq{z33333333|pqqqqqqqqrq33333pqqqrq333333333pqqqqqqq{zq33333pqqqr{3333333 33pqqqqqq{zq3
+   ~pqqqr3333
+   ~~qqqqqqr{tt3h   ~qqqr333
+pqqqqqqqqqqqqqrr3333pqqqqqqr333pqqqqqqqqqqqqqrr3
+ 3pqqqqqqqr333pqqqqqqqqqqqqqrr33xttttt|qr333pqqqqqqqqqqqqqrr33ttttt|pqr333pqqqqqqqqqqqqqrr3333333333pqr333pqqqqqqqqqqqqqrr3
+      3
+~xtz333pqqqqqqqqqqqqqrr3qqq 3qqqq333pqqqqqqqqqqqqqrr3h  jr33tttt333x|qqqqqqqqqqqqrr3pqrr33333333333pqqqqqqqqqqqqrr3pqqrr333
+    333qpqqqqqqqqqqqqrr3pqqr   ~h j333|x|qqqqqqqqqqrr3pqq     ~qr3333qxtttt|qqqqq{zr3xt|qqqqqqqqr3333tttt|pqqqqqr{3t|xt|qqqqqqr 33333333|pqqqqqrr33 73|x|qqqqqr333333333pqqqqqrr33333|qpqqqqqj333333333pqqqqqr   333qpqqqqqqr     3333pqqqqq  jr333qpqqqqqqiiiij3333pqqqqqqqqrr33
+~qpqqqqqqqqqqqr3333pqqqqqqqqrr3
+~qqpqqqqqqqqqqqr 333pqqqqqqqrr3tt|pqqqqqqqqqqqrq333pqqqqqqqqrr3333ppqqqqqqqqqqqj333pqqqqqqq{z 333pxt|qqqqqqqqqqr333pqqqqqqqr{tz333xt|pqqqqqqqqqqr333pqqqqqqqrr 33333 ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqr       ~pqqqqqqqqqqr333pqqqqqqqiiiiiiiii~qqqqqqqqqqr3 33pqqqqqqqqqqqqqqqqqqqqqqqqqqqq ~~qqqqq \ No newline at end of file
diff --git a/data/layouts/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin
new file mode 100644
index 000000000..addb5d6ce
--- /dev/null
+++ b/data/layouts/FortreeCity/border.bin
Binary files differ
diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc
new file mode 100644
index 000000000..02564b36a
--- /dev/null
+++ b/data/layouts/FortreeCity/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_MapBorder::
+ .incbin "data/layouts/FortreeCity/border.bin"
+
+FortreeCity_MapBlockdata::
+ .incbin "data/layouts/FortreeCity/map.bin"
+
+ .align 2
+FortreeCity_Layout::
+ .4byte 0x28
+ .4byte 0x14
+ .4byte FortreeCity_MapBorder
+ .4byte FortreeCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fortree
+
diff --git a/data/layouts/FortreeCity/map.bin b/data/layouts/FortreeCity/map.bin
new file mode 100644
index 000000000..a2aa40e98
--- /dev/null
+++ b/data/layouts/FortreeCity/map.bin
@@ -0,0 +1 @@
+�������������������������������$%&�������HIJ�����$%&���*$%&�����$%&���+,-./������PQR+,-./**+,-./���+,-./��34567������D\DHIJK34567��34567�**34567�*3<B>B>B7���������PQRS3<B=B>B?BVBVB;B<B>B>B?BVBVBVB;B<B=B>B?BVBVB;B<B>B>B7��������XYZ[CFEFGDDCFFFGDDDCFEFGDDCFEFG�����0`abc��M�HIJ����������M��HIJ�M����00000X2Y2Y2SSa2�PQR����cddddea2��PQR�a2SSS00000000`2a2a2a2a2a2��A�����������a2S��A��a2a2a2b2000000000h2a2a2a2a2��s����S������`2U2��s��a2a2a2j200000000000h2a2a2a2�������0������`2]���*Sa2a2j200000�00(0)0)0+00`2a2K2$%&**��0򼯽����1`2a2����a2a2a20�$%&����01230`2K2+,-./����0X2Y2Y2Y2Y2a2K2�*�Sa2a2a2�+,-./���89:;0`2�34567�����K2K2K2K2K2K2����0h2i2i2�34567���`ABCX2a2�3<B=B>B?BVBVBVBVBVBVBVBVBVBVBVBVBVBVBVBN騈騈騈騐B;B<B>B>B7���000X2a2a2SCFEFGDDDDDDDDDDDDDDD00X2Y2DCFEF6G����X2Y2a2a2a2a2SSM�HIJ�������������L2Y2a2a2S6S6S6M������K2K2a2a2a2a2a2a2a2�PQR����������HIJ�K2a2a2a2a2a2a2��������K2K2K2a2a2a2a2�D\D����������PQR��K2K2a2a2a2K2���**������K2K2K2K2����*���������D\D����K2K2K2��� \ No newline at end of file
diff --git a/data/layouts/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc
new file mode 100644
index 000000000..6460a35b5
--- /dev/null
+++ b/data/layouts/FortreeCity_DecorationShop/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_DecorationShop_MapBorder::
+ .incbin "data/layouts/FortreeCity_DecorationShop/border.bin"
+
+FortreeCity_DecorationShop_MapBlockdata::
+ .incbin "data/layouts/FortreeCity_DecorationShop/map.bin"
+
+ .align 2
+FortreeCity_DecorationShop_Layout::
+ .4byte 0x8
+ .4byte 0x6
+ .4byte FortreeCity_DecorationShop_MapBorder
+ .4byte FortreeCity_DecorationShop_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin
new file mode 100644
index 000000000..6ca8b4e61
--- /dev/null
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
@@ -0,0 +1 @@
+������������������3�3��󏺙���������󱬯󱬯󱬯󱬯󊼇�3��󱬯�7 \ No newline at end of file
diff --git a/data/layouts/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/border.bin
Binary files differ
diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc
new file mode 100644
index 000000000..da7f1e73e
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_Gym_MapBorder::
+ .incbin "data/layouts/FortreeCity_Gym/border.bin"
+
+FortreeCity_Gym_MapBlockdata::
+ .incbin "data/layouts/FortreeCity_Gym/map.bin"
+
+ .align 2
+FortreeCity_Gym_Layout::
+ .4byte 0x14
+ .4byte 0x19
+ .4byte FortreeCity_Gym_MapBorder
+ .4byte FortreeCity_Gym_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_FortreeGym
+
diff --git a/data/layouts/FortreeCity_Gym/map.bin b/data/layouts/FortreeCity_Gym/map.bin
new file mode 100644
index 000000000..cff943707
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/map.bin
Binary files differ
diff --git a/data/layouts/FortreeCity_House1/border.bin b/data/layouts/FortreeCity_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/FortreeCity_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc
new file mode 100644
index 000000000..214846c22
--- /dev/null
+++ b/data/layouts/FortreeCity_House1/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_House1_MapBorder::
+ .incbin "data/layouts/FortreeCity_House1/border.bin"
+
+FortreeCity_House1_MapBlockdata::
+ .incbin "data/layouts/FortreeCity_House1/map.bin"
+
+ .align 2
+FortreeCity_House1_Layout::
+ .4byte 0x8
+ .4byte 0x6
+ .4byte FortreeCity_House1_MapBorder
+ .4byte FortreeCity_House1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin
new file mode 100644
index 000000000..5a3ac8cb6
--- /dev/null
+++ b/data/layouts/FortreeCity_House1/map.bin
@@ -0,0 +1 @@
+����������������󮪍�3��󷶟󴱧󱭍��󷶟󱬯󱬯󱬯󱬯󱪱󱬯��󱬯�7 \ No newline at end of file
diff --git a/data/layouts/FortreeCity_House2/border.bin b/data/layouts/FortreeCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/FortreeCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc
new file mode 100644
index 000000000..3aa0898bf
--- /dev/null
+++ b/data/layouts/FortreeCity_House2/layout.inc
@@ -0,0 +1,15 @@
+FortreeCity_House2_MapBorder::
+ .incbin "data/layouts/FortreeCity_House2/border.bin"
+
+FortreeCity_House2_MapBlockdata::
+ .incbin "data/layouts/FortreeCity_House2/map.bin"
+
+ .align 2
+FortreeCity_House2_Layout::
+ .4byte 0x8
+ .4byte 0x6
+ .4byte FortreeCity_House2_MapBorder
+ .4byte FortreeCity_House2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin
new file mode 100644
index 000000000..3fbcd6043
--- /dev/null
+++ b/data/layouts/FortreeCity_House2/map.bin
@@ -0,0 +1 @@
+���������������󮪯�7��󷵣󴱧󱭍��󷶟󱬯󱬯󱬯󱬯󱪱󱬯��󱬯�7 \ No newline at end of file
diff --git a/data/layouts/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/GraniteCave_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc
new file mode 100644
index 000000000..009fd12f5
--- /dev/null
+++ b/data/layouts/GraniteCave_1F/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_1F_MapBorder::
+ .incbin "data/layouts/GraniteCave_1F/border.bin"
+
+GraniteCave_1F_MapBlockdata::
+ .incbin "data/layouts/GraniteCave_1F/map.bin"
+
+ .align 2
+GraniteCave_1F_Layout::
+ .4byte 0x2a
+ .4byte 0xf
+ .4byte GraniteCave_1F_MapBorder
+ .4byte GraniteCave_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/GraniteCave_1F/map.bin b/data/layouts/GraniteCave_1F/map.bin
new file mode 100644
index 000000000..58c7945ab
--- /dev/null
+++ b/data/layouts/GraniteCave_1F/map.bin
@@ -0,0 +1,5 @@
+22222222222222222222222?22''2222222222222222222222222222222    "2222222222222222222222222222222222222222222222222222222222226222222  
+222222222222222222222J6R6F622222 $# 
+22222222222<22222222;62;622222#
+22222222# XYZ  "222;62;62?22      "#    
+2222# "# "2;2;6222#   "2222#      "#       $'# XYZ$$#            $#         $ \ No newline at end of file
diff --git a/data/layouts/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/GraniteCave_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc
new file mode 100644
index 000000000..a57b238be
--- /dev/null
+++ b/data/layouts/GraniteCave_B1F/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_B1F_MapBorder::
+ .incbin "data/layouts/GraniteCave_B1F/border.bin"
+
+GraniteCave_B1F_MapBlockdata::
+ .incbin "data/layouts/GraniteCave_B1F/map.bin"
+
+ .align 2
+GraniteCave_B1F_Layout::
+ .4byte 0x20
+ .4byte 0x1a
+ .4byte GraniteCave_B1F_MapBorder
+ .4byte GraniteCave_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/GraniteCave_B1F/map.bin b/data/layouts/GraniteCave_B1F/map.bin
new file mode 100644
index 000000000..27f98c6cf
--- /dev/null
+++ b/data/layouts/GraniteCave_B1F/map.bin
@@ -0,0 +1,10 @@
+2/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2!!!!
+222/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2?2222!!!!!!
+2?222/2/2/2/2/2/2/2/22222!!!!!
+/2/2/2/2/2/222222222/2/2/222?222/2/2/2/2/2/2/222222222/2/2/222222/2/2/2/2/2/2/222222#!#!!
+222222#!#!#!#!!!!!!!#222222��0�2��0�222222222222222222222222222222222222222222222222>2222?22222  
+222  
+222222222222222222222222222  #222222222222222#  
+2222222222222222222222222222222222#  
+222222=22# 
+222 !!!!"2222?222222222#     !!!"#   ###    ##      #     ##       ##                              # \ No newline at end of file
diff --git a/data/layouts/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/GraniteCave_B2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc
new file mode 100644
index 000000000..7ffd04b00
--- /dev/null
+++ b/data/layouts/GraniteCave_B2F/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_B2F_MapBorder::
+ .incbin "data/layouts/GraniteCave_B2F/border.bin"
+
+GraniteCave_B2F_MapBlockdata::
+ .incbin "data/layouts/GraniteCave_B2F/map.bin"
+
+ .align 2
+GraniteCave_B2F_Layout::
+ .4byte 0x20
+ .4byte 0x1a
+ .4byte GraniteCave_B2F_MapBorder
+ .4byte GraniteCave_B2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/GraniteCave_B2F/map.bin b/data/layouts/GraniteCave_B2F/map.bin
new file mode 100644
index 000000000..bbf8dc7af
--- /dev/null
+++ b/data/layouts/GraniteCave_B2F/map.bin
@@ -0,0 +1,2 @@
+2222222222222222222222262222222222S22222222222222'62>22222222222:2>22222222222222222222222222:2     "222222222222222222>22BR22222226222222222222222222222 $P622            $$        $    666666666666666666666666666666666666666666666S66622  2 2b6 2 2"22S622222222222222222222222222222222222222>2222222222222222222222222222'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222    
+222222222222222222222222222222'222   $22=222222222222     "'222$            $$    $$                $$      $$                              # \ No newline at end of file
diff --git a/data/layouts/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/GraniteCave_StevensRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc
new file mode 100644
index 000000000..5ee4fade4
--- /dev/null
+++ b/data/layouts/GraniteCave_StevensRoom/layout.inc
@@ -0,0 +1,15 @@
+GraniteCave_StevensRoom_MapBorder::
+ .incbin "data/layouts/GraniteCave_StevensRoom/border.bin"
+
+GraniteCave_StevensRoom_MapBlockdata::
+ .incbin "data/layouts/GraniteCave_StevensRoom/map.bin"
+
+ .align 2
+GraniteCave_StevensRoom_Layout::
+ .4byte 0xf
+ .4byte 0xe
+ .4byte GraniteCave_StevensRoom_MapBorder
+ .4byte GraniteCave_StevensRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/GraniteCave_StevensRoom/map.bin b/data/layouts/GraniteCave_StevensRoom/map.bin
new file mode 100644
index 000000000..3dc6987c2
--- /dev/null
+++ b/data/layouts/GraniteCave_StevensRoom/map.bin
@@ -0,0 +1,4 @@
+   22222222222222222222222222$!
+22222$
+2222$
+$!!!!!$$!!!!!!!!$$!!!!!!!!!!$ \ No newline at end of file
diff --git a/data/layouts/Harbor/border.bin b/data/layouts/Harbor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Harbor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc
new file mode 100644
index 000000000..e95b8ec9d
--- /dev/null
+++ b/data/layouts/Harbor/layout.inc
@@ -0,0 +1,15 @@
+Harbor_MapBorder::
+ .incbin "data/layouts/Harbor/border.bin"
+
+Harbor_MapBlockdata::
+ .incbin "data/layouts/Harbor/map.bin"
+
+ .align 2
+Harbor_Layout::
+ .4byte 0x18
+ .4byte 0xf
+ .4byte Harbor_MapBorder
+ .4byte Harbor_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/Harbor/map.bin b/data/layouts/Harbor/map.bin
new file mode 100644
index 000000000..c77c1edfb
--- /dev/null
+++ b/data/layouts/Harbor/map.bin
@@ -0,0 +1 @@
+������������������������������������������������!!!!!!!!!!!!!!!!!!!!!!!!222MNNNNNNNNNNNNNNNNNNNN222Gqqqqqqqqqqqqqqqqqqqq222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222hVVW[3[3UVVVVVVVF􂔷VVVV222222222%222%222%22`󶀯󯶫�6*622222222222222222`󼊳󼊳󯶫22222222222222222`*6*6*6*6󶀯222222222222222`(6(6(6(6󼊳 \ No newline at end of file
diff --git a/data/layouts/House1/border.bin b/data/layouts/House1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/House1/border.bin
Binary files differ
diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc
new file mode 100644
index 000000000..b93f24df4
--- /dev/null
+++ b/data/layouts/House1/layout.inc
@@ -0,0 +1,15 @@
+House1_MapBorder::
+ .incbin "data/layouts/House1/border.bin"
+
+House1_MapBlockdata::
+ .incbin "data/layouts/House1/map.bin"
+
+ .align 2
+House1_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte House1_MapBorder
+ .4byte House1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/House1/map.bin b/data/layouts/House1/map.bin
new file mode 100644
index 000000000..ea185484d
--- /dev/null
+++ b/data/layouts/House1/map.bin
@@ -0,0 +1 @@
+��yz����   𐩰𣈆�2�2$2$2$2$2��9252626262626272#2#292=H6I6�2>2>2?2#2#292=P6Q6�2>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file
diff --git a/data/layouts/House2/border.bin b/data/layouts/House2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/House2/border.bin
Binary files differ
diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc
new file mode 100644
index 000000000..35566d8d1
--- /dev/null
+++ b/data/layouts/House2/layout.inc
@@ -0,0 +1,15 @@
+House2_MapBorder::
+ .incbin "data/layouts/House2/border.bin"
+
+House2_MapBlockdata::
+ .incbin "data/layouts/House2/map.bin"
+
+ .align 2
+House2_Layout::
+ .4byte 0xb
+ .4byte 0x8
+ .4byte House2_MapBorder
+ .4byte House2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/House2/map.bin b/data/layouts/House2/map.bin
new file mode 100644
index 000000000..0e9f07964
--- /dev/null
+++ b/data/layouts/House2/map.bin
@@ -0,0 +1 @@
+��0x��   hlm�𣈆82$2$2$2$2p2t2u2�292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,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/House3/border.bin b/data/layouts/House3/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/House3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc
new file mode 100644
index 000000000..6e2de11f4
--- /dev/null
+++ b/data/layouts/House3/layout.inc
@@ -0,0 +1,15 @@
+House3_MapBorder::
+ .incbin "data/layouts/House3/border.bin"
+
+House3_MapBlockdata::
+ .incbin "data/layouts/House3/map.bin"
+
+ .align 2
+House3_Layout::
+ .4byte 0xa
+ .4byte 0x8
+ .4byte House3_MapBorder
+ .4byte House3_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/House3/map.bin b/data/layouts/House3/map.bin
new file mode 100644
index 000000000..1f732ba3f
--- /dev/null
+++ b/data/layouts/House3/map.bin
@@ -0,0 +1 @@
+��������������2󏡶!2!2@2򅩆񝳐!2)2)2D2NOD2)2)2)2!2)2)2D2VWD2)2)2)2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/layouts/House4/border.bin b/data/layouts/House4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/House4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc
new file mode 100644
index 000000000..b06b3d427
--- /dev/null
+++ b/data/layouts/House4/layout.inc
@@ -0,0 +1,15 @@
+House4_MapBorder::
+ .incbin "data/layouts/House4/border.bin"
+
+House4_MapBlockdata::
+ .incbin "data/layouts/House4/map.bin"
+
+ .align 2
+House4_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte House4_MapBorder
+ .4byte House4_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/House4/map.bin b/data/layouts/House4/map.bin
new file mode 100644
index 000000000..6274e4418
--- /dev/null
+++ b/data/layouts/House4/map.bin
@@ -0,0 +1 @@
+����������2󏡶񽨪!2!2!2񚮘!2)2D2)2)2)2)2)2)2)2!2)2)2)2)2)2)2N_D2!2)2)2)2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/layouts/HouseWithBed/border.bin b/data/layouts/HouseWithBed/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/HouseWithBed/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc
new file mode 100644
index 000000000..7fb8d2c9b
--- /dev/null
+++ b/data/layouts/HouseWithBed/layout.inc
@@ -0,0 +1,15 @@
+HouseWithBed_MapBorder::
+ .incbin "data/layouts/HouseWithBed/border.bin"
+
+HouseWithBed_MapBlockdata::
+ .incbin "data/layouts/HouseWithBed/map.bin"
+
+ .align 2
+HouseWithBed_Layout::
+ .4byte 0xa
+ .4byte 0x8
+ .4byte HouseWithBed_MapBorder
+ .4byte HouseWithBed_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/HouseWithBed/map.bin b/data/layouts/HouseWithBed/map.bin
new file mode 100644
index 000000000..b91b7153b
--- /dev/null
+++ b/data/layouts/HouseWithBed/map.bin
@@ -0,0 +1 @@
+nohi    vwp2q2$2$2$2$2$2$2~22Z6[6#2#2#2#2#2#2#2,2b6c6#2#2#2#2#2#2LM92#2#2#2#2#2#2+2TU92#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/layouts/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin
new file mode 100644
index 000000000..8459c2996
--- /dev/null
+++ b/data/layouts/InsideOfTruck/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc
new file mode 100644
index 000000000..d1ddf8686
--- /dev/null
+++ b/data/layouts/InsideOfTruck/layout.inc
@@ -0,0 +1,15 @@
+InsideOfTruck_MapBorder::
+ .incbin "data/layouts/InsideOfTruck/border.bin"
+
+InsideOfTruck_MapBlockdata::
+ .incbin "data/layouts/InsideOfTruck/map.bin"
+
+ .align 2
+InsideOfTruck_Layout::
+ .4byte 0x5
+ .4byte 0x5
+ .4byte InsideOfTruck_MapBorder
+ .4byte InsideOfTruck_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideOfTruck
+
diff --git a/data/layouts/InsideOfTruck/map.bin b/data/layouts/InsideOfTruck/map.bin
new file mode 100644
index 000000000..84b946be5
--- /dev/null
+++ b/data/layouts/InsideOfTruck/map.bin
@@ -0,0 +1,2 @@
+ 
+2 2 22222!"#$  \ No newline at end of file
diff --git a/data/layouts/IslandCave/border.bin b/data/layouts/IslandCave/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/layouts/IslandCave/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc
new file mode 100644
index 000000000..5a3035b72
--- /dev/null
+++ b/data/layouts/IslandCave/layout.inc
@@ -0,0 +1,15 @@
+IslandCave_MapBorder::
+ .incbin "data/layouts/IslandCave/border.bin"
+
+IslandCave_MapBlockdata::
+ .incbin "data/layouts/IslandCave/map.bin"
+
+ .align 2
+IslandCave_Layout::
+ .4byte 0x11
+ .4byte 0x21
+ .4byte IslandCave_MapBorder
+ .4byte IslandCave_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/IslandCave/map.bin b/data/layouts/IslandCave/map.bin
new file mode 100644
index 000000000..a7fa61b4d
--- /dev/null
+++ b/data/layouts/IslandCave/map.bin
Binary files differ
diff --git a/data/layouts/IslandHarbor/border.bin b/data/layouts/IslandHarbor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/IslandHarbor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc
new file mode 100644
index 000000000..7fc86dca4
--- /dev/null
+++ b/data/layouts/IslandHarbor/layout.inc
@@ -0,0 +1,15 @@
+IslandHarbor_MapBorder::
+ .incbin "data/layouts/IslandHarbor/border.bin"
+
+IslandHarbor_MapBlockdata::
+ .incbin "data/layouts/IslandHarbor/map.bin"
+
+ .align 2
+IslandHarbor_Layout::
+ .4byte 0x11
+ .4byte 0xd
+ .4byte IslandHarbor_MapBorder
+ .4byte IslandHarbor_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_IslandHarbor
+
diff --git a/data/layouts/IslandHarbor/map.bin b/data/layouts/IslandHarbor/map.bin
new file mode 100644
index 000000000..e14816107
--- /dev/null
+++ b/data/layouts/IslandHarbor/map.bin
@@ -0,0 +1 @@
+�      �� ����������������������������*+89:+.�����pppp���@AB���ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp����������������� \ No newline at end of file
diff --git a/data/layouts/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/JaggedPass/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc
new file mode 100644
index 000000000..5620551b8
--- /dev/null
+++ b/data/layouts/JaggedPass/layout.inc
@@ -0,0 +1,15 @@
+JaggedPass_MapBorder::
+ .incbin "data/layouts/JaggedPass/border.bin"
+
+JaggedPass_MapBlockdata::
+ .incbin "data/layouts/JaggedPass/map.bin"
+
+ .align 2
+JaggedPass_Layout::
+ .4byte 0x1e
+ .4byte 0x2e
+ .4byte JaggedPass_MapBorder
+ .4byte JaggedPass_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/JaggedPass/map.bin b/data/layouts/JaggedPass/map.bin
new file mode 100644
index 000000000..57195b4f5
--- /dev/null
+++ b/data/layouts/JaggedPass/map.bin
Binary files differ
diff --git a/data/layouts/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/LavaridgeTown/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc
new file mode 100644
index 000000000..662955430
--- /dev/null
+++ b/data/layouts/LavaridgeTown/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_MapBorder::
+ .incbin "data/layouts/LavaridgeTown/border.bin"
+
+LavaridgeTown_MapBlockdata::
+ .incbin "data/layouts/LavaridgeTown/map.bin"
+
+ .align 2
+LavaridgeTown_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte LavaridgeTown_MapBorder
+ .4byte LavaridgeTown_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin
new file mode 100644
index 000000000..604ad5f3f
--- /dev/null
+++ b/data/layouts/LavaridgeTown/map.bin
@@ -0,0 +1,3 @@
+qqqq{ttttt|qqqqqqq66{tttzq2񭀬񭀬xttttttttr{�����2�t�2|qqqNKLOq6rr�񋍐񋉖�JHIMyy0123rr��233�2�PQRS2289:;򷠶rr�񠫞򘄨�XYZ[󩅍`ABC򷠶rr������`abc�5�50 1"1044rr򑺐񚢠򎰬0 1"10000 1"1000rr񚠀񚠀�2�20 1"1000 1"1000rr�燘�燘�00 1!11111!1!1111rr�2��2��200(1)1)1)1)1)1)1)1)1)1)1rr񠙁񣝹񣞃000000000000rr������0000 0 0
+00 0 0
+00rr������0000rr������000  �4rr򼯽����000 !" !"�4rr00000000000040000�4m000000000000000򷠶qqrm0000000000000044qqllllllllllllllll \ No newline at end of file
diff --git a/data/layouts/LavaridgeTown_Gym_1F/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/border.bin
Binary files differ
diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
new file mode 100644
index 000000000..36f4cb826
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_Gym_1F_MapBorder::
+ .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin"
+
+LavaridgeTown_Gym_1F_MapBlockdata::
+ .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin"
+
+ .align 2
+LavaridgeTown_Gym_1F_Layout::
+ .4byte 0x11
+ .4byte 0x13
+ .4byte LavaridgeTown_Gym_1F_MapBorder
+ .4byte LavaridgeTown_Gym_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_LavaridgeGym
+
diff --git a/data/layouts/LavaridgeTown_Gym_1F/map.bin b/data/layouts/LavaridgeTown_Gym_1F/map.bin
new file mode 100644
index 000000000..31d16da5e
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin
@@ -0,0 +1,3 @@
+   22222' 222 2222  22222  2222 222  222222  2222  2222  222222  2222  2222 2222  22  222      2222 2 2  22  22  22  !"#$  2222  22  22  22222  2222  22  22  2222  2222  22  22 %&&&&  22 2  22 22222 222 %&  22 22222 2222  22  222
+2222222222
+22  222222222 2222222  22220022 \ No newline at end of file
diff --git a/data/layouts/LavaridgeTown_Gym_B1F/border.bin b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
Binary files differ
diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
new file mode 100644
index 000000000..9b80d7f90
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_Gym_B1F_MapBorder::
+ .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin"
+
+LavaridgeTown_Gym_B1F_MapBlockdata::
+ .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin"
+
+ .align 2
+LavaridgeTown_Gym_B1F_Layout::
+ .4byte 0x11
+ .4byte 0x13
+ .4byte LavaridgeTown_Gym_B1F_MapBorder
+ .4byte LavaridgeTown_Gym_B1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_LavaridgeGym
+
diff --git a/data/layouts/LavaridgeTown_Gym_B1F/map.bin b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
new file mode 100644
index 000000000..aeaf0177c
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
@@ -0,0 +1,6 @@
+++++)+++++)++++++3333(33333(3333332222022;220222222 22822
+222222
+282222++++)++)+)+++)+++33331331313331333<22;1221212221222 22221 221 21 2221 222 22221 221 21 2221 222 22221 22191 2221 22292221 221 21%&&1%&& 22221%&1 21 2221 222%&&&1 221 21 2281 222 22221 221 21 2221 222 2822(92( 21 2221 222 22220 220 21%&&( 222 2222:
+222
+21 2220 2229222222221 222:
+222 22228222219222222 \ No newline at end of file
diff --git a/data/layouts/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
Binary files differ
diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc
new file mode 100644
index 000000000..c59e12e49
--- /dev/null
+++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_HerbShop_MapBorder::
+ .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin"
+
+LavaridgeTown_HerbShop_MapBlockdata::
+ .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin"
+
+ .align 2
+LavaridgeTown_HerbShop_Layout::
+ .4byte 0xb
+ .4byte 0x8
+ .4byte LavaridgeTown_HerbShop_MapBorder
+ .4byte LavaridgeTown_HerbShop_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin
new file mode 100644
index 000000000..cc0294a80
--- /dev/null
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
@@ -0,0 +1 @@
+�����������������3񔘜񔘜�x2p2p2p2p2�������2h2h2h2x2p2p2p2p2p2y2h2h2h23�2h2h2h2h2h2h2h2h2h2�2g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file
diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..e38d63815
--- /dev/null
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_PokemonCenter_1F_MapBorder::
+ .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin"
+
+LavaridgeTown_PokemonCenter_1F_MapBlockdata::
+ .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin"
+
+ .align 2
+LavaridgeTown_PokemonCenter_1F_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte LavaridgeTown_PokemonCenter_1F_MapBorder
+ .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonCenter
+
diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
new file mode 100644
index 000000000..d841f9f1a
--- /dev/null
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
@@ -0,0 +1 @@
+���   JK   ���H"#RSI2򤛚�2P*+2[Q$2222 2&222X!!!Y<222'2 24222`2l2m2n2o22%222'2�2�2222021222322222'2�6塀228292:2;2242=>'2𐩺222@2A2B2C22&2EF'2(2222222222&2427 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/LilycoveCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc
new file mode 100644
index 000000000..ed4bd81e4
--- /dev/null
+++ b/data/layouts/LilycoveCity/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_MapBorder::
+ .incbin "data/layouts/LilycoveCity/border.bin"
+
+LilycoveCity_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity/map.bin"
+
+ .align 2
+LilycoveCity_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte LilycoveCity_MapBorder
+ .4byte LilycoveCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/LilycoveCity/map.bin b/data/layouts/LilycoveCity/map.bin
new file mode 100644
index 000000000..5d6b56ad9
--- /dev/null
+++ b/data/layouts/LilycoveCity/map.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_ContestHall/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestHall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc
new file mode 100644
index 000000000..61e6e27ee
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestHall/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_ContestHall_MapBorder::
+ .incbin "data/layouts/LilycoveCity_ContestHall/border.bin"
+
+LilycoveCity_ContestHall_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_ContestHall/map.bin"
+
+ .align 2
+LilycoveCity_ContestHall_Layout::
+ .4byte 0x33
+ .4byte 0x21
+ .4byte LilycoveCity_ContestHall_MapBorder
+ .4byte LilycoveCity_ContestHall_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LilycoveCity_ContestHall/map.bin b/data/layouts/LilycoveCity_ContestHall/map.bin
new file mode 100644
index 000000000..06fdae4f7
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestHall/map.bin
@@ -0,0 +1,3 @@
+///////////////////////////////2222222222~��v� 2222222222////
+�����////22222<=>bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb<=> 22222////
+DEF. 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2,DEF////<=>bbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*24bbbb<=>DEF. 2!2!2!2!202`2`2`2`2`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!2!2!2!2"2,DEFbbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2`2`2`2*24bbbb 2!2!2!2!202`2`2J2`2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2J2`2`222!2!2!2!2"2(2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2*2(2`2J2`2`2J2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2`2I2`2I2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R`2`2R`2`2`2`2`2`2P2`2P2`2`2`2$%2%2pq2q2q2�2qwBqr%2%2&f2`2`2Q2`2Q2`2`2`2`2`2`2R`2`2R`2*2(2`2`2`2`2`2`2`2`2`2`2`2X2`2X2`2`2`2$%2%2pq2q2q2�2q2qq2r%2%2&f2`2`2Y2`2Y2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2xyy{2|2}2yyz%2%2&f2`2`2I2`2I2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2P2`2P2`2`2`222222솫�222222f2`2`2Q2`2Q2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2솫�2f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2�2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2              f2`2`2`2`2*2(2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2*2(2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2I2`2`2`2`2`2H2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2Q2`2`2`2`2`2P2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2I2`2I2`2*2(2`2P2`2P2`2$%2%2pq2q2q2�2qwBqr%2%2&f2Y2`2`2`2`2`2X2`2$%2%2pq2q2q2�2qwBqr%2%2&f2Q2`2Q2`2*2(2`2X2`2X2`2$%2%2pq2q2q2�2q2qq2r%2%2&f2`2`2`2`2`2`2`2`2$%2%2pq2q2q2�2q2qq2r%2%2&f2Y2`2Y2`2*2(2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2I2`2`2`2`2`2H2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2xyy�2�2�2yyz%2%2&f2Q2`2`2`2`2`2P2`2$%2%2xyy񣱰�2yyz%2%2&f2I2`2I2`2*2(2`2P2`2P2`222222𙹀�222222f2Y2`2`2`2`2`2X2`222222񼚀�222222f2Q2`2Q2`2*2(2`2X2`2X2`2𙹀�2f2`2`2`2`2`2`2`2`2񼚀�2f2Y2`2Y2`2*2(2`2`2`2`2`2�2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2�2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2J2`2`2`2J2`2`2`2J2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2J2`2`2`2J2`2`2`2J2`2`2*2(2`2`2R`2`2`2R`2`2`2R`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2R`2`2`2R`2`2`2R`2`2*2 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_ContestLobby/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc
new file mode 100644
index 000000000..20cf4389f
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_ContestLobby_MapBorder::
+ .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin"
+
+LilycoveCity_ContestLobby_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin"
+
+ .align 2
+LilycoveCity_ContestLobby_Layout::
+ .4byte 0x1f
+ .4byte 0xc
+ .4byte LilycoveCity_ContestLobby_MapBorder
+ .4byte LilycoveCity_ContestLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LilycoveCity_ContestLobby/map.bin b/data/layouts/LilycoveCity_ContestLobby/map.bin
new file mode 100644
index 000000000..122962e42
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/map.bin
@@ -0,0 +1 @@
+��������[\]���:;���M[\]��������bbb�b�b�c6de�bbBCbb�c6de�b�b�bbT 2!2!2!2!2!2!2!2!2!2!2�󘨴󫎾񭆊�U2!2!2!2!2!2!2!2!2!2!2"2(2`2`2`2`2`2`2`2`2`2`2��������f2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2�2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2�`2`2`2�`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2�`2`2`2�`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`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/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
new file mode 100644
index 000000000..b275834f7
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_1F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin"
+
+LilycoveCity_CoveLilyMotel_1F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin"
+
+ .align 2
+LilycoveCity_CoveLilyMotel_1F_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
+ .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
new file mode 100644
index 000000000..5242f8e57
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
@@ -0,0 +1 @@
+�a���� �����2!2!2!2!2󏡶�2!2!2@2�2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2D2N_D2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
new file mode 100644
index 000000000..82a294c48
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_2F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin"
+
+LilycoveCity_CoveLilyMotel_2F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin"
+
+ .align 2
+LilycoveCity_CoveLilyMotel_2F_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
+ .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
new file mode 100644
index 000000000..4484b5b55
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
@@ -0,0 +1 @@
+�a����������2!2!2!2!2!2!2!2򤝜󒬠!2)2N_D2)2)2D2NOD2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2)2N_)2)2!2D2VWD2)2)2D2VW)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/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
new file mode 100644
index 000000000..899e934bd
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStoreElevator_MapBorder::
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin"
+
+LilycoveCity_DepartmentStoreElevator_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStoreElevator_Layout::
+ .4byte 0x5
+ .4byte 0x6
+ .4byte LilycoveCity_DepartmentStoreElevator_MapBorder
+ .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleFrontier
+
diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
new file mode 100644
index 000000000..7d9ae193b
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
@@ -0,0 +1 @@
+(***,011148999<\2]2]2]2]2d2e2e2e2f2d2O2W2e2f2 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
new file mode 100644
index 000000000..d40483308
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStoreRooftop_MapBorder::
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin"
+
+LilycoveCity_DepartmentStoreRooftop_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStoreRooftop_Layout::
+ .4byte 0x12
+ .4byte 0xc
+ .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
+ .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
new file mode 100644
index 000000000..e9125baf0
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
@@ -0,0 +1 @@
+&��������oo����'.S2S2S2S2S2S2S2S2wwS2NO5/6󀈬J2J2J2J2J2J2M2M23VW=z�'6��J2J2J2J2J2J2J2J2J2^_ET2S2/6󀈬J2J2J2J2J2J2J2J2J2M2M2M2M2�676��J2J2򨯐J2J2򨯐J2J2J2J2J2�67>U2[2[2[2[2[2[2[2[2[2[2[2[2[2[2[2?FccccccccccccccccG������������������������������������������������������������������������ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
new file mode 100644
index 000000000..d3b5d9420
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_1F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin"
+
+LilycoveCity_DepartmentStore_1F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_1F_Layout::
+ .4byte 0x12
+ .4byte 0x8
+ .4byte LilycoveCity_DepartmentStore_1F_MapBorder
+ .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
new file mode 100644
index 000000000..2d3d15360
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
@@ -0,0 +1 @@
+�|}~�����������  ���������������Px2�2𾲮p2p2�󡶠𬖸�x2p2p2p2p2p2�2h2h2h2h2h2�������2h2h2h2n2h2�2g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h2�2g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
new file mode 100644
index 000000000..e5b01c8fd
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_2F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin"
+
+LilycoveCity_DepartmentStore_2F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_2F_Layout::
+ .4byte 0x12
+ .4byte 0x8
+ .4byte LilycoveCity_DepartmentStore_2F_MapBorder
+ .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
new file mode 100644
index 000000000..82ca90b08
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
@@ -0,0 +1 @@
+�|}~������    ����������PQ 2𣊦�22222222222222222222222222222222m222��22󽢶𲡆𲫚22��2u223422������22342222��22� 2222�22��2m2222222�2222�22222u \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
new file mode 100644
index 000000000..5d7aa93eb
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_3F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin"
+
+LilycoveCity_DepartmentStore_3F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_3F_Layout::
+ .4byte 0x12
+ .4byte 0x8
+ .4byte LilycoveCity_DepartmentStore_3F_MapBorder
+ .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
new file mode 100644
index 000000000..c10b776f5
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
@@ -0,0 +1 @@
+�|}~�����6    ������������6QP 2𣋶�222�C2񭀬�2� 222222222222������22222222+,2222222222+,2222342222222222342222;<2222222222;<22222222222222222222 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
new file mode 100644
index 000000000..b4585ca03
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_4F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin"
+
+LilycoveCity_DepartmentStore_4F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_4F_Layout::
+ .4byte 0x12
+ .4byte 0x8
+ .4byte LilycoveCity_DepartmentStore_4F_MapBorder
+ .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
new file mode 100644
index 000000000..bc1a09e2c
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
@@ -0,0 +1 @@
+�|}~����    ��������PQ 2𣍆�222222222222222222222222222222222222222󽢶𲡆�222222222񡻢222�����22񡻢񡻢22񺣲222� 222�22񺣲񺣲2222222�222�2222222 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
new file mode 100644
index 000000000..ade5e4bf5
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_5F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin"
+
+LilycoveCity_DepartmentStore_5F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_5F_Layout::
+ .4byte 0x12
+ .4byte 0x8
+ .4byte LilycoveCity_DepartmentStore_5F_MapBorder
+ .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
new file mode 100644
index 000000000..80acc3900
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
Binary files differ
diff --git a/data/layouts/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc
new file mode 100644
index 000000000..de51e7fd6
--- /dev/null
+++ b/data/layouts/LilycoveCity_House2/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House2_MapBorder::
+ .incbin "data/layouts/LilycoveCity_House2/border.bin"
+
+LilycoveCity_House2_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_House2/map.bin"
+
+ .align 2
+LilycoveCity_House2_Layout::
+ .4byte 0x8
+ .4byte 0x8
+ .4byte LilycoveCity_House2_MapBorder
+ .4byte LilycoveCity_House2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/LilycoveCity_House2/map.bin b/data/layouts/LilycoveCity_House2/map.bin
new file mode 100644
index 000000000..e381f20eb
--- /dev/null
+++ b/data/layouts/LilycoveCity_House2/map.bin
@@ -0,0 +1 @@
+�������������2򧠜!2!2󏡶�2Y2N6O6)2)2)2)2)2Y2V6W6D2)2)2)2)2!2)2)2)2)2)2)2)2 33333333#333333 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
new file mode 100644
index 000000000..0dab4095c
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_LilycoveMuseum_1F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin"
+
+LilycoveCity_LilycoveMuseum_1F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin"
+
+ .align 2
+LilycoveCity_LilycoveMuseum_1F_Layout::
+ .4byte 0x15
+ .4byte 0xe
+ .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
+ .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_LilycoveMuseum
+
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
new file mode 100644
index 000000000..6e92a8b58
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
@@ -0,0 +1 @@
+          !"#$% &'222222222222222222222222222222222 22222222 2 2 2 2 2 2 2 222222222222  -.  /  �2222222222256722222:2;2;2;2<22222222222 22222B()*DO222222222222222J012LO22:2;2;2;2;2<222222222RSSSTO22HSAS@I>22222222?2?2?2?2?2F22M2?2?2?2O22222222+222,>222842;2;2;29O222222223>22?2F222RSSSSTO222222?2F22222 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
new file mode 100644
index 000000000..aea446410
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_LilycoveMuseum_2F_MapBorder::
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin"
+
+LilycoveCity_LilycoveMuseum_2F_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin"
+
+ .align 2
+LilycoveCity_LilycoveMuseum_2F_Layout::
+ .4byte 0x16
+ .4byte 0xd
+ .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
+ .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_LilycoveMuseum
+
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
new file mode 100644
index 000000000..76a918838
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
@@ -0,0 +1 @@
+yyyz��������jkl���xyyy������������rst�����������q2p2q2p2q2p2q2�q2p2q2�q2p2����p2q2p2q2p2i2h2i2h2i2h2i2h2i2h2i2h2i2p2q2p2q2q2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2p2�nno�2h2i2h2�nno�2h2i2h2�nno�2q2�XYw{2i2h2i2�XYw{2i2h2i2�XYw{2p2|2}2~22�2h2i2h2|2}2~22�2h2i2h2|2}2~22�2q2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2h2p2i2h2i2h2�nno�2h2i2h2�nno�2h2i2h2i2q2h2i2h2i2�XYw{2i2h2i2�XYw{2i2h2i2h2p2i2h2i2h2|2}2~22�2h2i2h2|2}2~22�2h2i2h2i2q2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2 \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
new file mode 100644
index 000000000..9b30c7c08
--- /dev/null
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
@@ -0,0 +1,15 @@
+LilycoveCity_PokemonTrainerFanClub_MapBorder::
+ .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin"
+
+LilycoveCity_PokemonTrainerFanClub_MapBlockdata::
+ .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin"
+
+ .align 2
+LilycoveCity_PokemonTrainerFanClub_Layout::
+ .4byte 0xc
+ .4byte 0xe
+ .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
+ .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
new file mode 100644
index 000000000..cddfe5d9d
--- /dev/null
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
@@ -0,0 +1,2 @@
+no0vwi    ��~22q2$2$2$2$2$282$2�2�292#2#2+2LMLM,2#2#2#292#2#2#2TUTU#2#2#2#292#2#2#2#2#2#2,2#2#2#2#2 3�2�2#2#2#2#2#2#2�2�2�2#2#2#2#2#2#2�� 526262626272
+hi�2�2$2=2H^HI?2%2p2q292#2#2=2PQPQ?2#2#2#292#2#2E2F2F2F2F2G2#2#2#292#2#2#2#2#2#2#2#2#2#2#292#2#2#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom1/border.bin b/data/layouts/LinkContestRoom1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LinkContestRoom1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc
new file mode 100644
index 000000000..e71fe2df3
--- /dev/null
+++ b/data/layouts/LinkContestRoom1/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom1_MapBorder::
+ .incbin "data/layouts/LinkContestRoom1/border.bin"
+
+LinkContestRoom1_MapBlockdata::
+ .incbin "data/layouts/LinkContestRoom1/map.bin"
+
+ .align 2
+LinkContestRoom1_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte LinkContestRoom1_MapBorder
+ .4byte LinkContestRoom1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin
new file mode 100644
index 000000000..a8853f6ae
--- /dev/null
+++ b/data/layouts/LinkContestRoom1/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom2/border.bin b/data/layouts/LinkContestRoom2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LinkContestRoom2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc
new file mode 100644
index 000000000..2dd66ab96
--- /dev/null
+++ b/data/layouts/LinkContestRoom2/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom2_MapBorder::
+ .incbin "data/layouts/LinkContestRoom2/border.bin"
+
+LinkContestRoom2_MapBlockdata::
+ .incbin "data/layouts/LinkContestRoom2/map.bin"
+
+ .align 2
+LinkContestRoom2_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte LinkContestRoom2_MapBorder
+ .4byte LinkContestRoom2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin
new file mode 100644
index 000000000..7cb63b40d
--- /dev/null
+++ b/data/layouts/LinkContestRoom2/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&22222솫�2222226솫�26 \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom3/border.bin b/data/layouts/LinkContestRoom3/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LinkContestRoom3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc
new file mode 100644
index 000000000..c53cad723
--- /dev/null
+++ b/data/layouts/LinkContestRoom3/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom3_MapBorder::
+ .incbin "data/layouts/LinkContestRoom3/border.bin"
+
+LinkContestRoom3_MapBlockdata::
+ .incbin "data/layouts/LinkContestRoom3/map.bin"
+
+ .align 2
+LinkContestRoom3_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte LinkContestRoom3_MapBorder
+ .4byte LinkContestRoom3_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin
new file mode 100644
index 000000000..59e9e9182
--- /dev/null
+++ b/data/layouts/LinkContestRoom3/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy𲡐�2yyz%2%2&22222񋉠�2222226񋉠�26 \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LinkContestRoom4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc
new file mode 100644
index 000000000..883918f37
--- /dev/null
+++ b/data/layouts/LinkContestRoom4/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom4_MapBorder::
+ .incbin "data/layouts/LinkContestRoom4/border.bin"
+
+LinkContestRoom4_MapBlockdata::
+ .incbin "data/layouts/LinkContestRoom4/map.bin"
+
+ .align 2
+LinkContestRoom4_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte LinkContestRoom4_MapBorder
+ .4byte LinkContestRoom4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin
new file mode 100644
index 000000000..4e2166c19
--- /dev/null
+++ b/data/layouts/LinkContestRoom4/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy򕂐�2yyz%2%2&22222򭪠�2222226򭪠�26 \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom5/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LinkContestRoom5/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc
new file mode 100644
index 000000000..72a9d9f4e
--- /dev/null
+++ b/data/layouts/LinkContestRoom5/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom5_MapBorder::
+ .incbin "data/layouts/LinkContestRoom5/border.bin"
+
+LinkContestRoom5_MapBlockdata::
+ .incbin "data/layouts/LinkContestRoom5/map.bin"
+
+ .align 2
+LinkContestRoom5_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte LinkContestRoom5_MapBorder
+ .4byte LinkContestRoom5_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin
new file mode 100644
index 000000000..ad068fe7c
--- /dev/null
+++ b/data/layouts/LinkContestRoom5/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy�2�2�2yyz%2%2&22222𙹀�2222226𙹀�26 \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom6/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LinkContestRoom6/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc
new file mode 100644
index 000000000..33db4b56d
--- /dev/null
+++ b/data/layouts/LinkContestRoom6/layout.inc
@@ -0,0 +1,15 @@
+LinkContestRoom6_MapBorder::
+ .incbin "data/layouts/LinkContestRoom6/border.bin"
+
+LinkContestRoom6_MapBlockdata::
+ .incbin "data/layouts/LinkContestRoom6/map.bin"
+
+ .align 2
+LinkContestRoom6_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte LinkContestRoom6_MapBorder
+ .4byte LinkContestRoom6_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin
new file mode 100644
index 000000000..9fcec5a5e
--- /dev/null
+++ b/data/layouts/LinkContestRoom6/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy񣱰�2yyz%2%2&22222񼚀�2222226񼚀�26 \ No newline at end of file
diff --git a/data/layouts/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/LittlerootTown/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc
new file mode 100644
index 000000000..8193ac695
--- /dev/null
+++ b/data/layouts/LittlerootTown/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MapBorder::
+ .incbin "data/layouts/LittlerootTown/border.bin"
+
+LittlerootTown_MapBlockdata::
+ .incbin "data/layouts/LittlerootTown/map.bin"
+
+ .align 2
+LittlerootTown_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte LittlerootTown_MapBorder
+ .4byte LittlerootTown_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Petalburg
+
diff --git a/data/layouts/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin
new file mode 100644
index 000000000..9af76f90e
--- /dev/null
+++ b/data/layouts/LittlerootTown/map.bin
@@ -0,0 +1,3 @@
+����������500������������������00����������0000000000000000����0000000000000000��002 2 2 2
+20000002 2 2 2
+2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000�00000000�0000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-00000000󏎉000&4I5'00000000��󏎉0000200000000󏎉����00000000000000������󏎉󏎉󏎉󏎉󏎉󏎉󏎉���� \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
Binary files differ
diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
new file mode 100644
index 000000000..092c7d20b
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_BrendansHouse_1F_MapBorder::
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin"
+
+LittlerootTown_BrendansHouse_1F_MapBlockdata::
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin"
+
+ .align 2
+LittlerootTown_BrendansHouse_1F_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte LittlerootTown_BrendansHouse_1F_MapBorder
+ .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BrendansMaysHouse
+
diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
new file mode 100644
index 000000000..3ae8e69a6
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
@@ -0,0 +1 @@
+nnnn01234&&  M89:;<222222B222d222222@A222222252H2I2J2.2622222222662222222 2!2"#$2%222222(2)2*2+2,2-222 \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
new file mode 100644
index 000000000..5235f4d98
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_BrendansHouse_2F_MapBorder::
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin"
+
+LittlerootTown_BrendansHouse_2F_MapBlockdata::
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin"
+
+ .align 2
+LittlerootTown_BrendansHouse_2F_Layout::
+ .4byte 0x9
+ .4byte 0x8
+ .4byte LittlerootTown_BrendansHouse_2F_MapBorder
+ .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BrendansMaysHouse
+
diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
new file mode 100644
index 000000000..bfa5b907e
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
@@ -0,0 +1 @@
+RTPTV�   Z[Ue�b2c2x2f2]2x2222{2|2}22𩒊𬗌2��2�2񁺚񄿜2婤�岯񁺚񄿜222񚢪񝧬2222222222 \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/border.bin b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
new file mode 100644
index 000000000..88b81a289
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MaysHouse_1F_MapBorder::
+ .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin"
+
+LittlerootTown_MaysHouse_1F_MapBlockdata::
+ .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin"
+
+ .align 2
+LittlerootTown_MaysHouse_1F_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte LittlerootTown_MaysHouse_1F_MapBorder
+ .4byte LittlerootTown_MaysHouse_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BrendansMaysHouse
+
diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/map.bin b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
new file mode 100644
index 000000000..21f62ebe3
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
@@ -0,0 +1 @@
+nnnnno m&&CD120vwux22KL9:82222y22F22222222222@A222222������22222������22222������222������2 \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
new file mode 100644
index 000000000..0b6134dbd
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MaysHouse_2F_MapBorder::
+ .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin"
+
+LittlerootTown_MaysHouse_2F_MapBlockdata::
+ .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
+
+ .align 2
+LittlerootTown_MaysHouse_2F_Layout::
+ .4byte 0x9
+ .4byte 0x8
+ .4byte LittlerootTown_MaysHouse_2F_MapBorder
+ .4byte LittlerootTown_MaysHouse_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BrendansMaysHouse
+
diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
new file mode 100644
index 000000000..5904a9639
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
@@ -0,0 +1,2 @@
+ 
+'VTPTQ/WUXYE2222]2g22`2a22𲡐𵦒2�2ଂ2񋉠񎎢2��2�2񋉠񎎢怋�払2񣱰񦶲22222222222 \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
new file mode 100644
index 000000000..d0be539a0
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
@@ -0,0 +1,15 @@
+LittlerootTown_ProfessorBirchsLab_MapBorder::
+ .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin"
+
+LittlerootTown_ProfessorBirchsLab_MapBlockdata::
+ .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin"
+
+ .align 2
+LittlerootTown_ProfessorBirchsLab_Layout::
+ .4byte 0xd
+ .4byte 0xd
+ .4byte LittlerootTown_ProfessorBirchsLab_MapBorder
+ .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Lab
+
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
new file mode 100644
index 000000000..0f84e80b2
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
@@ -0,0 +1,5 @@
+  <
+   
+
+
+ !2D"2#2>2"232"232>2��(2*2*2A22222)2:2222222222221B22$2%2627222222?2?222,-,-22222224545222222=2>2>2>2222222G2?2�220222222222;.H8922222222I2C:2H@2&22222222KBO2?22.22222?2?2 \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_1F/border.bin b/data/layouts/MagmaHideout_1F/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc
new file mode 100644
index 000000000..b50c7f015
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_1F_MapBorder::
+ .incbin "data/layouts/MagmaHideout_1F/border.bin"
+
+MagmaHideout_1F_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_1F/map.bin"
+
+ .align 2
+MagmaHideout_1F_Layout::
+ .4byte 0x25
+ .4byte 0x26
+ .4byte MagmaHideout_1F_MapBorder
+ .4byte MagmaHideout_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin
new file mode 100644
index 000000000..fdf0d4252
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/map.bin
Binary files differ
diff --git a/data/layouts/MagmaHideout_2F_1R/border.bin b/data/layouts/MagmaHideout_2F_1R/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_1R/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc
new file mode 100644
index 000000000..b9f0d27d7
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_1R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_1R_MapBorder::
+ .incbin "data/layouts/MagmaHideout_2F_1R/border.bin"
+
+MagmaHideout_2F_1R_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_2F_1R/map.bin"
+
+ .align 2
+MagmaHideout_2F_1R_Layout::
+ .4byte 0x21
+ .4byte 0x27
+ .4byte MagmaHideout_2F_1R_MapBorder
+ .4byte MagmaHideout_2F_1R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_2F_1R/map.bin b/data/layouts/MagmaHideout_2F_1R/map.bin
new file mode 100644
index 000000000..d74c32347
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_1R/map.bin
@@ -0,0 +1,2 @@
+qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq{tttttVttttttttttttttttttttt|qqqqrqqq{t^ttttt-|qqqqq{ttttt|qqqqqrqq33333333tttttz33333qqqqqqrqqq33333333333333333333t|qqqqr{tt3333333333333333333333qqqqrr3333333333333333333333333qqqqrr{ttttttttttttttttt��t|333qqqqrrr33333333333333333333333qqqqrrr33333333333333333333tt|qqqqrrr33333333333333333333333qqqqrrr33333333333333333333333qqqqrrr{ttt��tttttttttttttttt|pqqqqrrrr7{t��ttttttttttttt|77pqqqqrrrr7r33333333333377pqqqqrrr17r333333333333t|pqqqqrrrr7r333333��mn33333333pqqqqrrrr7r333333��uv33333333pqqqqrrrr{333333��}~33333333pqqqqrrrrr3333333333333333333pqqqqrrrrr3333333333333333333pqqqqrrrrr{tttttttttttt��ttt|pqqqqrrrrrr{ttVt#tttttt��tt|pqqqqrrrrrrr{t^tt|333333333qqqqrrr1rrrr3333|33333333qqqqrrrrrrrr33333t�ttttt|pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr{t�tttt-tttt|pqqqqrrrrrrrrr{�tttttttt|pqqqqrrrrrrrrr1333333333pqqqqrrrrrrr1rr3333333
+7 pqqqqrrrrrrrrrr3333333qqpqqqqrrrrrrrrrr33333 33qqpqqqqrrrrrrrr1     ~qqpqqqqrrrrrrrrrqqqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqqpqqqqrrrr1rrrrqqqqqqqqqqqpqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_2F_2R/border.bin b/data/layouts/MagmaHideout_2F_2R/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_2R/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc
new file mode 100644
index 000000000..01507909c
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_2R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_2R_MapBorder::
+ .incbin "data/layouts/MagmaHideout_2F_2R/border.bin"
+
+MagmaHideout_2F_2R_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_2F_2R/map.bin"
+
+ .align 2
+MagmaHideout_2F_2R_Layout::
+ .4byte 0x31
+ .4byte 0x1c
+ .4byte MagmaHideout_2F_2R_MapBorder
+ .4byte MagmaHideout_2F_2R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_2F_2R/map.bin b/data/layouts/MagmaHideout_2F_2R/map.bin
new file mode 100644
index 000000000..34cbf7eaa
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_2R/map.bin
@@ -0,0 +1,5 @@
+qqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqxtttttttttt|qq{ttt|qqqqqqqqqqqqqqq{t����tttttttttttttt����t|p{���x|qqqqqqqqqqqqq{z{����ttt-tttttttttt����|pp{�����pqqqqqqqqqqqqr{z����{GGGGGGGGGGG|�����pppr�����x|qqqqqqttttttzr�����F��������������ppp  j��pqqqqqqqqqqqqqrq23��q2�������������hppqqq{��x|qqqqqqqqqqqqr����������������3��pqpx|qqqr{�|�pqqqqqqqqqqqqr��h     jF��3��������pqx|pqq{r�p�pqqqqqqqqqq{z��pqh  j��j������h qqppq{{�x|x|qqqqqqqqqqr���ppqqjqqqq j����ph   p{qr{�|x|pqqqqqqqqqqr���pqpqq{z{tt|qqj���px|qqqpr{tr�pq2ppqqqqqqqqqqr���pqpq{zqrqqpqqqr���x|xt|qxr{tx|pxttttqqqqq{z���x|xtz{tzqhqqr����x|qx|{tr{t�|pxtttttqqqqqr{t�t|xt-tzqqqpqqq{�3���x|qxq{r33ppqqqqqqqqqqq1r333ttttt-t|x|qqr{-t�tt|xt-ttqr33ppqqqqqqqqqqqrr33333333333pqxttzr33333xttttttt33ppqqqqqqqqqqqrr33333333333xttttt3333333333333333ppqqqqqqqqqqqrr33333
+   3333333333333333333333333ppqh    qqqqq 3333pqqr3333333333333
+           pqpqqqqqqqqqqqr 333pqq  3333333
+               qpqqqqqqqqqqqr1333pqqqq 33333
+qqqqqqqqqqqqqqqqqqpqqqqqqqqqqrr3 33pqqqqq     qqqqqqqqqqqqqqqqqqpqqqqqqqqqqq qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_2F_3R/border.bin b/data/layouts/MagmaHideout_2F_3R/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_3R/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc
new file mode 100644
index 000000000..d88fb50fd
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_3R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_3R_MapBorder::
+ .incbin "data/layouts/MagmaHideout_2F_3R/border.bin"
+
+MagmaHideout_2F_3R_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_2F_3R/map.bin"
+
+ .align 2
+MagmaHideout_2F_3R_Layout::
+ .4byte 0x3c
+ .4byte 0x13
+ .4byte MagmaHideout_2F_3R_MapBorder
+ .4byte MagmaHideout_2F_3R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_2F_3R/map.bin b/data/layouts/MagmaHideout_2F_3R/map.bin
new file mode 100644
index 000000000..f25017291
--- /dev/null
+++ b/data/layouts/MagmaHideout_2F_3R/map.bin
@@ -0,0 +1 @@
+{tttttttttttttttVttttttttttttttt|r{ttt#ttt#tttttt^ttttttttttr{ttt#ttt#tttttt^tttttttttttttt|rr{tttttttttttt|{tttttt###rr{tttttttttttt|{tttttt###ttt|rr{tttttt#ttt|x�z{ttttttttrr{tttttt#ttt|x�z{tttttttttt|rrr{tttttttt|r{tttt#ttrrr{tttttttt|r{tttt#ttt|rrrr{tttttt|xt�tzr{tt#tttrrrr{tttttt|xt�tzr{tt#ttt|rrrrr{tttt|xtt�ttzr{tttt|rrrrr{tttt|xtt�ttzr{tttt|rrrrrr{tt|xttt�tttzr{tt|rrrrrr{tt|xttt�tttzr{tt|rrrrrrr{|xtttt�ttttzr{|rrrrrrr{|xtttt�ttttzr{|rrrrrrrrxtttt#�ttt#tzrrrrrrrrrxtttt#�ttt#tzrrrrrrrrrxtttttt�ttt#ttzrrrrrrrrxtttttt�ttt#ttzrrrrrrrrXYXYrrrrrrrrXYXYrrrrrrrr`a`arrrrrrrr`a`arrrrr1rr rrrrr1rr                           qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqx|pxttttqqqqq{z���x|xtz{t \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_3F_1R/border.bin b/data/layouts/MagmaHideout_3F_1R/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_1R/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc
new file mode 100644
index 000000000..c2199b2f2
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_1R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_1R_MapBorder::
+ .incbin "data/layouts/MagmaHideout_3F_1R/border.bin"
+
+MagmaHideout_3F_1R_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_3F_1R/map.bin"
+
+ .align 2
+MagmaHideout_3F_1R_Layout::
+ .4byte 0x1c
+ .4byte 0x18
+ .4byte MagmaHideout_3F_1R_MapBorder
+ .4byte MagmaHideout_3F_1R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_3F_1R/map.bin b/data/layouts/MagmaHideout_3F_1R/map.bin
new file mode 100644
index 000000000..da590f5dd
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_1R/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqq{tttttt|qqqqqq{ttttttttt|qqqr{����|qqqqqr{-t#tt-t|xtttzr����xtVttt|r*+++++,xt#-tt}~��xtt^tt|r12�3��3+++,r23�3���3�34r:;;;;;;;;;<r{t��t|r{tttt�ttttttz{��|xtVttt|rrr{ttt�ttttt-tz}~xtt^tt|rMrrrrrr{t����t|rrMr{ttz{����|xttttt�tt|rrrrr{t#z}~��x--t#tt�t|rrrrr1��{GGGGGGGGGG|��rrrrrr�F3���3��������rrrrrr�����3��3�3���rr1rrr���F���3�����qrrrrrr��{G�3���������rrrrrr�F�3��3�������rrrrMr�����3��������rrrrrr�������������~~~~~~ iiiiiiiiiiiii~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_3F_2R/border.bin b/data/layouts/MagmaHideout_3F_2R/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_2R/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc
new file mode 100644
index 000000000..2c4662a49
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_2R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_2R_MapBorder::
+ .incbin "data/layouts/MagmaHideout_3F_2R/border.bin"
+
+MagmaHideout_3F_2R_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_3F_2R/map.bin"
+
+ .align 2
+MagmaHideout_3F_2R_Layout::
+ .4byte 0x18
+ .4byte 0x11
+ .4byte MagmaHideout_3F_2R_MapBorder
+ .4byte MagmaHideout_3F_2R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_3F_2R/map.bin b/data/layouts/MagmaHideout_3F_2R/map.bin
new file mode 100644
index 000000000..49857819a
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_2R/map.bin
@@ -0,0 +1,7 @@
+qqqqq{tttttttttttttt|qqqqqqqqr{������������|qqqqqqqqrr`a`a`abcbcbcxtt|qqqqrrXYXYZ[7��|qqqqqrr`a`abcuvq{-ttzr}~qr{����hijkkknZ[qr����pqrsssvbcqrr����xyz{{{~Z[qrXY��mnmnbcqrr`aXY��uvuv
+7 ~~qr`a��}~}~
+7p6q6q6q6qrr
+7~~7q6q6q~~  7
+7p6q6qqqq6q6q6q6r  7
+7~~q6qqqq6qq6q67rq6r 7 
+7p6q6q6q6q6q6q6q67q6q6q6~~~~     ~~q6q6qqq6 \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_3F_3R/border.bin b/data/layouts/MagmaHideout_3F_3R/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_3R/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc
new file mode 100644
index 000000000..4042b9653
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_3R/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_3R_MapBorder::
+ .incbin "data/layouts/MagmaHideout_3F_3R/border.bin"
+
+MagmaHideout_3F_3R_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_3F_3R/map.bin"
+
+ .align 2
+MagmaHideout_3F_3R_Layout::
+ .4byte 0x21
+ .4byte 0x18
+ .4byte MagmaHideout_3F_3R_MapBorder
+ .4byte MagmaHideout_3F_3R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_3F_3R/map.bin b/data/layouts/MagmaHideout_3F_3R/map.bin
new file mode 100644
index 000000000..7c808ffb5
--- /dev/null
+++ b/data/layouts/MagmaHideout_3F_3R/map.bin
@@ -0,0 +1 @@
+{tttttttttttttttVttttttttttttttt|r{tttttttttttttt^tttttttttttttt|rr{tttttttttttt|�{tttttttttttt|rr{tttttttttt|x�z{tttttttttt|rr1r{tttttttt|���r{tttt#ttt|rr1rr{tttttt|xt�tzr{tttttt|rrrrr{tttt|�����rr{tttt|rrrrrr{#t|xtt�ttzrr{#t|rrrrrrr{|�������rrr{|rrrrrrrrxttt�#t#zrrrrrrrrrrrr��������{zrrrrMrrrrrrx#ttt�tttz�rrrrrrrrrrrx|��������rrrrrrrrrrr�xtttt�ttt#tzrrrrrrrrrr���������{ttzrrrrrrrrrxt#tttt�tttz{G|rrrrrrrrr�����������F��rrrrrrrrr{GGGG|qq{GGG��rrrrrrrrrF����qqF�����rrrrrrrrr������������rrrrrMrrrF���q��efF���rrrrrrrrr�~��������F���~~~~~~~~~iiiiii ii~~~~~~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_4F/border.bin b/data/layouts/MagmaHideout_4F/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MagmaHideout_4F/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc
new file mode 100644
index 000000000..d7f8c547c
--- /dev/null
+++ b/data/layouts/MagmaHideout_4F/layout.inc
@@ -0,0 +1,15 @@
+MagmaHideout_4F_MapBorder::
+ .incbin "data/layouts/MagmaHideout_4F/border.bin"
+
+MagmaHideout_4F_MapBlockdata::
+ .incbin "data/layouts/MagmaHideout_4F/map.bin"
+
+ .align 2
+MagmaHideout_4F_Layout::
+ .4byte 0x3b
+ .4byte 0x1c
+ .4byte MagmaHideout_4F_MapBorder
+ .4byte MagmaHideout_4F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MagmaHideout_4F/map.bin b/data/layouts/MagmaHideout_4F/map.bin
new file mode 100644
index 000000000..45a5547c6
--- /dev/null
+++ b/data/layouts/MagmaHideout_4F/map.bin
@@ -0,0 +1 @@
+qqqqqqqqq{tttttttt-ttttt|{|ppqqqqpqhiiiiijpppqqq{ttz{ttttttqqqq{ttttz{ttttttt|qq{-|xzppxttt|pqxttt|qrppp{ttz{ttzqqqqqqqqqqr{t��tz{����|qp{tzqx|qpxt|qqpxtt-t|pqrppxzq{tz{tttttttt{-ttzr{����z����x|xz{-t|pqx|qpqqpqqqqqppqrppq{zqqrhiiiiiiir{t��zr���������xttz��pxt|x|pqqx--t|qppqrpxttzqq{zpqqqqqqrr{��tz����������������xt||pxttttt|pqpxtzxttttt-zqpqqqqqqqrrr�������������������pqpxtt|qqqppqxt|q{tttVttt|p{ttttttrrr�qef������h     jq����x|tt|t|ppqqqpq1{tt^tt|ppr{tttttrrr�q������h {-t#| j����pqqqt|pqpxt|qxtzrppxzrqqqqqrrj�����h {t{G|xt|j���x����|px|pqqpqq{zpxttzqq{ttrrqr��qhjqr{G�G|x|j�������ppqpx|qxtttzxttttttzqqMrqr���hp{{F���3��qx|j������ppqx|p{-tttttt��ttttttt-ttttrjr���ppr{{3���3|qpr������pxt|pxz{ttttt-��ttttt|qqqhijjrr���pp1rqF��3����|x|j�����x|qppqqr{t������tttt|pqhqrqrrM���ppr1{3����33�|pq  j��x|pxttzr{��������-|ppqhqqr{rr���pxzrF��3�3���3��ph  j1����px|q{tzr����qq���ppphqqqrr{r���pqq1F3����3�����pphjrj���x|pr{tz���������ppppqqqrrrqM��|qrF������3�3pppprjr����ppqrr�������ef�ppppqqqqrr1qr���qtz�\�3������ppppjrr����pp{zr�ef��������pppxtt|qrrr{���q�����d�3�����ppppqrrr����pxz{z�����������pppqqqpqrrrrmn��������F������ppppqrrj��x|qrq���������h ppqqqpqrrrruv��q������������ppppqrjr����xtzq���h     h pqqqpqrr1r}~��mn�����q�h   qjrr�������h  qqqqqpqpqqqpqr j��uv�qmn��pqqqqqqqqqqq j���q�pqqqh     qqpqqqpqrqqqqr j}~��quv��pqqqqqqqqqqqqqqrj�����pqqqpqqqhiiiiqqpqrqqqq     j}~��pqqqqqqqqqqqqqqq     qqqpqqqpqqhiiiiiqrqqqqqqqqqq    qqqqqqqqh                qqqpqhqqqqqqqrqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqpqxttttttttz \ No newline at end of file
diff --git a/data/layouts/MarineCave_End/border.bin b/data/layouts/MarineCave_End/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/MarineCave_End/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc
new file mode 100644
index 000000000..256338b89
--- /dev/null
+++ b/data/layouts/MarineCave_End/layout.inc
@@ -0,0 +1,15 @@
+MarineCave_End_MapBorder::
+ .incbin "data/layouts/MarineCave_End/border.bin"
+
+MarineCave_End_MapBlockdata::
+ .incbin "data/layouts/MarineCave_End/map.bin"
+
+ .align 2
+MarineCave_End_Layout::
+ .4byte 0x1b
+ .4byte 0x1e
+ .4byte MarineCave_End_MapBorder
+ .4byte MarineCave_End_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/MarineCave_End/map.bin b/data/layouts/MarineCave_End/map.bin
new file mode 100644
index 000000000..85138661d
--- /dev/null
+++ b/data/layouts/MarineCave_End/map.bin
@@ -0,0 +1,14 @@
+����������������������������������� ���������������
+���������� �2�2�2�2�2�2�2�2�2�2�2�2�2
+
+��������� ��2�2�2�2�2�2�2�2�2�2�2�2�2
+
+���������  �2�2�2�2�2�2�2�2�2�2�2��2�2
+
+���������  �2�2�2�2�2�2�2�������
+��������� �2�2�2�2�2�2�2
+��������������� � �2�2�2�2�2�2�2
+����
+�������������2�2�2�2�2�2�2
+���������� ����������������� �  "22222222222��
+���� �222222222������ �2222222222222������ �#####"2222222������� �#####"##"22222222����� �##"2222����� �#"22222����� ����2#"2222����� ���O��2222��� ����OOO����222222��� ��NOOOOOON�222222��� ��NOOOOOON�222222��� ���NNOOOONN�222222��� ��NNNNOONNN�222222��� �#2lpNNNNNNp�222222��� �2#2lpppppjs2s2222222��� �#"2#2s2s2s2s2s2$222222 ##2��� �2###"2222222222222222��� ���������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/MarineCave_Entrance/border.bin b/data/layouts/MarineCave_Entrance/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/MarineCave_Entrance/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc
new file mode 100644
index 000000000..219c182d7
--- /dev/null
+++ b/data/layouts/MarineCave_Entrance/layout.inc
@@ -0,0 +1,15 @@
+MarineCave_Entrance_MapBorder::
+ .incbin "data/layouts/MarineCave_Entrance/border.bin"
+
+MarineCave_Entrance_MapBlockdata::
+ .incbin "data/layouts/MarineCave_Entrance/map.bin"
+
+ .align 2
+MarineCave_Entrance_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte MarineCave_Entrance_MapBorder
+ .4byte MarineCave_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/MarineCave_Entrance/map.bin b/data/layouts/MarineCave_Entrance/map.bin
new file mode 100644
index 000000000..62aa8537f
--- /dev/null
+++ b/data/layouts/MarineCave_Entrance/map.bin
@@ -0,0 +1,7 @@
+�������������������������������3������������ ��� $1$1$1�����������$1$1$1$1$1$1��������� �� $1�1񔄯񔀵���������$1$1�1񗈗𻜟�1������� �� $1�1񗈗𻜟𻜕�������$1$1�1񗈗�����1������ � $1�1񗈗��pp��1������$1�1񗈗��ppp��1��� �� �1񗈗��pppp��1 ��
+� $1�1񗈗��ppppp�񐻽$1
+� �1񗈗��pppppp�𻜕$1
+� 𾡗��ppppppp��񐻽
+� 񗈗�ppppppppp�𻜕
+� 𻜟�ppppppppp�𻜕
+�����1�ppVVVVppp�����������pV����Vp�������������V����V��������������������������� \ No newline at end of file
diff --git a/data/layouts/Mart/border.bin b/data/layouts/Mart/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Mart/border.bin
Binary files differ
diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc
new file mode 100644
index 000000000..5233e09ab
--- /dev/null
+++ b/data/layouts/Mart/layout.inc
@@ -0,0 +1,15 @@
+Mart_MapBorder::
+ .incbin "data/layouts/Mart/border.bin"
+
+Mart_MapBlockdata::
+ .incbin "data/layouts/Mart/map.bin"
+
+ .align 2
+Mart_Layout::
+ .4byte 0xb
+ .4byte 0x8
+ .4byte Mart_MapBorder
+ .4byte Mart_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/Mart/map.bin b/data/layouts/Mart/map.bin
new file mode 100644
index 000000000..08f393264
--- /dev/null
+++ b/data/layouts/Mart/map.bin
@@ -0,0 +1,3 @@
+"#$#$D*()() 222 2220212!212%292:2222222- AB222+,22+
+22222234223
+222222;<22;222222222 \ No newline at end of file
diff --git a/data/layouts/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/MauvilleCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc
new file mode 100644
index 000000000..7a8c17da2
--- /dev/null
+++ b/data/layouts/MauvilleCity/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_MapBorder::
+ .incbin "data/layouts/MauvilleCity/border.bin"
+
+MauvilleCity_MapBlockdata::
+ .incbin "data/layouts/MauvilleCity/map.bin"
+
+ .align 2
+MauvilleCity_Layout::
+ .4byte 0x28
+ .4byte 0x14
+ .4byte MauvilleCity_MapBorder
+ .4byte MauvilleCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
+
diff --git a/data/layouts/MauvilleCity/map.bin b/data/layouts/MauvilleCity/map.bin
new file mode 100644
index 000000000..80a38e902
--- /dev/null
+++ b/data/layouts/MauvilleCity/map.bin
Binary files differ
diff --git a/data/layouts/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/MauvilleCity_BikeShop/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc
new file mode 100644
index 000000000..f0d358a35
--- /dev/null
+++ b/data/layouts/MauvilleCity_BikeShop/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_BikeShop_MapBorder::
+ .incbin "data/layouts/MauvilleCity_BikeShop/border.bin"
+
+MauvilleCity_BikeShop_MapBlockdata::
+ .incbin "data/layouts/MauvilleCity_BikeShop/map.bin"
+
+ .align 2
+MauvilleCity_BikeShop_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte MauvilleCity_BikeShop_MapBorder
+ .4byte MauvilleCity_BikeShop_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BikeShop
+
diff --git a/data/layouts/MauvilleCity_BikeShop/map.bin b/data/layouts/MauvilleCity_BikeShop/map.bin
new file mode 100644
index 000000000..9891b9fd5
--- /dev/null
+++ b/data/layouts/MauvilleCity_BikeShop/map.bin
@@ -0,0 +1,2 @@
+()*+,- 
+    012345222892:2;2<2:2@A2B2?2C2D2!"#2$2%2&2HIJ2?2KL?2?2?2?2P2Q2R2?2ST"?2?2?2?2?2?2?2?2EF!"?2?2?2?2?2?2?2?2MN6?22 2?2?2?2?2?2UV \ No newline at end of file
diff --git a/data/layouts/MauvilleCity_GameCorner/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/MauvilleCity_GameCorner/border.bin
Binary files differ
diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc
new file mode 100644
index 000000000..307f7205e
--- /dev/null
+++ b/data/layouts/MauvilleCity_GameCorner/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_GameCorner_MapBorder::
+ .incbin "data/layouts/MauvilleCity_GameCorner/border.bin"
+
+MauvilleCity_GameCorner_MapBlockdata::
+ .incbin "data/layouts/MauvilleCity_GameCorner/map.bin"
+
+ .align 2
+MauvilleCity_GameCorner_Layout::
+ .4byte 0x16
+ .4byte 0xb
+ .4byte MauvilleCity_GameCorner_MapBorder
+ .4byte MauvilleCity_GameCorner_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_MauvilleGameCorner
+
diff --git a/data/layouts/MauvilleCity_GameCorner/map.bin b/data/layouts/MauvilleCity_GameCorner/map.bin
new file mode 100644
index 000000000..ce3f9bf73
--- /dev/null
+++ b/data/layouts/MauvilleCity_GameCorner/map.bin
@@ -0,0 +1,3 @@
+<=>>>>? 
+
+ ///DFEFFFG.227772LC2M2N2M2M2O22222222222TVUVUUW 222222222222222\2]2^2^2^2]2_2 22222622$2%2222$2%222222222222222&2,-'22&2,-'22222"# 22"# 222&2,-'22&2,-'22222*+ 22*+ 222&2,-'22&2,-'2222223 2223 222&245'22&245'22222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/layouts/MauvilleCity_Gym/border.bin b/data/layouts/MauvilleCity_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/border.bin
Binary files differ
diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc
new file mode 100644
index 000000000..290fca78e
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+MauvilleCity_Gym_MapBorder::
+ .incbin "data/layouts/MauvilleCity_Gym/border.bin"
+
+MauvilleCity_Gym_MapBlockdata::
+ .incbin "data/layouts/MauvilleCity_Gym/map.bin"
+
+ .align 2
+MauvilleCity_Gym_Layout::
+ .4byte 0xa
+ .4byte 0x15
+ .4byte MauvilleCity_Gym_MapBorder
+ .4byte MauvilleCity_Gym_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_MauvilleGym
+
diff --git a/data/layouts/MauvilleCity_Gym/map.bin b/data/layouts/MauvilleCity_Gym/map.bin
new file mode 100644
index 000000000..8860e5651
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/map.bin
Binary files differ
diff --git a/data/layouts/MeteorFalls_1F_1R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc
new file mode 100644
index 000000000..ba7a0e487
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_1F_1R_MapBorder::
+ .incbin "data/layouts/MeteorFalls_1F_1R/border.bin"
+
+MeteorFalls_1F_1R_MapBlockdata::
+ .incbin "data/layouts/MeteorFalls_1F_1R/map.bin"
+
+ .align 2
+MeteorFalls_1F_1R_Layout::
+ .4byte 0x1e
+ .4byte 0x2a
+ .4byte MeteorFalls_1F_1R_MapBorder
+ .4byte MeteorFalls_1F_1R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MeteorFalls
+
diff --git a/data/layouts/MeteorFalls_1F_1R/map.bin b/data/layouts/MeteorFalls_1F_1R/map.bin
new file mode 100644
index 000000000..4891475a3
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/map.bin
@@ -0,0 +1 @@
+4deDDDLDDDDDDDDDDDDDDdeDDDDfg<4lmDDDTDDDDDDfgDDDDDDlmDDDDno<4tu.D/\.DEFGDnoDDDDD/tu.DDDno<42222242DMN2O/vw.DD<22222242vw<42222 242222242�����(<222222422<42㺝22?2>2>2>2>2?2�ppp�(<222222?222<42�2�22422������ppp�(<222224222<42222?2��pppppppp�(<2222242222<4>2>2>2?2�ppppppppp�(=2>2>2>2>2?2222<46666>272yppppppx5262>2>2>2<4deDDDD/��������.DDfgDDDdeD2D<4lmDDDD/��������.DDnoDDDlmD2D<4tu.DDD/��������.LDnoDD/tu.2D<42242DD/��������.TDnoDD<2㺝2<42242*D/LLLLLLLL.\.vw.(<2�2�222<4>2>2?2*��TTTTTTTT�Z[�22((=2>2>2>2>2<422�ppppppppppXY���(<4>2>2>2?2�pppp8pBqBqBqBqBrB9pp�(<BBBBB<42�pppx(<BBBBB4B`Ba騛騛騜B<BBBBBB<42222�ppp�<B4BhBi騣騣騤B=B3}~<42222222222222(<B4B*�q�0(<<4222222222㺝2(<B4B*�p��((=>>><42>2>2>2>2>2>222�2�22(=B?B*�pp�(01111<4>2?2LDD2Dde<2222272yp�011111<4fgTDD2Dlm=2>2>2?2DLDD/���.DDDDD<4no\)2)2)2)2tu.DDD/DTDD/���.DDDDD<4vw)2)2)2)2)2)2)2.DDD/\.D/���.DDDDL<4)2)2)2)2)2)2)2)2)2)2)2)2)2)2*DD/���.DEFGT<4)2)2)2�U2V2W2�)2)2)2)2)2)2**D/���.DMN2O\<411�]^_�1111212**/LLL.<2222<4*)2�U2W2U2V2V2W2�)2)2)2)2)2***�TTT�(<222<42�]_]^^_�112112**�ppp�(<2222<41��U2V2V2V2W2U2W2�)2)2)2)**�ppp�(<2㺝2<41�]^^^_]_�121112*�ppp�(<2�2�22<4*�U2W2U2V2V2W2U2V2W2�)2)2)2)2*�ppp�(<2222<4*�]_]^^_]^_�)2㺝)22�pPQ�(=222<4*�U2V2V2V2W2U2V2V2W2�)2�2�2)2*��pXY�0=2>2<4*�]^^^_]^^_�21112�pppp��0111<4*)2)2)2)2)2)2)2)2)2)2)2)2)2��ppppp��Z[�<42)2)2)2$2)2)2)2)2)2)2)2)26)2�ppppPQppXY�<4XXYHIJY")2)2)2)2)2)26�ppppXYpppp�<6666666666666666666666666666 \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_1F_2R/border.bin b/data/layouts/MeteorFalls_1F_2R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc
new file mode 100644
index 000000000..2e3fcaf2e
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_1F_2R_MapBorder::
+ .incbin "data/layouts/MeteorFalls_1F_2R/border.bin"
+
+MeteorFalls_1F_2R_MapBlockdata::
+ .incbin "data/layouts/MeteorFalls_1F_2R/map.bin"
+
+ .align 2
+MeteorFalls_1F_2R_Layout::
+ .4byte 0x1e
+ .4byte 0x20
+ .4byte MeteorFalls_1F_2R_MapBorder
+ .4byte MeteorFalls_1F_2R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MeteorFalls
+
diff --git a/data/layouts/MeteorFalls_1F_2R/map.bin b/data/layouts/MeteorFalls_1F_2R/map.bin
new file mode 100644
index 000000000..67ce2b784
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/map.bin
@@ -0,0 +1,2 @@
+>>>>>>>>>>>>>>4111111111111<4222222222222(=>>>>?22222222222201111=>>>>>>>>?2>2>2>2>2>2�U2V2V2W2U2W2�=>>01111111111212111�]^^_]_�11=>>>>>11111112>2>2>2>2>2�U2W2U2V2V2V2W2�=01111114112111�]_]^^^_�1111<>>>>?*>2>2>2>2>2�U2V2W2U2W2U2V2V2W2�=>>(<4111121211�]^_]_]^^_�11(<4*11112>2>2>2�U2W2U2V2V2W22U2V2V2W2�=((=>4**4111121�]_]^^_�]^^_�(01<4**?222222�2U2V2V2W22�22222�01(<4**22222�22]^^_�2U2W2U2V2W2�=>((<4** 22222��U2V2V2W222�2]_]^_�1((<4**2222���]^^_����2222222(((<4**����
+2222222�<4�2U2W2U2V2V2W2(((<4**>?2222U2V2W2�=?�2]_]^^_(((<4**?22��]^_��2222222(((<4**?2222��2222�222222222(((<4**22 222��2222222�222222(((<4**22222��Z[�22222222223��(<4**������pXY����222222(<(<4**�pppppPQpppp�2222 22((3��4**dQppPQXYpppp�222222(((<4**lYPQXYpppppp�222222(((<4**�pXYppppp�6262622223��((<4**�pppppppp�222222(<((<4**�pp�626262626262222222(<3�(<4**�pp�222222222222(<(<34**kzqqzk}Q���������(<(<66���������������������� \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_B1F_1R/border.bin b/data/layouts/MeteorFalls_B1F_1R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_1R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc
new file mode 100644
index 000000000..a4f385d8f
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_B1F_1R_MapBorder::
+ .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin"
+
+MeteorFalls_B1F_1R_MapBlockdata::
+ .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin"
+
+ .align 2
+MeteorFalls_B1F_1R_Layout::
+ .4byte 0x1d
+ .4byte 0x26
+ .4byte MeteorFalls_B1F_1R_MapBorder
+ .4byte MeteorFalls_B1F_1R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MeteorFalls
+
diff --git a/data/layouts/MeteorFalls_B1F_1R/map.bin b/data/layouts/MeteorFalls_B1F_1R/map.bin
new file mode 100644
index 000000000..a37afdb17
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_1R/map.bin
@@ -0,0 +1,6 @@
+>>>>>>>>>>>>>>>?DDDDDDDDDD=>>>4DDDD/DDDEFGDDDD.DD<?DDD/DDDMN2ODDDD.D(<411111D/22222222.((<4*11c11B*222222222���(((<4*BB BBBBB*2222222222�p�(((<4*BBBBBB*�����������p�(((<4*BBBBBB*�ppppppppppp�((=4*BB匯哛嘡
+*�ppppppppppp�((0<4*BB<R4R*�ppppppppppp�0(<4*BB<R R4R*�pppBqBqBqBqBpp�0((<4*BB<RR4R*�px(<B��
+*yp��((<4*BB=R>R?R*�p�(<B=?*�pp�(<4*BB1*�p�(<Bc*�pp�(<4*BBB211�p�(<BBB BB*�pp�(<4*BBB222��p�(<BBBBB*�pp�(<4*BBB222�pp�(<BBBBB*�pp�(<4*BBB222�pp�(<BBBB*�pp�(<4*BBB咮咮咮kBzBqBqBzBkBBBB12�pp�(<4*BBBBBBBBBBBBBBB*���pp�(<4*6R哛哛哛哛哛哛嘡
+BBBBB>BB*�pppp�(<4*RRRRRR4RBBBBB12�pppp�(<4R RRRRR>R?RBBBBB*���pppp�(<4RRR4RBBBBB*�pppppp�(<4RRRR4RBBBBBBB*�pppppp�(<4RRRR4RBBBBBBB2�pppppxk(<6�����������
+B*��ppppx(<(<R4
+*�ppppp�(<(<R4*�ppppp�(<�(<R4*�ppppp�(<�R4*�ppppp�(<<R4*�ppppp�(<<R4*�ppppp�(<<R4*2222222<<R4*222222<<R4*222222<<R�66���}~����� \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_2R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc
new file mode 100644
index 000000000..982edc975
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_B1F_2R_MapBorder::
+ .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin"
+
+MeteorFalls_B1F_2R_MapBlockdata::
+ .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin"
+
+ .align 2
+MeteorFalls_B1F_2R_Layout::
+ .4byte 0xb
+ .4byte 0x12
+ .4byte MeteorFalls_B1F_2R_MapBorder
+ .4byte MeteorFalls_B1F_2R_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MeteorFalls
+
diff --git a/data/layouts/MeteorFalls_B1F_2R/map.bin b/data/layouts/MeteorFalls_B1F_2R/map.bin
new file mode 100644
index 000000000..5f4497752
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_2R/map.bin
@@ -0,0 +1 @@
+>>>>>>>>>41111111<4*11111(<4**22222((<4**22222((<4**�����((<4**�ppp�((<4**�ppp�((<4**�ppp�((<4**�ppp�((<4**�ppp�((<4**�ppp�((<4**�ppp�((<4**�ppp�((<4**22222((<4**22222((<4*��}~��(<��������� \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_StevensCave/border.bin b/data/layouts/MeteorFalls_StevensCave/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MeteorFalls_StevensCave/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc
new file mode 100644
index 000000000..1baf70a09
--- /dev/null
+++ b/data/layouts/MeteorFalls_StevensCave/layout.inc
@@ -0,0 +1,15 @@
+MeteorFalls_StevensCave_MapBorder::
+ .incbin "data/layouts/MeteorFalls_StevensCave/border.bin"
+
+MeteorFalls_StevensCave_MapBlockdata::
+ .incbin "data/layouts/MeteorFalls_StevensCave/map.bin"
+
+ .align 2
+MeteorFalls_StevensCave_Layout::
+ .4byte 0x1e
+ .4byte 0x20
+ .4byte MeteorFalls_StevensCave_MapBorder
+ .4byte MeteorFalls_StevensCave_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MeteorFalls
+
diff --git a/data/layouts/MeteorFalls_StevensCave/map.bin b/data/layouts/MeteorFalls_StevensCave/map.bin
new file mode 100644
index 000000000..e509d66c2
--- /dev/null
+++ b/data/layouts/MeteorFalls_StevensCave/map.bin
@@ -0,0 +1,21 @@
+               "11111     
+             "111((   
+(  "1111111121((((666(61111111122((((�1112(61111111122(((�111112(61111111122((�111116(61111111122(�11111(6(6222�222222011111((6(6�22�22�222222222(((6(62222�222         (6(622�2222(       
+(6(�1�2222222((�1111111�(6(�111�      
+22(�111111!!6�11111�     "
+2�1
+1(( 
+111111�� 
+222((�((((6111111((6 
+22((2((((61111(((6622((2((((6*2222(((�1�622(���2((((6*2222(((612622�11�2((((6*2��2(((612�2�22222((((6*2�22(((*1�222��222((((6   
+222(((6**22222�22    (6 
+
+�2((��**2222�22(6   6(6**
+2(��222222((6(  
+(6***2��222   ((6((
+(6***222222222�2(66  6((((6** 
+2222�22��2(6(666((((6**6  
+22222222(((   (((6*   
+*222�2   ((((6  ((6*   
+**22222(   (((6(66��(6   
+* HIJ   (666(((6����               �� \ No newline at end of file
diff --git a/data/layouts/MirageTower_1F/border.bin b/data/layouts/MirageTower_1F/border.bin
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/layouts/MirageTower_1F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc
new file mode 100644
index 000000000..be36cc758
--- /dev/null
+++ b/data/layouts/MirageTower_1F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_1F_MapBorder::
+ .incbin "data/layouts/MirageTower_1F/border.bin"
+
+MirageTower_1F_MapBlockdata::
+ .incbin "data/layouts/MirageTower_1F/map.bin"
+
+ .align 2
+MirageTower_1F_Layout::
+ .4byte 0x15
+ .4byte 0x11
+ .4byte MirageTower_1F_MapBorder
+ .4byte MirageTower_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MirageTower
+
diff --git a/data/layouts/MirageTower_1F/map.bin b/data/layouts/MirageTower_1F/map.bin
new file mode 100644
index 000000000..b77d14890
--- /dev/null
+++ b/data/layouts/MirageTower_1F/map.bin
@@ -0,0 +1,3 @@
+EE  EEEEEE22𩒊𬗂𬗂𬗌222𩒊񄿒񝧢񝧢񝦒�22222񁺚�2p     q�2𩒔222񁺚p 22222 q𬘒񄾌22�2p2222222q񄿒�22222222222񁺚�22222222222񁺚�2𩒊�22222222񁺚�2񚡚�222222񁺚�22񚡚hi񄿒�2�22񁺚hi񄿒�2  
+񚢪񄾌2222𩒊񄿒�2p    
+22񚢴2<2񚢪񝧢�2   E      XY       EE                 E \ No newline at end of file
diff --git a/data/layouts/MirageTower_2F/border.bin b/data/layouts/MirageTower_2F/border.bin
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/layouts/MirageTower_2F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc
new file mode 100644
index 000000000..ec4971bc4
--- /dev/null
+++ b/data/layouts/MirageTower_2F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_2F_MapBorder::
+ .incbin "data/layouts/MirageTower_2F/border.bin"
+
+MirageTower_2F_MapBlockdata::
+ .incbin "data/layouts/MirageTower_2F/map.bin"
+
+ .align 2
+MirageTower_2F_Layout::
+ .4byte 0x15
+ .4byte 0x11
+ .4byte MirageTower_2F_MapBorder
+ .4byte MirageTower_2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MirageTower
+
diff --git a/data/layouts/MirageTower_2F/map.bin b/data/layouts/MirageTower_2F/map.bin
new file mode 100644
index 000000000..79c3056a9
--- /dev/null
+++ b/data/layouts/MirageTower_2F/map.bin
@@ -0,0 +1,3 @@
+EE  EEEEEE222𩒊𬗂𬗂�22?2222𩓚񝧢񝧢񝦒�222/2/22𩓚p     q�2222/2/2𩓚p 22222 q𬗌22/2/2�2p2222222q�222/2/222222222222/2222222222/2�2222222222/2𩓤22222222񚡚hi�2222񁺚hi񝧬22  
+񚢪�2222222񚢴22    
+2222222222222   E2               2EE2                 2E \ No newline at end of file
diff --git a/data/layouts/MirageTower_3F/border.bin b/data/layouts/MirageTower_3F/border.bin
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/layouts/MirageTower_3F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc
new file mode 100644
index 000000000..c12de3a15
--- /dev/null
+++ b/data/layouts/MirageTower_3F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_3F_MapBorder::
+ .incbin "data/layouts/MirageTower_3F/border.bin"
+
+MirageTower_3F_MapBlockdata::
+ .incbin "data/layouts/MirageTower_3F/map.bin"
+
+ .align 2
+MirageTower_3F_Layout::
+ .4byte 0x15
+ .4byte 0x11
+ .4byte MirageTower_3F_MapBorder
+ .4byte MirageTower_3F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MirageTower
+
diff --git a/data/layouts/MirageTower_3F/map.bin b/data/layouts/MirageTower_3F/map.bin
new file mode 100644
index 000000000..376ac2836
--- /dev/null
+++ b/data/layouts/MirageTower_3F/map.bin
@@ -0,0 +1,6 @@
+EE  EEEEEE𩒊𬗂𬗂�2222𩒊�2񚢪񝧢񝧢�2222񁺚�222222     
+񚢴2222222 22222 
+22222222222
+/222𩒔2222222/22/2񄿜22222222𩒔𩓚�22222222𩓚�2񚡚�222222񚢪�22񁺤2222񚢴22222  
+222𩒊𬗂𬗂𬗂�22    
+222񚢪񝧢񝧢񝧢�22   E2               2EE2                 2E \ No newline at end of file
diff --git a/data/layouts/MirageTower_4F/border.bin b/data/layouts/MirageTower_4F/border.bin
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/layouts/MirageTower_4F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc
new file mode 100644
index 000000000..518f7c943
--- /dev/null
+++ b/data/layouts/MirageTower_4F/layout.inc
@@ -0,0 +1,15 @@
+MirageTower_4F_MapBorder::
+ .incbin "data/layouts/MirageTower_4F/border.bin"
+
+MirageTower_4F_MapBlockdata::
+ .incbin "data/layouts/MirageTower_4F/map.bin"
+
+ .align 2
+MirageTower_4F_Layout::
+ .4byte 0xd
+ .4byte 0xa
+ .4byte MirageTower_4F_MapBorder
+ .4byte MirageTower_4F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_MirageTower
+
diff --git a/data/layouts/MirageTower_4F/map.bin b/data/layouts/MirageTower_4F/map.bin
new file mode 100644
index 000000000..283534fb7
--- /dev/null
+++ b/data/layouts/MirageTower_4F/map.bin
@@ -0,0 +1,2 @@
+EE EE2𩒊𬗂𬗌2  B B B B Bq�222�2楤橞橞橞欱񄾌2�2燘񅀬2�2˙〣〣〣狟�2222i�222222𩒊񄿜22  
+𩒊𬘒񄿒�2   E         E \ No newline at end of file
diff --git a/data/layouts/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/MossdeepCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc
new file mode 100644
index 000000000..881cf9498
--- /dev/null
+++ b/data/layouts/MossdeepCity/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_MapBorder::
+ .incbin "data/layouts/MossdeepCity/border.bin"
+
+MossdeepCity_MapBlockdata::
+ .incbin "data/layouts/MossdeepCity/map.bin"
+
+ .align 2
+MossdeepCity_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte MossdeepCity_MapBorder
+ .4byte MossdeepCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mossdeep
+
diff --git a/data/layouts/MossdeepCity/map.bin b/data/layouts/MossdeepCity/map.bin
new file mode 100644
index 000000000..bf150f5bb
--- /dev/null
+++ b/data/layouts/MossdeepCity/map.bin
Binary files differ
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
Binary files differ
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
new file mode 100644
index 000000000..2c2fb717d
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_GameCorner_1F_MapBorder::
+ .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin"
+
+MossdeepCity_GameCorner_1F_MapBlockdata::
+ .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin"
+
+ .align 2
+MossdeepCity_GameCorner_1F_Layout::
+ .4byte 0xc
+ .4byte 0xa
+ .4byte MossdeepCity_GameCorner_1F_MapBorder
+ .4byte MossdeepCity_GameCorner_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_MossdeepGameCorner
+
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
new file mode 100644
index 000000000..8be990dde
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
@@ -0,0 +1,53 @@
+)2(2  12  22*22022 2
+2"#$2%&'
+2
+2
+2 2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 2
+222
+2
+2
+222
+2
+2
+2 22
+2
+2
+22
+2
+2 22 !
+2
+2
+2 !2
+2
+2 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/MossdeepCity_GameCorner_B1F/border.bin b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
Binary files differ
diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
new file mode 100644
index 000000000..ec5dd2a57
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_GameCorner_B1F_MapBorder::
+ .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin"
+
+MossdeepCity_GameCorner_B1F_MapBlockdata::
+ .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin"
+
+ .align 2
+MossdeepCity_GameCorner_B1F_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte MossdeepCity_GameCorner_B1F_MapBorder
+ .4byte MossdeepCity_GameCorner_B1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/map.bin b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
new file mode 100644
index 000000000..399d05705
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
@@ -0,0 +1,2 @@
+� 
+        ��6$2$2$2$2$2$2$2$2$2$2�692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#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/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc
new file mode 100644
index 000000000..a65212a40
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_Gym_MapBorder::
+ .incbin "data/layouts/MossdeepCity_Gym/border.bin"
+
+MossdeepCity_Gym_MapBlockdata::
+ .incbin "data/layouts/MossdeepCity_Gym/map.bin"
+
+ .align 2
+MossdeepCity_Gym_Layout::
+ .4byte 0x1a
+ .4byte 0x24
+ .4byte MossdeepCity_Gym_MapBorder
+ .4byte MossdeepCity_Gym_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_MossdeepGym
+
diff --git a/data/layouts/MossdeepCity_Gym/map.bin b/data/layouts/MossdeepCity_Gym/map.bin
new file mode 100644
index 000000000..da585f73f
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/map.bin
@@ -0,0 +1,40 @@
+666666666666666666666666666666626666666666666666666 66666666666666666 66666666666666666$ 666666666666666 
+q2r2
+q2r266666666 6666 
+p2s2t2 p2s266666666()6666 \2
+ 666666666 6666 
+Y2Z2Y2Z2666666666  !"#666666X2[2
+X2[2
+666666666 
+
+
+
+66666666]2666666666666666666666666 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666266
+66666666666666Q2R2
+66666666666 6T2P2S266666666666666m26 
+
+
+
+66666666666666i2j2i2j26266666666666666666h2k2
+h2k266666666666666666666
+l2
+66666666666666666666666i2j2
+$6666666666666666666h2k2
+66 6666666666666666 
+6666666666666666666Q2R2Q2R26666666666666 66P2S2T2P2S2% 666666666 66 
+
+
+
+$666666666 6
+
+
+
+$6666626 
+
+
+
+6a2b26666666  
+
+ 6`2c2
+6d26666666 $00$62
+6666666666666 \ No newline at end of file
diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
new file mode 100644
index 000000000..759e68891
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_SpaceCenter_1F_MapBorder::
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin"
+
+MossdeepCity_SpaceCenter_1F_MapBlockdata::
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin"
+
+ .align 2
+MossdeepCity_SpaceCenter_1F_Layout::
+ .4byte 0x10
+ .4byte 0xa
+ .4byte MossdeepCity_SpaceCenter_1F_MapBorder
+ .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
new file mode 100644
index 000000000..44f5081b9
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
Binary files differ
diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
new file mode 100644
index 000000000..6e370a7fa
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_SpaceCenter_2F_MapBorder::
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin"
+
+MossdeepCity_SpaceCenter_2F_MapBlockdata::
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin"
+
+ .align 2
+MossdeepCity_SpaceCenter_2F_Layout::
+ .4byte 0x10
+ .4byte 0xa
+ .4byte MossdeepCity_SpaceCenter_2F_MapBorder
+ .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
new file mode 100644
index 000000000..d2e52d780
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
Binary files differ
diff --git a/data/layouts/MossdeepCity_StevensHouse/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/MossdeepCity_StevensHouse/border.bin
Binary files differ
diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc
new file mode 100644
index 000000000..0db92aee9
--- /dev/null
+++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc
@@ -0,0 +1,15 @@
+MossdeepCity_StevensHouse_MapBorder::
+ .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin"
+
+MossdeepCity_StevensHouse_MapBlockdata::
+ .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin"
+
+ .align 2
+MossdeepCity_StevensHouse_Layout::
+ .4byte 0xb
+ .4byte 0x8
+ .4byte MossdeepCity_StevensHouse_MapBorder
+ .4byte MossdeepCity_StevensHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/MossdeepCity_StevensHouse/map.bin b/data/layouts/MossdeepCity_StevensHouse/map.bin
new file mode 100644
index 000000000..ade25497a
--- /dev/null
+++ b/data/layouts/MossdeepCity_StevensHouse/map.bin
@@ -0,0 +1 @@
+����h     ii𣈆p2$2$2$2$2$2$2q2q292#2#2#2�6�6�6�6#2#2[392#2#2#2�6�6󚄰#2#2c792#2#2#2#2#2,2#2#2#2[392#2#2#2#2#2#2#2#2#2c792#2#2 #2#2#2#2#2#2 \ No newline at end of file
diff --git a/data/layouts/MtChimney/border.bin b/data/layouts/MtChimney/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/MtChimney/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc
new file mode 100644
index 000000000..29a3b1ad7
--- /dev/null
+++ b/data/layouts/MtChimney/layout.inc
@@ -0,0 +1,15 @@
+MtChimney_MapBorder::
+ .incbin "data/layouts/MtChimney/border.bin"
+
+MtChimney_MapBlockdata::
+ .incbin "data/layouts/MtChimney/map.bin"
+
+ .align 2
+MtChimney_Layout::
+ .4byte 0x28
+ .4byte 0x2f
+ .4byte MtChimney_MapBorder
+ .4byte MtChimney_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/MtChimney/map.bin b/data/layouts/MtChimney/map.bin
new file mode 100644
index 000000000..1e7e2868d
--- /dev/null
+++ b/data/layouts/MtChimney/map.bin
@@ -0,0 +1 @@
+h~qpqqpqpqrrrq2r�x|q2{z��ppppqrrqqqrqqpqqpqqpqpqrrr{z�|xtz{�~6ppppqrrqqqrqqpqh~qqph~qrrrr{�yyy��qppppqrrqqqrq{pqpqqqppqqrrrr��������h~pppqrrqq{zqrpqpqqqppqqrrrr���������ph~pxtzrqqrqqrpqpqqqppq{zrrrU��������~pph~2q2q2q2rqqrqqrpqpqqqpxtzq22227��������qpppq2q2q2q2rq{zqqrpqpqqqpq2q2q2q2q2q2q2q2��������h~ppq2q2q2q2rqrqq{zpqpqqqpq2q2q2q2{ttt������pqppq2q2q2q2rqrqqrqpqx|qqpq2q2q2q2rrr������~~h~pq2q2q2{zqrq{zqx|qpqqphijq2rr�����pqh~h~2q2q2q2rq{zqrqqqpqx|qppqrq222jqqr����~h~qph~2q2q2q2q2rqrqqrq{qpqqpqpxtzq2q2q22i2jiiiii~qh~6pq2q2q2q2q2rqrqqrqr|x|qx|x|q2q2q2q2hijriijqqhii~6q6pq2q2q2q2q2rqrqqr{zpqpqqpqx|q2q2q2pqr2i2jii~hi2i2i2~2q2q2q2q2q2rqrq{zr{x|x|qpqqpq2q2q2xtzq2q22i2i2i2i2~2q2q2q2q2q2q2q2q2q2r{zqr{zrqpqpqx|qpq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zrq{zr{z|pqpqqpqx|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6rqrqrrqppqx|qpqqxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6r{z{zr{px|qx|xttt|pq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6rrqrqrrpqx|qxttt|pxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6q6rrqr{zrpqqxt|qqqppq6q6x|q2q2q2q2q2q2q2q2q2q2q2q2q2{z{ttzrqrrqrxtt|qxt|qpxt|q2xt|q2q2{ttttt�2ttz{z{ttz{zrqrqqqxt|qpqxt|xtt|xttzq2q2q2q2q2q2{ttz{z{ttz{zqrttt|qx|xt|qxt|q6x|q2q2{�2tttttzq2q2{z{z{ttz{tztt|pqqxt|x|qqxt|xttzq2q2q2q2q2q2q2q2q2r{z{z{ttzqqqqpx|qqqpqxtt|qxt|q2q2q2q2q2q2q2q2q2{tzrq2rq2rqqq2{tqqpqxt|q�|qqqx|qqx|q2q2q2{ttt�2z{tz{�{zqq{�qqqx|q�2pq�6pqqqqxtt|xtttzq2q2q2q2{zq2q2r�6r{ttz�qqqqx|��t|xttttt|qxtttttttt�2zq2q2q2rqrrq�2q2󊥈qqqqp󊦜qpqqqqqqxtttttt|q2q2q2q2q2q2q2q2r{�rq�6qq�6qqqqxtt|pqq2qq���������pq2q2q2q2q2{ttzr�6r򰯘{tt|qqqqqqppqq2qq�q2&2'2!2!2"2q2q2xttt�2tzq2q2q2r{z��6r�2qxtt|qqqppq򰯘q�&2.6/))*Z2Z2Z2Z2Z2Z2Z2Z2T2S2q2{zr򰰬{z��2tt|pqqqppq�6�q�-67112q2q2q2q2q2q2q2q2\2[2R2Qq2r�6{z򰰬�6qqpxt|�2pxt|󊥈�->?9:%q2q2q2q2q2q2q2q2d6q2q2YRQqrq�6{�|qxt|p��t|�|��5FGABWq2q2q2q2q2q2q2q2q2q2q2rqYRQq{z�6pq�2qpp󊦜qp�p��򰯘q2q2q2q2q2q2q2q24q2q2q2򰯘q2rqrqYRQ{tp�2��2pxt|qp�6p�6�󊦜q2q2q2q2q2q2q2q2q2q2q2q2󊦜{z{��2rqYPap󊦜��t|p�2x|pq������q2q2q2q2������{z{���6r�2rrYx�|󊦜qpp�qp��t�|q2q2�q2q2q2q2�q2q2q2q2{z{z󊦜{z�rrrq��t|qpp�6qp󊦜q��t�6��22���6tt�z{z�2q2q2rq2�6rrrq󊦜qp�2px|�2���|�6��2���77���򰯘�6{zq2�6{�zq2{zrrtt|qp�x|p󊦜�6��|�����77������6rq2q2{z��2q2rq2rr򰯘p�2p�qp�t�|��p������������{z򰯘rq2��q2r�2rr��p�p��2p�6q�6p�6�p�6�����������r�2��r򰰬󊥈r�rr��p�p�6�xtt|x|�x|�6����������r���6r�򰯘�r�rr \ No newline at end of file
diff --git a/data/layouts/MtPyre_1F/border.bin b/data/layouts/MtPyre_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MtPyre_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc
new file mode 100644
index 000000000..2402e815c
--- /dev/null
+++ b/data/layouts/MtPyre_1F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_1F_MapBorder::
+ .incbin "data/layouts/MtPyre_1F/border.bin"
+
+MtPyre_1F_MapBlockdata::
+ .incbin "data/layouts/MtPyre_1F/map.bin"
+
+ .align 2
+MtPyre_1F_Layout::
+ .4byte 0x16
+ .4byte 0x13
+ .4byte MtPyre_1F_MapBorder
+ .4byte MtPyre_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_1F/map.bin b/data/layouts/MtPyre_1F/map.bin
new file mode 100644
index 000000000..60b992a73
--- /dev/null
+++ b/data/layouts/MtPyre_1F/map.bin
@@ -0,0 +1 @@
+����������������2�����������2�2�2�2&7&7�2�2�2�2�2�2�2������2�2�2�2�6�6�2�6�6�6�2�6�6�����'7�2�2�2�2�6�6�2�6�6�6�2�6�6�2�2�2�2�2�2�2�2�2�2�6�6�2�2�2�2�2�2�222�2�2�2�2�2�2�2�2�2�2�2�6�6�6�2�6�6&7�6�2�2�2�2�2�6�6�6�2�6�6&7�6�2�2�2�2�2�2�2�2�2�2�2�2�2�6�6�2�2�2�2�2�2�2�2�2�2�2�6�6�2�2�2�2�2�2�2�2�2&7�6�2�2�6�6�2�2�2�2�2�6�6&7�6�2�2�6�6�2�2�2�2�2�6�6�2�2�2�2�2�2�2�2�2�222 \ No newline at end of file
diff --git a/data/layouts/MtPyre_2F/border.bin b/data/layouts/MtPyre_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MtPyre_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc
new file mode 100644
index 000000000..8d6ca1200
--- /dev/null
+++ b/data/layouts/MtPyre_2F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_2F_MapBorder::
+ .incbin "data/layouts/MtPyre_2F/border.bin"
+
+MtPyre_2F_MapBlockdata::
+ .incbin "data/layouts/MtPyre_2F/map.bin"
+
+ .align 2
+MtPyre_2F_Layout::
+ .4byte 0xd
+ .4byte 0xd
+ .4byte MtPyre_2F_MapBorder
+ .4byte MtPyre_2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_2F/map.bin b/data/layouts/MtPyre_2F/map.bin
new file mode 100644
index 000000000..97b7e9e31
--- /dev/null
+++ b/data/layouts/MtPyre_2F/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�3��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/MtPyre_3F/border.bin b/data/layouts/MtPyre_3F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MtPyre_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc
new file mode 100644
index 000000000..24ed0f7b1
--- /dev/null
+++ b/data/layouts/MtPyre_3F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_3F_MapBorder::
+ .incbin "data/layouts/MtPyre_3F/border.bin"
+
+MtPyre_3F_MapBlockdata::
+ .incbin "data/layouts/MtPyre_3F/map.bin"
+
+ .align 2
+MtPyre_3F_Layout::
+ .4byte 0xd
+ .4byte 0xd
+ .4byte MtPyre_3F_MapBorder
+ .4byte MtPyre_3F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_3F/map.bin b/data/layouts/MtPyre_3F/map.bin
new file mode 100644
index 000000000..758eccc3a
--- /dev/null
+++ b/data/layouts/MtPyre_3F/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�2���2�2�2���2�3���2�3�� \ No newline at end of file
diff --git a/data/layouts/MtPyre_4F/border.bin b/data/layouts/MtPyre_4F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MtPyre_4F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc
new file mode 100644
index 000000000..65a8fcf59
--- /dev/null
+++ b/data/layouts/MtPyre_4F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_4F_MapBorder::
+ .incbin "data/layouts/MtPyre_4F/border.bin"
+
+MtPyre_4F_MapBlockdata::
+ .incbin "data/layouts/MtPyre_4F/map.bin"
+
+ .align 2
+MtPyre_4F_Layout::
+ .4byte 0xd
+ .4byte 0xd
+ .4byte MtPyre_4F_MapBorder
+ .4byte MtPyre_4F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_4F/map.bin b/data/layouts/MtPyre_4F/map.bin
new file mode 100644
index 000000000..98dc679ff
--- /dev/null
+++ b/data/layouts/MtPyre_4F/map.bin
@@ -0,0 +1 @@
+����������2��������&&�2�2�2&������'&��2�2�2����������􀯴�0����2������􀯴�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�6�2�2����3�2�2�2&�2�2�2�2�2�������&�2�3�2�2�2�2�2�2�2�2�2�2 \ No newline at end of file
diff --git a/data/layouts/MtPyre_5F/border.bin b/data/layouts/MtPyre_5F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MtPyre_5F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc
new file mode 100644
index 000000000..222c6eb80
--- /dev/null
+++ b/data/layouts/MtPyre_5F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_5F_MapBorder::
+ .incbin "data/layouts/MtPyre_5F/border.bin"
+
+MtPyre_5F_MapBlockdata::
+ .incbin "data/layouts/MtPyre_5F/map.bin"
+
+ .align 2
+MtPyre_5F_Layout::
+ .4byte 0xd
+ .4byte 0xd
+ .4byte MtPyre_5F_MapBorder
+ .4byte MtPyre_5F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_5F/map.bin b/data/layouts/MtPyre_5F/map.bin
new file mode 100644
index 000000000..12fbeeb7e
--- /dev/null
+++ b/data/layouts/MtPyre_5F/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�6�2����2�3&�2�2��2�2�2�2�2��2�2�&�2�2�2�2�2�2�2�2�2�2�2�3 \ No newline at end of file
diff --git a/data/layouts/MtPyre_6F/border.bin b/data/layouts/MtPyre_6F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MtPyre_6F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc
new file mode 100644
index 000000000..31b5288d5
--- /dev/null
+++ b/data/layouts/MtPyre_6F/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_6F_MapBorder::
+ .incbin "data/layouts/MtPyre_6F/border.bin"
+
+MtPyre_6F_MapBlockdata::
+ .incbin "data/layouts/MtPyre_6F/map.bin"
+
+ .align 2
+MtPyre_6F_Layout::
+ .4byte 0xd
+ .4byte 0xd
+ .4byte MtPyre_6F_MapBorder
+ .4byte MtPyre_6F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_6F/map.bin b/data/layouts/MtPyre_6F/map.bin
new file mode 100644
index 000000000..1f7438bfb
--- /dev/null
+++ b/data/layouts/MtPyre_6F/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�6�2�2�2�2&�2�2�2�2�2�2�6�6�2�2�2������������2�������������2��&�2�2&&�2󬳺&&�2�2&�2�2�2��2�2�2�2�2��2�2�2�2�3�2�2�2�2�2�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/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin
new file mode 100644
index 000000000..1d7df4a00
--- /dev/null
+++ b/data/layouts/MtPyre_Exterior/border.bin
Binary files differ
diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc
new file mode 100644
index 000000000..1b5997dba
--- /dev/null
+++ b/data/layouts/MtPyre_Exterior/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_Exterior_MapBorder::
+ .incbin "data/layouts/MtPyre_Exterior/border.bin"
+
+MtPyre_Exterior_MapBlockdata::
+ .incbin "data/layouts/MtPyre_Exterior/map.bin"
+
+ .align 2
+MtPyre_Exterior_Layout::
+ .4byte 0x26
+ .4byte 0x33
+ .4byte MtPyre_Exterior_MapBorder
+ .4byte MtPyre_Exterior_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_Exterior/map.bin b/data/layouts/MtPyre_Exterior/map.bin
new file mode 100644
index 000000000..7ab1e0461
--- /dev/null
+++ b/data/layouts/MtPyre_Exterior/map.bin
Binary files differ
diff --git a/data/layouts/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin
new file mode 100644
index 000000000..1d7df4a00
--- /dev/null
+++ b/data/layouts/MtPyre_Summit/border.bin
Binary files differ
diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc
new file mode 100644
index 000000000..58e932eb7
--- /dev/null
+++ b/data/layouts/MtPyre_Summit/layout.inc
@@ -0,0 +1,15 @@
+MtPyre_Summit_MapBorder::
+ .incbin "data/layouts/MtPyre_Summit/border.bin"
+
+MtPyre_Summit_MapBlockdata::
+ .incbin "data/layouts/MtPyre_Summit/map.bin"
+
+ .align 2
+MtPyre_Summit_Layout::
+ .4byte 0x32
+ .4byte 0x25
+ .4byte MtPyre_Summit_MapBorder
+ .4byte MtPyre_Summit_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/MtPyre_Summit/map.bin b/data/layouts/MtPyre_Summit/map.bin
new file mode 100644
index 000000000..1de8bd5ea
--- /dev/null
+++ b/data/layouts/MtPyre_Summit/map.bin
Binary files differ
diff --git a/data/layouts/NavelRock_B1F/border.bin b/data/layouts/NavelRock_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/NavelRock_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc
new file mode 100644
index 000000000..6f15bd276
--- /dev/null
+++ b/data/layouts/NavelRock_B1F/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_B1F_MapBorder::
+ .incbin "data/layouts/NavelRock_B1F/border.bin"
+
+NavelRock_B1F_MapBlockdata::
+ .incbin "data/layouts/NavelRock_B1F/map.bin"
+
+ .align 2
+NavelRock_B1F_Layout::
+ .4byte 0x17
+ .4byte 0xb
+ .4byte NavelRock_B1F_MapBorder
+ .4byte NavelRock_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_NavelRock
+
diff --git a/data/layouts/NavelRock_B1F/map.bin b/data/layouts/NavelRock_B1F/map.bin
new file mode 100644
index 000000000..861fb6575
--- /dev/null
+++ b/data/layouts/NavelRock_B1F/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222?22GGGGGGGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/layouts/NavelRock_Bottom/border.bin b/data/layouts/NavelRock_Bottom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/NavelRock_Bottom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc
new file mode 100644
index 000000000..5c96a8cef
--- /dev/null
+++ b/data/layouts/NavelRock_Bottom/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Bottom_MapBorder::
+ .incbin "data/layouts/NavelRock_Bottom/border.bin"
+
+NavelRock_Bottom_MapBlockdata::
+ .incbin "data/layouts/NavelRock_Bottom/map.bin"
+
+ .align 2
+NavelRock_Bottom_Layout::
+ .4byte 0x16
+ .4byte 0x16
+ .4byte NavelRock_Bottom_MapBorder
+ .4byte NavelRock_Bottom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_NavelRock
+
diff --git a/data/layouts/NavelRock_Bottom/map.bin b/data/layouts/NavelRock_Bottom/map.bin
new file mode 100644
index 000000000..af2f8a245
--- /dev/null
+++ b/data/layouts/NavelRock_Bottom/map.bin
@@ -0,0 +1 @@
+r���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eee�GGG�cc���pr���eeeF���Gcc���pr���eFF]ddd[GG���pr���edde]d[cdd���pr���eddee{ccdd���pr���eddeFdGcdd���pr���edde=ddcdd���pr���eslmdddk�t���pr���ee=ddddd�c���pr���eed=dddd>c���pGGGGGGGGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/layouts/NavelRock_Entrance/border.bin b/data/layouts/NavelRock_Entrance/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/NavelRock_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc
new file mode 100644
index 000000000..6dcedcb20
--- /dev/null
+++ b/data/layouts/NavelRock_Entrance/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Entrance_MapBorder::
+ .incbin "data/layouts/NavelRock_Entrance/border.bin"
+
+NavelRock_Entrance_MapBlockdata::
+ .incbin "data/layouts/NavelRock_Entrance/map.bin"
+
+ .align 2
+NavelRock_Entrance_Layout::
+ .4byte 0x15
+ .4byte 0x20
+ .4byte NavelRock_Entrance_MapBorder
+ .4byte NavelRock_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_NavelRock
+
diff --git a/data/layouts/NavelRock_Entrance/map.bin b/data/layouts/NavelRock_Entrance/map.bin
new file mode 100644
index 000000000..6fd5b9fa0
--- /dev/null
+++ b/data/layouts/NavelRock_Entrance/map.bin
@@ -0,0 +1 @@
+22222222222222222222222222222222222?2222222222222222222222222222222222222222222222222222222222222222222�GGGG�2222222�GGGGG�2222��222222222222222222222222222222�2222�22222222222222�222222222222222222222222GGXYZGGGGGGGGGGG \ No newline at end of file
diff --git a/data/layouts/NavelRock_Exterior/border.bin b/data/layouts/NavelRock_Exterior/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/NavelRock_Exterior/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc
new file mode 100644
index 000000000..c2c4fa95e
--- /dev/null
+++ b/data/layouts/NavelRock_Exterior/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Exterior_MapBorder::
+ .incbin "data/layouts/NavelRock_Exterior/border.bin"
+
+NavelRock_Exterior_MapBlockdata::
+ .incbin "data/layouts/NavelRock_Exterior/map.bin"
+
+ .align 2
+NavelRock_Exterior_Layout::
+ .4byte 0x15
+ .4byte 0x18
+ .4byte NavelRock_Exterior_MapBorder
+ .4byte NavelRock_Exterior_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Dewford
+
diff --git a/data/layouts/NavelRock_Exterior/map.bin b/data/layouts/NavelRock_Exterior/map.bin
new file mode 100644
index 000000000..9b3342a1a
--- /dev/null
+++ b/data/layouts/NavelRock_Exterior/map.bin
Binary files differ
diff --git a/data/layouts/NavelRock_Fork/border.bin b/data/layouts/NavelRock_Fork/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/NavelRock_Fork/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc
new file mode 100644
index 000000000..ab5d9c867
--- /dev/null
+++ b/data/layouts/NavelRock_Fork/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Fork_MapBorder::
+ .incbin "data/layouts/NavelRock_Fork/border.bin"
+
+NavelRock_Fork_MapBlockdata::
+ .incbin "data/layouts/NavelRock_Fork/map.bin"
+
+ .align 2
+NavelRock_Fork_Layout::
+ .4byte 0x1b
+ .4byte 0x56
+ .4byte NavelRock_Fork_MapBorder
+ .4byte NavelRock_Fork_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_NavelRock
+
diff --git a/data/layouts/NavelRock_Fork/map.bin b/data/layouts/NavelRock_Fork/map.bin
new file mode 100644
index 000000000..0b314cc16
--- /dev/null
+++ b/data/layouts/NavelRock_Fork/map.bin
@@ -0,0 +1 @@
+2222222222222222222?22222222222222222222222222222222222222222222GGGGGGGGGG�222�GGGGGGGGGG2222222222222222222222222222222222222222222222222222222222222222222�GGGGGGGGGG22�222222222222222222222222222GGGGGGGGGG�22�2222222222222222222222222222���2�����2���2222222222222222222222222GGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/layouts/NavelRock_LadderRoom1/border.bin b/data/layouts/NavelRock_LadderRoom1/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc
new file mode 100644
index 000000000..a7fc73d22
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom1/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_LadderRoom1_MapBorder::
+ .incbin "data/layouts/NavelRock_LadderRoom1/border.bin"
+
+NavelRock_LadderRoom1_MapBlockdata::
+ .incbin "data/layouts/NavelRock_LadderRoom1/map.bin"
+
+ .align 2
+NavelRock_LadderRoom1_Layout::
+ .4byte 0x9
+ .4byte 0x8
+ .4byte NavelRock_LadderRoom1_MapBorder
+ .4byte NavelRock_LadderRoom1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_NavelRock
+
diff --git a/data/layouts/NavelRock_LadderRoom1/map.bin b/data/layouts/NavelRock_LadderRoom1/map.bin
new file mode 100644
index 000000000..c2951c043
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom1/map.bin
@@ -0,0 +1 @@
+22222222?2GGGGGGGGGGGG \ No newline at end of file
diff --git a/data/layouts/NavelRock_LadderRoom2/border.bin b/data/layouts/NavelRock_LadderRoom2/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc
new file mode 100644
index 000000000..8fbd6e51f
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom2/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_LadderRoom2_MapBorder::
+ .incbin "data/layouts/NavelRock_LadderRoom2/border.bin"
+
+NavelRock_LadderRoom2_MapBlockdata::
+ .incbin "data/layouts/NavelRock_LadderRoom2/map.bin"
+
+ .align 2
+NavelRock_LadderRoom2_Layout::
+ .4byte 0x9
+ .4byte 0x8
+ .4byte NavelRock_LadderRoom2_MapBorder
+ .4byte NavelRock_LadderRoom2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_NavelRock
+
diff --git a/data/layouts/NavelRock_LadderRoom2/map.bin b/data/layouts/NavelRock_LadderRoom2/map.bin
new file mode 100644
index 000000000..47dd37b93
--- /dev/null
+++ b/data/layouts/NavelRock_LadderRoom2/map.bin
@@ -0,0 +1 @@
+?22V22^22fGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/layouts/NavelRock_Top/border.bin b/data/layouts/NavelRock_Top/border.bin
new file mode 100644
index 000000000..8d839d092
--- /dev/null
+++ b/data/layouts/NavelRock_Top/border.bin
@@ -0,0 +1 @@
+<<<< \ No newline at end of file
diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc
new file mode 100644
index 000000000..50698cc76
--- /dev/null
+++ b/data/layouts/NavelRock_Top/layout.inc
@@ -0,0 +1,15 @@
+NavelRock_Top_MapBorder::
+ .incbin "data/layouts/NavelRock_Top/border.bin"
+
+NavelRock_Top_MapBlockdata::
+ .incbin "data/layouts/NavelRock_Top/map.bin"
+
+ .align 2
+NavelRock_Top_Layout::
+ .4byte 0x19
+ .4byte 0x1c
+ .4byte NavelRock_Top_MapBorder
+ .4byte NavelRock_Top_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_NavelRock
+
diff --git a/data/layouts/NavelRock_Top/map.bin b/data/layouts/NavelRock_Top/map.bin
new file mode 100644
index 000000000..fce085ae6
--- /dev/null
+++ b/data/layouts/NavelRock_Top/map.bin
@@ -0,0 +1 @@
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<PQ3R<<<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X22222Z<<<<<<<<<<<<<<<<CDp22222rDE<<<<<<<<<<<<CDFLp22222rLGDE<<<<<<<<<CF[\\p22222r\\]GE<<<<<<<CFLcLLp222?22rLLeLGE<<<<<CFL[FLLp22222rLLG]LGE<<DDFL[FLLL��LLLG]LGDD\\\\F[\\\��\\]LG\\\\LL[\\FLLL�������LLGG]LLLLL[FLLLL[\�lllll�\]LLG]LLLFFLLLL[FL�lllll�LG]LLG\\\LLLL[\FLL�lllll�LLGG]LLLL \ No newline at end of file
diff --git a/data/layouts/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/NewMauville_Entrance/border.bin
Binary files differ
diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc
new file mode 100644
index 000000000..bbd81cac7
--- /dev/null
+++ b/data/layouts/NewMauville_Entrance/layout.inc
@@ -0,0 +1,15 @@
+NewMauville_Entrance_MapBorder::
+ .incbin "data/layouts/NewMauville_Entrance/border.bin"
+
+NewMauville_Entrance_MapBlockdata::
+ .incbin "data/layouts/NewMauville_Entrance/map.bin"
+
+ .align 2
+NewMauville_Entrance_Layout::
+ .4byte 0x9
+ .4byte 0x9
+ .4byte NewMauville_Entrance_MapBorder
+ .4byte NewMauville_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/NewMauville_Entrance/map.bin b/data/layouts/NewMauville_Entrance/map.bin
new file mode 100644
index 000000000..1e3f471e8
--- /dev/null
+++ b/data/layouts/NewMauville_Entrance/map.bin
@@ -0,0 +1 @@
+t||���||�ut���2���suu󕿉󕿓�3�suu󕿝󕿝�3�suu󕿝󕿝�3�suu󕿝󕿝�3�suu󕿝򺓥�3�su�������s�lllllll� \ No newline at end of file
diff --git a/data/layouts/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/NewMauville_Inside/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc
new file mode 100644
index 000000000..096142c6d
--- /dev/null
+++ b/data/layouts/NewMauville_Inside/layout.inc
@@ -0,0 +1,15 @@
+NewMauville_Inside_MapBorder::
+ .incbin "data/layouts/NewMauville_Inside/border.bin"
+
+NewMauville_Inside_MapBlockdata::
+ .incbin "data/layouts/NewMauville_Inside/map.bin"
+
+ .align 2
+NewMauville_Inside_Layout::
+ .4byte 0x29
+ .4byte 0x29
+ .4byte NewMauville_Inside_MapBorder
+ .4byte NewMauville_Inside_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BikeShop
+
diff --git a/data/layouts/NewMauville_Inside/map.bin b/data/layouts/NewMauville_Inside/map.bin
new file mode 100644
index 000000000..78d1e39ce
--- /dev/null
+++ b/data/layouts/NewMauville_Inside/map.bin
@@ -0,0 +1 @@
+h��jh��jp'��'''�'���rp�'����'��������rpu2򋳊u2/2/2�6/2�2􃷄����2u2񝧬�6�u2����􀲖󻷆rp}2�272727272�67272�2�2�'''''�''�}2222�6�6}2􈋎􎕒}2򽇼�6rp}2�'''''''�}22/2/2/2/2/2�6/2/2/2~22222/2~2�6�6�6�6}222/2rh�}2���jp}2�27272727272�67272�2�22222222/2/2/2~2222rp'��}2���rp}2�''''''''�}22222222>22222��rpu2�2/2~22񝧬rh�}2���jp}22�22222222�2��r�y2o2𸧚�2o272�p��}2�'��rxy27272727272727272727272727272zp'w�}2�w'rp�2/2~22/2񝧬r�'''''''''''''''�pu2/2/2~22/2/2rp}262222.22rp}2.2222622rxy2727272727272z�y272𸧚�27272��'''''''�p���}2�''rh���jp󻷆u2~22/2/2rp'��''����'����rp�6�6}22222rpu2򋳊u2/2�2򰫊�u2󻷆􀲖rpu2/2~22222���}22222222�}2�6�6}22rp}2�22222�'��}22222222�}22/2~22rp�22񋉠222/2�6/2~222222222~2222.2rp�X62񥀤22�272󓫊�22�272727272�272o27272o272�p��X62�222�''�}22�''''�'w''��r�y2o272o272o272�p}222/2/2/2/2�u2/2/2/2�2�2r���p'w'w�w�rp}22226222�}222222��`'��'��ajpu2/2/2/2�2/2�2rp}222222��}222222�'��u2򘇒/2򋳊�'''rp}2�2��������272𸧚�27272��2𸧚2222/2�6/2~2222222/2/2/2rp�6222����'���'�}2����'�}2222�272󐦒�222222�272�2�2rp��2622222/2�6/2/2/2/2~22򕂐�u2/2~2222�''�}222222�'�}2rp��22222�272󐦒�2�22222�}222222rxy27272727272zp}2rp��222���''�}2��22222~222222r�''''''�p}2rxy2�2�22�27272zxy272727272727272727272727272zp}2r�'�}22�''��''''''''''''''�p}2rp}22rp}2rp}22rh���jh��\n]���p}2rp}22rp���'���rp�����v2���a��}2rp}22��򂢌�u2򕁼�2���򂢌򑽘/2/2/2񝧬���}2rp}22�'����''�}22�}2222�'�''�}2222222222�6/2~2rp}222/2򕂆򑽎/2/2/2~22�}2.2222/2�6/2/2/2~2222�2o2727272�2�67272zxy2727272727272727272�2�222~2222�272�67272�2�2222�w��'�'''��''''''''''�}2222222�''''�}222622/2򘇒/2rxy2727272727272zxy27272727272727272z�'''''''��'''''''''� \ No newline at end of file
diff --git a/data/layouts/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/OldaleTown/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc
new file mode 100644
index 000000000..9709ca1ea
--- /dev/null
+++ b/data/layouts/OldaleTown/layout.inc
@@ -0,0 +1,15 @@
+OldaleTown_MapBorder::
+ .incbin "data/layouts/OldaleTown/border.bin"
+
+OldaleTown_MapBlockdata::
+ .incbin "data/layouts/OldaleTown/map.bin"
+
+ .align 2
+OldaleTown_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte OldaleTown_MapBorder
+ .4byte OldaleTown_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Petalburg
+
diff --git a/data/layouts/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin
new file mode 100644
index 000000000..28b17c441
--- /dev/null
+++ b/data/layouts/OldaleTown/map.bin
@@ -0,0 +1 @@
+��������0󕘗0����������������󕙝�10������������0000󮀝󱄏0000��������0000󮀝󱅟0(0)0)0������00l2m2m2n2󮀝󱅟001230����00tuuv󮀝󱅕�189:;0����00|}~󮀝󱅕�1`ABC0����00����󮁭􉭥󱄅󘝅󘝏����000󕘍󘞟000󮀝󱅕󱅕�10��0󕘍󱅕󱅟00󮀝󱅕󱅕�1020󕙝󱅕󱅕�1000󮀝󱅕󱆯002󒕫􉭥󱅕󱅕󘝅󘞕󱅕􉭯0󏎉��000􆨭󱅕󱅕󱅕󱅟000����000H0I0㺝󱅕󱅕�1l2m2m2n2����000PQRS󱅕󱅟0tuuv����󏎉0XYZ[󮀝󱅟0|}~������0`abc󮀝󱆯0����������000󕘍󱅕�10000󏎉������000󮀝󱅕�10000��������󏎉�1x2󱅕󱆯󏎉󏎉���� \ No newline at end of file
diff --git a/data/layouts/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/PacifidlogTown/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc
new file mode 100644
index 000000000..4ba791f23
--- /dev/null
+++ b/data/layouts/PacifidlogTown/layout.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_MapBorder::
+ .incbin "data/layouts/PacifidlogTown/border.bin"
+
+PacifidlogTown_MapBlockdata::
+ .incbin "data/layouts/PacifidlogTown/map.bin"
+
+ .align 2
+PacifidlogTown_Layout::
+ .4byte 0x14
+ .4byte 0x28
+ .4byte PacifidlogTown_MapBorder
+ .4byte PacifidlogTown_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/PacifidlogTown/map.bin b/data/layouts/PacifidlogTown/map.bin
new file mode 100644
index 000000000..02c1454bb
--- /dev/null
+++ b/data/layouts/PacifidlogTown/map.bin
@@ -0,0 +1,6 @@
+qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqt||�qqqqqqqqqqqqqt||}�q{�qqqqqqqqqqt|}qqq{�q{y|||||||||}qqt||�{|����qqqqqqt�||}qt{�����{y|||||}t���|}�����{��������}�����ppp������������ppuv 
+  pppppppppppp}~22ppppppppp 
+  p22pp0123ppp22p2!2!2!22pPQRS p22p 2!2!2!2$2p2XYZ[2p 2!2!2!2$2p())*2,p2HabK2p()*2),ppX2p2!2!2!22pX2ppp`2P2Q2 2!2!2!2!2$2P2Q2P2Q2`2pp()*2)),pppppppppppppX2ppppp 
+  p 
+  pp`2ppppp22p22ppX2pppp22p22pp`2p 
+   2!2!2!2$2p 2!2!2!2$2ppX2p22()*2),()*2),`2p22ppX2ppppX2ppppX2p 2!2!2!2$2pp`2ppppp`2P2Q2P2Q2`2p()*2),ppX2ppppppppX2P2Q2P2Q2P2Q2P2Q2`2pppppppp`2pppppppppppuvpppppppppppppppppp}~ppppppppppppppuvppppr{{{{{{{{{{{{t}~pp{{�qqqqklllllmq�{{{{qqqqkll�qqqqq�lllmqqkll��qqqqqqqqqqqq�ll�qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/layouts/PacifidlogTown_House1/border.bin b/data/layouts/PacifidlogTown_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc
new file mode 100644
index 000000000..b5dcf58b2
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House1/layout.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House1_MapBorder::
+ .incbin "data/layouts/PacifidlogTown_House1/border.bin"
+
+PacifidlogTown_House1_MapBlockdata::
+ .incbin "data/layouts/PacifidlogTown_House1/map.bin"
+
+ .align 2
+PacifidlogTown_House1_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte PacifidlogTown_House1_MapBorder
+ .4byte PacifidlogTown_House1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin
new file mode 100644
index 000000000..7865fdc7c
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House1/map.bin
@@ -0,0 +1 @@
+��������������������񂐝򱃏񅖟򤯇񗰙񅐽𠖧𠖧𠖧𣝫񅒍𹁡��񰖧𼄫򊌍𹁡��񰖧𼄫񅓝񑧇񑧇񑧇񔫫򊍓񋝃񋝃񋝃񋝃�7񋝃�3��񋝃񋧯 \ No newline at end of file
diff --git a/data/layouts/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc
new file mode 100644
index 000000000..a10daa3cd
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House2/layout.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House2_MapBorder::
+ .incbin "data/layouts/PacifidlogTown_House2/border.bin"
+
+PacifidlogTown_House2_MapBlockdata::
+ .incbin "data/layouts/PacifidlogTown_House2/map.bin"
+
+ .align 2
+PacifidlogTown_House2_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte PacifidlogTown_House2_MapBorder
+ .4byte PacifidlogTown_House2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin
new file mode 100644
index 000000000..617346322
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House2/map.bin
@@ -0,0 +1 @@
+�������������������񂓑򭾍򴂟񅒃񶡉򊊽𠖧𠖧𠖧𣝫򊌍𸾷��񰖧𼄫񅒍𹁡��𸾷𼄫񅓝񑧇񑧇񑧇񔫫񅓓񋝃񋝃񋝃񋝃�7񋝃�3��񋝃񋧯 \ No newline at end of file
diff --git a/data/layouts/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/PetalburgCity/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc
new file mode 100644
index 000000000..bae16b88f
--- /dev/null
+++ b/data/layouts/PetalburgCity/layout.inc
@@ -0,0 +1,15 @@
+PetalburgCity_MapBorder::
+ .incbin "data/layouts/PetalburgCity/border.bin"
+
+PetalburgCity_MapBlockdata::
+ .incbin "data/layouts/PetalburgCity/map.bin"
+
+ .align 2
+PetalburgCity_Layout::
+ .4byte 0x1e
+ .4byte 0x1e
+ .4byte PetalburgCity_MapBorder
+ .4byte PetalburgCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Petalburg
+
diff --git a/data/layouts/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin
new file mode 100644
index 000000000..35f0172ca
--- /dev/null
+++ b/data/layouts/PetalburgCity/map.bin
@@ -0,0 +1,4 @@
+����������������������������������UNMNMNV�����������������������D   
+F��������000������������LL�5�������5���������������T  L?������?���������������0 !"LL������L���������������001100LL������L���������������00 1"100LL������L���������������00 1"10<2fL򼯽����1L��������������5�500 1"1deT0011101T00000P2Q2XY����0000 1"1000000 1!1"110000000123���5�50000 1"1000000 1!1"1000000089:;��001111!1!1111111!1!1"10000000`ABC��󏎉(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110�����������000000 1"100PQRS00 1"10�����������000000 1"100XYZ[00 1"10�5����������0 0 0
+000 1"10`abc00 1"1000���������00 1!111111111!1!1100��������� 00 1!1)1)1)1)1)1)1)1)1)1)1*100��������5�5 !"00 1"1000000000󏎉󏎉�������00020000 1"10<2=2=2=2=2=2=2>2�����������00000000 1"10D  
+EEF�����������00000000 1"10LL����������������󏎉0 1"10T L������������������0 1"100 !"00L������������������0 1!111111000L������������������0(1)1)1)1)1)1*1000T������������������󏎉󏎉󏎉󏎉󏎉󏎉������000������0��������������������󏎉�1�������1������������������ \ No newline at end of file
diff --git a/data/layouts/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc
new file mode 100644
index 000000000..36fe1002f
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+PetalburgCity_Gym_MapBorder::
+ .incbin "data/layouts/PetalburgCity_Gym/border.bin"
+
+PetalburgCity_Gym_MapBlockdata::
+ .incbin "data/layouts/PetalburgCity_Gym/map.bin"
+
+ .align 2
+PetalburgCity_Gym_Layout::
+ .4byte 0x9
+ .4byte 0x70
+ .4byte PetalburgCity_Gym_MapBorder
+ .4byte PetalburgCity_Gym_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PetalburgGym
+
diff --git a/data/layouts/PetalburgCity_Gym/map.bin b/data/layouts/PetalburgCity_Gym/map.bin
new file mode 100644
index 000000000..17d5ba980
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/map.bin
@@ -0,0 +1,10 @@
+()()
+01  01 2*234567*22 222;<=>?222 222222222 222222222 222222222 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2ABCDEFG2 2IJKLMNO2 2QRSTUVW2 2YZ[\]^_2 222222222
+        222222222 2�������2 2�������2 2�������2 2�������2 222222222
+        222222222 2�������2 2�������2 2�������2 2�������2 222222222
+        222222222 2�������2 2�������2 2�������2 2�������2 222222222
+        222222222 2�������2 2�������2 2�������2 2�������2 222222222P��
+  X��    222222222,++++++++,++++++++,@+++++@2+,H++++H2,2+00+22 \ No newline at end of file
diff --git a/data/layouts/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/PetalburgWoods/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc
new file mode 100644
index 000000000..840e17f7e
--- /dev/null
+++ b/data/layouts/PetalburgWoods/layout.inc
@@ -0,0 +1,15 @@
+PetalburgWoods_MapBorder::
+ .incbin "data/layouts/PetalburgWoods/border.bin"
+
+PetalburgWoods_MapBlockdata::
+ .incbin "data/layouts/PetalburgWoods/map.bin"
+
+ .align 2
+PetalburgWoods_Layout::
+ .4byte 0x30
+ .4byte 0x2c
+ .4byte PetalburgWoods_MapBorder
+ .4byte PetalburgWoods_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin
new file mode 100644
index 000000000..a032b4c43
--- /dev/null
+++ b/data/layouts/PetalburgWoods/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������000000 0 0 0 0 0 0����������������IIII��������������00000򶥹򶥹 0 0 0����������������000000��������0����000000󩄹󢻝 0 0 000��������������000000��������0����000000���� 0 0000������000 0 0 0 04000000������ 0 0000000 0 0 000���������������0 0 0 0 0 0 00000000������ 0 0 00󏎉򶥹򶥹 0 00����00000������ 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0󩄹󢻉󢻝 0 0 000000000 0������ 0 0 0 0򶥹󏎉󏎉0000󏎉󏎉򶥹򶥹򶥹������򶥹򶥹󏎉0000 0 0������0 0 0 0󩄹󢻉󢻝0000󩄹󢻉󢻉󢻉󢻉�������󥿷󥿷�5000 0 0 0������0000������0000�����������������������100 0 0 0������0000���������������������������������500 0 0 0������000 0������00000�����������������������10 0 0 0������0 0 0 0 0 0 000000000000000000��������������50 0 0 0������ 0 0 0 0 0 0 0000000 0 0 0 00000000��������������00 0 0������ 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000��������������000 0������󏌹򶥹򶥹󏎉0000򶥹򶥹򶥹򶥹򶥹00��������������0000������󢻉󢻉󢻉󢻝0000󩄹󢻉󢻉󢻉󢻝00������00������������������������0000����������00������00������ 0000����������������������������00���� 000000���� 0 000��������������0000����������00���� 000000���� 0 0 00��������000000000000 0 0 0 0 0 0 0 000���� 0 0000000 0 0 0 0 00�������� 0 0 00000000000 0 0 0 0 0 0000���� 0 0 00󏎉0 0 0 0 0 0 0 0������0 0 0 0 0 0 0 0 0000000000000000���� 0 0 0 0󩅍0 0 0 0 0 0 0 0������ 0 0 0 0 0 0򶥹򶥹󏎉000000󏎉󏎉󏎉���� 0 0 0 0��󏌹 0 0 0 0򶥹������ 0 0 0 0 0 0�5���󢻝000000󩄹󢻉󢻉���� 0 0 0 0����5 0 0 0 0�5������� 0 0 0 0 0 0������000000����������0 0 0 0����󏌹򶥹�������� 0 0 0 0 0 0����������������������000 0���������������� 0 0 0 0 0 0������000000����������0000����������������0 0 0 0 0 0 0 0 0 040000000 0 0 0 0��������������������������󏎉0 0 0 0 0 0 000000000 0 0 0 0 0������0000������������������5000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 0������������󏎉󏎉󏎉󏎉000000󏌹򶥹򶥹򶧉󏎉󏎉󏎉000 0 00 0 0��������������������5000000�5�������������5000 0 0 0 0 0��������������������000000��������������0000 0 0򶥹��������������������IIII��������������IIII�5����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/PokemonCenter_1F/border.bin b/data/layouts/PokemonCenter_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..bf1335f84
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/layout.inc
@@ -0,0 +1,15 @@
+PokemonCenter_1F_MapBorder::
+ .incbin "data/layouts/PokemonCenter_1F/border.bin"
+
+PokemonCenter_1F_MapBlockdata::
+ .incbin "data/layouts/PokemonCenter_1F/map.bin"
+
+ .align 2
+PokemonCenter_1F_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte PokemonCenter_1F_MapBorder
+ .4byte PokemonCenter_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonCenter
+
diff --git a/data/layouts/PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin
new file mode 100644
index 000000000..5201dde15
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/map.bin
@@ -0,0 +1 @@
+ ij   JK   qrH"#RSI22y2z2P*+2[Q$2222 2&2422X!!!Y<222'2 2222`2l2m2n2o22%222'2�2�2222021222322222'2�6塀228292:2;2242=>'2𐩺222@2A2B2C22&2EF'2(2222222222&24276 \ No newline at end of file
diff --git a/data/layouts/PokemonCenter_2F/border.bin b/data/layouts/PokemonCenter_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc
new file mode 100644
index 000000000..3cb812de7
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/layout.inc
@@ -0,0 +1,15 @@
+PokemonCenter_2F_MapBorder::
+ .incbin "data/layouts/PokemonCenter_2F/border.bin"
+
+PokemonCenter_2F_MapBlockdata::
+ .incbin "data/layouts/PokemonCenter_2F/map.bin"
+
+ .align 2
+PokemonCenter_2F_Layout::
+ .4byte 0xe
+ .4byte 0xa
+ .4byte PokemonCenter_2F_MapBorder
+ .4byte PokemonCenter_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonCenter
+
diff --git a/data/layouts/PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin
new file mode 100644
index 000000000..c623d86fc
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/map.bin
@@ -0,0 +1 @@
+  ? \  ?\  ?Gd6Gd6G�����2��O2��Ob2����]���]���/2 2l2l2�2a2�2l2�<�2l2�/2𩒊22󃍮�22g2򽃪2g2D�2󛵾�222󕫺22'2񚢪22222222222'2 22222^2^222^2^222'2(622422ff42&2ff&24276 \ No newline at end of file
diff --git a/data/layouts/RecordCorner/border.bin b/data/layouts/RecordCorner/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RecordCorner/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc
new file mode 100644
index 000000000..ed258b2a7
--- /dev/null
+++ b/data/layouts/RecordCorner/layout.inc
@@ -0,0 +1,15 @@
+RecordCorner_MapBorder::
+ .incbin "data/layouts/RecordCorner/border.bin"
+
+RecordCorner_MapBlockdata::
+ .incbin "data/layouts/RecordCorner/map.bin"
+
+ .align 2
+RecordCorner_Layout::
+ .4byte 0x14
+ .4byte 0xa
+ .4byte RecordCorner_MapBorder
+ .4byte RecordCorner_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_CableClub
+
diff --git a/data/layouts/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin
new file mode 100644
index 000000000..51dfb6e5a
--- /dev/null
+++ b/data/layouts/RecordCorner/map.bin
@@ -0,0 +1 @@
+�����������������������������񅀎񗝞񎎢񑓤񗝞񗜬��񝫰򰬸򰯘򰯘򅫈򰫔��񝫰�2������񭄈�2��񝫰򰭂����򈰀򰫔��񝫰�2������񰉀�2��񝫰򰯬򶹜򶹜򶹈򰫔��񶒰򰯘򰯘򰯘򰯘򰬤�"2"2"2"2 \ No newline at end of file
diff --git a/data/layouts/Route101/border.bin b/data/layouts/Route101/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route101/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc
new file mode 100644
index 000000000..e42ecf340
--- /dev/null
+++ b/data/layouts/Route101/layout.inc
@@ -0,0 +1,15 @@
+Route101_MapBorder::
+ .incbin "data/layouts/Route101/border.bin"
+
+Route101_MapBlockdata::
+ .incbin "data/layouts/Route101/map.bin"
+
+ .align 2
+Route101_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte Route101_MapBorder
+ .4byte Route101_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Petalburg
+
diff --git a/data/layouts/Route101/map.bin b/data/layouts/Route101/map.bin
new file mode 100644
index 000000000..fab3a1d69
--- /dev/null
+++ b/data/layouts/Route101/map.bin
@@ -0,0 +1 @@
+��������󮀝�10����������������􆨭�10���������� 0 0 000000000 0 0 0������5 0 0 0 0000000 0 0 0 0���� 0 0 0 0 0 0000000 0 0 0 0 0 0��򶥹 0 0 0000000󏌹 0 0 0 0 0���� 0 000n������򶥹 0 0000�������0000����00󕘗0��󏎉0000000����0󕙝�10����00󕘍�10�� 0 00􆧝󱄏����0󕘍󱅕�10 0 0 0 0 00􆧝�1����0􆧝󱅕�10 0 0 0 0 0 00􆨷����00􆨭�100 0 0 0 0 0 0000�� 0 00000����򶥹 0 0 00󏎉 0 0 0 0 00000000�� 0 000��򶥹 0 0 0 0000000��򶥹󏎉���� 0 0 0 0000000����������򶥹򶧉󏎉󏎉00������������������00������������������00�������� \ No newline at end of file
diff --git a/data/layouts/Route102/border.bin b/data/layouts/Route102/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route102/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc
new file mode 100644
index 000000000..194d44fce
--- /dev/null
+++ b/data/layouts/Route102/layout.inc
@@ -0,0 +1,15 @@
+Route102_MapBorder::
+ .incbin "data/layouts/Route102/border.bin"
+
+Route102_MapBlockdata::
+ .incbin "data/layouts/Route102/map.bin"
+
+ .align 2
+Route102_Layout::
+ .4byte 0x32
+ .4byte 0x14
+ .4byte Route102_MapBorder
+ .4byte Route102_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Petalburg
+
diff --git a/data/layouts/Route102/map.bin b/data/layouts/Route102/map.bin
new file mode 100644
index 000000000..7378bb44b
--- /dev/null
+++ b/data/layouts/Route102/map.bin
@@ -0,0 +1 @@
+������������������������������������������������������������������������������������������������������������ 0 0 000000000000�2�6�6�20�������� 0 0 0 0������������������ 0 0 0000󕘍󘝏0000011110�������� 0 0 0 0������������ 0 0 0 0 0 0 0 0 00󕘍󱅕󱅕󘝏00000000000000�0 0 0 0 0������������ 0 0 0 0 0 0 0 00󕙝�1q2y2􉭥􉭯0000000000󏎉00�00 0 0 0����������000 0 0 0 0 0 0 00󮀝�1����00������󏎉󏎉��00�000 0 0����������0000 0 0 0 0000�1r2�1��0000 0 0 0 0 00������󏎉�00000000000����000000000000����00 0 0 0 0 0 0 00��������{0000000000000��󏎉󏎉󏎉󏎉0000����0 0 0 0 0 0 0 000��������󏎉00000000000����������00󏎉���� 0 0 0 0 0 00000����������00000󕘍󘝏00000��������00������ 0 0 0 0000000����������00󕘍󘞕󱅕�1000󏎉������ 0 000������ 0 0 000󏎉000���� 0 0����󕘍󱅕󱅕󱆥�1000�������� 0 0��������򶥹000��󏎉000 0 0 0 0����󮀝󱅕󱆥�10󏎉󏎉�������� 0 0 0000������000����000 0 0 0 0 000󕙝󱆥􉭯000������������ 0 0 00󏎉������00 0 0 0��0000 0 0 0000􆨭�100󏎉󏎉������������ 0 0 0 0��������0 0 0 0 0 0 0 000000000000000����������������򶥹򶥹��������󏌹򶥹򶥹 0 0 000000󏎉󏎉󏎉󏎉���������������������������������� 0 0 0 00000������������������������������������������򶥹򶥹󏎉󏎉������������������ \ No newline at end of file
diff --git a/data/layouts/Route103/border.bin b/data/layouts/Route103/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route103/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc
new file mode 100644
index 000000000..fe3bac066
--- /dev/null
+++ b/data/layouts/Route103/layout.inc
@@ -0,0 +1,15 @@
+Route103_MapBorder::
+ .incbin "data/layouts/Route103/border.bin"
+
+Route103_MapBlockdata::
+ .incbin "data/layouts/Route103/map.bin"
+
+ .align 2
+Route103_Layout::
+ .4byte 0x50
+ .4byte 0x16
+ .4byte Route103_MapBorder
+ .4byte Route103_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Petalburg
+
diff --git a/data/layouts/Route103/map.bin b/data/layouts/Route103/map.bin
new file mode 100644
index 000000000..44518dc92
--- /dev/null
+++ b/data/layouts/Route103/map.bin
@@ -0,0 +1 @@
+���������������������������pppppppppp�sq{�sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqqu���������������������������uvpppppppp�{|�s{�qquqq{�qqqqt|||||||�qqqqqqqqt}qqqqqu����000000 0 0 0 0 0 0�����������}~pppppppp���s{�sqquqt�{||||}qt����q{||||||||}qqqqqqu����000󕘍󘝏 0 0 0 0 0�����������ppppppuvPQpp�{�s{�ququ{��|||||}qqq{|����������||||||}�� 0 0000􆨭􉭯00 0 0 0 0 0���������puvppp}~XYpp��s{�{|}t}t��������yyy��������������������� 0 0 0 0󥠈�4�4�4�4�4o4 0 0 0 0������dQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M1��0000���������� 0 0 0 0 0 0 00000�4�4�4�4�4�4�4����lYuvpp}~XYppp}~Xm{|�����yz0������1111100000�0���� 0 0 0 0 0 0 000000000000�����p}~pppppppppppp����000000�����000000�00000000����0�0�� 0 0 0 0 0 0 00000󕘍󘝅�10000���pppppppppppppppppp������000����00000000000000�00��򶥹 0 0 0 0 00040􆨭󱅕󱄏000�ppppppppppppppppppppppppp�0000���0�0�00000�0000111���� 0 0 0 00000000􆨭􉭯000�ppppppppppppppppppppppppp�011110���000000000011!1!1)1���� 0 0 0 0000000 0 0 0 00000�ppppppppppppppppppppppppp�0(1)1!1!1111100000011!1!1)1*10����󥠈�4�4�4�4�4�4�4�4 0 0 0 0 00000�0yppppppppppppppppppppppp�000(1)1)1)1!1!1111111111111111!1!1)1*100�����0000000 0 0 0 0 0 0 0򶧉󏎉󏎉dQPQppppppppppuvppppp����0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000�����0000000 0 0 0 0 0 0 0󩄹󢻉��lYXYuvppppPQPQ}~puvpx���000���0�000000000000000000000�������󏎉000000򶥹򶥹򶥹�������2�2yp}~uvPQXYXYpPQ}~Pe������������00000000�0����������000000�5��������������ppp}~XYpppppXYppXm������������000000000�����������󏎉0000���������������uvppppppppppppppp��������������0�0�0�0�0�0�0�0�0�����������󢻝0000���������������}~ppppppppppppppx0�������������������������������������������0000���������������pppppppppppppppp�������������������������������������������󢻝0000���������������pppppppppppppppp���������������������������������������������0000���������������pppppppppppppppp������������������������������������� \ No newline at end of file
diff --git a/data/layouts/Route104/border.bin b/data/layouts/Route104/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route104/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc
new file mode 100644
index 000000000..9a9418e46
--- /dev/null
+++ b/data/layouts/Route104/layout.inc
@@ -0,0 +1,15 @@
+Route104_MapBorder::
+ .incbin "data/layouts/Route104/border.bin"
+
+Route104_MapBlockdata::
+ .incbin "data/layouts/Route104/map.bin"
+
+ .align 2
+Route104_Layout::
+ .4byte 0x28
+ .4byte 0x50
+ .4byte Route104_MapBorder
+ .4byte Route104_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/Route104/map.bin b/data/layouts/Route104/map.bin
new file mode 100644
index 000000000..7731bc31c
--- /dev/null
+++ b/data/layouts/Route104/map.bin
Binary files differ
diff --git a/data/layouts/Route104_MrBrineysHouse/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route104_MrBrineysHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc
new file mode 100644
index 000000000..3474f3335
--- /dev/null
+++ b/data/layouts/Route104_MrBrineysHouse/layout.inc
@@ -0,0 +1,15 @@
+Route104_MrBrineysHouse_MapBorder::
+ .incbin "data/layouts/Route104_MrBrineysHouse/border.bin"
+
+Route104_MrBrineysHouse_MapBlockdata::
+ .incbin "data/layouts/Route104_MrBrineysHouse/map.bin"
+
+ .align 2
+Route104_MrBrineysHouse_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte Route104_MrBrineysHouse_MapBorder
+ .4byte Route104_MrBrineysHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/Route104_MrBrineysHouse/map.bin b/data/layouts/Route104_MrBrineysHouse/map.bin
new file mode 100644
index 000000000..7660fd5d7
--- /dev/null
+++ b/data/layouts/Route104_MrBrineysHouse/map.bin
@@ -0,0 +1 @@
+������������������2򧠜!2�2!2!2�2񚨜󒬠񽨴)2)2)2)2)2)2)2)2)2)2�6)2)2)2)2)2)2NO)2)2)2!2)2)2)2)2)2)2VWD2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file
diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
Binary files differ
diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
new file mode 100644
index 000000000..a46ffc18c
--- /dev/null
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
@@ -0,0 +1,15 @@
+Route104_PrettyPetalFlowerShop_MapBorder::
+ .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin"
+
+Route104_PrettyPetalFlowerShop_MapBlockdata::
+ .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin"
+
+ .align 2
+Route104_PrettyPetalFlowerShop_Layout::
+ .4byte 0xf
+ .4byte 0x9
+ .4byte Route104_PrettyPetalFlowerShop_MapBorder
+ .4byte Route104_PrettyPetalFlowerShop_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PrettyPetalFlowerShop
+
diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/map.bin b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
new file mode 100644
index 000000000..d34ff5c1a
--- /dev/null
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
Binary files differ
diff --git a/data/layouts/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route104_Prototype/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc
new file mode 100644
index 000000000..b2b2c4f19
--- /dev/null
+++ b/data/layouts/Route104_Prototype/layout.inc
@@ -0,0 +1,15 @@
+Route104_Prototype_MapBorder::
+ .incbin "data/layouts/Route104_Prototype/border.bin"
+
+Route104_Prototype_MapBlockdata::
+ .incbin "data/layouts/Route104_Prototype/map.bin"
+
+ .align 2
+Route104_Prototype_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte Route104_Prototype_MapBorder
+ .4byte Route104_Prototype_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/Route104_Prototype/map.bin b/data/layouts/Route104_Prototype/map.bin
new file mode 100644
index 000000000..71bd63e62
--- /dev/null
+++ b/data/layouts/Route104_Prototype/map.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route105/border.bin b/data/layouts/Route105/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route105/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc
new file mode 100644
index 000000000..ce78ef9cc
--- /dev/null
+++ b/data/layouts/Route105/layout.inc
@@ -0,0 +1,15 @@
+Route105_MapBorder::
+ .incbin "data/layouts/Route105/border.bin"
+
+Route105_MapBlockdata::
+ .incbin "data/layouts/Route105/map.bin"
+
+ .align 2
+Route105_Layout::
+ .4byte 0x28
+ .4byte 0x50
+ .4byte Route105_MapBorder
+ .4byte Route105_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Dewford
+
diff --git a/data/layouts/Route105/map.bin b/data/layouts/Route105/map.bin
new file mode 100644
index 000000000..c4bd8286c
--- /dev/null
+++ b/data/layouts/Route105/map.bin
Binary files differ
diff --git a/data/layouts/Route106/border.bin b/data/layouts/Route106/border.bin
new file mode 100644
index 000000000..281762f5b
--- /dev/null
+++ b/data/layouts/Route106/border.bin
@@ -0,0 +1 @@
+CCCC \ No newline at end of file
diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc
new file mode 100644
index 000000000..ea255b383
--- /dev/null
+++ b/data/layouts/Route106/layout.inc
@@ -0,0 +1,15 @@
+Route106_MapBorder::
+ .incbin "data/layouts/Route106/border.bin"
+
+Route106_MapBlockdata::
+ .incbin "data/layouts/Route106/map.bin"
+
+ .align 2
+Route106_Layout::
+ .4byte 0x50
+ .4byte 0x14
+ .4byte Route106_MapBorder
+ .4byte Route106_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Dewford
+
diff --git a/data/layouts/Route106/map.bin b/data/layouts/Route106/map.bin
new file mode 100644
index 000000000..b7e7d7238
--- /dev/null
+++ b/data/layouts/Route106/map.bin
Binary files differ
diff --git a/data/layouts/Route107/border.bin b/data/layouts/Route107/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route107/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc
new file mode 100644
index 000000000..ea305b2a7
--- /dev/null
+++ b/data/layouts/Route107/layout.inc
@@ -0,0 +1,15 @@
+Route107_MapBorder::
+ .incbin "data/layouts/Route107/border.bin"
+
+Route107_MapBlockdata::
+ .incbin "data/layouts/Route107/map.bin"
+
+ .align 2
+Route107_Layout::
+ .4byte 0x3c
+ .4byte 0x14
+ .4byte Route107_MapBorder
+ .4byte Route107_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Dewford
+
diff --git a/data/layouts/Route107/map.bin b/data/layouts/Route107/map.bin
new file mode 100644
index 000000000..521997b0f
--- /dev/null
+++ b/data/layouts/Route107/map.bin
Binary files differ
diff --git a/data/layouts/Route108/border.bin b/data/layouts/Route108/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route108/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc
new file mode 100644
index 000000000..1ec7171cf
--- /dev/null
+++ b/data/layouts/Route108/layout.inc
@@ -0,0 +1,15 @@
+Route108_MapBorder::
+ .incbin "data/layouts/Route108/border.bin"
+
+Route108_MapBlockdata::
+ .incbin "data/layouts/Route108/map.bin"
+
+ .align 2
+Route108_Layout::
+ .4byte 0x3c
+ .4byte 0x14
+ .4byte Route108_MapBorder
+ .4byte Route108_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Slateport
+
diff --git a/data/layouts/Route108/map.bin b/data/layouts/Route108/map.bin
new file mode 100644
index 000000000..138ddc020
--- /dev/null
+++ b/data/layouts/Route108/map.bin
@@ -0,0 +1 @@
+ppppppppppppppppPQpp�񬬿񬬿񬬿񬬿񬬿񬬿�pppppppppppppPQpppppppppppPQppppppppppppppXYp�𲍷𝺟�1^5_5𻚿^5_5𻜟bQppppppppppppXYpppppppppPQXY�񬬿�pPQpppppppppPc^5_5𻚿�5n5o5𝺟n5o5𝸿jYppp񩨇񬬿񬬿�1�pPQppuvpuvPQXYpPc^5_5bQXY�񬬿�pPQppXkn5o5𻜟�1^5_5�1Q3R3S3T3�5�puvPc^5_5𻚿𻚿bQXYpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvp������n5o5X7YZ[\7]�p}~Xkn5o5𝺟𝺟jYppPQpPQpppppppp����ppXkn5o5jYpp}~pppppp���1`abcde�pppp��𻜟𻜟��pppXYpXYppppppppppppppp����pppppppppppp���i3j3k3���ppppp������pppppppppppppppppppppppppppppppppppppppppp�����pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp�񬬿�pppppppppppppppPQpppppppppppppppppppp}~ppppppppp�񬬿�pXY�𲌗𻜋�ppppppppppppppXYpppppppppppppp�񬬿�1�ppppPQppPQpp���5�ppp�𻚿𻜟�pp�񬬿�ppppppPQppPQuvppppp�񬬿�p��𝺟�ppuvXYuvXYppp���uvp������pPc^5_5bQpppppXYppXY}~uvppPc^5_5bQp����PQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~p����pPQPQXYpppppppppXYp����PQXY}~pppPQppppppXYpp}~pppXYpppppPQpppXYXYppppppppppppppppppXYpppppppXYppppppppppppppppppppppXYppppppp \ No newline at end of file
diff --git a/data/layouts/Route109/border.bin b/data/layouts/Route109/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route109/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc
new file mode 100644
index 000000000..fa41585e9
--- /dev/null
+++ b/data/layouts/Route109/layout.inc
@@ -0,0 +1,15 @@
+Route109_MapBorder::
+ .incbin "data/layouts/Route109/border.bin"
+
+Route109_MapBlockdata::
+ .incbin "data/layouts/Route109/map.bin"
+
+ .align 2
+Route109_Layout::
+ .4byte 0x28
+ .4byte 0x3f
+ .4byte Route109_MapBorder
+ .4byte Route109_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Slateport
+
diff --git a/data/layouts/Route109/map.bin b/data/layouts/Route109/map.bin
new file mode 100644
index 000000000..62350867e
--- /dev/null
+++ b/data/layouts/Route109/map.bin
Binary files differ
diff --git a/data/layouts/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route109_SeashoreHouse/border.bin
Binary files differ
diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc
new file mode 100644
index 000000000..9ec997b48
--- /dev/null
+++ b/data/layouts/Route109_SeashoreHouse/layout.inc
@@ -0,0 +1,15 @@
+Route109_SeashoreHouse_MapBorder::
+ .incbin "data/layouts/Route109_SeashoreHouse/border.bin"
+
+Route109_SeashoreHouse_MapBlockdata::
+ .incbin "data/layouts/Route109_SeashoreHouse/map.bin"
+
+ .align 2
+Route109_SeashoreHouse_Layout::
+ .4byte 0xf
+ .4byte 0xa
+ .4byte Route109_SeashoreHouse_MapBorder
+ .4byte Route109_SeashoreHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_SeashoreHouse
+
diff --git a/data/layouts/Route109_SeashoreHouse/map.bin b/data/layouts/Route109_SeashoreHouse/map.bin
new file mode 100644
index 000000000..cb7853a17
--- /dev/null
+++ b/data/layouts/Route109_SeashoreHouse/map.bin
@@ -0,0 +1,3 @@
+./   67
+
+   22222'22222"2,2,2-2$2$2,2,2-2$2$2$2,2,2&2 %2%2%2%2%2!22*2222*2*2222*2*222 $2$2$2$2$2!22%2222%2%2222%2%222 *2*2*2*2*2*2*2*2*2*2*2!22%2%2%2%2%2%2%2%2%222 \ No newline at end of file
diff --git a/data/layouts/Route110/border.bin b/data/layouts/Route110/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route110/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc
new file mode 100644
index 000000000..24e5a9321
--- /dev/null
+++ b/data/layouts/Route110/layout.inc
@@ -0,0 +1,15 @@
+Route110_MapBorder::
+ .incbin "data/layouts/Route110/border.bin"
+
+Route110_MapBlockdata::
+ .incbin "data/layouts/Route110/map.bin"
+
+ .align 2
+Route110_Layout::
+ .4byte 0x28
+ .4byte 0x64
+ .4byte Route110_MapBorder
+ .4byte Route110_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
+
diff --git a/data/layouts/Route110/map.bin b/data/layouts/Route110/map.bin
new file mode 100644
index 000000000..ac83cb93d
--- /dev/null
+++ b/data/layouts/Route110/map.bin
Binary files differ
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin
Binary files differ
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc
new file mode 100644
index 000000000..abf78f62d
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadEntrance_MapBorder::
+ .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin"
+
+Route110_SeasideCyclingRoadEntrance_MapBlockdata::
+ .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin"
+
+ .align 2
+Route110_SeasideCyclingRoadEntrance_Layout::
+ .4byte 0xf
+ .4byte 0x6
+ .4byte Route110_SeasideCyclingRoadEntrance_MapBorder
+ .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin
new file mode 100644
index 000000000..e9fc770d4
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin
@@ -0,0 +1 @@
+������������������������������x2p2p2p2p2񛮺𩒊𬙦x2p2p2p2�2h2h2h2h2񴗎񃉎񆐦�2h2h2h2\2h2h2h2h2p2Y2Z2Y2Z2p2y2h2h2l2d6h2h2h2a6b6a6b6h2h2t6 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHouseCorridor/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseCorridor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc
new file mode 100644
index 000000000..fe6ee4d26
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseCorridor_MapBorder::
+ .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin"
+
+Route110_TrickHouseCorridor_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin"
+
+ .align 2
+Route110_TrickHouseCorridor_Layout::
+ .4byte 0xf
+ .4byte 0x18
+ .4byte Route110_TrickHouseCorridor_MapBorder
+ .4byte Route110_TrickHouseCorridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/Route110_TrickHouseCorridor/map.bin b/data/layouts/Route110_TrickHouseCorridor/map.bin
new file mode 100644
index 000000000..8981d28bd
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseCorridor/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)2)2!2)2)2��!2)2)2��!2)2)2�2!2�2!2)2)2)222 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHouseEnd/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEnd/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc
new file mode 100644
index 000000000..dd9474aee
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEnd/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseEnd_MapBorder::
+ .incbin "data/layouts/Route110_TrickHouseEnd/border.bin"
+
+Route110_TrickHouseEnd_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHouseEnd/map.bin"
+
+ .align 2
+Route110_TrickHouseEnd_Layout::
+ .4byte 0xc
+ .4byte 0x8
+ .4byte Route110_TrickHouseEnd_MapBorder
+ .4byte Route110_TrickHouseEnd_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/Route110_TrickHouseEnd/map.bin b/data/layouts/Route110_TrickHouseEnd/map.bin
new file mode 100644
index 000000000..506fdb644
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEnd/map.bin
@@ -0,0 +1 @@
+�������2���6 26!2�2�2�2�2!2!2!2�2!2!2!2!2)2)2)2)2)2D2)2)2)2)2)2!2)2)2)2)2NO)2)2)2)2)2!2)2)2)2D2VWD2)2)2)2)2!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/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEntrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc
new file mode 100644
index 000000000..97f3abe24
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseEntrance_MapBorder::
+ .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin"
+
+Route110_TrickHouseEntrance_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin"
+
+ .align 2
+Route110_TrickHouseEntrance_Layout::
+ .4byte 0xc
+ .4byte 0x8
+ .4byte Route110_TrickHouseEntrance_MapBorder
+ .4byte Route110_TrickHouseEntrance_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/Route110_TrickHouseEntrance/map.bin b/data/layouts/Route110_TrickHouseEntrance/map.bin
new file mode 100644
index 000000000..1306bb9b5
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEntrance/map.bin
@@ -0,0 +1 @@
+��6���!2!2!2!2!2!2!2!2!2񚨜�2!2)2)2)2D2NOD2)2)2)2)23)2)2)2D2VWD2)2)2)23'7)2)2)2)2)2)2)2)2)2)2"7 333333333333#333332233333 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
new file mode 100644
index 000000000..546876ab0
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle1_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin"
+
+Route110_TrickHousePuzzle1_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle1_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle1_MapBorder
+ .4byte Route110_TrickHousePuzzle1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle1/map.bin b/data/layouts/Route110_TrickHousePuzzle1/map.bin
new file mode 100644
index 000000000..2bf5b392c
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin
@@ -0,0 +1,2 @@
+o233333333334
+w6 #$+$$$+$+$$!222Z2Z2*Z2Z2Z2*Z2*Z2Z2"22222222222222"22222,222,2,22,2222#$$+$$$$$$+%202Z2Z2Z2*Z2Z2Z2Z2Z2Z2*Z22Z22"22222222222222,22(220%22,2220$!2#!2Z2Z22#+$$%Z2Z2*2Z2"22"2Z2*Z2Z2Z222222"22"22222222(22,22,22,22222#$+$+$$$$+$%222Z2Z2"Z2*Z2Z2Z2Z2*Z2Z22222"2Z2222222222222,222222,222#$$$+$$$$+$$%20Z2Z2Z2Z2*Z2Z2Z2Z2*Z2Z2Z22Z22222Z22222Z222222222222222222222 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
new file mode 100644
index 000000000..65caaa734
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle2_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin"
+
+Route110_TrickHousePuzzle2_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle2_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle2_MapBorder
+ .4byte Route110_TrickHousePuzzle2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle2/map.bin b/data/layouts/Route110_TrickHousePuzzle2/map.bin
new file mode 100644
index 000000000..cb35a063e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin
@@ -0,0 +1,2 @@
+o         
+w6 222222222�22222222����22�22222X22�22222�2��������2���222�22X222222i2�����2222�222�2222222222�22���������222�22�2222222�222�22�2���222�222��2�2�X2�2����222�2�2�2�2�X22�i�i�2�222�2�22�222�������2�22�2222222i22�22��2�2���������2222�2222�22�2��222�2222�22�222222�2�22222�22��2222�������22222222222222222222 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
new file mode 100644
index 000000000..a03cf9a71
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle3_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin"
+
+Route110_TrickHousePuzzle3_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle3_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle3_MapBorder
+ .4byte Route110_TrickHousePuzzle3_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle3/map.bin b/data/layouts/Route110_TrickHousePuzzle3/map.bin
new file mode 100644
index 000000000..ac4f344d9
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin
@@ -0,0 +1,2 @@
+o         
+w6 &22&22&2X2&22&22-8292-22-22-22-82925@A522M22:225@Aq222q222U222B22X222K2L2829222&8292225S2T2M@A522"@AM22q222222U222"22q222K2L2./8292-22K2L25S2T25675@A5225S2T2q222X222q222U222U22282928292228292&225@AM@A5225@A"22~22U2X22q222q222"22./K2L2&./22-K2L2567:S2T2"67M225S2T2q2q2q2B22"q2q2U222222228292-228292225225@A5225@A522q222q222q222q222q222222222222222222 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
new file mode 100644
index 000000000..581b41a43
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle4_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin"
+
+Route110_TrickHousePuzzle4_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle4_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle4_MapBorder
+ .4byte Route110_TrickHousePuzzle4_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle4/map.bin b/data/layouts/Route110_TrickHousePuzzle4/map.bin
new file mode 100644
index 000000000..2dbcf251b
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 2222��22222�22222222�2222��22222��2��2�2�2222222�2222�2�22��222�2222�2��2�2���22222�22222222222�22�22222222222�222������22222�22222222222��������2222222�2222�2222���2��22�222�22�22�222�����2��222�222�222222�222���22222�222222�222�2222222222��������������2q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
new file mode 100644
index 000000000..5e06ac31e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle5_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin"
+
+Route110_TrickHousePuzzle5_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle5_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle5_MapBorder
+ .4byte Route110_TrickHousePuzzle5_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle5/map.bin b/data/layouts/Route110_TrickHousePuzzle5/map.bin
new file mode 100644
index 000000000..470e3eba3
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 hh222hhhhhh2222h22222hhhhh2hhh2222222hhh222hh2222222hh22222h2222222h22222222222222222222222222222h2222222h22222hh2222222h22222hh2222222h22222hhh22222hhh222hhhh22222hhh222hhhh22222hhhh2hhhhhh222hhhh222hhhhh222hhh22222hhhhh2hhh2222222hhh222hhh22222hhh22222hhh222hhh22222222222hhhhh22222h22hhhhhhhh22hh \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
new file mode 100644
index 000000000..398c17951
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle6_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin"
+
+Route110_TrickHousePuzzle6_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle6_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle6_MapBorder
+ .4byte Route110_TrickHousePuzzle6_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle6/map.bin b/data/layouts/Route110_TrickHousePuzzle6/map.bin
new file mode 100644
index 000000000..45dc20ba1
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 ��222�222222�22�2222�22�222�22�2222222�2�2��222222�22�2�2�22222���222222�22222�22222�22�2�22222���2�22�22222222�2222��2262�2�2�222�2222���2�2�222�22222222�22��2��2222222��22�22�222���22�22�2���2��2222�222222�2��2�22�22�22222222�22��22222222222222222��2�22222222222222�222222��2222���222222�2222��2222 \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
new file mode 100644
index 000000000..1612ec41b
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle7_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin"
+
+Route110_TrickHousePuzzle7_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle7_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle7_MapBorder
+ .4byte Route110_TrickHousePuzzle7_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle7/map.bin b/data/layouts/Route110_TrickHousePuzzle7/map.bin
new file mode 100644
index 000000000..68ac73547
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 �22�22�222��22������2��22������22�22����������22�2����222�2��22��2�2���2�2�������222�22�2�2222�������2�2�2����2222222�2�2�22222���22�2���2�����2��2�����2�22���2�2���222��2��2��2�2��22�������2222�222222222222�2������������2�2���2��2����2�2������������222�22����22�222�2�2222��2����2�2�2222222�������� \ No newline at end of file
diff --git a/data/layouts/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/border.bin
Binary files differ
diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
new file mode 100644
index 000000000..3520b503f
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle8_MapBorder::
+ .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin"
+
+Route110_TrickHousePuzzle8_MapBlockdata::
+ .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle8_Layout::
+ .4byte 0xf
+ .4byte 0x16
+ .4byte Route110_TrickHousePuzzle8_MapBorder
+ .4byte Route110_TrickHousePuzzle8_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrickHousePuzzle
+
diff --git a/data/layouts/Route110_TrickHousePuzzle8/map.bin b/data/layouts/Route110_TrickHousePuzzle8/map.bin
new file mode 100644
index 000000000..b59b0f606
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 222622222222226k2k2l6l6l6k2l6l6l6l6l6l6l6l6l6k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2222662266666k262626666666262k262k2l6k2k2k2k2l6l6k2k2k2k2k2k22k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k22k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6l6l6k2l6k2k2k2l6k2k2k2k2226662622262222226622622222222 \ No newline at end of file
diff --git a/data/layouts/Route111/border.bin b/data/layouts/Route111/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/Route111/border.bin
Binary files differ
diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc
new file mode 100644
index 000000000..2966c06c5
--- /dev/null
+++ b/data/layouts/Route111/layout.inc
@@ -0,0 +1,15 @@
+Route111_MapBorder::
+ .incbin "data/layouts/Route111/border.bin"
+
+Route111_MapBlockdata::
+ .incbin "data/layouts/Route111/map.bin"
+
+ .align 2
+Route111_Layout::
+ .4byte 0x28
+ .4byte 0x8c
+ .4byte Route111_MapBorder
+ .4byte Route111_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
+
diff --git a/data/layouts/Route111/map.bin b/data/layouts/Route111/map.bin
new file mode 100644
index 000000000..4ce11a8a9
--- /dev/null
+++ b/data/layouts/Route111/map.bin
Binary files differ
diff --git a/data/layouts/Route112/border.bin b/data/layouts/Route112/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/layouts/Route112/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc
new file mode 100644
index 000000000..72a0c428c
--- /dev/null
+++ b/data/layouts/Route112/layout.inc
@@ -0,0 +1,15 @@
+Route112_MapBorder::
+ .incbin "data/layouts/Route112/border.bin"
+
+Route112_MapBlockdata::
+ .incbin "data/layouts/Route112/map.bin"
+
+ .align 2
+Route112_Layout::
+ .4byte 0x28
+ .4byte 0x3c
+ .4byte Route112_MapBorder
+ .4byte Route112_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lavaridge
+
diff --git a/data/layouts/Route112/map.bin b/data/layouts/Route112/map.bin
new file mode 100644
index 000000000..ef3fd5f10
--- /dev/null
+++ b/data/layouts/Route112/map.bin
Binary files differ
diff --git a/data/layouts/Route113/border.bin b/data/layouts/Route113/border.bin
new file mode 100644
index 000000000..73e1e3c60
--- /dev/null
+++ b/data/layouts/Route113/border.bin
@@ -0,0 +1 @@
+mnuv \ No newline at end of file
diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc
new file mode 100644
index 000000000..0c1d76b58
--- /dev/null
+++ b/data/layouts/Route113/layout.inc
@@ -0,0 +1,15 @@
+Route113_MapBorder::
+ .incbin "data/layouts/Route113/border.bin"
+
+Route113_MapBlockdata::
+ .incbin "data/layouts/Route113/map.bin"
+
+ .align 2
+Route113_Layout::
+ .4byte 0x64
+ .4byte 0x14
+ .4byte Route113_MapBorder
+ .4byte Route113_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fallarbor
+
diff --git a/data/layouts/Route113/map.bin b/data/layouts/Route113/map.bin
new file mode 100644
index 000000000..609690de2
--- /dev/null
+++ b/data/layouts/Route113/map.bin
Binary files differ
diff --git a/data/layouts/Route114/border.bin b/data/layouts/Route114/border.bin
new file mode 100644
index 000000000..23e2a92e5
--- /dev/null
+++ b/data/layouts/Route114/border.bin
@@ -0,0 +1 @@
+klst \ No newline at end of file
diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc
new file mode 100644
index 000000000..071f9e1b6
--- /dev/null
+++ b/data/layouts/Route114/layout.inc
@@ -0,0 +1,15 @@
+Route114_MapBorder::
+ .incbin "data/layouts/Route114/border.bin"
+
+Route114_MapBlockdata::
+ .incbin "data/layouts/Route114/map.bin"
+
+ .align 2
+Route114_Layout::
+ .4byte 0x28
+ .4byte 0x50
+ .4byte Route114_MapBorder
+ .4byte Route114_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fallarbor
+
diff --git a/data/layouts/Route114/map.bin b/data/layouts/Route114/map.bin
new file mode 100644
index 000000000..3bad45e04
--- /dev/null
+++ b/data/layouts/Route114/map.bin
Binary files differ
diff --git a/data/layouts/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc
new file mode 100644
index 000000000..f915e572a
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsHouse_MapBorder::
+ .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin"
+
+Route114_FossilManiacsHouse_MapBlockdata::
+ .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin"
+
+ .align 2
+Route114_FossilManiacsHouse_Layout::
+ .4byte 0xa
+ .4byte 0x8
+ .4byte Route114_FossilManiacsHouse_MapBorder
+ .4byte Route114_FossilManiacsHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/Route114_FossilManiacsHouse/map.bin b/data/layouts/Route114_FossilManiacsHouse/map.bin
new file mode 100644
index 000000000..ea2d94fda
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsHouse/map.bin
@@ -0,0 +1 @@
+����������6򧠜!2�2�233��@2!2)2)2)2)277򅩆�2!2NOD2)2󨉼)2)2)2Y2VW)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/layouts/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin
new file mode 100644
index 000000000..580a207f4
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/border.bin
@@ -0,0 +1 @@
+wwww \ No newline at end of file
diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
new file mode 100644
index 000000000..c2392ff01
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsTunnel_MapBorder::
+ .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin"
+
+Route114_FossilManiacsTunnel_MapBlockdata::
+ .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin"
+
+ .align 2
+Route114_FossilManiacsTunnel_Layout::
+ .4byte 0xd
+ .4byte 0x1a
+ .4byte Route114_FossilManiacsTunnel_MapBorder
+ .4byte Route114_FossilManiacsTunnel_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fallarbor
+
diff --git a/data/layouts/Route114_FossilManiacsTunnel/map.bin b/data/layouts/Route114_FossilManiacsTunnel/map.bin
new file mode 100644
index 000000000..61838bff2
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin
@@ -0,0 +1 @@
+w2whiiiiiijw2w2w2whxhiiGijrw2wwwphxhiOjrzjwww2pphx33rzjrwwwppp33�2zjrrwwwppp�6y233rrrwwwppp3y2y2�6rrrwwwppp3y2y2�2rrrwwwpp-2�y2y2�2rrrwwwp-2�p3y2�6rrrwwww2�pp3y2�2rrrwwww2ppp3y2�6,rrwwww2ppp񱠪r�6rzjw2ww2ppp3�2r3zjrw2ww2ppp3�2r3y6rrw2ww2ppp3�2r3y6rrw2whxp-2��2r3y6rrw2wp�2p�2p 3r77rrw2wp�6p�2p 3zj3rzjwp�2p�6p 33r3r3rwp�2p�2p3�2r3r7rwp�2p�2p3�6r3zjrhx�2p7p3�2r77rrpy6�2phx3�2zj3rrpy6�2pp3333r3rrpy6�2pp3񶏼�2r3rr \ No newline at end of file
diff --git a/data/layouts/Route114_LanettesHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route114_LanettesHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc
new file mode 100644
index 000000000..be9689ae3
--- /dev/null
+++ b/data/layouts/Route114_LanettesHouse/layout.inc
@@ -0,0 +1,15 @@
+Route114_LanettesHouse_MapBorder::
+ .incbin "data/layouts/Route114_LanettesHouse/border.bin"
+
+Route114_LanettesHouse_MapBlockdata::
+ .incbin "data/layouts/Route114_LanettesHouse/map.bin"
+
+ .align 2
+Route114_LanettesHouse_Layout::
+ .4byte 0xb
+ .4byte 0x8
+ .4byte Route114_LanettesHouse_MapBorder
+ .4byte Route114_LanettesHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Lab
+
diff --git a/data/layouts/Route114_LanettesHouse/map.bin b/data/layouts/Route114_LanettesHouse/map.bin
new file mode 100644
index 000000000..de1858be4
--- /dev/null
+++ b/data/layouts/Route114_LanettesHouse/map.bin
@@ -0,0 +1,2 @@
+  
+L  !2 !22"2#2"2#2 !2(2(202PQ2(:2Q62%2282XY22BY,-2@22J262%2P4522222)2,-XJ2222145 \ No newline at end of file
diff --git a/data/layouts/Route115/border.bin b/data/layouts/Route115/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route115/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc
new file mode 100644
index 000000000..9d6c3c969
--- /dev/null
+++ b/data/layouts/Route115/layout.inc
@@ -0,0 +1,15 @@
+Route115_MapBorder::
+ .incbin "data/layouts/Route115/border.bin"
+
+Route115_MapBlockdata::
+ .incbin "data/layouts/Route115/map.bin"
+
+ .align 2
+Route115_Layout::
+ .4byte 0x28
+ .4byte 0x50
+ .4byte Route115_MapBorder
+ .4byte Route115_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fallarbor
+
diff --git a/data/layouts/Route115/map.bin b/data/layouts/Route115/map.bin
new file mode 100644
index 000000000..64a58e691
--- /dev/null
+++ b/data/layouts/Route115/map.bin
Binary files differ
diff --git a/data/layouts/Route116/border.bin b/data/layouts/Route116/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route116/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc
new file mode 100644
index 000000000..232cc41f8
--- /dev/null
+++ b/data/layouts/Route116/layout.inc
@@ -0,0 +1,15 @@
+Route116_MapBorder::
+ .incbin "data/layouts/Route116/border.bin"
+
+Route116_MapBlockdata::
+ .incbin "data/layouts/Route116/map.bin"
+
+ .align 2
+Route116_Layout::
+ .4byte 0x64
+ .4byte 0x14
+ .4byte Route116_MapBorder
+ .4byte Route116_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/Route116/map.bin b/data/layouts/Route116/map.bin
new file mode 100644
index 000000000..a6e9d8843
--- /dev/null
+++ b/data/layouts/Route116/map.bin
Binary files differ
diff --git a/data/layouts/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route116_TunnelersRestHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc
new file mode 100644
index 000000000..1bd42eafc
--- /dev/null
+++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc
@@ -0,0 +1,15 @@
+Route116_TunnelersRestHouse_MapBorder::
+ .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin"
+
+Route116_TunnelersRestHouse_MapBlockdata::
+ .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin"
+
+ .align 2
+Route116_TunnelersRestHouse_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte Route116_TunnelersRestHouse_MapBorder
+ .4byte Route116_TunnelersRestHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/Route116_TunnelersRestHouse/map.bin b/data/layouts/Route116_TunnelersRestHouse/map.bin
new file mode 100644
index 000000000..91e2c2019
--- /dev/null
+++ b/data/layouts/Route116_TunnelersRestHouse/map.bin
@@ -0,0 +1 @@
+�������������2򧠜!2!2!2!2󏡶�2!2)2)2)2)2)2)2)2)2)2Y2NO)2)2)2)2NOD2!2VWD2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/layouts/Route117/border.bin b/data/layouts/Route117/border.bin
new file mode 100644
index 000000000..addb5d6ce
--- /dev/null
+++ b/data/layouts/Route117/border.bin
Binary files differ
diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc
new file mode 100644
index 000000000..25e133f28
--- /dev/null
+++ b/data/layouts/Route117/layout.inc
@@ -0,0 +1,15 @@
+Route117_MapBorder::
+ .incbin "data/layouts/Route117/border.bin"
+
+Route117_MapBlockdata::
+ .incbin "data/layouts/Route117/map.bin"
+
+ .align 2
+Route117_Layout::
+ .4byte 0x3c
+ .4byte 0x14
+ .4byte Route117_MapBorder
+ .4byte Route117_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
+
diff --git a/data/layouts/Route117/map.bin b/data/layouts/Route117/map.bin
new file mode 100644
index 000000000..bdeda9cd4
--- /dev/null
+++ b/data/layouts/Route117/map.bin
@@ -0,0 +1,10 @@
+����������������5670 2 000󕄠󘉢00 0 0
+200000000��������00 0 00000���������h4s4q0u4i0j4000 2 0󕄠󘉢40 0 0 0 00000000������� 0 0 0 0 0 0 00000000���������p4{4|4}4q0r440 0 00󕄠󰱲 0000 0 0
+0000000�������8IIIIII:0000000����������p4q0q0t4y4z40 0 00򼝠�0 0 200 2004000�������@2 22
+222B000000
+2����������x4y4y4z400 00 04󭬰�0000 20 000000�����@222 22
+2B00000000000���������������������0� !"������20@2222 22B000000000
+2�����02000000000000000000000000000IIIIIIIHI0000IJ0111111100000���200011111111111111100000000002202020200000000 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202011111111!1"1000000000011111!1!1!1!1*10��������(1)1!1!1!11110000022020202 !!!!!!!!1"100��� 20000(1)1!1!1!1!1!1!1*10�1���������10(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100����200000(1)1!1!1!1"100����������00 1!1*1000000020202000000000000000������000000(1!1!1"100����������0 1"100000000II@@@@II8II000II:0 0 0������0200000 1!1!110��K1L5L5L5M1��001!1"1000000��00����00@22 22
+222B 0 0 0��������0 0 0 00(1!1!1"10��11111��00 1!1*1000�����0�������@222 22
+22B 0 0 0�������� 0 0 0 0 00 1!1!1100000000001!1"100���������������@2222 22
+2B 0 0 0�������� 0 0 0 0 0 0(1!1!1!11111111111!1!1*100����������H0IIIIIIJ@@@�------�%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*100�����������00000000000000���0������0��%0%0 0 0 00000000000000000�������������0�����0�����0���������������%0%0%000�����������00���������� \ No newline at end of file
diff --git a/data/layouts/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin
new file mode 100644
index 000000000..7f603e844
--- /dev/null
+++ b/data/layouts/Route117_PokemonDayCare/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc
new file mode 100644
index 000000000..403881bfe
--- /dev/null
+++ b/data/layouts/Route117_PokemonDayCare/layout.inc
@@ -0,0 +1,15 @@
+Route117_PokemonDayCare_MapBorder::
+ .incbin "data/layouts/Route117_PokemonDayCare/border.bin"
+
+Route117_PokemonDayCare_MapBlockdata::
+ .incbin "data/layouts/Route117_PokemonDayCare/map.bin"
+
+ .align 2
+Route117_PokemonDayCare_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte Route117_PokemonDayCare_MapBorder
+ .4byte Route117_PokemonDayCare_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonDayCare
+
diff --git a/data/layouts/Route117_PokemonDayCare/map.bin b/data/layouts/Route117_PokemonDayCare/map.bin
new file mode 100644
index 000000000..bd4b64e13
--- /dev/null
+++ b/data/layouts/Route117_PokemonDayCare/map.bin
@@ -0,0 +1,2 @@
+567      
+=>?$2&22&244222 22 .!.#222222222(222322222-2022222222222)*%2222222820212222222C222922%2;<22@AAAAA \ No newline at end of file
diff --git a/data/layouts/Route118/border.bin b/data/layouts/Route118/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route118/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc
new file mode 100644
index 000000000..cb87f8414
--- /dev/null
+++ b/data/layouts/Route118/layout.inc
@@ -0,0 +1,15 @@
+Route118_MapBorder::
+ .incbin "data/layouts/Route118/border.bin"
+
+Route118_MapBlockdata::
+ .incbin "data/layouts/Route118/map.bin"
+
+ .align 2
+Route118_Layout::
+ .4byte 0x50
+ .4byte 0x14
+ .4byte Route118_MapBorder
+ .4byte Route118_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
+
diff --git a/data/layouts/Route118/map.bin b/data/layouts/Route118/map.bin
new file mode 100644
index 000000000..dfd8a293d
--- /dev/null
+++ b/data/layouts/Route118/map.bin
Binary files differ
diff --git a/data/layouts/Route119/border.bin b/data/layouts/Route119/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/layouts/Route119/border.bin
Binary files differ
diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc
new file mode 100644
index 000000000..66502fb15
--- /dev/null
+++ b/data/layouts/Route119/layout.inc
@@ -0,0 +1,15 @@
+Route119_MapBorder::
+ .incbin "data/layouts/Route119/border.bin"
+
+Route119_MapBlockdata::
+ .incbin "data/layouts/Route119/map.bin"
+
+ .align 2
+Route119_Layout::
+ .4byte 0x28
+ .4byte 0x8c
+ .4byte Route119_MapBorder
+ .4byte Route119_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fortree
+
diff --git a/data/layouts/Route119/map.bin b/data/layouts/Route119/map.bin
new file mode 100644
index 000000000..1126455a2
--- /dev/null
+++ b/data/layouts/Route119/map.bin
Binary files differ
diff --git a/data/layouts/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
new file mode 100644
index 000000000..9637beea5
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
@@ -0,0 +1,15 @@
+Route119_WeatherInstitute_1F_MapBorder::
+ .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin"
+
+Route119_WeatherInstitute_1F_MapBlockdata::
+ .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin"
+
+ .align 2
+Route119_WeatherInstitute_1F_Layout::
+ .4byte 0x14
+ .4byte 0xd
+ .4byte Route119_WeatherInstitute_1F_MapBorder
+ .4byte Route119_WeatherInstitute_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Lab
+
diff --git a/data/layouts/Route119_WeatherInstitute_1F/map.bin b/data/layouts/Route119_WeatherInstitute_1F/map.bin
new file mode 100644
index 000000000..07a4e7ebb
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_1F/map.bin
@@ -0,0 +1 @@
+__nk___k_____��_|}~_ggkgggk,-,-g��g���lmv2kj2z2z2k4545j2𩒊z2�2�2�2�tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R2�2w2R2R2�2w2R2R2��R2R2R2��R2U2�2fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z2�2R2R2R2�2z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]R2R2R2R2R2R2R2R2 \ No newline at end of file
diff --git a/data/layouts/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
new file mode 100644
index 000000000..4f0948f7b
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
@@ -0,0 +1,15 @@
+Route119_WeatherInstitute_2F_MapBorder::
+ .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin"
+
+Route119_WeatherInstitute_2F_MapBlockdata::
+ .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin"
+
+ .align 2
+Route119_WeatherInstitute_2F_Layout::
+ .4byte 0x14
+ .4byte 0xb
+ .4byte Route119_WeatherInstitute_2F_MapBorder
+ .4byte Route119_WeatherInstitute_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Lab
+
diff --git a/data/layouts/Route119_WeatherInstitute_2F/map.bin b/data/layouts/Route119_WeatherInstitute_2F/map.bin
new file mode 100644
index 000000000..97953f463
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_2F/map.bin
@@ -0,0 +1 @@
+_��_k___________|6}6~6_g��gk,-,-,-,-,-g�6��6gj2𩒊z2k4545454545j2�2z2�2z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2��i2i2i2��i2i2i2i2i2r2i2i2i2�2w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2�r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2��i2i2i2��i2i2i2i2i2r2\i2i2kr2i2i2i2i2i2i2i2i2i2i2i2i2i2i2 \ No newline at end of file
diff --git a/data/layouts/Route120/border.bin b/data/layouts/Route120/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/layouts/Route120/border.bin
Binary files differ
diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc
new file mode 100644
index 000000000..f9e9255a0
--- /dev/null
+++ b/data/layouts/Route120/layout.inc
@@ -0,0 +1,15 @@
+Route120_MapBorder::
+ .incbin "data/layouts/Route120/border.bin"
+
+Route120_MapBlockdata::
+ .incbin "data/layouts/Route120/map.bin"
+
+ .align 2
+Route120_Layout::
+ .4byte 0x28
+ .4byte 0x64
+ .4byte Route120_MapBorder
+ .4byte Route120_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Fortree
+
diff --git a/data/layouts/Route120/map.bin b/data/layouts/Route120/map.bin
new file mode 100644
index 000000000..599e6014d
--- /dev/null
+++ b/data/layouts/Route120/map.bin
Binary files differ
diff --git a/data/layouts/Route121/border.bin b/data/layouts/Route121/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/Route121/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc
new file mode 100644
index 000000000..4d2c9744a
--- /dev/null
+++ b/data/layouts/Route121/layout.inc
@@ -0,0 +1,15 @@
+Route121_MapBorder::
+ .incbin "data/layouts/Route121/border.bin"
+
+Route121_MapBlockdata::
+ .incbin "data/layouts/Route121/map.bin"
+
+ .align 2
+Route121_Layout::
+ .4byte 0x50
+ .4byte 0x14
+ .4byte Route121_MapBorder
+ .4byte Route121_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/Route121/map.bin b/data/layouts/Route121/map.bin
new file mode 100644
index 000000000..cfee98f2a
--- /dev/null
+++ b/data/layouts/Route121/map.bin
@@ -0,0 +1 @@
+����ur��������������������X��������01112��0Z6ur��������������������������������������ur��������������������X��������01112��0Zur������������������������������������ur��������s6L5L5u6��������X0000000001112000Zur00000000����0000000000������������00ur��������{211}2�5�������5X000000008999:000Zur00000000����0000000000������������||||}r�������� 0 0 0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQR�����D�5�������5 0 0 0 000000 0 0 0000000󏎉0BD-EC0tyy}r00000000 0 0 0 0 0000000000 0 0 0 00Z0000000000000000000000000000 0 0 0 0 000000��000000r00tz000000000 0 0 0 0 0 0 000000 0 0 0 0 0 0Z0000000000000000000000000000 0 0 0 0 000000��󏎉00000r&'rPQQQQR00PQQR00PQR00PQQQQQQQQR000000000001111111100000000 0 0 0 0 0 0 00000����t񯣔yyz00r 0 0000000000Z0000Z00X0 0 00 0 0 00Z00000000011!1!1)1)1)1)1)1*10 0 0 0PQQQQQQQQQQQR00����r0000000r 0 0 0PQQQQR0PR0000Z00X0 0 0 0 0 0 00Z0000󏎉111!1!1!1*100000 0 0 0 0 0 0 0 0 0 0 00t|||||񯣔||||z0000000r 0 0 0 0 0 0 00000Z 0 000Z0000 0 0 0 0 0 00000󏎉󩄹)1)1)1)1)1*100󏎉󏌹򶥹򶥹 0 0 0 0t|||}t����񯣔�����yyy�y񯣔zPQQQQQQQQQQR 0 0 00Z00000000000000󩄹�5�500000000��������t|||}t���z000000000000 0 0 0 0 0000000000000 0 0 0 0 00ZPQQQQQQQQR0000�5�5t|00000000�5���5����5ut���z00000tyy񯣔yy�0000 0 0 0 0 0 0 0000000000 0 0 0 0 00Z011111100000t|||}�yyy��yyy||||||||}r00000t|||}]^0^0^0_{||||� 0 0 0 0 0 0 00000000 0 0 0 0 0PQR0󥆎󾻾󾽊00000u�����PPP��PPPt��������}t||||}����]^0^0^0^0_�����{||||||||||||||||||||||||||||||||||}�p1p1p1p1󏎉P�5�5t||}q0q0q0q0q0q0t��}������pPe]^0^0^0^0_dQpp��������������������������������������p1p1p1p1��Pt|}t��||||||}����ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1�5�5t}q0q0u����������ppppppppPQ�e^0^0^0^0g�pXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}�pppppppppppppppppXY��������pppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1 \ No newline at end of file
diff --git a/data/layouts/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route121_SafariZoneEntrance/border.bin
Binary files differ
diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc
new file mode 100644
index 000000000..38ad9e97e
--- /dev/null
+++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc
@@ -0,0 +1,15 @@
+Route121_SafariZoneEntrance_MapBorder::
+ .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin"
+
+Route121_SafariZoneEntrance_MapBlockdata::
+ .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin"
+
+ .align 2
+Route121_SafariZoneEntrance_Layout::
+ .4byte 0x12
+ .4byte 0xe
+ .4byte Route121_SafariZoneEntrance_MapBorder
+ .4byte Route121_SafariZoneEntrance_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
+
diff --git a/data/layouts/Route121_SafariZoneEntrance/map.bin b/data/layouts/Route121_SafariZoneEntrance/map.bin
new file mode 100644
index 000000000..35c1badac
--- /dev/null
+++ b/data/layouts/Route121_SafariZoneEntrance/map.bin
@@ -0,0 +1 @@
+������������]����������������������x2p2p2p2p2p2�󡶠𬗂�e2x2p2p2p2p2�2h2h2h2h2h2�������2h2�2h2h2�2\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h2�2d6h2h2h2h2ababh2h2h2h2h2h2h2�2h2h2h2򭪖\2h2h2h2��dh2h2h2�x2�2h2h2h2��2�2h2h2h2��2�2h2h2h2��\2h2h2h2q2�2d6h2h2t6 \ No newline at end of file
diff --git a/data/layouts/Route122/border.bin b/data/layouts/Route122/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route122/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc
new file mode 100644
index 000000000..7f0baac20
--- /dev/null
+++ b/data/layouts/Route122/layout.inc
@@ -0,0 +1,15 @@
+Route122_MapBorder::
+ .incbin "data/layouts/Route122/border.bin"
+
+Route122_MapBlockdata::
+ .incbin "data/layouts/Route122/map.bin"
+
+ .align 2
+Route122_Layout::
+ .4byte 0x28
+ .4byte 0x28
+ .4byte Route122_MapBorder
+ .4byte Route122_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/Route122/map.bin b/data/layouts/Route122/map.bin
new file mode 100644
index 000000000..1c76b0b0a
--- /dev/null
+++ b/data/layouts/Route122/map.bin
Binary files differ
diff --git a/data/layouts/Route123/border.bin b/data/layouts/Route123/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/layouts/Route123/border.bin
Binary files differ
diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc
new file mode 100644
index 000000000..0c76c2b7b
--- /dev/null
+++ b/data/layouts/Route123/layout.inc
@@ -0,0 +1,15 @@
+Route123_MapBorder::
+ .incbin "data/layouts/Route123/border.bin"
+
+Route123_MapBlockdata::
+ .incbin "data/layouts/Route123/map.bin"
+
+ .align 2
+Route123_Layout::
+ .4byte 0x8c
+ .4byte 0x14
+ .4byte Route123_MapBorder
+ .4byte Route123_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/Route123/map.bin b/data/layouts/Route123/map.bin
new file mode 100644
index 000000000..e1ab62bd7
--- /dev/null
+++ b/data/layouts/Route123/map.bin
@@ -0,0 +1,2 @@
+������������������������������������������������������ppppppppppppppppppppp�E00G�ppppppppppppppppp���������@000000000�����@��������������00hiiiiiiiiiiiij����� 0 0 0 0�� 00 0 0��4K1L5L5L5M1�����������p��pppppppppppppppppp�E00G�ppppppppppppppppp���������@AIIIIIIII90@�����������00000pqqqqqqqqqqqqr����0 0 0 0 0 0 0�� 0 0 0 0�011111����������00���ppppppppppppppppp�E00G�ppppppppppppppppp���������@Bs6u60s6u60s6u6@00 0 0
+00@�������000000�40x�y�yyy�qqqqqr���00 0 0 0 0 0 0� 0 0 0 0�000000���������������pppppppppppppppp�E00G�ppppppppppppppppp���������@B{2}20{2}20{2}2@00@���������������000000�00 0 0x�qqqqr���000 0 0 0 0 0 0 0 0 0 0 0�0000000���������ppppppppppppppp�E00G�ppppppppppppppppp��������@Bs6u60s6u60s6u6@0 0@�������������000000�0 0 0 0 0xyy�w���󥠈�4�4�4�4�40 0 0000 0 0�0000 0 000000000�����������ppppppppppppp�E00G�ppppppppppppppppp������0@B{2}20{2}20{2}2@0 !"0@�00��������000000� 0 0 0 0 0�4o00���0000000� 0000000�000 0 0 0 0 0����0�������������ppppppppppp�E00G�pppppppppppppp�������000@3II0000II2400000@0��4000��������000000� 0 0 0 0 0 0�000��0000000��000000000 0 0 0 0 0 0 0����0��������������pppppppppp�E00G�pppppppppppp������00000@0000000000000000@00�0000��������000000%0%0 0 0 0 0�000�00000000��0�400000��%0 0 0 0 0 0 0���0����������������pppppppp�E00G�ppppppppp��������00000000@�000000000󕘗000@00�000000000000000�4000��%0 0 0 0�000󥠈�4�4�4�40 0 0 0���00000����%0 0 0 0 0 0 0���0������������ppp�E00G�pp���������������000000000@0000000000󮀧000@00�00000000000000000����� 0 00�0�00000000�%0 0 0��0000����%0 0 0 0 0 0��0000000000������������>4>4>40000>4>4>4���������������000000000HIIIIIIIIII0󮀧0II200��4�4���0󥠈�4�4�4�4o4000������000��00000000�� 0 0 0 0�4��������000 0 0 00���0�����������0�40001100�40����000000000040000000000󮀧000000000���000000���������0000�0000000���%0 0 0 0 0000000000000000000 0 0 0���0������000001!1"100000���0000000000�����00000000000000000󮀧0000000000000000�������0000󥠈�4�4�4�4�4�����%0%0 0 000000000�00�400000000 0 0 0 0 00����K1L5L5L5M100111!1!1*1000000���������������00󕘍󘝅󘝅󘝅󘝅󘝅󘞕󱄅󘝅󘝅󘝅󘝅󘝅󘝅󘝅󘝏00�0����󥠈�4�4�4�4o0000000���� 0000011110�11111000000 0 0 0 0 0 0 000001111111!1!1!1!1*100000000000�������0􆨭􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭥􉭯00�000000000�0111111100�0111!1!1)1*10�(1)1)1!1!11111�40 0 0 0 0 0 0 00011111111111!1!1!1)1)1*100�400�����00000000000��������0000000000000000000000000000000000�0011111111000�0(1)1)1)1)1!1!1111110�0(1)1)1)1*1000�000(1)1)1)1)1*10%0%0%0 0 0 0 0 000(1)1)1)1)1)1)1)1)1)1)1)1)1*1000000�������0��������0�����������@4I0IIIIIIIIIII@4@4IIIII0@4����00000�00(1)1)1)1)1)1)1*1000000000(1)1)1)1)1)1*10�0000000�40000000000����%0%0%0%0 000000000�400000000000���������0������������0000000000000��000000��������00�000000�4000000��00000000�40000000000000��000������������00�4000000000000���������������0000000000����������������������������0��������������0���000000�����������000000000���000�����������������������00000000������������������������������� \ No newline at end of file
diff --git a/data/layouts/Route124/border.bin b/data/layouts/Route124/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route124/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc
new file mode 100644
index 000000000..d27ed902a
--- /dev/null
+++ b/data/layouts/Route124/layout.inc
@@ -0,0 +1,15 @@
+Route124_MapBorder::
+ .incbin "data/layouts/Route124/border.bin"
+
+Route124_MapBlockdata::
+ .incbin "data/layouts/Route124/map.bin"
+
+ .align 2
+Route124_Layout::
+ .4byte 0x50
+ .4byte 0x50
+ .4byte Route124_MapBorder
+ .4byte Route124_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mossdeep
+
diff --git a/data/layouts/Route124/map.bin b/data/layouts/Route124/map.bin
new file mode 100644
index 000000000..acd4a65fb
--- /dev/null
+++ b/data/layouts/Route124/map.bin
Binary files differ
diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
Binary files differ
diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
new file mode 100644
index 000000000..263571235
--- /dev/null
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
@@ -0,0 +1,15 @@
+Route124_DivingTreasureHuntersHouse_MapBorder::
+ .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin"
+
+Route124_DivingTreasureHuntersHouse_MapBlockdata::
+ .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin"
+
+ .align 2
+Route124_DivingTreasureHuntersHouse_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte Route124_DivingTreasureHuntersHouse_MapBorder
+ .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
new file mode 100644
index 000000000..8f1f6cbef
--- /dev/null
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
@@ -0,0 +1 @@
+��yzX����  g 𐪬𦊲�2$2$2$2$2$2�9252626262626272#2#292=�2H6I6�>?#2#292=�2P6Q6�>?#2#292E2F2F2F2F2F2G#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file
diff --git a/data/layouts/Route125/border.bin b/data/layouts/Route125/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route125/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc
new file mode 100644
index 000000000..f0d4e13b7
--- /dev/null
+++ b/data/layouts/Route125/layout.inc
@@ -0,0 +1,15 @@
+Route125_MapBorder::
+ .incbin "data/layouts/Route125/border.bin"
+
+Route125_MapBlockdata::
+ .incbin "data/layouts/Route125/map.bin"
+
+ .align 2
+Route125_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Route125_MapBorder
+ .4byte Route125_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mossdeep
+
diff --git a/data/layouts/Route125/map.bin b/data/layouts/Route125/map.bin
new file mode 100644
index 000000000..078f2713d
--- /dev/null
+++ b/data/layouts/Route125/map.bin
Binary files differ
diff --git a/data/layouts/Route126/border.bin b/data/layouts/Route126/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route126/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc
new file mode 100644
index 000000000..859d025a5
--- /dev/null
+++ b/data/layouts/Route126/layout.inc
@@ -0,0 +1,15 @@
+Route126_MapBorder::
+ .incbin "data/layouts/Route126/border.bin"
+
+Route126_MapBlockdata::
+ .incbin "data/layouts/Route126/map.bin"
+
+ .align 2
+Route126_Layout::
+ .4byte 0x50
+ .4byte 0x50
+ .4byte Route126_MapBorder
+ .4byte Route126_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mossdeep
+
diff --git a/data/layouts/Route126/map.bin b/data/layouts/Route126/map.bin
new file mode 100644
index 000000000..2d684cf64
--- /dev/null
+++ b/data/layouts/Route126/map.bin
Binary files differ
diff --git a/data/layouts/Route127/border.bin b/data/layouts/Route127/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route127/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc
new file mode 100644
index 000000000..767330aff
--- /dev/null
+++ b/data/layouts/Route127/layout.inc
@@ -0,0 +1,15 @@
+Route127_MapBorder::
+ .incbin "data/layouts/Route127/border.bin"
+
+Route127_MapBlockdata::
+ .incbin "data/layouts/Route127/map.bin"
+
+ .align 2
+Route127_Layout::
+ .4byte 0x50
+ .4byte 0x50
+ .4byte Route127_MapBorder
+ .4byte Route127_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mossdeep
+
diff --git a/data/layouts/Route127/map.bin b/data/layouts/Route127/map.bin
new file mode 100644
index 000000000..fa44f9960
--- /dev/null
+++ b/data/layouts/Route127/map.bin
Binary files differ
diff --git a/data/layouts/Route128/border.bin b/data/layouts/Route128/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route128/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc
new file mode 100644
index 000000000..16624fa02
--- /dev/null
+++ b/data/layouts/Route128/layout.inc
@@ -0,0 +1,15 @@
+Route128_MapBorder::
+ .incbin "data/layouts/Route128/border.bin"
+
+Route128_MapBlockdata::
+ .incbin "data/layouts/Route128/map.bin"
+
+ .align 2
+Route128_Layout::
+ .4byte 0x78
+ .4byte 0x28
+ .4byte Route128_MapBorder
+ .4byte Route128_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mossdeep
+
diff --git a/data/layouts/Route128/map.bin b/data/layouts/Route128/map.bin
new file mode 100644
index 000000000..fae8a373e
--- /dev/null
+++ b/data/layouts/Route128/map.bin
Binary files differ
diff --git a/data/layouts/Route129/border.bin b/data/layouts/Route129/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route129/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc
new file mode 100644
index 000000000..9b7d6af1d
--- /dev/null
+++ b/data/layouts/Route129/layout.inc
@@ -0,0 +1,15 @@
+Route129_MapBorder::
+ .incbin "data/layouts/Route129/border.bin"
+
+Route129_MapBlockdata::
+ .incbin "data/layouts/Route129/map.bin"
+
+ .align 2
+Route129_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Route129_MapBorder
+ .4byte Route129_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mossdeep
+
diff --git a/data/layouts/Route129/map.bin b/data/layouts/Route129/map.bin
new file mode 100644
index 000000000..8d09787fd
--- /dev/null
+++ b/data/layouts/Route129/map.bin
Binary files differ
diff --git a/data/layouts/Route130/border.bin b/data/layouts/Route130/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route130/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc
new file mode 100644
index 000000000..41db11cb4
--- /dev/null
+++ b/data/layouts/Route130/layout.inc
@@ -0,0 +1,15 @@
+Route130_MapBorder::
+ .incbin "data/layouts/Route130/border.bin"
+
+Route130_MapBlockdata::
+ .incbin "data/layouts/Route130/map.bin"
+
+ .align 2
+Route130_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Route130_MapBorder
+ .4byte Route130_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/Route130/map.bin b/data/layouts/Route130/map.bin
new file mode 100644
index 000000000..b06fa74dc
--- /dev/null
+++ b/data/layouts/Route130/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{vpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr�qkllmq�vppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppu�qk�qquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{�qklllmq�vppppuv��q{|||}qt�}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqk�klm�mq�vppp}~p�y�qqqty�ppu{{vpp�y�ppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQpppp�yyy�ppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~��qq{�qqqt}qt�ppXYpppuvppppppuv�yy�pXYpp}~ppppppXYpppppppppppppppppppppPQppp}~ppp�y�q{|||}qt�puv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQp�y�����y�pp}~q|ppppppppppPQppppXYppPQpppppppu{�q�{vpppppppppppppppuvu{�qq|pppXYppppppppuvppppy�ppppppppppXYppppppppXYpppppuv��qqqq�vpppppppppppppp}~zqqqt�ppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~p�yyyyy�uvppppppu{{vpuvp�yyy�uvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{�km�v}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuv�yy�ppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppzt�ppppppp}~pppppppppppppppppppppppp}~PQ�yy�qqt�p}~ppppppppppppppppppppppppp}~pp��ppppppppppppppppppppppppppppppppppppXYppp�yy�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{�qqq�vpuv�qq|ppppppppppppppppppppppppppuv�y�}~pppppppppppppppppppppppppppppu{{�qqqqqq�v}~qqt�pPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvppp��qqqqqqqqq�vpyy�uvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~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/border.bin b/data/layouts/Route131/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route131/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc
new file mode 100644
index 000000000..7fae261cc
--- /dev/null
+++ b/data/layouts/Route131/layout.inc
@@ -0,0 +1,15 @@
+Route131_MapBorder::
+ .incbin "data/layouts/Route131/border.bin"
+
+Route131_MapBlockdata::
+ .incbin "data/layouts/Route131/map.bin"
+
+ .align 2
+Route131_Layout::
+ .4byte 0x3c
+ .4byte 0x28
+ .4byte Route131_MapBorder
+ .4byte Route131_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/Route131/map.bin b/data/layouts/Route131/map.bin
new file mode 100644
index 000000000..096d6e116
--- /dev/null
+++ b/data/layouts/Route131/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut�|}��ppVOOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqqqqt||}qqt}u����pppVOOOOOOOOOOOOOOOOOVppppppppppppppppp||||||||}qqqt|}t}�pppppppVOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqt���|||}qt}��pppppppVOOOOOOOOOOOOOOOVppppppppppppppppppqqt||}qqqt���|}��ppppppppVOOOOOOOOOOOOOOOVpppppppppppppppppp||}qt�|||}������ppuvppppppVOOOOOOOOOOOOOOVpppppppppppppppppp���|}������uvpu{vp}~ppppppVOOOOOOOOOOOOOVppppppppppppppppppp��Z[��ppppp}~pzq|ppppppppppVOOOOOOOOOOOOVpppppppPQpppppppppp�pXYppppuvpppp�y�pppppppuvpVOOOOOOOOOOOOVppuvu{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pVOOOOOOOOOOOVpuv}~zq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vVOOOOOOOOOOVp}~pp�y�PQ}~ppppppppPQpp�y�ppuvPQpppPQ}~pPQppzq|VOOOOOOOOOVpuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp�y�pVOOOOOOOOVu�|pppuvpppu�qq�vpppppppppppXYppppp}~pppXYppppppuvpVOOOOOOVpzq|ppp}~PQp�yyyy�PQppppppppppppppppppppuvppppppp}~uvVVVVVVuv�y�pppppXYuvppPQpXYu{pppppppppppppppppp}~u{vpppppp}~ppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq�{vppppuvppuvXYpppppppu{vpppppPQppuv�ypppppppppppppppppppp�yyy�pppp}~uv}~pppppppu{�q|pppppXYpp}~ppppppppppppppppppppppppppppppppp}~pppppppPQzqqq|ppppppPQpppPQppppppppppppppppppppppppppppppppppppppppXY�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/Route132/border.bin b/data/layouts/Route132/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route132/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc
new file mode 100644
index 000000000..afaa7fb58
--- /dev/null
+++ b/data/layouts/Route132/layout.inc
@@ -0,0 +1,15 @@
+Route132_MapBorder::
+ .incbin "data/layouts/Route132/border.bin"
+
+Route132_MapBlockdata::
+ .incbin "data/layouts/Route132/map.bin"
+
+ .align 2
+Route132_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Route132_MapBorder
+ .4byte Route132_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/Route132/map.bin b/data/layouts/Route132/map.bin
new file mode 100644
index 000000000..3250c0429
--- /dev/null
+++ b/data/layouts/Route132/map.bin
Binary files differ
diff --git a/data/layouts/Route133/border.bin b/data/layouts/Route133/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route133/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc
new file mode 100644
index 000000000..5ff11108b
--- /dev/null
+++ b/data/layouts/Route133/layout.inc
@@ -0,0 +1,15 @@
+Route133_MapBorder::
+ .incbin "data/layouts/Route133/border.bin"
+
+Route133_MapBlockdata::
+ .incbin "data/layouts/Route133/map.bin"
+
+ .align 2
+Route133_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Route133_MapBorder
+ .4byte Route133_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/Route133/map.bin b/data/layouts/Route133/map.bin
new file mode 100644
index 000000000..1d4e74f73
--- /dev/null
+++ b/data/layouts/Route133/map.bin
@@ -0,0 +1 @@
+ppppuvuvPQppppPQppppppuvppppPQPQppppuvPQPQPQpppPQppPQppuvPQuvppppPQPQuvPQuvpppPQPQpp}~}~XYppuvXYPQuvPQ}~PQuvXYXYppPQ}~XYXYXYpuvXYPQXYPQ}~XY}~PQuvXYXY}~XY}~PQpXYXYuvppppppuv}~ppXY}~XYccXY}~ppppPQXYpppppppPQ}~ppXYppXYccppppXY}~cccccpppppXYPQppp}~pppppp}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQ���cccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2Wcccc���cXY��cccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2𻜟�1_ccccPQ��ccccccccccccccccccccccccccccc^𻜟𻜟𻜟𻜟𻜟𻜟_ccccccc}~�񬬿񬬿񬬿񬬿񬬿�1^WWWW_OgccccXYc�����ccccccccccc������ccccccccfGGN𻜟𻜟𻜟𻜟�1_ccccVF2F2F2F2𲍷𻜟^WWWWWWW���tyo_cccccc����cccccccccccccccccc��������cccccfGGN𻜟𻜟𻜟_cccc^^W_𻜟𻜟�1f�������tyyo𻜟_cccc����cccccccccccccccVF2F2F2Wccccc������cccccfGN𻜟𻜟_cccV>2f��_𻜟^W��tyyyyyo𻜟�1OGgcc���cccccccccccccccccc^𻜟�1?2F2F2Wccccc�������cccfGGGGgccc^^����WW�tyyo𻜟𻜟𻜟�1OGgcc���ccccccccccccc����cccfN𻜟𻜟�1?2F2F2Wccccc�������ccccccccV>2f��������𻜟𻜟𻜟�1OGGgcc���cccu{{{{{{{{{{{{t����ccfN𻜟𻜟𻜟�1?2F2F2Wccccc������cccccc^�1f��tyyyyo�1OGGGGGgcc�����cu{{��������������{{t��ccfN𻜟𻜟𻜟𻜟�1?2F2F2Wccccc�����cccc^�1nyyo𻜟𻜟𻜟_ccccc�����cccu����tyyyyyyyyyy�����{t�ccfN𻜟𻜟𻜟𻜟𻜟�1?2F2F2Wccccccccccc^𻜟𻜟𻜟�1OGGGgcc�����cccu{{��tyy�$1$1$1$1$1$1$1$1$1$1�yyy��|��ccfN𻜟𻜟𻜟𻜟𻜟𻜟�1_cccccccccccfGN𻜟𻜟Ogccccccccccccu{�tyyy�$1�1񔄯񔄯�1$1$1�1񔄯񔀵$1$1$1���tccccfGGGGGGGGGGGGGgc���cccccccccfGGGGgcccccccccccccztyo񔄯񔄯񔄹����񐿷񔄹���񐿷񔄯ny��tcccccccccccccccccccPQ���cccccccccccccccccccccccccc}~���������pp������p�������}y~cccccccccccccccccccXYc���ccccccccccccccccccccccccccppppppppppppppppppppppppppcccccccccccccccccccccccccc����cccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccccPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{������������tPQXYccXYcPQPQXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYpppppu��tyyyyy��tyyyyy~XYcccccccXYXYppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{��to𻜟�𻜟n��𻜟�𻜟?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{�tyyo𻜟𻜟�𻜟no𻜟𻜟𻜟?2WccpppppppppppPQXYO1O1O1O1O1�1_cccccccccuv}~llllcccccccccccppu���to𻜟𻜟�1^_𻜟𻜟𻜟�^_𻜟�1_cppppppppppppXYO1O1O1O1O1O1O1�1_ccccccccc}~llllccccccccccccccc}yyyo𻜟�𻜟�1no𻜟𻜟𻜟�1fg^_�1_ccpppppppppppPQO1O1O1O1O1O1O1�1_cccccccccclllccccccccccccccccccccc^𻜟𻜟^_𻜟𻜟𻜟𻜟�1nofg�1_cccppppppppppXYO1O1O1O1O1O1O1�1_ccccccccccccccccccccccccccccccccccfGN𻜟fg�1�𻜟𻜟𻜟𻜟�1no�1_cccccpppppp�ccPQO1O1O1O1O1O1�1_cccccccccccccccccccccccccccccccccccc^𻜟no𻜟𻜟OGGGN𻜟𻜟OgcccccccppPQ�ccXYPQO1O1O1O1�1_cccccccccc\\\cccccccccccccccccccccccfN𻜟𻜟�1OGgcccfGGGGgccccccccccXY���ccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfN𻜟�1Ogcccccccccccccccccccccccc����ccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQ����ccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYpp����ccuvccccccccccuvpp}~XYccccccPQccccPQpppppPQuvccccccccccpppuvppPQuv}~ppppppppppPQPQ}~ccccccuvPQ}~ppppuvccccccXYuvPQXYpppppXY}~PQccccppPQuvp}~PQXY}~PQppuvppppPQXYXYppPQPQuv}~XYpppppp}~uvuvPQuv}~XYpPQuvPQuvppXYPQuvuvXY}~PQpXYppppXYuv}~PQuvXYppppppXYXY}~pppppppppppp}~}~XY}~pppppXY}~XY}~ppppXY}~}~ppppXYppppppppp}~ppXY}~pppppp \ No newline at end of file
diff --git a/data/layouts/Route134/border.bin b/data/layouts/Route134/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/Route134/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc
new file mode 100644
index 000000000..9eeca6cc9
--- /dev/null
+++ b/data/layouts/Route134/layout.inc
@@ -0,0 +1,15 @@
+Route134_MapBorder::
+ .incbin "data/layouts/Route134/border.bin"
+
+Route134_MapBlockdata::
+ .incbin "data/layouts/Route134/map.bin"
+
+ .align 2
+Route134_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Route134_MapBorder
+ .4byte Route134_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/Route134/map.bin b/data/layouts/Route134/map.bin
new file mode 100644
index 000000000..7b78a2d3c
--- /dev/null
+++ b/data/layouts/Route134/map.bin
Binary files differ
diff --git a/data/layouts/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/RustboroCity/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc
new file mode 100644
index 000000000..00c45dcc2
--- /dev/null
+++ b/data/layouts/RustboroCity/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_MapBorder::
+ .incbin "data/layouts/RustboroCity/border.bin"
+
+RustboroCity_MapBlockdata::
+ .incbin "data/layouts/RustboroCity/map.bin"
+
+ .align 2
+RustboroCity_Layout::
+ .4byte 0x28
+ .4byte 0x3c
+ .4byte RustboroCity_MapBorder
+ .4byte RustboroCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin
new file mode 100644
index 000000000..06736e47e
--- /dev/null
+++ b/data/layouts/RustboroCity/map.bin
Binary files differ
diff --git a/data/layouts/RustboroCity_CuttersHouse/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc
new file mode 100644
index 000000000..0c86dede9
--- /dev/null
+++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_CuttersHouse_MapBorder::
+ .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin"
+
+RustboroCity_CuttersHouse_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin"
+
+ .align 2
+RustboroCity_CuttersHouse_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte RustboroCity_CuttersHouse_MapBorder
+ .4byte RustboroCity_CuttersHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin
new file mode 100644
index 000000000..5515d00cf
--- /dev/null
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
@@ -0,0 +1 @@
+yzfg8898x88��no@@A@�VW�3�3v3w3+3+3+3+3�3^3_3+3{3|3|3}3,3,3,3,3,3,3+3�3>2>2�3,3,3,3j7k7E3+3�3>2>2�3,3,3D3r7s7E3+3�3�3�3�3,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
new file mode 100644
index 000000000..dbf6b388e
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_1F_MapBorder::
+ .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin"
+
+RustboroCity_DevonCorp_1F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin"
+
+ .align 2
+RustboroCity_DevonCorp_1F_Layout::
+ .4byte 0x13
+ .4byte 0x9
+ .4byte RustboroCity_DevonCorp_1F_MapBorder
+ .4byte RustboroCity_DevonCorp_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/RustboroCity_DevonCorp_1F/map.bin b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
new file mode 100644
index 000000000..09f86a742
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
@@ -0,0 +1 @@
+�����������3�����������������࿥࿥���࿥�3������3�3�3�3������3�3�3������������3�����3�3�3���࿥࿥욎욎�3࿥࿥�3�3�3࿥࿥�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�322�3�3�3�3�3�3�3�3�3�3�3�3 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
new file mode 100644
index 000000000..34d581ae5
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_2F_MapBorder::
+ .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin"
+
+RustboroCity_DevonCorp_2F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin"
+
+ .align 2
+RustboroCity_DevonCorp_2F_Layout::
+ .4byte 0x13
+ .4byte 0x9
+ .4byte RustboroCity_DevonCorp_2F_MapBorder
+ .4byte RustboroCity_DevonCorp_2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/RustboroCity_DevonCorp_2F/map.bin b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
new file mode 100644
index 000000000..03985c572
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
@@ -0,0 +1 @@
+���������������������������������������࿥࿥࿥࿥࿥࿥࿥࿥�3�࿥�3�3�3�3񋝍�3�3񋝍�3�3񋝍�3�3࿥𺎻�7�3�3񥔑�3�3񥔑�3�3񥔑�3�3�3ᅡ񫞕�3�3񗯫�3�3�3�3�3�3�3�3�3�3�3�3�3񗱋�3�3񋝍�3�3񋝍�3�3񋝍�3�3�3�3�3�3�3�3�3񥔑�3�3񥔑�3�3񥔑�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_DevonCorp_3F/border.bin b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
new file mode 100644
index 000000000..64c555be5
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_3F_MapBorder::
+ .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin"
+
+RustboroCity_DevonCorp_3F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin"
+
+ .align 2
+RustboroCity_DevonCorp_3F_Layout::
+ .4byte 0x13
+ .4byte 0x9
+ .4byte RustboroCity_DevonCorp_3F_MapBorder
+ .4byte RustboroCity_DevonCorp_3F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/RustboroCity_DevonCorp_3F/map.bin b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
new file mode 100644
index 000000000..5a55ee4ab
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
@@ -0,0 +1 @@
+���������������������������IJK��������࿥࿥࿥࿥Q3R3S3࿥࿥࿥࿥�3�3�3�3�3��3򌆷򏋯�3�3�3�3򌇁��3፼�3�3�3HC�������3�3�3���B�3�3��3�3�3PC�������3�3�3��C�3፼�3�3�–�������3�3�3��〤��3��3�3�3��3򞦉򷍉�3�3�3�3򞥃��3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc
new file mode 100644
index 000000000..b904524a6
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat1_1F_MapBorder::
+ .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin"
+
+RustboroCity_Flat1_1F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin"
+
+ .align 2
+RustboroCity_Flat1_1F_Layout::
+ .4byte 0xe
+ .4byte 0x8
+ .4byte RustboroCity_Flat1_1F_MapBorder
+ .4byte RustboroCity_Flat1_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin
new file mode 100644
index 000000000..017298e71
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
@@ -0,0 +1 @@
+8()*:888:8x88:H0 2B@@@B@�VWBP3+3+3+3+3+3+3+3+3+3�3^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,3쨹H6I6􌷳+3p7q7E3,3,3,3,3�3>2P6Q6􌷳F3G3,3,3,3,3,3,3�3�3�3�3�3�3N7O7,3,3,3,3LM,3,3,3,3,3,3 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc
new file mode 100644
index 000000000..aa6e3ebdf
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat1_2F_MapBorder::
+ .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin"
+
+RustboroCity_Flat1_2F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin"
+
+ .align 2
+RustboroCity_Flat1_2F_Layout::
+ .4byte 0xe
+ .4byte 0x8
+ .4byte RustboroCity_Flat1_2F_MapBorder
+ .4byte RustboroCity_Flat1_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin
new file mode 100644
index 000000000..936907d32
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
@@ -0,0 +1 @@
+8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3,3,3,3,3,3,3+3D3~77�7E3,3{|||},3,3+3,3�7�7�7E3,3�:2!7/3�,3,3+3G3G3,3,3,3,3��3��3�,3,3+3O7O7,3,3,3,3�����,3,3 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc
new file mode 100644
index 000000000..8e44c97b7
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_1F_MapBorder::
+ .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin"
+
+RustboroCity_Flat2_1F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin"
+
+ .align 2
+RustboroCity_Flat2_1F_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte RustboroCity_Flat2_1F_MapBorder
+ .4byte RustboroCity_Flat2_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_Flat2_1F/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin
new file mode 100644
index 000000000..0f6829f9c
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
Binary files differ
diff --git a/data/layouts/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc
new file mode 100644
index 000000000..ffcba8d17
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_2F_MapBorder::
+ .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin"
+
+RustboroCity_Flat2_2F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin"
+
+ .align 2
+RustboroCity_Flat2_2F_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte RustboroCity_Flat2_2F_MapBorder
+ .4byte RustboroCity_Flat2_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_Flat2_2F/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin
new file mode 100644
index 000000000..9f3750fb4
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
Binary files differ
diff --git a/data/layouts/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc
new file mode 100644
index 000000000..77775b4e0
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_3F_MapBorder::
+ .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin"
+
+RustboroCity_Flat2_3F_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin"
+
+ .align 2
+RustboroCity_Flat2_3F_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte RustboroCity_Flat2_3F_MapBorder
+ .4byte RustboroCity_Flat2_3F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_Flat2_3F/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin
new file mode 100644
index 000000000..2112fe799
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
Binary files differ
diff --git a/data/layouts/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/border.bin
Binary files differ
diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc
new file mode 100644
index 000000000..8c064171b
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_Gym_MapBorder::
+ .incbin "data/layouts/RustboroCity_Gym/border.bin"
+
+RustboroCity_Gym_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_Gym/map.bin"
+
+ .align 2
+RustboroCity_Gym_Layout::
+ .4byte 0xb
+ .4byte 0x14
+ .4byte RustboroCity_Gym_MapBorder
+ .4byte RustboroCity_Gym_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_RustboroGym
+
diff --git a/data/layouts/RustboroCity_Gym/map.bin b/data/layouts/RustboroCity_Gym/map.bin
new file mode 100644
index 000000000..4451674a7
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/map.bin
@@ -0,0 +1,2 @@
+ '226 2
+2 2 6222226222622722222222222222222222222#/22 !!!!!!"#22()))))"#2272022,2.22 "#222#/2 "/2 "#22212(*2 "#2()*222-242%"#222.222(!!"#2 "/2272()"#2 $5222322 "+2()*/2(*/2(*227222272227222222222222222&/22222&/222272220027222 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_House/border.bin b/data/layouts/RustboroCity_House/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_House/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc
new file mode 100644
index 000000000..b1b90daee
--- /dev/null
+++ b/data/layouts/RustboroCity_House/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_House_MapBorder::
+ .incbin "data/layouts/RustboroCity_House/border.bin"
+
+RustboroCity_House_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_House/map.bin"
+
+ .align 2
+RustboroCity_House_Layouts::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte RustboroCity_House_MapBorder
+ .4byte RustboroCity_House_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_House/map.bin b/data/layouts/RustboroCity_House/map.bin
new file mode 100644
index 000000000..5a53bbc77
--- /dev/null
+++ b/data/layouts/RustboroCity_House/map.bin
@@ -0,0 +1 @@
+yz89888819fg��IA@@JKAno�3�3Q3+3+3+3R3S363+3v3w3+3,3,3{3|3|3|3|3}3,3,3,3+3,3,3쨹H^􌷳,3,3,3+3,3,3쨹PQ􌷳,3,3,3+3,3,3�3�3�3�3�3�3,3,3,3F3,3,3,3,3,3,3,3,3,3,3G3N,3,3,3,3LM,3,3,3,3O \ No newline at end of file
diff --git a/data/layouts/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/RustboroCity_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc
new file mode 100644
index 000000000..27893f2fb
--- /dev/null
+++ b/data/layouts/RustboroCity_House1/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_House1_MapBorder::
+ .incbin "data/layouts/RustboroCity_House1/border.bin"
+
+RustboroCity_House1_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_House1/map.bin"
+
+ .align 2
+RustboroCity_House1_Layout::
+ .4byte 0xd
+ .4byte 0x8
+ .4byte RustboroCity_House1_MapBorder
+ .4byte RustboroCity_House1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/RustboroCity_House1/map.bin b/data/layouts/RustboroCity_House1/map.bin
new file mode 100644
index 000000000..a14fc0405
--- /dev/null
+++ b/data/layouts/RustboroCity_House1/map.bin
@@ -0,0 +1 @@
+888188::88888CJK@@BB@TUICN7R3S363+3+3+3+3+3\3]3Q3N7+3,3,3,3,3,3,3,3{3|3|3}3,3+3,3D3~77�7E3,3�3>2>2�3,3+3,3D3�7�7�7,3,3�3�3�3�3,3F3,3,3,3,3,3,3,3,3,3,3,3G3N7,3,3,3,3LM,3,3,3,3,3O7 \ No newline at end of file
diff --git a/data/layouts/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin
new file mode 100644
index 000000000..8f857616b
--- /dev/null
+++ b/data/layouts/RustboroCity_PokemonSchool/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc
new file mode 100644
index 000000000..2c4eb3977
--- /dev/null
+++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc
@@ -0,0 +1,15 @@
+RustboroCity_PokemonSchool_MapBorder::
+ .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin"
+
+RustboroCity_PokemonSchool_MapBlockdata::
+ .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin"
+
+ .align 2
+RustboroCity_PokemonSchool_Layout::
+ .4byte 0xc
+ .4byte 0xb
+ .4byte RustboroCity_PokemonSchool_MapBorder
+ .4byte RustboroCity_PokemonSchool_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonSchool
+
diff --git a/data/layouts/RustboroCity_PokemonSchool/map.bin b/data/layouts/RustboroCity_PokemonSchool/map.bin
new file mode 100644
index 000000000..3f3b183d3
--- /dev/null
+++ b/data/layouts/RustboroCity_PokemonSchool/map.bin
Binary files differ
diff --git a/data/layouts/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/RusturfTunnel/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc
new file mode 100644
index 000000000..7a063b922
--- /dev/null
+++ b/data/layouts/RusturfTunnel/layout.inc
@@ -0,0 +1,15 @@
+RusturfTunnel_MapBorder::
+ .incbin "data/layouts/RusturfTunnel/border.bin"
+
+RusturfTunnel_MapBlockdata::
+ .incbin "data/layouts/RusturfTunnel/map.bin"
+
+ .align 2
+RusturfTunnel_Layout::
+ .4byte 0x24
+ .4byte 0x18
+ .4byte RusturfTunnel_MapBorder
+ .4byte RusturfTunnel_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_RusturfTunnel
+
diff --git a/data/layouts/RusturfTunnel/map.bin b/data/layouts/RusturfTunnel/map.bin
new file mode 100644
index 000000000..87ce9bc73
--- /dev/null
+++ b/data/layouts/RusturfTunnel/map.bin
@@ -0,0 +1,2 @@
+3!43!!!4222222@<A@<<<A22222222222222222222222222222222222222222222222222222222222222222                 
+2222222223!!4222222222234@<<A3422222222222@A@A22222222222 PQR   3!422         @<A2223!!4      "22222222234@<<A342222222222   "@A   @A2222222222222 "  2222222222222      2222     PQR  342222            @A2222            222   PQR  3!4        3!4@<A           @<A \ No newline at end of file
diff --git a/data/layouts/SSTidalCorridor/border.bin b/data/layouts/SSTidalCorridor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SSTidalCorridor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc
new file mode 100644
index 000000000..bcc034ecd
--- /dev/null
+++ b/data/layouts/SSTidalCorridor/layout.inc
@@ -0,0 +1,15 @@
+SSTidalCorridor_MapBorder::
+ .incbin "data/layouts/SSTidalCorridor/border.bin"
+
+SSTidalCorridor_MapBlockdata::
+ .incbin "data/layouts/SSTidalCorridor/map.bin"
+
+ .align 2
+SSTidalCorridor_Layout::
+ .4byte 0x12
+ .4byte 0xd
+ .4byte SSTidalCorridor_MapBorder
+ .4byte SSTidalCorridor_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/SSTidalCorridor/map.bin b/data/layouts/SSTidalCorridor/map.bin
new file mode 100644
index 000000000..f8cf1725d
--- /dev/null
+++ b/data/layouts/SSTidalCorridor/map.bin
@@ -0,0 +1 @@
+����������������������������������򕂆򕂆򕂆򕂆򕂆򕂆򕂆򕁀 6򘆴򪥨򳴆򰯢򭪠򳴆򰯬򑽄�2򘆴011111111112򘆴�2򘆴011111111112򘆴�2򘆴011111111112򘆴�2򘆴011111111112򘆴�2򘆴%#$"#$"#$"#&򘆴�2򘆴-+6{*+6{*+6{*+6�򘆴�2򘆴򛌔򞑌򞑌򞑌򞑌򞑌򡕜�2 򂤬򑽄򑽄򑽄򑽄򑽄򑽄򑽄�2 \ No newline at end of file
diff --git a/data/layouts/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalLowerDeck/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SSTidalLowerDeck/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc
new file mode 100644
index 000000000..807da09a1
--- /dev/null
+++ b/data/layouts/SSTidalLowerDeck/layout.inc
@@ -0,0 +1,15 @@
+SSTidalLowerDeck_MapBorder::
+ .incbin "data/layouts/SSTidalLowerDeck/border.bin"
+
+SSTidalLowerDeck_MapBlockdata::
+ .incbin "data/layouts/SSTidalLowerDeck/map.bin"
+
+ .align 2
+SSTidalLowerDeck_Layout::
+ .4byte 0x11
+ .4byte 0xd
+ .4byte SSTidalLowerDeck_MapBorder
+ .4byte SSTidalLowerDeck_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/SSTidalLowerDeck/map.bin b/data/layouts/SSTidalLowerDeck/map.bin
new file mode 100644
index 000000000..059ce30fe
--- /dev/null
+++ b/data/layouts/SSTidalLowerDeck/map.bin
@@ -0,0 +1 @@
+�������������������������������2��22��2���2222 2���2 2���2 2����2 2 2 22 2�2�2�2 2�2�2�2 2�2�2�2�2 2 2 22􆼚􍆀􊁜 2�2�2 2�2�2�2 2 2 22�������2���2����2 2 22�������2���2����2 2 22�2�2�2�2�2�2�2�2�2�2�2�2�2�2 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2􆼤2􆼚􍆀􊁜 2􆼤 2�2�2 2 2��2�������2���2���2 2�6�6�������2�2�2�2�2�2�2 2�� \ No newline at end of file
diff --git a/data/layouts/SSTidalRooms/border.bin b/data/layouts/SSTidalRooms/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SSTidalRooms/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc
new file mode 100644
index 000000000..e44aac53c
--- /dev/null
+++ b/data/layouts/SSTidalRooms/layout.inc
@@ -0,0 +1,15 @@
+SSTidalRooms_MapBorder::
+ .incbin "data/layouts/SSTidalRooms/border.bin"
+
+SSTidalRooms_MapBlockdata::
+ .incbin "data/layouts/SSTidalRooms/map.bin"
+
+ .align 2
+SSTidalRooms_Layout::
+ .4byte 0x24
+ .4byte 0x12
+ .4byte SSTidalRooms_MapBorder
+ .4byte SSTidalRooms_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_InsideShip
+
diff --git a/data/layouts/SSTidalRooms/map.bin b/data/layouts/SSTidalRooms/map.bin
new file mode 100644
index 000000000..6103ad0c2
--- /dev/null
+++ b/data/layouts/SSTidalRooms/map.bin
@@ -0,0 +1 @@
+6@k�c�mE@k�c�mE@k�c�''@k�c�mE7>Hs���uMHs���uMHs���////���uM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2��;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282��828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr𭦀;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz��828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282? \ No newline at end of file
diff --git a/data/layouts/SafariZone_North/border.bin b/data/layouts/SafariZone_North/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/SafariZone_North/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc
new file mode 100644
index 000000000..c6986540f
--- /dev/null
+++ b/data/layouts/SafariZone_North/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_North_MapBorder::
+ .incbin "data/layouts/SafariZone_North/border.bin"
+
+SafariZone_North_MapBlockdata::
+ .incbin "data/layouts/SafariZone_North/map.bin"
+
+ .align 2
+SafariZone_North_Layout::
+ .4byte 0x28
+ .4byte 0x28
+ .4byte SafariZone_North_MapBorder
+ .4byte SafariZone_North_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/SafariZone_North/map.bin b/data/layouts/SafariZone_North/map.bin
new file mode 100644
index 000000000..4f5296815
--- /dev/null
+++ b/data/layouts/SafariZone_North/map.bin
Binary files differ
diff --git a/data/layouts/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/SafariZone_Northeast/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc
new file mode 100644
index 000000000..026e4a7c7
--- /dev/null
+++ b/data/layouts/SafariZone_Northeast/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Northeast_MapBorder::
+ .incbin "data/layouts/SafariZone_Northeast/border.bin"
+
+SafariZone_Northeast_MapBlockdata::
+ .incbin "data/layouts/SafariZone_Northeast/map.bin"
+
+ .align 2
+SafariZone_Northeast_Layout::
+ .4byte 0x28
+ .4byte 0x28
+ .4byte SafariZone_Northeast_MapBorder
+ .4byte SafariZone_Northeast_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/SafariZone_Northeast/map.bin b/data/layouts/SafariZone_Northeast/map.bin
new file mode 100644
index 000000000..9a8803a6a
--- /dev/null
+++ b/data/layouts/SafariZone_Northeast/map.bin
Binary files differ
diff --git a/data/layouts/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/SafariZone_Northwest/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc
new file mode 100644
index 000000000..09d8bd482
--- /dev/null
+++ b/data/layouts/SafariZone_Northwest/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Northwest_MapBorder::
+ .incbin "data/layouts/SafariZone_Northwest/border.bin"
+
+SafariZone_Northwest_MapBlockdata::
+ .incbin "data/layouts/SafariZone_Northwest/map.bin"
+
+ .align 2
+SafariZone_Northwest_Layout::
+ .4byte 0x28
+ .4byte 0x28
+ .4byte SafariZone_Northwest_MapBorder
+ .4byte SafariZone_Northwest_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/SafariZone_Northwest/map.bin b/data/layouts/SafariZone_Northwest/map.bin
new file mode 100644
index 000000000..1825a1c92
--- /dev/null
+++ b/data/layouts/SafariZone_Northwest/map.bin
Binary files differ
diff --git a/data/layouts/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SafariZone_RestHouse/border.bin
Binary files differ
diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc
new file mode 100644
index 000000000..4176cb370
--- /dev/null
+++ b/data/layouts/SafariZone_RestHouse/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_RestHouse_MapBorder::
+ .incbin "data/layouts/SafariZone_RestHouse/border.bin"
+
+SafariZone_RestHouse_MapBlockdata::
+ .incbin "data/layouts/SafariZone_RestHouse/map.bin"
+
+ .align 2
+SafariZone_RestHouse_Layout::
+ .4byte 0xa
+ .4byte 0x9
+ .4byte SafariZone_RestHouse_MapBorder
+ .4byte SafariZone_RestHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/SafariZone_RestHouse/map.bin b/data/layouts/SafariZone_RestHouse/map.bin
new file mode 100644
index 000000000..c57c99c7b
--- /dev/null
+++ b/data/layouts/SafariZone_RestHouse/map.bin
@@ -0,0 +1 @@
+        $2$2$2$2$2$2$2$2$2$292#242�6�6<2#2#2#2#292#242�6�6<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/layouts/SafariZone_South/border.bin b/data/layouts/SafariZone_South/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/SafariZone_South/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc
new file mode 100644
index 000000000..ec83ba5b0
--- /dev/null
+++ b/data/layouts/SafariZone_South/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_South_MapBorder::
+ .incbin "data/layouts/SafariZone_South/border.bin"
+
+SafariZone_South_MapBlockdata::
+ .incbin "data/layouts/SafariZone_South/map.bin"
+
+ .align 2
+SafariZone_South_Layout::
+ .4byte 0x28
+ .4byte 0x28
+ .4byte SafariZone_South_MapBorder
+ .4byte SafariZone_South_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/SafariZone_South/map.bin b/data/layouts/SafariZone_South/map.bin
new file mode 100644
index 000000000..50497b503
--- /dev/null
+++ b/data/layouts/SafariZone_South/map.bin
Binary files differ
diff --git a/data/layouts/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/SafariZone_Southeast/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc
new file mode 100644
index 000000000..e55309b46
--- /dev/null
+++ b/data/layouts/SafariZone_Southeast/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Southeast_MapBorder::
+ .incbin "data/layouts/SafariZone_Southeast/border.bin"
+
+SafariZone_Southeast_MapBlockdata::
+ .incbin "data/layouts/SafariZone_Southeast/map.bin"
+
+ .align 2
+SafariZone_Southeast_Layout::
+ .4byte 0x28
+ .4byte 0x28
+ .4byte SafariZone_Southeast_MapBorder
+ .4byte SafariZone_Southeast_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/SafariZone_Southeast/map.bin b/data/layouts/SafariZone_Southeast/map.bin
new file mode 100644
index 000000000..a778b8797
--- /dev/null
+++ b/data/layouts/SafariZone_Southeast/map.bin
Binary files differ
diff --git a/data/layouts/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/SafariZone_Southwest/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc
new file mode 100644
index 000000000..1236d4d4b
--- /dev/null
+++ b/data/layouts/SafariZone_Southwest/layout.inc
@@ -0,0 +1,15 @@
+SafariZone_Southwest_MapBorder::
+ .incbin "data/layouts/SafariZone_Southwest/border.bin"
+
+SafariZone_Southwest_MapBlockdata::
+ .incbin "data/layouts/SafariZone_Southwest/map.bin"
+
+ .align 2
+SafariZone_Southwest_Layout::
+ .4byte 0x28
+ .4byte 0x28
+ .4byte SafariZone_Southwest_MapBorder
+ .4byte SafariZone_Southwest_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Lilycove
+
diff --git a/data/layouts/SafariZone_Southwest/map.bin b/data/layouts/SafariZone_Southwest/map.bin
new file mode 100644
index 000000000..0074b6e55
--- /dev/null
+++ b/data/layouts/SafariZone_Southwest/map.bin
Binary files differ
diff --git a/data/layouts/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ScorchedSlab/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc
new file mode 100644
index 000000000..897d873ab
--- /dev/null
+++ b/data/layouts/ScorchedSlab/layout.inc
@@ -0,0 +1,15 @@
+ScorchedSlab_MapBorder::
+ .incbin "data/layouts/ScorchedSlab/border.bin"
+
+ScorchedSlab_MapBlockdata::
+ .incbin "data/layouts/ScorchedSlab/map.bin"
+
+ .align 2
+ScorchedSlab_Layout::
+ .4byte 0xf
+ .4byte 0x14
+ .4byte ScorchedSlab_MapBorder
+ .4byte ScorchedSlab_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ScorchedSlab/map.bin b/data/layouts/ScorchedSlab/map.bin
new file mode 100644
index 000000000..edbd982ee
--- /dev/null
+++ b/data/layouts/ScorchedSlab/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222��������ppppp����pppppp��ppppppp��ppppppp��ppppppp��ppppppp��ppppppp��ppp�ppp�GG^^���^^GGG          $G \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Entrance/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc
new file mode 100644
index 000000000..1d6ce495b
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Entrance/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Entrance_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Entrance/border.bin"
+
+SeafloorCavern_Entrance_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Entrance/map.bin"
+
+ .align 2
+SeafloorCavern_Entrance_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte SeafloorCavern_Entrance_MapBorder
+ .4byte SeafloorCavern_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Entrance/map.bin b/data/layouts/SeafloorCavern_Entrance/map.bin
new file mode 100644
index 000000000..f41e6e77d
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Entrance/map.bin
@@ -0,0 +1,11 @@
+���������������������������3����������� �� $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$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$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$1$1
+� $1$1�1񗈗𻜟𻜟𻜟񐻽$1$1
+� $1�1񗈗�������𻝥�1$1
+� �1񗈗��ppppp��𻜕$1
+� 𾡗��ppppppp��񐻽
+� 񗈗�ppppppppp�𻜕
+� 𻜟�ppppppppp�𻜕
+�����1�ppVVVVppp�����������pV����Vp�������������V����V��������������������������� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room1/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc
new file mode 100644
index 000000000..7f7cf0570
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room1/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room1_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room1/border.bin"
+
+SeafloorCavern_Room1_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room1/map.bin"
+
+ .align 2
+SeafloorCavern_Room1_Layout::
+ .4byte 0x14
+ .4byte 0x15
+ .4byte SeafloorCavern_Room1_MapBorder
+ .4byte SeafloorCavern_Room1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Room1/map.bin b/data/layouts/SeafloorCavern_Room1/map.bin
new file mode 100644
index 000000000..57cd82f78
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room1/map.bin
@@ -0,0 +1 @@
+�����������������������������������2�2�2�������3�22222���2�2�������222�222222���2�������222��2�2222��2��������22222��222��2���������622222��22�����������6222222�222���������������2�222���������������2�222�������22������2��222������2222222222�222������22��6�6�6�6�2��2222�����22��6�6�6�6�22�22<22�����2��6�6�6�6�6�22���������2��6�6����22����������2����22222����������2222222�������������2222222������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc
new file mode 100644
index 000000000..89f4e6a79
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room2_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room2/border.bin"
+
+SeafloorCavern_Room2_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room2/map.bin"
+
+ .align 2
+SeafloorCavern_Room2_Layout::
+ .4byte 0x12
+ .4byte 0xc
+ .4byte SeafloorCavern_Room2_MapBorder
+ .4byte SeafloorCavern_Room2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Room2/map.bin b/data/layouts/SeafloorCavern_Room2/map.bin
new file mode 100644
index 000000000..72a064870
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/map.bin
@@ -0,0 +1,7 @@
+����������������� �3����3������� �222����22��
+���� �2222222222�
+�����2��2��2��2�
+��� ��2��2��2��2�
+��� �22222��2222�
+��� �222222222���
+��� �f2������������� �22������������� �2222���������������������������� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc
new file mode 100644
index 000000000..070842a9f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room3_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room3/border.bin"
+
+SeafloorCavern_Room3_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room3/map.bin"
+
+ .align 2
+SeafloorCavern_Room3_Layout::
+ .4byte 0x10
+ .4byte 0x11
+ .4byte SeafloorCavern_Room3_MapBorder
+ .4byte SeafloorCavern_Room3_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Room3/map.bin b/data/layouts/SeafloorCavern_Room3/map.bin
new file mode 100644
index 000000000..01d18c73c
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/map.bin
@@ -0,0 +1 @@
+�6�6�6�6���������6�6�6�6�6�6�6����3����6�6�6�6�6�6���22222���6�6�6�6�6��6�22222����6�6�6���222222��6��6�6�6��22222222���6�6�6��222���222���6�6�6��222��6�222������222��6�222�������222��6�222����222222���222����222222222222����222222222222����QQQM22222222����22222�����������22222������������������6�6�6�6�6�6�6 \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room4/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc
new file mode 100644
index 000000000..6c984109d
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room4/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room4_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room4/border.bin"
+
+SeafloorCavern_Room4_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room4/map.bin"
+
+ .align 2
+SeafloorCavern_Room4_Layout::
+ .4byte 0x12
+ .4byte 0x13
+ .4byte SeafloorCavern_Room4_MapBorder
+ .4byte SeafloorCavern_Room4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Room4/map.bin b/data/layouts/SeafloorCavern_Room4/map.bin
new file mode 100644
index 000000000..928749c95
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room4/map.bin
@@ -0,0 +1 @@
+�������������������3������3��6���2222������222��6���2222������222��6���LQQM������222��6���2222222292222�����22222222922222����22222�����2222����2222���6�6�6��222����2222������222����2222��3��222����22222922222222������2229222222�������������LQQQM������������22222������������22222�������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room5/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc
new file mode 100644
index 000000000..c48b00dba
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room5/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room5_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room5/border.bin"
+
+SeafloorCavern_Room5_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room5/map.bin"
+
+ .align 2
+SeafloorCavern_Room5_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte SeafloorCavern_Room5_MapBorder
+ .4byte SeafloorCavern_Room5_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Room5/map.bin b/data/layouts/SeafloorCavern_Room5/map.bin
new file mode 100644
index 000000000..386430fe4
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room5/map.bin
@@ -0,0 +1 @@
+����������������������3�����������������2222222�������������2222222�����������������222������������������22������������������22������������������222222������������22222222������������222���22���������22222�����22222�����22222�����22222�����22��������22222�����22�����������������2������������������2�������������������2222222�������������2222222�������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin
new file mode 100644
index 000000000..a00c39057
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/border.bin
@@ -0,0 +1 @@
+~~~~ \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc
new file mode 100644
index 000000000..f729d0b1b
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room6_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room6/border.bin"
+
+SeafloorCavern_Room6_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room6/map.bin"
+
+ .align 2
+SeafloorCavern_Room6_Layout::
+ .4byte 0x18
+ .4byte 0x17
+ .4byte SeafloorCavern_Room6_MapBorder
+ .4byte SeafloorCavern_Room6_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SeafloorCavern_Room6/map.bin b/data/layouts/SeafloorCavern_Room6/map.bin
new file mode 100644
index 000000000..452263326
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/map.bin
@@ -0,0 +1 @@
+������������������������z����2������������������xzzy2y2y2y2����������������xxzzy2y2y2y2�p��������������xxzzy2y2y2y2�p�ppppppppppp��xxzzy2y2y2y2�p�ppp�vvv�ppp��xxzz�����p�ppu�~~~�wpp��xxzz�ppppp�pp}�����pp��xxzz�pp����pp�������pp��xxzz�p�ppp�ppppp�pppp���xxzz�p�ppp�p�����pppp���xxzz�p�ppp�p�ppppp���p��xxzz�p�p��p��������pp�p�xxzz�p�p�p�pp�ppppppp�p�xxzz�p�p�p�pp����pppp�p�xxzz�p�p�p�ppppp�pppp�p�xxzz�p�p�p�pppp�p�����p�xxzz�p�p�p�pppp������pp�xxzz�p�p�p������ppppppp�xxzz�p���pp�ppp�ppppp�vvvvzz�ppppp��o2o2o2�v�p�vv~~~~vvvvvvvvvz~2�2~2x~vvv~~~~~~~~~~~~~~~�����~~~~~~~~~~ \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin
new file mode 100644
index 000000000..a00c39057
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/border.bin
@@ -0,0 +1 @@
+~~~~ \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc
new file mode 100644
index 000000000..784b9bbb9
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room7_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room7/border.bin"
+
+SeafloorCavern_Room7_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room7/map.bin"
+
+ .align 2
+SeafloorCavern_Room7_Layout::
+ .4byte 0x17
+ .4byte 0x19
+ .4byte SeafloorCavern_Room7_MapBorder
+ .4byte SeafloorCavern_Room7_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SeafloorCavern_Room7/map.bin b/data/layouts/SeafloorCavern_Room7/map.bin
new file mode 100644
index 000000000..7fa1d903d
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/map.bin
@@ -0,0 +1 @@
+�����������������������z�����2�������~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2���������������xzz������ppp����������xxzz�ppppppppppppppppp�xxzz�p���������������p�xxzz�p�ppppppppppppp�p�xxzz�p���������������p�xxzz�p��pppp�ppppppppp�xxzz�pp�pppp���������p�xxzz�pp�pppppppppppp�p�xxzz��p�pp���������p�p�xxzz��p�pp��pppppp�p�p�xxzz��p�pp��pppppp�p�p�xxzz��p�����������p��p�xxzz��pppp�ppppppp�p�p�xxzz��pppp�ppppppp�p�p�xxzz�����������ppp�����xxz𛉄q2yppppppp�ppp�ppp�xxzy6z6y2�ppppppp�ppp�ppp�xxzy6z6y2q2q2q2q2q2ypp�ppp�ppp�xxz�6�6y2y2y2y2y2y2�pp�ppp�ppp�xxzzy2�2y2y2sy2t�pp�ppp�ppp�xx����������vvvvvvvvvv��� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room8/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc
new file mode 100644
index 000000000..8f3d826c7
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room8/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room8_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room8/border.bin"
+
+SeafloorCavern_Room8_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room8/map.bin"
+
+ .align 2
+SeafloorCavern_Room8_Layout::
+ .4byte 0xb
+ .4byte 0xe
+ .4byte SeafloorCavern_Room8_MapBorder
+ .4byte SeafloorCavern_Room8_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Room8/map.bin b/data/layouts/SeafloorCavern_Room8/map.bin
new file mode 100644
index 000000000..e70e95b47
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room8/map.bin
@@ -0,0 +1 @@
+�������������������6������3��������222�������22222������22222������22222������22222������22222������22222������2LQM2������22222������22222�������������� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc
new file mode 100644
index 000000000..a5039da8f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9/layout.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room9_MapBorder::
+ .incbin "data/layouts/SeafloorCavern_Room9/border.bin"
+
+SeafloorCavern_Room9_MapBlockdata::
+ .incbin "data/layouts/SeafloorCavern_Room9/map.bin"
+
+ .align 2
+SeafloorCavern_Room9_Layout::
+ .4byte 0x1b
+ .4byte 0x2e
+ .4byte SeafloorCavern_Room9_MapBorder
+ .4byte SeafloorCavern_Room9_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SeafloorCavern_Room9/map.bin b/data/layouts/SeafloorCavern_Room9/map.bin
new file mode 100644
index 000000000..252112ac2
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9/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 ���� ��222 # ��OO�� ��222���OOOO�����222�pNOOOONp���222�ppNNNNpp���22222��pppppppp���22222 �ppppppppp���22222222#2s2lpppppppp�����222222222#2lpppppjs2s2$2������22222222#2s2s2s2s2s2$2222��������2222222222222����������������222222��������������������������������� \ No newline at end of file
diff --git a/data/layouts/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/layouts/SealedChamber_InnerRoom/border.bin
Binary files differ
diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc
new file mode 100644
index 000000000..7a064d5f0
--- /dev/null
+++ b/data/layouts/SealedChamber_InnerRoom/layout.inc
@@ -0,0 +1,15 @@
+SealedChamber_InnerRoom_MapBorder::
+ .incbin "data/layouts/SealedChamber_InnerRoom/border.bin"
+
+SealedChamber_InnerRoom_MapBlockdata::
+ .incbin "data/layouts/SealedChamber_InnerRoom/map.bin"
+
+ .align 2
+SealedChamber_InnerRoom_Layout::
+ .4byte 0x15
+ .4byte 0x17
+ .4byte SealedChamber_InnerRoom_MapBorder
+ .4byte SealedChamber_InnerRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SealedChamber_InnerRoom/map.bin b/data/layouts/SealedChamber_InnerRoom/map.bin
new file mode 100644
index 000000000..823fa5fab
--- /dev/null
+++ b/data/layouts/SealedChamber_InnerRoom/map.bin
@@ -0,0 +1 @@
+�������������������������������������������������������������������2222�����2222��������2222�777�2222�������222222222222222������22���22222���22������22���22222���22������22�7�22222�7�22������222222222222222������222222222222222���������222222222������������222222222����������7�222222222�7�������222222222222222������222222222222222������22���22222���22������22���22222���22�������2�7�22222�7�2�������2222222222222���������������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/layouts/SealedChamber_OuterRoom/border.bin
Binary files differ
diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc
new file mode 100644
index 000000000..bc6afaf29
--- /dev/null
+++ b/data/layouts/SealedChamber_OuterRoom/layout.inc
@@ -0,0 +1,15 @@
+SealedChamber_OuterRoom_MapBorder::
+ .incbin "data/layouts/SealedChamber_OuterRoom/border.bin"
+
+SealedChamber_OuterRoom_MapBlockdata::
+ .incbin "data/layouts/SealedChamber_OuterRoom/map.bin"
+
+ .align 2
+SealedChamber_OuterRoom_Layout::
+ .4byte 0x15
+ .4byte 0x17
+ .4byte SealedChamber_OuterRoom_MapBorder
+ .4byte SealedChamber_OuterRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SealedChamber_OuterRoom/map.bin b/data/layouts/SealedChamber_OuterRoom/map.bin
new file mode 100644
index 000000000..bf1482f97
--- /dev/null
+++ b/data/layouts/SealedChamber_OuterRoom/map.bin
@@ -0,0 +1,11 @@
+`*+,a)2324)222222222222222222222222222222   
+2   
+2 
+555255525222222222222222   
+2   
+2 
+555255525222222222222222   
+2   
+222255525552222222222222222222   
+2   
+22225552555222222222222222222222222�����2222222222�VVV�2222222222�VGV�22222$ggggg_____ggggg#$                 #$$                 ## \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc
new file mode 100644
index 000000000..ec138440a
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave1_MapBorder::
+ .incbin "data/layouts/SecretBase_BlueCave1/border.bin"
+
+SecretBase_BlueCave1_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BlueCave1/map.bin"
+
+ .align 2
+SecretBase_BlueCave1_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte SecretBase_BlueCave1_MapBorder
+ .4byte SecretBase_BlueCave1_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/layouts/SecretBase_BlueCave1/map.bin b/data/layouts/SecretBase_BlueCave1/map.bin
new file mode 100644
index 000000000..371b2a8d5
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave1/map.bin
@@ -0,0 +1,50 @@
+6
+2
+2
+2
+2
+2   6
+2
+22
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26 
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc
new file mode 100644
index 000000000..8c2b48661
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave2_MapBorder::
+ .incbin "data/layouts/SecretBase_BlueCave2/border.bin"
+
+SecretBase_BlueCave2_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BlueCave2/map.bin"
+
+ .align 2
+SecretBase_BlueCave2_Layout::
+ .4byte 0xf
+ .4byte 0x7
+ .4byte SecretBase_BlueCave2_MapBorder
+ .4byte SecretBase_BlueCave2_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/layouts/SecretBase_BlueCave2/map.bin b/data/layouts/SecretBase_BlueCave2/map.bin
new file mode 100644
index 000000000..4993e5b65
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave2/map.bin
@@ -0,0 +1,57 @@
+  62
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+2
+2
+2
+22
+2
+2
+26  \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc
new file mode 100644
index 000000000..0ac8bee1b
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave3_MapBorder::
+ .incbin "data/layouts/SecretBase_BlueCave3/border.bin"
+
+SecretBase_BlueCave3_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BlueCave3/map.bin"
+
+ .align 2
+SecretBase_BlueCave3_Layout::
+ .4byte 0xa
+ .4byte 0x11
+ .4byte SecretBase_BlueCave3_MapBorder
+ .4byte SecretBase_BlueCave3_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/layouts/SecretBase_BlueCave3/map.bin b/data/layouts/SecretBase_BlueCave3/map.bin
new file mode 100644
index 000000000..968aade07
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave3/map.bin
@@ -0,0 +1,51 @@
+ 
+2
+2
+2
+22
+2
+2
+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
+2
+2
+2
+2 
+2  
+2 
+2  
+2
+2
+22
+2  
+2
+2  
+2 6
+222  
+2
+22
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc
new file mode 100644
index 000000000..d0e5ed45f
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave4_MapBorder::
+ .incbin "data/layouts/SecretBase_BlueCave4/border.bin"
+
+SecretBase_BlueCave4_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BlueCave4/map.bin"
+
+ .align 2
+SecretBase_BlueCave4_Layout::
+ .4byte 0x9
+ .4byte 0x11
+ .4byte SecretBase_BlueCave4_MapBorder
+ .4byte SecretBase_BlueCave4_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBlueCave
+
diff --git a/data/layouts/SecretBase_BlueCave4/map.bin b/data/layouts/SecretBase_BlueCave4/map.bin
new file mode 100644
index 000000000..631ac0f81
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave4/map.bin
@@ -0,0 +1,57 @@
+ 
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+22  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2 6
+2
+2"6  #6  2 
+2   6
+22  
+2
+2
+2  
+22
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc
new file mode 100644
index 000000000..9044fd6d1
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave1_MapBorder::
+ .incbin "data/layouts/SecretBase_BrownCave1/border.bin"
+
+SecretBase_BrownCave1_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BrownCave1/map.bin"
+
+ .align 2
+SecretBase_BrownCave1_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte SecretBase_BrownCave1_MapBorder
+ .4byte SecretBase_BrownCave1_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/layouts/SecretBase_BrownCave1/map.bin b/data/layouts/SecretBase_BrownCave1/map.bin
new file mode 100644
index 000000000..56d3436ca
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave1/map.bin
@@ -0,0 +1,54 @@
+6
+2
+2
+2
+2
+2
+2
+2  
+2 6
+2
+22
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc
new file mode 100644
index 000000000..7cfb9573b
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave2_MapBorder::
+ .incbin "data/layouts/SecretBase_BrownCave2/border.bin"
+
+SecretBase_BrownCave2_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BrownCave2/map.bin"
+
+ .align 2
+SecretBase_BrownCave2_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte SecretBase_BrownCave2_MapBorder
+ .4byte SecretBase_BrownCave2_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/layouts/SecretBase_BrownCave2/map.bin b/data/layouts/SecretBase_BrownCave2/map.bin
new file mode 100644
index 000000000..184896975
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave2/map.bin
@@ -0,0 +1,56 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2 6  
+26
+2
+2
+2
+2
+2
+22
+2  
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2
+2 2 6
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc
new file mode 100644
index 000000000..5ad1bf526
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave3_MapBorder::
+ .incbin "data/layouts/SecretBase_BrownCave3/border.bin"
+
+SecretBase_BrownCave3_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BrownCave3/map.bin"
+
+ .align 2
+SecretBase_BrownCave3_Layout::
+ .4byte 0xf
+ .4byte 0xb
+ .4byte SecretBase_BrownCave3_MapBorder
+ .4byte SecretBase_BrownCave3_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/layouts/SecretBase_BrownCave3/map.bin b/data/layouts/SecretBase_BrownCave3/map.bin
new file mode 100644
index 000000000..d9967522a
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave3/map.bin
@@ -0,0 +1,69 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+26
+2
+2
+2 66
+2
+2
+2  
+2
+2
+2 6  
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2  
+2
+2
+2
+2 
+2
+2
+2  
+2
+2
+2
+2  2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+22
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc
new file mode 100644
index 000000000..6094a3832
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave4_MapBorder::
+ .incbin "data/layouts/SecretBase_BrownCave4/border.bin"
+
+SecretBase_BrownCave4_MapBlockdata::
+ .incbin "data/layouts/SecretBase_BrownCave4/map.bin"
+
+ .align 2
+SecretBase_BrownCave4_Layout::
+ .4byte 0xe
+ .4byte 0xc
+ .4byte SecretBase_BrownCave4_MapBorder
+ .4byte SecretBase_BrownCave4_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseBrownCave
+
diff --git a/data/layouts/SecretBase_BrownCave4/map.bin b/data/layouts/SecretBase_BrownCave4/map.bin
new file mode 100644
index 000000000..8b5a763c4
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave4/map.bin
@@ -0,0 +1,70 @@
+  62
+2
+2
+2
+2
+2
+2
+2"6
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2#6
+2
+2  
+2
+2
+2
+2  
+2
+2
+2  
+2  
+2
+2
+2 
+2  
+2
+2
+2  
+2
+2
+2
+22
+2  
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+22
+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/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc
new file mode 100644
index 000000000..a4664d509
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave1_MapBorder::
+ .incbin "data/layouts/SecretBase_RedCave1/border.bin"
+
+SecretBase_RedCave1_MapBlockdata::
+ .incbin "data/layouts/SecretBase_RedCave1/map.bin"
+
+ .align 2
+SecretBase_RedCave1_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte SecretBase_RedCave1_MapBorder
+ .4byte SecretBase_RedCave1_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseRedCave
+
diff --git a/data/layouts/SecretBase_RedCave1/map.bin b/data/layouts/SecretBase_RedCave1/map.bin
new file mode 100644
index 000000000..ce666b57d
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave1/map.bin
@@ -0,0 +1,51 @@
+
+2
+2
+2
+2
+2
+2
+2   6
+2
+2
+2
+2
+2
+2
+2 6 
+2
+2
+2
+2
+2
+2
+2
+26 
+2
+2
+2
+2
+2
+22
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+22
+2
+2
+26  \ No newline at end of file
diff --git a/data/layouts/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc
new file mode 100644
index 000000000..7999395d8
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave2_MapBorder::
+ .incbin "data/layouts/SecretBase_RedCave2/border.bin"
+
+SecretBase_RedCave2_MapBlockdata::
+ .incbin "data/layouts/SecretBase_RedCave2/map.bin"
+
+ .align 2
+SecretBase_RedCave2_Layout::
+ .4byte 0x7
+ .4byte 0x10
+ .4byte SecretBase_RedCave2_MapBorder
+ .4byte SecretBase_RedCave2_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseRedCave
+
diff --git a/data/layouts/SecretBase_RedCave2/map.bin b/data/layouts/SecretBase_RedCave2/map.bin
new file mode 100644
index 000000000..4fa03acfe
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave2/map.bin
@@ -0,0 +1,42 @@
+ 
+22
+2  
+2
+2
+2  
+2
+2
+2 
+2
+2
+2  2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2 6 
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2 
+2
+2
+26
+26 
+2  2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc
new file mode 100644
index 000000000..6a3cc123b
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave3_MapBorder::
+ .incbin "data/layouts/SecretBase_RedCave3/border.bin"
+
+SecretBase_RedCave3_MapBlockdata::
+ .incbin "data/layouts/SecretBase_RedCave3/map.bin"
+
+ .align 2
+SecretBase_RedCave3_Layout::
+ .4byte 0xf
+ .4byte 0x8
+ .4byte SecretBase_RedCave3_MapBorder
+ .4byte SecretBase_RedCave3_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseRedCave
+
diff --git a/data/layouts/SecretBase_RedCave3/map.bin b/data/layouts/SecretBase_RedCave3/map.bin
new file mode 100644
index 000000000..0528e565d
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave3/map.bin
@@ -0,0 +1,47 @@
+ 
+2
+22
+2   6
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2
+2 6
+2
+2
+2
+2  
+2
+2
+2
+2
+222
+22
+2
+2
+2
+2  
+2
+2
+2
+2
+26
+2
+2
+2
+2  
+2
+22
+2
+2 6
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc
new file mode 100644
index 000000000..665f44709
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave4_MapBorder::
+ .incbin "data/layouts/SecretBase_RedCave4/border.bin"
+
+SecretBase_RedCave4_MapBlockdata::
+ .incbin "data/layouts/SecretBase_RedCave4/map.bin"
+
+ .align 2
+SecretBase_RedCave4_Layout::
+ .4byte 0x9
+ .4byte 0xf
+ .4byte SecretBase_RedCave4_MapBorder
+ .4byte SecretBase_RedCave4_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseRedCave
+
diff --git a/data/layouts/SecretBase_RedCave4/map.bin b/data/layouts/SecretBase_RedCave4/map.bin
new file mode 100644
index 000000000..526763290
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave4/map.bin
@@ -0,0 +1,56 @@
+ 
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2 "66 #6 2  
+2
+2
+2
+22
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2 6 
+22
+2
+2
+2
+2 6  
+2
+2
+2  \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc
new file mode 100644
index 000000000..2bcc9f58a
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub1_MapBorder::
+ .incbin "data/layouts/SecretBase_Shrub1/border.bin"
+
+SecretBase_Shrub1_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Shrub1/map.bin"
+
+ .align 2
+SecretBase_Shrub1_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte SecretBase_Shrub1_MapBorder
+ .4byte SecretBase_Shrub1_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseShrub
+
diff --git a/data/layouts/SecretBase_Shrub1/map.bin b/data/layouts/SecretBase_Shrub1/map.bin
new file mode 100644
index 000000000..4b566cc1b
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub1/map.bin
@@ -0,0 +1,53 @@
+ 
+2
+2 
+2
+2
+2
+2  
+2
+2 6
+22
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc
new file mode 100644
index 000000000..e94376c3b
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub2_MapBorder::
+ .incbin "data/layouts/SecretBase_Shrub2/border.bin"
+
+SecretBase_Shrub2_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Shrub2/map.bin"
+
+ .align 2
+SecretBase_Shrub2_Layout::
+ .4byte 0xf
+ .4byte 0x7
+ .4byte SecretBase_Shrub2_MapBorder
+ .4byte SecretBase_Shrub2_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseShrub
+
diff --git a/data/layouts/SecretBase_Shrub2/map.bin b/data/layouts/SecretBase_Shrub2/map.bin
new file mode 100644
index 000000000..8cb88cc44
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub2/map.bin
@@ -0,0 +1,57 @@
+  6
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+22  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+22
+2
+2
+2
+2
+2  \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc
new file mode 100644
index 000000000..449f1a11f
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub3_MapBorder::
+ .incbin "data/layouts/SecretBase_Shrub3/border.bin"
+
+SecretBase_Shrub3_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Shrub3/map.bin"
+
+ .align 2
+SecretBase_Shrub3_Layout::
+ .4byte 0xd
+ .4byte 0xb
+ .4byte SecretBase_Shrub3_MapBorder
+ .4byte SecretBase_Shrub3_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseShrub
+
diff --git a/data/layouts/SecretBase_Shrub3/map.bin b/data/layouts/SecretBase_Shrub3/map.bin
new file mode 100644
index 000000000..d51aeea21
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub3/map.bin
@@ -0,0 +1,65 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2 
+2 
+2  
+2
+2
+2
+22
+2 6
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+22
+2
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc
new file mode 100644
index 000000000..139a82050
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub4_MapBorder::
+ .incbin "data/layouts/SecretBase_Shrub4/border.bin"
+
+SecretBase_Shrub4_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Shrub4/map.bin"
+
+ .align 2
+SecretBase_Shrub4_Layout::
+ .4byte 0xe
+ .4byte 0xb
+ .4byte SecretBase_Shrub4_MapBorder
+ .4byte SecretBase_Shrub4_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseShrub
+
diff --git a/data/layouts/SecretBase_Shrub4/map.bin b/data/layouts/SecretBase_Shrub4/map.bin
new file mode 100644
index 000000000..8a4cf836d
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub4/map.bin
@@ -0,0 +1,69 @@
+ 
+2
+2"6
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2#6
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2 
+2
+2
+2  
+2
+22
+2
+2   6
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2
+2  2
+2
+2
+2  
+2
+2
+2
+2
+2 
+22
+2  
+2
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Tree1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc
new file mode 100644
index 000000000..73e6e41a6
--- /dev/null
+++ b/data/layouts/SecretBase_Tree1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree1_MapBorder::
+ .incbin "data/layouts/SecretBase_Tree1/border.bin"
+
+SecretBase_Tree1_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Tree1/map.bin"
+
+ .align 2
+SecretBase_Tree1_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte SecretBase_Tree1_MapBorder
+ .4byte SecretBase_Tree1_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseTree
+
diff --git a/data/layouts/SecretBase_Tree1/map.bin b/data/layouts/SecretBase_Tree1/map.bin
new file mode 100644
index 000000000..907f1486a
--- /dev/null
+++ b/data/layouts/SecretBase_Tree1/map.bin
@@ -0,0 +1,56 @@
+
+2
+22
+2
+2
+2
+2  
+2 6
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Tree2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc
new file mode 100644
index 000000000..95b122220
--- /dev/null
+++ b/data/layouts/SecretBase_Tree2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree2_MapBorder::
+ .incbin "data/layouts/SecretBase_Tree2/border.bin"
+
+SecretBase_Tree2_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Tree2/map.bin"
+
+ .align 2
+SecretBase_Tree2_Layout::
+ .4byte 0x7
+ .4byte 0x10
+ .4byte SecretBase_Tree2_MapBorder
+ .4byte SecretBase_Tree2_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseTree
+
diff --git a/data/layouts/SecretBase_Tree2/map.bin b/data/layouts/SecretBase_Tree2/map.bin
new file mode 100644
index 000000000..c2e5698b0
--- /dev/null
+++ b/data/layouts/SecretBase_Tree2/map.bin
@@ -0,0 +1,48 @@
+ 
+2
+22
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2 6 
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2 
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+26
+26 
+2  2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc
new file mode 100644
index 000000000..66716a404
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree3_MapBorder::
+ .incbin "data/layouts/SecretBase_Tree3/border.bin"
+
+SecretBase_Tree3_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Tree3/map.bin"
+
+ .align 2
+SecretBase_Tree3_Layout::
+ .4byte 0x11
+ .4byte 0x8
+ .4byte SecretBase_Tree3_MapBorder
+ .4byte SecretBase_Tree3_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseTree
+
diff --git a/data/layouts/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin
new file mode 100644
index 000000000..b6ae04b00
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/map.bin
@@ -0,0 +1,63 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6 2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+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/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc
new file mode 100644
index 000000000..20d4c3e01
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree4_MapBorder::
+ .incbin "data/layouts/SecretBase_Tree4/border.bin"
+
+SecretBase_Tree4_MapBlockdata::
+ .incbin "data/layouts/SecretBase_Tree4/map.bin"
+
+ .align 2
+SecretBase_Tree4_Layout::
+ .4byte 0xe
+ .4byte 0xe
+ .4byte SecretBase_Tree4_MapBorder
+ .4byte SecretBase_Tree4_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseTree
+
diff --git a/data/layouts/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin
new file mode 100644
index 000000000..b3b381d9e
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/map.bin
@@ -0,0 +1,77 @@
+ 
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2 
+2
+2 
+2
+2
+2
+2
+2 "6  
+2
+2
+2
+2 #6 "6  2 #6  
+2 6
+2
+2
+2
+2
+222  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+22
+2
+26  \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc
new file mode 100644
index 000000000..7fa3aa823
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave1/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave1_MapBorder::
+ .incbin "data/layouts/SecretBase_YellowCave1/border.bin"
+
+SecretBase_YellowCave1_MapBlockdata::
+ .incbin "data/layouts/SecretBase_YellowCave1/map.bin"
+
+ .align 2
+SecretBase_YellowCave1_Layout::
+ .4byte 0xb
+ .4byte 0x9
+ .4byte SecretBase_YellowCave1_MapBorder
+ .4byte SecretBase_YellowCave1_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/layouts/SecretBase_YellowCave1/map.bin b/data/layouts/SecretBase_YellowCave1/map.bin
new file mode 100644
index 000000000..1301e7317
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave1/map.bin
@@ -0,0 +1,57 @@
+ 
+2
+22
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+22
+2
+2  \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc
new file mode 100644
index 000000000..0ae872e08
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave2/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave2_MapBorder::
+ .incbin "data/layouts/SecretBase_YellowCave2/border.bin"
+
+SecretBase_YellowCave2_MapBlockdata::
+ .incbin "data/layouts/SecretBase_YellowCave2/map.bin"
+
+ .align 2
+SecretBase_YellowCave2_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte SecretBase_YellowCave2_MapBorder
+ .4byte SecretBase_YellowCave2_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/layouts/SecretBase_YellowCave2/map.bin b/data/layouts/SecretBase_YellowCave2/map.bin
new file mode 100644
index 000000000..e18cb47c6
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave2/map.bin
@@ -0,0 +1,56 @@
+ 2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+26
+2  
+2
+2
+2
+2
+2
+2
+2  
+2 
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2 6  
+2  
+2
+2
+2
+2
+2
+2
+2  2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc
new file mode 100644
index 000000000..f42d88920
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave3/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave3_MapBorder::
+ .incbin "data/layouts/SecretBase_YellowCave3/border.bin"
+
+SecretBase_YellowCave3_MapBlockdata::
+ .incbin "data/layouts/SecretBase_YellowCave3/map.bin"
+
+ .align 2
+SecretBase_YellowCave3_Layout::
+ .4byte 0xc
+ .4byte 0xb
+ .4byte SecretBase_YellowCave3_MapBorder
+ .4byte SecretBase_YellowCave3_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/layouts/SecretBase_YellowCave3/map.bin b/data/layouts/SecretBase_YellowCave3/map.bin
new file mode 100644
index 000000000..b7d80a0ab
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave3/map.bin
@@ -0,0 +1,63 @@
+ 
+2
+2
+2  
+2
+2  
+2
+2
+2  
+2
+2  
+2
+2
+2  
+2
+2 
+2
+2
+2  
+2
+2 6
+2
+2
+22
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+266
+2
+2
+22
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc
new file mode 100644
index 000000000..b7a11df5a
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave4/layout.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave4_MapBorder::
+ .incbin "data/layouts/SecretBase_YellowCave4/border.bin"
+
+SecretBase_YellowCave4_MapBlockdata::
+ .incbin "data/layouts/SecretBase_YellowCave4/map.bin"
+
+ .align 2
+SecretBase_YellowCave4_Layout::
+ .4byte 0xd
+ .4byte 0xe
+ .4byte SecretBase_YellowCave4_MapBorder
+ .4byte SecretBase_YellowCave4_MapBlockdata
+ .4byte gTileset_SecretBase
+ .4byte gTileset_SecretBaseYellowCave
+
diff --git a/data/layouts/SecretBase_YellowCave4/map.bin b/data/layouts/SecretBase_YellowCave4/map.bin
new file mode 100644
index 000000000..d3c3e0204
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave4/map.bin
@@ -0,0 +1,80 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2"6
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2#6
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2  
+2
+2  
+2
+2 
+2
+2  
+2
+2 6
+2
+2
+22
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..a52425e15
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_HighTideEntranceRoom_MapBorder::
+ .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin"
+
+ShoalCave_HighTideEntranceRoom_MapBlockdata::
+ .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin"
+
+ .align 2
+ShoalCave_HighTideEntranceRoom_Layout::
+ .4byte 0x23
+ .4byte 0x23
+ .4byte ShoalCave_HighTideEntranceRoom_MapBorder
+ .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
new file mode 100644
index 000000000..0e4b88c8f
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
@@ -0,0 +1 @@
+      22𩒊𬗂𬗂𬗂𬗂𬗌�������22822222񁺚񄿒񄿒񄿒񄿒񄿜|�������z22822222񁺚񄿒񝧢񝧢񝧢񝧬|�ppppp�z22@QQQQQ񁺚񄿜����2����ppppp�z22222222񁺚񄿜|���������ppppp�z22222222񁺚񄿜|�ppppppppppppp���2���22񚢪񝧬|�ppppppppppppp�������z22�����ppppppppppppppppppp�z22|�����ppppppppppppppppppp�z22|�ppppppppppppppppppppppp�z22|�ppppppppppppppppppppppp�z22|�pppppppppppp�񬬿񬬿񬬿񬬿񬬿�2C22]C]CUCUCUCUC^�pppppp�𻜟𻜟𻜟𻜟𻜟�1�22BBBBBB|�pppppp�𻜟𻜟𻜟𻜟𻜟m#222BBBBB|�pppppp������𻜟𻜟�1�222BBB�2��ppppppppppp�𻜟𻜟�1�    BBB|����ppppppppppp�𻜟𻜟�1�BBB|�pppppppppppppp�𻜟�1mn#  BBB|�pppppppppppppp�𻜟�1�BBB��2�ppppppppppppp�𻜟�1�BBB�𻜋񬬿񬬿񬬿񬬿񬬿񬬿񬪁𻜟�1�  BBB�𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟�1�   BBB�𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟�1�BBB�𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟�1�BBB#BnBnBnBnBnBnBo𻜟𻜟𻜟𻜟𻜟𻜟�BBBBBBBBBB�𻜟𻜟𻜟𻜟𻜟𻜟�#         "�𻜟𻜟𻜟𻜟𻜟𻜟��𻜟𻜟𻜟u2𻜟𻜟�1�        " nnnnnXYZnnnn   "                                                                         \ No newline at end of file
diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
new file mode 100644
index 000000000..2d323b9e0
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_HighTideInnerRoom_MapBorder::
+ .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin"
+
+ShoalCave_HighTideInnerRoom_MapBlockdata::
+ .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
+
+ .align 2
+ShoalCave_HighTideInnerRoom_Layout::
+ .4byte 0x2e
+ .4byte 0x26
+ .4byte ShoalCave_HighTideInnerRoom_MapBorder
+ .4byte ShoalCave_HighTideInnerRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/map.bin b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
new file mode 100644
index 000000000..c540a4008
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
@@ -0,0 +1 @@
+BB��������������������������BBBBBBB����������������������������BB22222BBBBB籅籅擉曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮曮旙紹紹BB22222BBBBB肂肂涹濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗濗滙臖臖BBBBBBB��pppppppppppppppppppppppp��BBBBBBBBBB��pppppppppppppppppppppppp��BBBBBBBBBB[32��pppppppppppppppppppppppp��BBB22��ppp�񬬿񬬿񬬿񬬿񬬿񬬿񬬿񬬿񬬿񬬿�1�RRRRR[SRBBB22��ppp�𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟𻜟�1�RRRRRRBBB22��ppp�mnRnRnRnRnRnRnRnRnRnRnRo𻜟𻜟𻜟𻜟��2����BBB2��ppp��R[S  B B B B B B B"#R Ro𻜟������������BBB����ppp��RRBBBBBBBRR�𻜟�ppppppppp��BBB��ppppp��RRBBBBBBBRR�𻜟�ppppppppp��BBB��ppppp��RRBBBBRR�𻜟�ppppppppp��BBB��ppppp�����BBBBRR�𻜟𵕏񬬿񬬿񬬿񬬿�1�BBB��ppppp���𻜟�1�BBBBRR�𻜟𻜟𻜟𻜟𻜟𻜟�1�BBB��ppppppp�����BBBBRR�𻜟𻜟𻜟mnRnRnRnRnRnR#RBBB��pppppppppp��BBBBRR�𻜟𻜟𻜟�RRRRR[SRBBB籅籅擉曮曮曮曮曮曮曮曮曮曮旙紹紹BBBBRR�𻜟𻜟𻜟�RRRRRRRBBB肂肂涹濗濗濗濗濗濗濗濗濗濗滙臖臖BBBB�𻜟𻜟𻜟�RRRRRRR��pppppppppp��B2�𻜟𻜟𻜟��RRRR���𵕏�1�ppppppp��BBBBBB��������𻜟𻜟�RRRR#RnRnRnRnRnRo�ppppppp��BBBBBB��ppppp������RRRRRRRRRR��ppppp�񬪁�BBBBBB��ppppppppp��RRRRRRR��ppppp�mn#     "��ppppppppp��RRRRRRR�𻜟𻜋񬬿񬬿񬪁�   ��ppppppppp��RRRRRRR�𻜟𻜟𻜟𻜟𻜟���ppppppppp��RRRRRRR�𻜟𻜟𻜟𻜟𻜟�     "�𵕏񬬿񬬿񬬿񬬿�1�RRRRRRR#RnRnRnRnRnRnRnRnRnRnR#R�𻜟𻜟𻜟𻜟𻜟�1�RRRRRRRRRRRRRRRRRRR##nnnnnnnnnn1#RRRRRRRRRRRRRRRR<RRRR#        "RR<RRR#          XYZ  ## XYZ ##         "#   "#      "#       ##      ##                                     # \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..0a1eee113
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideEntranceRoom_MapBorder::
+ .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin"
+
+ShoalCave_LowTideEntranceRoom_MapBlockdata::
+ .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideEntranceRoom_Layout::
+ .4byte 0x23
+ .4byte 0x23
+ .4byte ShoalCave_LowTideEntranceRoom_MapBorder
+ .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
new file mode 100644
index 000000000..1cf7c87f2
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
@@ -0,0 +1,3 @@
+      22𩒊𬗂𬗂𬗂𬗂𬗌22822222񁺚񄿒񄿒񄿒񄿒񄿜   22822222񁺚񄿒񝧢񝧢񝧢񝧬222@QQQQQ񁺚񄿜222222222222񁺚񄿜𩒔222222222񁺚񄿜22222i񄿒�2222񚢪񝧬2222222񚡚񄿜2222222222񚢪�222222222222222񚡚񄿒�222222222222222222񚢪񝧬222222222222           22#     
+2𩒊�2 𲡐𵦈𵦈𵦈𵦈�222#B B B B B B
+𩓚񄿜񁺚񄿒񄿒񄿒񄿒�222BBBBBB񁺚񄿜񚢪񝧢񝦒񄿒񄿒p#222BBBBBB񁺚񄿜2񁺚񄿒�2222BBBB񚡚񄿒h2񁺚񄿒�2   #BBB2񚡚񄿒񄿒�22񁺚񄿒�2BBB22񚢪񝧢�222񁺚�2p # #BBB222222222222񁺚�2BBB#            #񁺚�2BBB#2 2𲡐𵦈𵦈𵦈𵦈𵦈𵦈𻰪�2 #BBB22񁺚񄿒񄿒񄿒񄿒񄿒񄿒񄿒�2  #BBB2𩓚񄿒񄿒񄿒񄿒񄿒񄿒񄿒񄿒BBB2񁺚񄿒񄿒񄿒񄿒�1񔄯�1񄿒񄿜BBB#B B B B B B Bq񄿒񄼓񗈗𻝥�1񄿒�2BBBBBBBBBB񄿒񄾽𻜟𻜟𸘆񄿜#         "񄿒�1񗈗𻜟𻝥�1񄿜񄿒𾡗𻜟u2𻜟𸘆�2#       "#     XYZ    ## "#               ##                    ##                               # \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideIceRoom/border.bin b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
new file mode 100644
index 000000000..206bd63f8
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
new file mode 100644
index 000000000..6d7a51575
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideIceRoom_MapBorder::
+ .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin"
+
+ShoalCave_LowTideIceRoom_MapBlockdata::
+ .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideIceRoom_Layout::
+ .4byte 0x14
+ .4byte 0x1e
+ .4byte ShoalCave_LowTideIceRoom_MapBorder
+ .4byte ShoalCave_LowTideIceRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ShoalCave_LowTideIceRoom/map.bin b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
new file mode 100644
index 000000000..222f1f26c
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
@@ -0,0 +1 @@
+{���������������|����{������������|��������3�3�3�3~�3�3~�3�3�3�3���������3}�3�3�3�3�3�3�3�3�3}���������3�3�3�3�3�3�3�3�3}�3~���������3�3�3�3�2�3�3�3�3�3�3�3�|�������3�3�3�3�3~�3�3�3�3�3�3�3��������3�3�3�3xyCyCyCz�3�3~}��������3�3�3x僀丆丆丆��3�3�3�3����|���3�3�3�丆丆丆丆�w����w|����3xyC僀丆丆丆丆��3�3�3�3�3�33�����3�丆丆丆丆丆丆��3�3�3�3�3�3�3�����3�丆丆丆~丆丆��3�3�3�3�3�3�3�����3�c�|丆丆丆��3�3�3�3�3�3�3�����3�2�3�3�丆丆丆��3�3�3~�3�3�3�����3�3�3}�丆丆丆僀z�3�3�3�3�3�3����}�3�3�3�丆丆丆丆僀yCz�3�3�3�3�����3�3~�3�丆丆~丆丆}��3�3�3�3����z�3�3�3�丆}丆丆丆丆僀z�3�3�3�����z�3�3��|丆丆丆丆丆��3�3�3�������3�3�3�3�丆丆丆丆丆��3�3�3�������3�3�3�3��|丆丆丆��3�3�3��{����3}�3}�3�3�丆丆丆��3�3�3���{��}�3�3�3�3�3������3�3�3�����3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�����3�3�3�3�3�3�2�3�3�3�3�3�3�3�3�3�����3�3~�2�3�3�3�3}�3�2�3�3�3�3�3����yyz�3�3~�3�3�3�3�3�3�3�3�3�3�������yyyyyz�3�3�3�3�3�3�3�������������yyyyyyy�� \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/border.bin b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
new file mode 100644
index 000000000..f66fc9723
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideInnerRoom_MapBorder::
+ .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin"
+
+ShoalCave_LowTideInnerRoom_MapBlockdata::
+ .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideInnerRoom_Layout::
+ .4byte 0x2e
+ .4byte 0x26
+ .4byte ShoalCave_LowTideInnerRoom_MapBorder
+ .4byte ShoalCave_LowTideInnerRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/map.bin b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
new file mode 100644
index 000000000..87df28cf4
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
@@ -0,0 +1,2 @@
+BBBBBBBBBBB22222BBBBB籅籅籅简简简简简简简简简简简简简简简简简简简简简简简简紹紹紹BB22222BBBBB肂肂肂尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿尿臖臖臖BBBBBBBRRRRRRRRRRRRRRRRRRRRRRRRBBBBBBBBBBRRRRRRRRRRRRRRRRRRRRRZSRRBBBBBBBBBB[32RRRRRRRRRRRRRRRRRRRRRRRRBBB22RRR 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2#2RRRRR[SRBBB22RRR222222222222222222222RRRRRRRBBB22RRR  R R R R R R R R R R R"22222222BBB2RRRR[S  B B B B B B B"#R R"222BBBRRRRRBBBBBBBRR222BBBRRRRRRRBBBBBBBRR222222222BBBRRRRRRRBBBBRR22#       #BBBRRRRRBBBBRR22#2 2 2 2 2 2 2 2 2 2#2BBB   BBBBRR2222222222222BBB2222BBBBRR222222  R R R R R R#RBBB22222222BBBBRR222222RRRRR[SRBBB籅籅籅籅简简简简简简简简紹紹紹紹BBBBRR222222RRRRRRRBBB肂肂肂肂尿尿尿尿尿尿尿尿臖臖臖臖BBBBRR222222RRRRRRR22222222B222222RRRRR#   
+2222BBBBBB   2RRRR#R R R R#R R1 2"22 #BBBBBB22RRRRRRRRRR22Z3  #BBBBBB2222222RRRRRRR222  #     "2222222RRRRRRR2222#  #  #2222222RRRRRRR2222#2 2 2 2 2#22222222RRRRRRR2222222222     "#    XYZ#RRRRRRR R R R R R R R R R R R#R#         #RRRRRRRRRRRRRRRRRRR##       1 R R R#RRRRRRRRRRRRRRRR<RRRR#        "RRRRR<RRR#          XYZ  ##    XYZ ##         "#   "#      "#       ##      ##                                     # \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/border.bin b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
new file mode 100644
index 000000000..79cc82e8c
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideLowerRoom_MapBorder::
+ .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin"
+
+ShoalCave_LowTideLowerRoom_MapBlockdata::
+ .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideLowerRoom_Layout::
+ .4byte 0x1f
+ .4byte 0xe
+ .4byte ShoalCave_LowTideLowerRoom_MapBorder
+ .4byte ShoalCave_LowTideLowerRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/map.bin b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
new file mode 100644
index 000000000..04bf2baf3
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
@@ -0,0 +1,4 @@
+222222222222Z322222222222222222222222222222222HQQQQQ  6 6 6 
+2222222222922222 6 6 6
+2222222222222292222222XYZ              
+222#                "222222222222XYZ#6 6 6#6#   ##6 6 6 6 6#6 \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/border.bin b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
new file mode 100644
index 000000000..62dbff40e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideStairsRoom_MapBorder::
+ .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin"
+
+ShoalCave_LowTideStairsRoom_MapBlockdata::
+ .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideStairsRoom_Layout::
+ .4byte 0x15
+ .4byte 0xf
+ .4byte ShoalCave_LowTideStairsRoom_MapBorder
+ .4byte ShoalCave_LowTideStairsRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/map.bin b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
new file mode 100644
index 000000000..f2b56644d
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
@@ -0,0 +1 @@
+             1     22222262 2626222222622222622262222222Z322222222222222266222222222222#                     \ No newline at end of file
diff --git a/data/layouts/SingleBattleColosseum/border.bin b/data/layouts/SingleBattleColosseum/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SingleBattleColosseum/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc
new file mode 100644
index 000000000..f42855de8
--- /dev/null
+++ b/data/layouts/SingleBattleColosseum/layout.inc
@@ -0,0 +1,15 @@
+SingleBattleColosseum_MapBorder::
+ .incbin "data/layouts/SingleBattleColosseum/border.bin"
+
+SingleBattleColosseum_MapBlockdata::
+ .incbin "data/layouts/SingleBattleColosseum/map.bin"
+
+ .align 2
+SingleBattleColosseum_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte SingleBattleColosseum_MapBorder
+ .4byte SingleBattleColosseum_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_CableClub
+
diff --git a/data/layouts/SingleBattleColosseum/map.bin b/data/layouts/SingleBattleColosseum/map.bin
new file mode 100644
index 000000000..1f66ab707
--- /dev/null
+++ b/data/layouts/SingleBattleColosseum/map.bin
@@ -0,0 +1 @@
+hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2T2U2U2b2c2U2U2V2U2�2���2U2`2U2U2d2e2U2U2a2U2�2���2U2T2U2U2f2g2U2U2V2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2 \ No newline at end of file
diff --git a/data/layouts/SkyPillar_1F/border.bin b/data/layouts/SkyPillar_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc
new file mode 100644
index 000000000..235f04935
--- /dev/null
+++ b/data/layouts/SkyPillar_1F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_1F_MapBorder::
+ .incbin "data/layouts/SkyPillar_1F/border.bin"
+
+SkyPillar_1F_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_1F/map.bin"
+
+ .align 2
+SkyPillar_1F_Layout::
+ .4byte 0xe
+ .4byte 0xe
+ .4byte SkyPillar_1F_MapBorder
+ .4byte SkyPillar_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SkyPillar_1F/map.bin b/data/layouts/SkyPillar_1F/map.bin
new file mode 100644
index 000000000..1eb299c49
--- /dev/null
+++ b/data/layouts/SkyPillar_1F/map.bin
@@ -0,0 +1 @@
+''''''''';<=''/////////CD2E//򞑌򞑌򞑌�2򞑌򞑌򞑂򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊�289999:򛌊򛌊򛌊�2@AAAAB򛌊򛌊򛌊AAAAAA򛌊򛌊�2AAAAAA�2򛌊򛌊�2AAAAAA򛌊�2򛌊�2IMMMMJ򛌊�2򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊�2"2#2򛌊򛌊�2 \ No newline at end of file
diff --git a/data/layouts/SkyPillar_2F/border.bin b/data/layouts/SkyPillar_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc
new file mode 100644
index 000000000..368fcd518
--- /dev/null
+++ b/data/layouts/SkyPillar_2F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_2F_MapBorder::
+ .incbin "data/layouts/SkyPillar_2F/border.bin"
+
+SkyPillar_2F_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_2F/map.bin"
+
+ .align 2
+SkyPillar_2F_Layout::
+ .4byte 0xe
+ .4byte 0xe
+ .4byte SkyPillar_2F_MapBorder
+ .4byte SkyPillar_2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SkyPillar_2F/map.bin b/data/layouts/SkyPillar_2F/map.bin
new file mode 100644
index 000000000..8ec9bf213
--- /dev/null
+++ b/data/layouts/SkyPillar_2F/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CD2E////CL2E//5252525252525252525252525242424242424242424242424242424242424242424242424242424289999:626262624242@AAAAB6262626242426262AAAAAA42424262626262AAAAAA4242424262626262AAAAAA4242424262624242IMMMMJ626242426242426262424242626262624242426262424242426262626242424262626242424242424242 \ No newline at end of file
diff --git a/data/layouts/SkyPillar_3F/border.bin b/data/layouts/SkyPillar_3F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc
new file mode 100644
index 000000000..32ac95143
--- /dev/null
+++ b/data/layouts/SkyPillar_3F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_3F_MapBorder::
+ .incbin "data/layouts/SkyPillar_3F/border.bin"
+
+SkyPillar_3F_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_3F/map.bin"
+
+ .align 2
+SkyPillar_3F_Layout::
+ .4byte 0xe
+ .4byte 0xe
+ .4byte SkyPillar_3F_MapBorder
+ .4byte SkyPillar_3F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SkyPillar_3F/map.bin b/data/layouts/SkyPillar_3F/map.bin
new file mode 100644
index 000000000..d6c76d48c
--- /dev/null
+++ b/data/layouts/SkyPillar_3F/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CL2E/CD2E/CD2E/򞑌򞑌򞑌򞑌�2򞑌򞑂򛌊򛌊򛌊�2򛌊򛌊�2򛌊�2򛌊򛌊򛌊�2򛌊�289999:򛌊򛌊򛌊�2@AAAAB򛌊򛌊�2�2AAAAAA򛌊򛌊򛌊�2AAAAAA򛌊�2򛌊򛌊AAAAAA򛌊򛌊򛌊�2IMMMMJ�2򛌊򛌊򛌊򛌊�2򛌊򛌊�2򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊�2򛌊򛌊�2 \ No newline at end of file
diff --git a/data/layouts/SkyPillar_4F/border.bin b/data/layouts/SkyPillar_4F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_4F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc
new file mode 100644
index 000000000..055abf133
--- /dev/null
+++ b/data/layouts/SkyPillar_4F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_4F_MapBorder::
+ .incbin "data/layouts/SkyPillar_4F/border.bin"
+
+SkyPillar_4F_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_4F/map.bin"
+
+ .align 2
+SkyPillar_4F_Layout::
+ .4byte 0xe
+ .4byte 0xe
+ .4byte SkyPillar_4F_MapBorder
+ .4byte SkyPillar_4F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SkyPillar_4F/map.bin b/data/layouts/SkyPillar_4F/map.bin
new file mode 100644
index 000000000..02e82bb4f
--- /dev/null
+++ b/data/layouts/SkyPillar_4F/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CD2E/CL2E/CL2E/5252525252525252652525252526262666424242642426242626242626424242426424289999:4262626242424242@AAAAB42626262426262AAAAAA42626424262662AAAAAA424242662662AAAAAA42424242624242IMMMMJ4242424242424262426426242662624242424264262426242624262624242424242624262426426262624242 \ No newline at end of file
diff --git a/data/layouts/SkyPillar_5F/border.bin b/data/layouts/SkyPillar_5F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SkyPillar_5F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc
new file mode 100644
index 000000000..3f3bb5bc1
--- /dev/null
+++ b/data/layouts/SkyPillar_5F/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_5F_MapBorder::
+ .incbin "data/layouts/SkyPillar_5F/border.bin"
+
+SkyPillar_5F_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_5F/map.bin"
+
+ .align 2
+SkyPillar_5F_Layout::
+ .4byte 0xe
+ .4byte 0xe
+ .4byte SkyPillar_5F_MapBorder
+ .4byte SkyPillar_5F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SkyPillar_5F/map.bin b/data/layouts/SkyPillar_5F/map.bin
new file mode 100644
index 000000000..b8cd541d5
--- /dev/null
+++ b/data/layouts/SkyPillar_5F/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CL2E////CD2E//򞑌򞑌�26򞑌�26򞑌򞑌򛌊6򛌊򛌊�26򛌊򛌊򛌊򛌊8999999:6򛌊6򛌊@AAAAAAB6򛌊�26�2AAAAAAAA򛌊6򛌊�2AAAAAAAA򛌊򛌊򛌊AAAAAAAA򛌊򛌊�2AAAAAAAA�26򛌊򛌊AAAAAAAA6򛌊򛌊IMMMMMMJ򛌊򛌊򛌊򛌊򛌊򛌊򛌊6򛌊6򛌊�2򛌊򛌊򛌊򛌊 \ No newline at end of file
diff --git a/data/layouts/SkyPillar_Entrance/border.bin b/data/layouts/SkyPillar_Entrance/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/SkyPillar_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc
new file mode 100644
index 000000000..1313bd196
--- /dev/null
+++ b/data/layouts/SkyPillar_Entrance/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_Entrance_MapBorder::
+ .incbin "data/layouts/SkyPillar_Entrance/border.bin"
+
+SkyPillar_Entrance_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_Entrance/map.bin"
+
+ .align 2
+SkyPillar_Entrance_Layout::
+ .4byte 0x12
+ .4byte 0x12
+ .4byte SkyPillar_Entrance_MapBorder
+ .4byte SkyPillar_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/SkyPillar_Entrance/map.bin b/data/layouts/SkyPillar_Entrance/map.bin
new file mode 100644
index 000000000..b215b86ef
--- /dev/null
+++ b/data/layouts/SkyPillar_Entrance/map.bin
@@ -0,0 +1 @@
+222222222222222222226222222222222222222 #���#22   #2226   #2222222222222222222222222222####���#### \ No newline at end of file
diff --git a/data/layouts/SkyPillar_Outside/border.bin b/data/layouts/SkyPillar_Outside/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc
new file mode 100644
index 000000000..5eb9df563
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_Outside_MapBorder::
+ .incbin "data/layouts/SkyPillar_Outside/border.bin"
+
+SkyPillar_Outside_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_Outside/map.bin"
+
+ .align 2
+SkyPillar_Outside_Layout::
+ .4byte 0x1c
+ .4byte 0x17
+ .4byte SkyPillar_Outside_MapBorder
+ .4byte SkyPillar_Outside_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SkyPillar_Outside/map.bin b/data/layouts/SkyPillar_Outside/map.bin
new file mode 100644
index 000000000..01b78d554
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/map.bin
@@ -0,0 +1 @@
+ppppppppppr�6�����򉼲�6t5pppppppppppppppr򉼲!1�������!1򉼲�6tppppppppppr򉼲!1!1!1�����򓌂!1!1!1!1ustppppppprs!1!1!1�!1�����򓋸�6!1�!1uqutppppprss!1!1!1!1!1�����򓋸��6!1!1uquuypppxsss!1!1!1��������򓋸򓌂!1uquu�ppp�ss{�!1�$1$1񔛚򑽄򑽄�����6uquu�ppp�ssqs�$1$1$1$1񔛚򑽄򑽄�2���ut}u�ppp�s{�s$1$1$1$1$1$1񔛚򑽄򑽄�2�t}uqu�ppp�{�ss$1$1$1$1$1$1$1�2������2uququ�ppp��ss{�$1$1$1$1$1$1��qqu��2uququ�pppp�ssqs$1$1$1$1$1�sqqqu��2uqut}�pppp�s{�{�$1$1$1$1�{|d|}��2ut}uq�ppPQ�{�{�{�$1$1$1����0���t}ut}��ppXY��{�{�{�$1$1$1$1$1$1�4$1$1ut}u��pppppp��{�{�s$1$1$1$1$1$1$1$1t}ut}�ppPQpppp��sqs{�$1$1$1�4$1t|}quu��ppXYppppPesq{�{��4$1$1t}qt|}u�pPQppppppXm{�q{�{|||}qt}t|}�pXYppppPQp��{�q{�����|}qu���pppppppXYpp��{|����0����|}�ppppppppppPQpp����$1$1$1$1$1��Z[�ppppppppppXYppppp�$1$1$1$1$1�pXYu{{{tp \ No newline at end of file
diff --git a/data/layouts/SkyPillar_Top/border.bin b/data/layouts/SkyPillar_Top/border.bin
new file mode 100644
index 000000000..e9d1c658c
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc
new file mode 100644
index 000000000..646c6f95f
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/layout.inc
@@ -0,0 +1,15 @@
+SkyPillar_Top_MapBorder::
+ .incbin "data/layouts/SkyPillar_Top/border.bin"
+
+SkyPillar_Top_MapBlockdata::
+ .incbin "data/layouts/SkyPillar_Top/map.bin"
+
+ .align 2
+SkyPillar_Top_Layout::
+ .4byte 0x1b
+ .4byte 0x18
+ .4byte SkyPillar_Top_MapBorder
+ .4byte SkyPillar_Top_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/SkyPillar_Top/map.bin b/data/layouts/SkyPillar_Top/map.bin
new file mode 100644
index 000000000..d87f50f30
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������������������������������d2d2d2�6d2d2d2�6d2d2d2񫊞񫊞񫊞�6d2d2d2�6d2d2d2�6d26664274242426427742742777427424277674242742424274274274277666427777774242424242767424242777766767666424277766767666642427774242424277777426427764242424242424264277777642427774277427424242426742427426742427774242424242424242424267667774242426642424242424242424242426426642''''''''''m𸫔n';<='''''''''//////////j𸫔k/CL2E/////////5252525252525252525252525252525252676774242424242424242426427777677677424242424242424274276[[[[[[[[[[[[[[[[[[[[[[[[[[[��������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/SlateportCity/border.bin b/data/layouts/SlateportCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/SlateportCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc
new file mode 100644
index 000000000..dfa184764
--- /dev/null
+++ b/data/layouts/SlateportCity/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_MapBorder::
+ .incbin "data/layouts/SlateportCity/border.bin"
+
+SlateportCity_MapBlockdata::
+ .incbin "data/layouts/SlateportCity/map.bin"
+
+ .align 2
+SlateportCity_Layout::
+ .4byte 0x28
+ .4byte 0x3c
+ .4byte SlateportCity_MapBorder
+ .4byte SlateportCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Slateport
+
diff --git a/data/layouts/SlateportCity/map.bin b/data/layouts/SlateportCity/map.bin
new file mode 100644
index 000000000..163beb4e8
--- /dev/null
+++ b/data/layouts/SlateportCity/map.bin
Binary files differ
diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
Binary files differ
diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
new file mode 100644
index 000000000..f921eb5fc
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_OceanicMuseum_1F_MapBorder::
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin"
+
+SlateportCity_OceanicMuseum_1F_MapBlockdata::
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin"
+
+ .align 2
+SlateportCity_OceanicMuseum_1F_Layout::
+ .4byte 0x14
+ .4byte 0x9
+ .4byte SlateportCity_OceanicMuseum_1F_MapBorder
+ .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_OceanicMuseum
+
diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
new file mode 100644
index 000000000..f18b01e49
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
@@ -0,0 +1,2 @@
+]W&'&'   ^_ ./ ./    22222222262722627222222222 2222222222222!222!2222(C222222222222)6C22)6C2222K22"2#2#2$222"2#2#2$22K222K222 222U6H6I6V6C22U6I636V6C222!2222(C22>6D22>6C22>6D22>6C222)6C2222K22`6C22`6
+ `6C22`6C2222K2 \ No newline at end of file
diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
Binary files differ
diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
new file mode 100644
index 000000000..7a6998987
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_OceanicMuseum_2F_MapBorder::
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin"
+
+SlateportCity_OceanicMuseum_2F_MapBlockdata::
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin"
+
+ .align 2
+SlateportCity_OceanicMuseum_2F_Layout::
+ .4byte 0x14
+ .4byte 0x9
+ .4byte SlateportCity_OceanicMuseum_2F_MapBorder
+ .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_OceanicMuseum
+
diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
new file mode 100644
index 000000000..1fa2cdc18
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
@@ -0,0 +1 @@
+ac %       bd%   22M2N2N2O22222-222222222C2289@,C22225C2S2T22S2T22 22C222334C22222K2[\2[\2(C2C22E2F2F2G2K2222222222222K2C22*01,C2222222Q2R2222 22C222334C2222222YZC222(C2C222222K222222222K2222K2 \ No newline at end of file
diff --git a/data/layouts/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SlateportCity_PokemonFanClub/border.bin
Binary files differ
diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
new file mode 100644
index 000000000..44f9a559f
--- /dev/null
+++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_PokemonFanClub_MapBorder::
+ .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin"
+
+SlateportCity_PokemonFanClub_MapBlockdata::
+ .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin"
+
+ .align 2
+SlateportCity_PokemonFanClub_Layout::
+ .4byte 0xe
+ .4byte 0xb
+ .4byte SlateportCity_PokemonFanClub_MapBorder
+ .4byte SlateportCity_PokemonFanClub_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonFanClub
+
diff --git a/data/layouts/SlateportCity_PokemonFanClub/map.bin b/data/layouts/SlateportCity_PokemonFanClub/map.bin
new file mode 100644
index 000000000..effff6653
--- /dev/null
+++ b/data/layouts/SlateportCity_PokemonFanClub/map.bin
Binary files differ
diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
new file mode 100644
index 000000000..00d5840c6
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_SternsShipyard_1F_MapBorder::
+ .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin"
+
+SlateportCity_SternsShipyard_1F_MapBlockdata::
+ .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin"
+
+ .align 2
+SlateportCity_SternsShipyard_1F_Layout::
+ .4byte 0x15
+ .4byte 0xf
+ .4byte SlateportCity_SternsShipyard_1F_MapBorder
+ .4byte SlateportCity_SternsShipyard_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/map.bin b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
new file mode 100644
index 000000000..036f5ce26
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
@@ -0,0 +1,7 @@
+������!
+!012! #!$!"!!"�22�22
+)28292:2)22)2)2)2)2)2)2)2)2222222  2 2 2 2 2 2 2 2&2)2)2)2)22A2B22222?�������)2)2)2'IJ2222
+G$[\3456 )2)2)2''2222   O)2cd;<=>2)2)2)2/7A2B222)2)2k2l2CDEF)2)2)2)2)2)2IJ2222 )2)2)2)2K2LMN2)2)2)2)2)2)22222222)2)2)253)2UV)2)2)2)2)2)2)2A2B222222)2)2(2_2(2*2*253)2)2)2)2)22IJ22222)2(2_2(2(2(2_2)2)2)2'222222
+'2(2W(2(2(2W)2)2)2'''222222
+/'(2(2(2(2(2)2)2)2//7222222
+77/)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file
diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/border.bin b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
new file mode 100644
index 000000000..01a969a3a
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
@@ -0,0 +1,15 @@
+SlateportCity_SternsShipyard_2F_MapBorder::
+ .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin"
+
+SlateportCity_SternsShipyard_2F_MapBlockdata::
+ .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
+
+ .align 2
+SlateportCity_SternsShipyard_2F_Layout::
+ .4byte 0x11
+ .4byte 0xf
+ .4byte SlateportCity_SternsShipyard_2F_MapBorder
+ .4byte SlateportCity_SternsShipyard_2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
+
diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/map.bin b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
new file mode 100644
index 000000000..d10ed2ac2
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
@@ -0,0 +1 @@
+���!!���!$#! !!$! !!22�22�2222222222222222222222  22  22@2B2A2B2222222222HJIJ2222PQQQQQQR222222222`cd;<=>�2A2B2@2B22222`klCDEF�2IJHJ2222`))KLMN�222222222`)5)UV)�2A2B2@2B22222`(W2(**5�2IJHJ222`(W2(((W2�222222222hi�iii�j222222222222%2%2222222222222222222222 \ No newline at end of file
diff --git a/data/layouts/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/layouts/SootopolisCity/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc
new file mode 100644
index 000000000..400a29cbd
--- /dev/null
+++ b/data/layouts/SootopolisCity/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MapBorder::
+ .incbin "data/layouts/SootopolisCity/border.bin"
+
+SootopolisCity_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity/map.bin"
+
+ .align 2
+SootopolisCity_Layout::
+ .4byte 0x3c
+ .4byte 0x3c
+ .4byte SootopolisCity_MapBorder
+ .4byte SootopolisCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Sootopolis
+
diff --git a/data/layouts/SootopolisCity/map.bin b/data/layouts/SootopolisCity/map.bin
new file mode 100644
index 000000000..ff03ebc3b
--- /dev/null
+++ b/data/layouts/SootopolisCity/map.bin
@@ -0,0 +1,12 @@
+�����������������2�󱙂��������9����������󱙂󱙂�2��������9��󱙂󱙂�2������������������󱙂���9���KLM�������������������9����2���������9���󱙂�2�󱙂�2���� 
+  ��2��������󱙂󱙂󱙂󱙂 
+ ���2��������������󱙂�2�� 
+ 󱙂%7'�󱙂��󱙂󱙂��KLM󱙂󱙂 
+ ����������� 
+ U����������󱙂-?/��󱙂��@AAAB Z�󱙂�2�����������2#$_���󱙂󱙂󱙂� 󱙂󱙂󱙂󱙂�2����2���󱙂�2��󱙂󱙂�2 󱙂���KLM�󱙂+,_���󱙂��D2E2�󱙂󱙂󱙂󱙂󱙂󱙂󱙂�󱙂�2�󱙂�2�2�@AAAAAAAB�2��� @AAF�2G\��󱙂�2�󱙂󱙂󱙂󱙂@AF󱙂GAAAB��󱙂�����D2������������󱙂��%6'�2��bD2c���󱙂�2�󱙂󱙂󱙂󱙂��bD2E2c�����������󱙂󱙂������9����󱙂��->/�2��2�D2����󱙂�2����������󱙂󱙂󱙂󱙂�2���������D2�����������AAAAAB��2�󱙂󱙂󱙂󱙂��󱙂�������������D2E2���������D2������ 
+ ��������������������D2E2�����������������D2E2�����2����󱙂󱙂󱙂��󱙂�󱙂�2��������󱙂󱙂󱙂�2�������2����������D2E2��2������􎓪󱙂󱙂�2� �󱙂������2�����82�2����D2E2��2������󱙂󱙂󱙂󱙂󱙂�2��������9���󱙂�2��󱙂���󱙂󱙂󱙂��2���󱙂󱙂󱙂����@AF󱙂GAAAAAAAAB��������󱙂󱙂�󱙂󱙂����2�����2�T 
+ B󱙂󱙂󱙂��2���2�bD2E2c�QR[RS��󱙂���TA 
+ ��󱙂󱙂��282󱙂󱙂��2;󱙂󱙂�^#$󱙂�2��D2E2��2���2�󱙂󱙂� �!2�"������2�^�2#$��󱙂󱙂�����2󱙂�2�^+,󱙂�2��D2E2�����2�󱙂󱙂�()2)2)2*�󱙂�2���^�2+,���󱙂󱙂 
+ � 
+ �KLM^󱙂󱙂󱙂��󱙂󱙂�2���n󱙂o�0q0q0q02�󱙂󱙂��^󱙂󱙂��2�D2E2�� �2� ^󱙂󱙂󱙂��󱙂󱙂�2���bD2E2c�q0�6q0�6q0���󱙂��^󱙂󱙂���D2E2��%7'�2�%7']AAAB󱙂��󱙂��D2���q0q0q0q0q0q0�6q0�6q0q0q0�����^󱙂󱙂󱙂󱙂�2�����-?/�2AAB�-?/�2����D2E2��󱙂��D2���q0q0q0q0q0q0q0q0q0q0q0q0q0q0���]AB󱙂󱙂󱙂�2�󱙂�2��������������󱙂󱙂󱙂�󱙂��󱙂�2�q0q0q0q0q0q0q0q0q0q0q0q0q0q0������D2E2�KLM�����󱙂󱙂�������2��KLM�D2E2������󱙂�2�q0q0t||||||||||�����TB󱙂�2 �󱙂�2��󱙂󱙂�KL󱙂�TYZB󱙂�������D2E2�ty}����������s����^󱙂󱙂�󱙂󱙂�󱙂󱙂�2 󱙂�^󱙂�2����󱙂�q0q0t}���yyyyyyyy�{y���^󱙂󱙂��2��󱙂󱙂%6'󱙂�^󱙂�2��k6l6l6m6�q0q0u��yyyyyyyyyy���s��^󱙂󱙂󱙂�2�� �2�󱙂󱙂->/󱙂�^󱙂󱙂󱙂��0123�q0q0u�yyyyyyyyyyyyy�s��]AAB󱙂󱙂�2��2��󱙂AAAAB��]AAAAB���89:;�q0q0u�yyy������yyyy�s��{|}~�󱙂󱙂�󱙂�󱙂󱙂��������������ABw�q0q0u�yy��������yyy�s�TPQRS�󱙂󱙂��D2�󱙂��󱙂���2���󱙂�2�����󱙂󱙂�2�q0q0u�yy��������yyy�s�^XYZ[�󱙂󱙂󱙂�2�󱙂�2�󱙂�󱙂�󱙂󱙂�2�󱙂󱙂󱙂󱙂��q0q0u�yy��������yyy�s�^abv��D2E2�󱙂�2��������󱙂���KLM�󱙂󱙂�2�D2E2�q0q0q0u�y�󞑯�1���󉅊�yy�s�^󱙂󱙂󱙂󱙂����󱙂�2��2��󱙂���TYZB󱙂󱙂��q0q0q0q0q0q0u�y�000000010�yy�s�^󱙂󱙂󱙂󱙂222�9����2�󱙂�2��2�^󱙂󱙂��q0q0q0q0q0q0t}�y�00000010�yy�s�]B󱙂@AF󱙂 222���2��2�����^󱙂󱙂�q0t��D2E2yz��y�00000000�yy�s���D2E2��N󱙂 
+ ���2���󱙂��2^󱙂󱙂󱙂�2�q0r��0000�yy�00000000�yy�{yyyD2E2��N󱙂����������2]B󱙂󱙂���q0r��0000�yy����������yy��04000p�N󱙂󱙂�2��2���2�󱙂���������tyyz0������yyyyyyyyyyyyyyy�00000p�V@AAAAAAB�������2��qty����yz0000�yyyyyyyyyyyyyyyyyyyy�00000p�����������������2�qqr0����000000�yyyyyyyyyyyyyyyyyyyy���000xyyyy�qqq���������2�qqr0����000000�yyyyyyyyyyyyyyyyyyyyyy�00000000x������������2�qqr000��000000�yyyyyyyyyyyyyyyyyyyyyy�000000000��pq��������2�qqr000��000000�yyyyyyyyyyyyyyyyyyyyyy����0000󏎉��pq��������2�qqr0000000󏎉00�yyyyyyyyyyyyyyyyyyyyyyyyy�0000����pqq�������2��qr0000000��00�yyyyyyyyyyyyyyyyyyyyyyyyy�0000����pqq�����������iiij000�����yyyyyyyyyyyyyyyyyyyyyyyyy���������pqq���������������ij0���yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy�����p������������������r0���yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy�`ii0i0i0�0�������������������iij�yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy�qqqq����������������������qr�yyyyyyyyyyyyyyyyyyyyyyyy�iiiiiiq��������������������������r�yyyyyyyyyyyyyyyyyyyyyyyy�qqqqqqq��������������������������r�yyyyyyyyy�����yyyyyy�iiiiqqqq�����������������������������r�yyyyyyy���������yyyy�qqqqqqq������������������������������r�yyyyyy�����������yyy�qqqqq��������������������������������iiii�yy��������������iiqq�����������������������������������qqqqiiiiiiiiiiiiiiiiiqqqq������������������������������������qqqqqqqqqqqqqqqqqqqqq����������������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/border.bin
Binary files differ
diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc
new file mode 100644
index 000000000..4c6a6eeef
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_1F_MapBorder::
+ .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin"
+
+SootopolisCity_Gym_1F_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin"
+
+ .align 2
+SootopolisCity_Gym_1F_Layout::
+ .4byte 0x11
+ .4byte 0x1a
+ .4byte SootopolisCity_Gym_1F_MapBorder
+ .4byte SootopolisCity_Gym_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_SootopolisGym
+
diff --git a/data/layouts/SootopolisCity_Gym_1F/map.bin b/data/layouts/SootopolisCity_Gym_1F/map.bin
new file mode 100644
index 000000000..dd52448c9
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/map.bin
Binary files differ
diff --git a/data/layouts/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/border.bin
Binary files differ
diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
new file mode 100644
index 000000000..7eb90fb71
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_B1F_MapBorder::
+ .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin"
+
+SootopolisCity_Gym_B1F_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin"
+
+ .align 2
+SootopolisCity_Gym_B1F_Layout::
+ .4byte 0x11
+ .4byte 0x1a
+ .4byte SootopolisCity_Gym_B1F_MapBorder
+ .4byte SootopolisCity_Gym_B1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_SootopolisGym
+
diff --git a/data/layouts/SootopolisCity_Gym_B1F/map.bin b/data/layouts/SootopolisCity_Gym_B1F/map.bin
new file mode 100644
index 000000000..58410408f
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin
@@ -0,0 +1 @@
+%&&&&&&&&&&&&&&&'-%             '/-]2222222222222^/-]2222222222222^/-]2222222222222^/5]2222222222222^7&57&..-%        '/..-]222222222^/-]222222222^/&&5]222222222^7&&&&&5=7&&&....-.%  './....-]222^/&&&&5]222^7&&&&&&&&&&]222^&&&&&&...%&&&&&&'...-%      '/-]222222^/-]2222222^/-]2222222^/-]2222222^/ \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SootopolisCity_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc
new file mode 100644
index 000000000..1ad9cc41c
--- /dev/null
+++ b/data/layouts/SootopolisCity_House1/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House1_MapBorder::
+ .incbin "data/layouts/SootopolisCity_House1/border.bin"
+
+SootopolisCity_House1_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_House1/map.bin"
+
+ .align 2
+SootopolisCity_House1_Layout::
+ .4byte 0x8
+ .4byte 0x7
+ .4byte SootopolisCity_House1_MapBorder
+ .4byte SootopolisCity_House1_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin
new file mode 100644
index 000000000..43f11b194
--- /dev/null
+++ b/data/layouts/SootopolisCity_House1/map.bin
@@ -0,0 +1 @@
+�������0��������2�3�3�3�3�3�3�2�3�3󽰫�7􀷍�3�3�3󽱻�7􀷍�3�3�3�3�3�3�3�3�3�3�3�3 �3�3�3 \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SootopolisCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc
new file mode 100644
index 000000000..9007d584b
--- /dev/null
+++ b/data/layouts/SootopolisCity_House2/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House2_MapBorder::
+ .incbin "data/layouts/SootopolisCity_House2/border.bin"
+
+SootopolisCity_House2_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_House2/map.bin"
+
+ .align 2
+SootopolisCity_House2_Layout::
+ .4byte 0x8
+ .4byte 0x7
+ .4byte SootopolisCity_House2_MapBorder
+ .4byte SootopolisCity_House2_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin
new file mode 100644
index 000000000..632e1e36a
--- /dev/null
+++ b/data/layouts/SootopolisCity_House2/map.bin
@@ -0,0 +1 @@
+���������vw�����𶾐󱘚�3�3�3�6�3�3�3󽰫�7􀷍�3�3�3�3�7�7􀷍�3�3�3�3�3�3�3�3�3�3�3 �3�3�3 \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/SootopolisCity_House3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc
new file mode 100644
index 000000000..540f4306c
--- /dev/null
+++ b/data/layouts/SootopolisCity_House3/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House3_MapBorder::
+ .incbin "data/layouts/SootopolisCity_House3/border.bin"
+
+SootopolisCity_House3_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_House3/map.bin"
+
+ .align 2
+SootopolisCity_House3_Layout::
+ .4byte 0x8
+ .4byte 0x7
+ .4byte SootopolisCity_House3_MapBorder
+ .4byte SootopolisCity_House3_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin
new file mode 100644
index 000000000..8bbd6c517
--- /dev/null
+++ b/data/layouts/SootopolisCity_House3/map.bin
@@ -0,0 +1 @@
+����������������򵂶�2�3�3�3𯜎�3�3�3�3�3�3�3�3󿏵􀷍�3�3�3�3�7􅞡�3�3�3�3�3�3�3�3 �3�3�3 \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin
Binary files differ
diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc
new file mode 100644
index 000000000..152563eb6
--- /dev/null
+++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_LotadAndSeedotHouse_MapBorder::
+ .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin"
+
+SootopolisCity_LotadAndSeedotHouse_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin"
+
+ .align 2
+SootopolisCity_LotadAndSeedotHouse_Layout::
+ .4byte 0x8
+ .4byte 0x7
+ .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder
+ .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin
new file mode 100644
index 000000000..ffeea7269
--- /dev/null
+++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin
@@ -0,0 +1 @@
+��XX��`��`��󮔊�3�3�3�3𶴼�3�3�3�7�7�3�3�3�3�3󽱻�7􀷍�3�3�3�3�3�3�3�3�3�3�3�3 �3�3�3 \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin
Binary files differ
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc
new file mode 100644
index 000000000..0b846950e
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MysteryEventsHouse_1F_MapBorder::
+ .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin"
+
+SootopolisCity_MysteryEventsHouse_1F_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin"
+
+ .align 2
+SootopolisCity_MysteryEventsHouse_1F_Layout::
+ .4byte 0xb
+ .4byte 0x8
+ .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder
+ .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_MysteryEventsHouse
+
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin
new file mode 100644
index 000000000..a9b17a746
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin
@@ -0,0 +1 @@
+89:' @AB /6666-7$%655555555556555555655555565555555555655 555555 \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin
Binary files differ
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc
new file mode 100644
index 000000000..1bb92b933
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MysteryEventsHouse_B1F_MapBorder::
+ .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin"
+
+SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata::
+ .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
+
+ .align 2
+SootopolisCity_MysteryEventsHouse_B1F_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder
+ .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_MysteryEventsHouse
+
diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin
new file mode 100644
index 000000000..558e1584e
--- /dev/null
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin
@@ -0,0 +1,2 @@
+ 
+        6666666666655555555555655 !!!!"555655())))*5556550111125555555555555#5555555555 \ No newline at end of file
diff --git a/data/layouts/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/SouthernIsland_Exterior/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc
new file mode 100644
index 000000000..4a62cd3f5
--- /dev/null
+++ b/data/layouts/SouthernIsland_Exterior/layout.inc
@@ -0,0 +1,15 @@
+SouthernIsland_Exterior_MapBorder::
+ .incbin "data/layouts/SouthernIsland_Exterior/border.bin"
+
+SouthernIsland_Exterior_MapBlockdata::
+ .incbin "data/layouts/SouthernIsland_Exterior/map.bin"
+
+ .align 2
+SouthernIsland_Exterior_Layout::
+ .4byte 0x21
+ .4byte 0x1e
+ .4byte SouthernIsland_Exterior_MapBorder
+ .4byte SouthernIsland_Exterior_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/SouthernIsland_Exterior/map.bin b/data/layouts/SouthernIsland_Exterior/map.bin
new file mode 100644
index 000000000..8c2c2df4a
--- /dev/null
+++ b/data/layouts/SouthernIsland_Exterior/map.bin
@@ -0,0 +1 @@
+qss򷠶�򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶�40uuuu�qss򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶t}uuu�qss򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶uquuu�qss򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶򷠶uquuu�qss򷠶򷠶򷠶򷠶򷠶�477򷠶򷠶򷠶򷠶򷠶�4ut}uu�qss4򷠶򷠶򷠶򷠶򷠶33򷠶򷠶򷠶򷠶򷠶4uuquu��ss04򷠶򷠶򷠶򷠶4334򷠶򷠶򷠶򷠶�4t}ut}u�ss{|�򷠶򷠶򷠶򷠶0004򷠶444444�4uquut}�s{�qs򷠶򷠶򷠶򷠶0000440000004ut}uu��{�sqs4򷠶򷠶򷠶�40000000򷠶�4000uuquu�p�s{�s044򷠶򷠶򷠶00000򷠶򷠶400uuquu�ps{�s{򥬎�4򷠶򷠶򷠶00044444t񯣔zuquu�p{�s{�44p044򷠶򷠶򷠶4t򥪄򥪄z000ut}u�p�ssq{|�{||�444444tz4444t񯣔yzuqu�p�ssqqq{󐉆�{򥪄�6|||}tyyyyz0000ut}�p�s{|||�44x�444t���z0000000t|}u��p�sqqqq{||�xyyyz0000000000t}qt}�pp�{||�qqqqs0000000000t||||}t|}��pp����{||�q{|||||񯣔|||}t����}���pppppp����{|�����]^0^0_���}������ppppppppppp��������]^0^0_�����ppppppppppppppppppppUV0V0V0�2^0^0_qpppppppppppppppppppppppp]^0^0^0^0^0^0_qppppppppppppppppppppppppSTTV3W3TTUqpppppppppppppppppppppppp[\\\\\\]qppppppppppppppppppppppppqqqqqqqqqpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/layouts/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/layouts/SouthernIsland_Interior/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc
new file mode 100644
index 000000000..b4d9a35d2
--- /dev/null
+++ b/data/layouts/SouthernIsland_Interior/layout.inc
@@ -0,0 +1,15 @@
+SouthernIsland_Interior_MapBorder::
+ .incbin "data/layouts/SouthernIsland_Interior/border.bin"
+
+SouthernIsland_Interior_MapBlockdata::
+ .incbin "data/layouts/SouthernIsland_Interior/map.bin"
+
+ .align 2
+SouthernIsland_Interior_Layout::
+ .4byte 0x1b
+ .4byte 0x18
+ .4byte SouthernIsland_Interior_MapBorder
+ .4byte SouthernIsland_Interior_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Rustboro
+
diff --git a/data/layouts/SouthernIsland_Interior/map.bin b/data/layouts/SouthernIsland_Interior/map.bin
new file mode 100644
index 000000000..db1e4b153
--- /dev/null
+++ b/data/layouts/SouthernIsland_Interior/map.bin
@@ -0,0 +1 @@
+����������������������������������������������������������������������������������������������������������������������������������������������������������������������������0000000��������������������0000000������������������00000000000����������������00򼜐�00򼜐�000����������������00󕄠�00󭫠�000����������������00󕄪0�60󕄪00����������������00󕄪000󕄪00����������������00󕄠򿡈򿢘�000����������������00󭫠󘉘󘉘�000����������������󏎉0󭬰󰱨�00��������������������0000000�����������������1���󒒷�100󏎉���������������1��������22���������������1�������������������������1����������������������������������������������������������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/TerraCave_End/border.bin b/data/layouts/TerraCave_End/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/TerraCave_End/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc
new file mode 100644
index 000000000..0865a8e5b
--- /dev/null
+++ b/data/layouts/TerraCave_End/layout.inc
@@ -0,0 +1,15 @@
+TerraCave_End_MapBorder::
+ .incbin "data/layouts/TerraCave_End/border.bin"
+
+TerraCave_End_MapBlockdata::
+ .incbin "data/layouts/TerraCave_End/map.bin"
+
+ .align 2
+TerraCave_End_Layout::
+ .4byte 0x1b
+ .4byte 0x1e
+ .4byte TerraCave_End_MapBorder
+ .4byte TerraCave_End_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/TerraCave_End/map.bin b/data/layouts/TerraCave_End/map.bin
new file mode 100644
index 000000000..93121190d
--- /dev/null
+++ b/data/layouts/TerraCave_End/map.bin
@@ -0,0 +1,9 @@
+����������������������������������� ��������
+����������������� �2�2�2
+���
+����������� �������2�2�2���
+�����������  �2�2�2�2�2�2�2�2�2�2�2�2�
+����������� ������2�2�2�2�2�2�2�
+���������������� �2�2�2�2�2�2�2�
+��������������� � �2�2�2�2�2�2�2������������������2�2�2�2�2�2�2
+����������� ����������������� �222222  "����� �2222222222����� �22222222   #����� �222222  #       "��� �22222 ##��� �22222��� �2222 ##��� �2222efg��� �222 #esdrfg��� �222efsdd_drfg��� �222qdd__d_ddp��� �222qd_d____dp��� �2222es_d__d_d_p��� �2222qdd___d_ddp��� �2222#2#2bdd_d_d_dp��� �222222#2b_d_d_`a3a3#2��� �2222222222#2a3a3a3a3a3#2    ��� �       "2222222222��� ���������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/TerraCave_Entrance/border.bin b/data/layouts/TerraCave_Entrance/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/TerraCave_Entrance/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc
new file mode 100644
index 000000000..19d50ef44
--- /dev/null
+++ b/data/layouts/TerraCave_Entrance/layout.inc
@@ -0,0 +1,15 @@
+TerraCave_Entrance_MapBorder::
+ .incbin "data/layouts/TerraCave_Entrance/border.bin"
+
+TerraCave_Entrance_MapBlockdata::
+ .incbin "data/layouts/TerraCave_Entrance/map.bin"
+
+ .align 2
+TerraCave_Entrance_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte TerraCave_Entrance_MapBorder
+ .4byte TerraCave_Entrance_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/TerraCave_Entrance/map.bin b/data/layouts/TerraCave_Entrance/map.bin
new file mode 100644
index 000000000..a8108c2ca
--- /dev/null
+++ b/data/layouts/TerraCave_Entrance/map.bin
@@ -0,0 +1,33 @@
+���� ������������������ �������3�
+������ ��� ����2�2�2
+
+������ ��� �2�2�2�2�2�2
+
+������� ���2�2��2
+
+����� �� �2�2�2�2
+� �2
+
+����� ���2�2�2�2
+� �2
+
+���� � �2�2�2�2�2�2
+� �2
+
+���� ��2�2����� �2
+
+�� �� �2�2�������2
+
+��  ���2�2
+�� �2�2�2�2�2
+
+��   �2�2�2�2
+���2�2�2�2�2
+
+��   �2�2�2�2
+��2�2�2�2�2�2
+��   �2�2�2�2�2�2�2�2�2��
+   �2�2�2�2�2�2�2�2�2�2
+ �2�2�2�
+   �2�2�2�2�2�2�2�2�2�2�2�2�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/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/TradeCenter/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc
new file mode 100644
index 000000000..5e0297e7a
--- /dev/null
+++ b/data/layouts/TradeCenter/layout.inc
@@ -0,0 +1,15 @@
+TradeCenter_MapBorder::
+ .incbin "data/layouts/TradeCenter/border.bin"
+
+TradeCenter_MapBlockdata::
+ .incbin "data/layouts/TradeCenter/map.bin"
+
+ .align 2
+TradeCenter_Layout::
+ .4byte 0xc
+ .4byte 0x9
+ .4byte TradeCenter_MapBorder
+ .4byte TradeCenter_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_CableClub
+
diff --git a/data/layouts/TradeCenter/map.bin b/data/layouts/TradeCenter/map.bin
new file mode 100644
index 000000000..7e592dbe6
--- /dev/null
+++ b/data/layouts/TradeCenter/map.bin
@@ -0,0 +1,2 @@
+017456742389?<=  >?<:;@AGDE((FGDBCHI2.2222222.2J2KP22
+2 2 2 22222SPQ2+22222+2R2SP2222222222SXY222#2$2%2&222Z2[,2-2 \ No newline at end of file
diff --git a/data/layouts/TrainerHill_1F/border.bin b/data/layouts/TrainerHill_1F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/TrainerHill_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc
new file mode 100644
index 000000000..2009cd49e
--- /dev/null
+++ b/data/layouts/TrainerHill_1F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_1F_MapBorder::
+ .incbin "data/layouts/TrainerHill_1F/border.bin"
+
+TrainerHill_1F_MapBlockdata::
+ .incbin "data/layouts/TrainerHill_1F/map.bin"
+
+ .align 2
+TrainerHill_1F_Layout::
+ .4byte 0x10
+ .4byte 0x15
+ .4byte TrainerHill_1F_MapBorder
+ .4byte TrainerHill_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrainerHill
+
diff --git a/data/layouts/TrainerHill_1F/map.bin b/data/layouts/TrainerHill_1F/map.bin
new file mode 100644
index 000000000..d72e84a5c
--- /dev/null
+++ b/data/layouts/TrainerHill_1F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2       12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;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/TrainerHill_2F/border.bin b/data/layouts/TrainerHill_2F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/TrainerHill_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc
new file mode 100644
index 000000000..f67b54bf1
--- /dev/null
+++ b/data/layouts/TrainerHill_2F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_2F_MapBorder::
+ .incbin "data/layouts/TrainerHill_2F/border.bin"
+
+TrainerHill_2F_MapBlockdata::
+ .incbin "data/layouts/TrainerHill_2F/map.bin"
+
+ .align 2
+TrainerHill_2F_Layout::
+ .4byte 0x10
+ .4byte 0x15
+ .4byte TrainerHill_2F_MapBorder
+ .4byte TrainerHill_2F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrainerHill
+
diff --git a/data/layouts/TrainerHill_2F/map.bin b/data/layouts/TrainerHill_2F/map.bin
new file mode 100644
index 000000000..8b78fd0b4
--- /dev/null
+++ b/data/layouts/TrainerHill_2F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;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/TrainerHill_3F/border.bin b/data/layouts/TrainerHill_3F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/TrainerHill_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc
new file mode 100644
index 000000000..280517f41
--- /dev/null
+++ b/data/layouts/TrainerHill_3F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_3F_MapBorder::
+ .incbin "data/layouts/TrainerHill_3F/border.bin"
+
+TrainerHill_3F_MapBlockdata::
+ .incbin "data/layouts/TrainerHill_3F/map.bin"
+
+ .align 2
+TrainerHill_3F_Layout::
+ .4byte 0x10
+ .4byte 0x15
+ .4byte TrainerHill_3F_MapBorder
+ .4byte TrainerHill_3F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrainerHill
+
diff --git a/data/layouts/TrainerHill_3F/map.bin b/data/layouts/TrainerHill_3F/map.bin
new file mode 100644
index 000000000..5280752f4
--- /dev/null
+++ b/data/layouts/TrainerHill_3F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;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/TrainerHill_4F/border.bin b/data/layouts/TrainerHill_4F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/TrainerHill_4F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc
new file mode 100644
index 000000000..eed0b0120
--- /dev/null
+++ b/data/layouts/TrainerHill_4F/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_4F_MapBorder::
+ .incbin "data/layouts/TrainerHill_4F/border.bin"
+
+TrainerHill_4F_MapBlockdata::
+ .incbin "data/layouts/TrainerHill_4F/map.bin"
+
+ .align 2
+TrainerHill_4F_Layout::
+ .4byte 0x10
+ .4byte 0x15
+ .4byte TrainerHill_4F_MapBorder
+ .4byte TrainerHill_4F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrainerHill
+
diff --git a/data/layouts/TrainerHill_4F/map.bin b/data/layouts/TrainerHill_4F/map.bin
new file mode 100644
index 000000000..3a285b7f8
--- /dev/null
+++ b/data/layouts/TrainerHill_4F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;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/TrainerHill_Entrance/border.bin b/data/layouts/TrainerHill_Entrance/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/TrainerHill_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc
new file mode 100644
index 000000000..896f43e0d
--- /dev/null
+++ b/data/layouts/TrainerHill_Entrance/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_Entrance_MapBorder::
+ .incbin "data/layouts/TrainerHill_Entrance/border.bin"
+
+TrainerHill_Entrance_MapBlockdata::
+ .incbin "data/layouts/TrainerHill_Entrance/map.bin"
+
+ .align 2
+TrainerHill_Entrance_Layout::
+ .4byte 0x13
+ .4byte 0x11
+ .4byte TrainerHill_Entrance_MapBorder
+ .4byte TrainerHill_Entrance_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrainerHill
+
diff --git a/data/layouts/TrainerHill_Entrance/map.bin b/data/layouts/TrainerHill_Entrance/map.bin
new file mode 100644
index 000000000..fc00c0a5f
--- /dev/null
+++ b/data/layouts/TrainerHill_Entrance/map.bin
@@ -0,0 +1,2 @@
+ !:;7<!'()BC3D)/(8335333/(O3N313M3L3/(K73J/(937393/(7373R73/&!!!ST"P373Q3*!!!#$%UV73)))+,-.   33I73H33 33533A3534
+393353353353@3130353353353353373031303130313031303130313031303130313631303130313031303130313031303130313037333313031303130313031303133331363   0313031303130313031303   03730313031303130313000313031303130313 \ No newline at end of file
diff --git a/data/layouts/TrainerHill_Roof/border.bin b/data/layouts/TrainerHill_Roof/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/layouts/TrainerHill_Roof/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc
new file mode 100644
index 000000000..9477dceda
--- /dev/null
+++ b/data/layouts/TrainerHill_Roof/layout.inc
@@ -0,0 +1,15 @@
+TrainerHill_Roof_MapBorder::
+ .incbin "data/layouts/TrainerHill_Roof/border.bin"
+
+TrainerHill_Roof_MapBlockdata::
+ .incbin "data/layouts/TrainerHill_Roof/map.bin"
+
+ .align 2
+TrainerHill_Roof_Layout::
+ .4byte 0x19
+ .4byte 0x10
+ .4byte TrainerHill_Roof_MapBorder
+ .4byte TrainerHill_Roof_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_TrainerHill
+
diff --git a/data/layouts/TrainerHill_Roof/map.bin b/data/layouts/TrainerHill_Roof/map.bin
new file mode 100644
index 000000000..815ec1067
--- /dev/null
+++ b/data/layouts/TrainerHill_Roof/map.bin
@@ -0,0 +1 @@
+�������XYajjZggd\]��������������`ajjjZgggde��������������hijjjZggglm�������gggggg�pqrijZglstu�ggggggkkkkkk�xyz^_bvw{|}�kkkkkkkkkkkk�k3��3fg[~��k3�kkkkkk�k�kkk�k3k3k3n3oc��3k3k3k3�kkk�k��k�kkk�k3k3k3k3k3k3k3k3k3k3k3�kkk�k�kkkkkk�k3k3k3k3k3k3k3k3k3k3k3�kkkkkkkkkkkk�k3k3k3k3k3k3k3k3k3k3k3�kkkkkk��������3k3򞤹򞤹򞤹�3k3�3��������������������������������������������k���������������������������������������������������������������������������W����������� \ No newline at end of file
diff --git a/data/layouts/Underwater1/border.bin b/data/layouts/Underwater1/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc
new file mode 100644
index 000000000..8e027bbd2
--- /dev/null
+++ b/data/layouts/Underwater1/layout.inc
@@ -0,0 +1,15 @@
+Underwater1_MapBorder::
+ .incbin "data/layouts/Underwater1/border.bin"
+
+Underwater1_MapBlockdata::
+ .incbin "data/layouts/Underwater1/map.bin"
+
+ .align 2
+Underwater1_Layout::
+ .4byte 0x50
+ .4byte 0x50
+ .4byte Underwater1_MapBorder
+ .4byte Underwater1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater1/map.bin b/data/layouts/Underwater1/map.bin
new file mode 100644
index 000000000..230e3dcd2
--- /dev/null
+++ b/data/layouts/Underwater1/map.bin
@@ -0,0 +1,17 @@
+22����������������������2222�2񝧢ಈ񝡒૸૸૸૸񝧢૸ಈ�2������22����2222�2񝡒૸૸񝧢૸񝧢񝡒૸૸񝧢񝧢૸૸�22�222�2񝧢�2�# 22
+"##~૸૸૸૸񝧢૸૸ಈ񝧢૸૸ଂ2222�2񝧢񝧢�#  "#####~૸૸૸ಈ񝧢�2}####### 22
+||~񝡒�###~૸񝧢񝧢񝧢�#  "�૸�######~񝧢��૸����������22�񝧢��૸��૸񝧢񝧢񝧢�22222�񝧢��૸�2��૸ಈ񝧢񝧢�22222�ಈ�2��૸�2��૸૸�2}|||| 22
+"�ಈ�2��૸�2��૸૸�2�#  "�૸񝧢��񝡒�2��૸૸�2��૸ಈ�2������������񝧢�2��૸૸�2��૸ಈ񝧢񝧢񝧢૸૸૸񝧢񝧢��૸૸�2�#|~૸񝡒૸񝧢񝡒૸ಈ񝧢񝧢�#~૸ಈ�#||~૸૸ಈ񝧢񝧢񝧢񝧢�2��ಈ񝧢�#|||||||||||~񝧢�2�#~񝧢�2��22#~񝧢��񝧢񝧢�22222�񝧢�#~񝧢񝡜2222�񝡒�#|||# 22
+"�񝡒�#  "���������૸��૸૸૸૸��૸��૸૸૸૸��૸��૸૸૸૸૸���૸��૸૸񝧢񝡒૸૸�2��񝡒��૸૸񝧢񝧢૸૸�2��񝡒��૸૸૸ಈ񝧢૸૸�22�ಈ�2��૸૸૸૸ಈ૸૸�2�2222�ಈ�2��૸૸ୈ�2૸񝧢૸૸�2222�ಈ�2�22�૸૸�222�2񝧢񝧢񝡒�2�# 22
+"�񝧢}"2222�૸૸�222�2񝡒ಈ񝡒�2��y2y2��񝧢�22�22�૸૸�2y2y2񝡒૸񝧢૸��񝧢�22�񝧢�# 22
+""~૸૸૸૸૸񝡒૸��񝧢�22�22�2񝧢�#  "�૸૸૸૸૸૸}|"�ಈ�2222�2񝧢�22�૸૸૸૸૸૸��૸�2�# 22
+|||"2222�૸૸૸૸૸૸��૸�2�#  "2222"~૸૸񝡒૸�2}|"�૸�2�# 22
+""|~૸૸�2}|"�૸}|#  ""|||||"�񝧢��񝧢��񝧢��񝧢��񝧢�2�����������񝧢񝧢񝧢񝧢񝡒૸�2��22�񝧢񝧢񝧢񝧢૸૸૸�2�2222�񝧢񝧢�2}||~૸૸૸૸�2222�񝧢񝧢}"�૸૸૸૸�# 22
+"�񝧢񝧢�"~૸૸񝡒�2�#  "22�񝧢񝧢}""|~����}"2222�񝧢�2}""|||||2222�񝧢�2�22�22�񝧢�2�# 22
+"�񝧢񝧢�#  "�񝧢񝧢�22"~񝧢񝧢�2222"~񝧢�2�222222�������"~񝧢��z222
+"2222�2񝧢૸૸����񝧢���2y2y2�2222�2񝧢૸૸૸�2���񝧢�#~񝧢�# 22
+"||||~૸૸૸���2�2��ಈ�22#  "#|~૸૸����22�૸�2�222�񝧢񝧢񝧢񝡜2222�૸�2�2222#|~񝧢񝧢񝡜2222�૸�2�# 22
+"||||||# 22
+"�૸�2�#  "#  "�񝡒�2��񝧢�2��񝧢}"22�2񝧢�2222�2�2�2222
+ "# 22
+"#  " \ No newline at end of file
diff --git a/data/layouts/Underwater2/border.bin b/data/layouts/Underwater2/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc
new file mode 100644
index 000000000..ac6350d47
--- /dev/null
+++ b/data/layouts/Underwater2/layout.inc
@@ -0,0 +1,15 @@
+Underwater2_MapBorder::
+ .incbin "data/layouts/Underwater2/border.bin"
+
+Underwater2_MapBlockdata::
+ .incbin "data/layouts/Underwater2/map.bin"
+
+ .align 2
+Underwater2_Layout::
+ .4byte 0x50
+ .4byte 0x50
+ .4byte Underwater2_MapBorder
+ .4byte Underwater2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater2/map.bin b/data/layouts/Underwater2/map.bin
new file mode 100644
index 000000000..0c6377c30
--- /dev/null
+++ b/data/layouts/Underwater2/map.bin
@@ -0,0 +1,35 @@
+�񝢬22�2���2�2��૸૸૸񝡜2222���222�2񝧢񝡒૸૸૸񝡜2222���222�2񝧢񝧢૸૸૸񝧢z222x2�#~6y2y2񝧢}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222
+    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 222222222222222222222222�2222222222222222222222222
+    22222222222222222222222222222222
+" #  222/2222�222 22222222222222�2222�񶏲�2� "#/#   "# 22222
+"222222222222222222�񝧢�2�##     " "2222222222222222222�񝧢�2�/ "222222
+  2222222222�񝧢�2�22222
+  22222222�񚢠�2�222222/  2222222�222/2222222222222/#  22222# 222222222222222222222222
+"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+"2222222222222222222222222222222222222222222222222# 22222222222222222
+   2222222222222222222222222222222222222222
+   "#     22222222222222222222222222222222222
+ " /#           22222222222222/2222222222
+"/ " #/#  22222222/222�2222222222
+ " " "# /#/# 22222222�22222222222
+ " "/ "#/#/# 2222222222222222222
+" "/ "#/## 2222222222
+"222222
+" " "#/#/# 22222# 2�22/2222222 "/ "### 22222#/222222222
+" "##22222222222222 " "#/# 2222222222222## 2222## 2
+"22222
+  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222
+ 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222
+"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222
+"## 2222222/222222
+" "22222222222222/222222222/222�222
+"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222
+"#/# 22222222222222efg2222222222/ "����##   222222222222222222mno222222222222222�񝢢�2�2� #  222222222222222222222222222222222222222222
+" "�񝢬22�2�2� /#  222222222222222222222222222222222222222
+"��񝡜2222�2�##    22222222222222222222222222222222
+  " "�6񝧢񝡜2222�2�/# 222222222222222222222222222222
+"/�6ಈ񝧢z222x2�2�##  2222222222222222222222222
+  " "�6૸}~�2y2y2�2} #   22222222222222222222
+ "�6૸� |||| ##   222222222222222
+ "/ "�6૸�/#  2222222
+     "�6૸��##       "/ "�6૸૸��// "�6૸૸૸�#"�૸૸ಈ�|~૸૸�2� ||||   \ No newline at end of file
diff --git a/data/layouts/Underwater3/border.bin b/data/layouts/Underwater3/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc
new file mode 100644
index 000000000..c365b6b8f
--- /dev/null
+++ b/data/layouts/Underwater3/layout.inc
@@ -0,0 +1,15 @@
+Underwater3_MapBorder::
+ .incbin "data/layouts/Underwater3/border.bin"
+
+Underwater3_MapBlockdata::
+ .incbin "data/layouts/Underwater3/map.bin"
+
+ .align 2
+Underwater3_Layout::
+ .4byte 0x50
+ .4byte 0x50
+ .4byte Underwater3_MapBorder
+ .4byte Underwater3_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater3/map.bin b/data/layouts/Underwater3/map.bin
new file mode 100644
index 000000000..fc5c331a5
--- /dev/null
+++ b/data/layouts/Underwater3/map.bin
@@ -0,0 +1 @@
+66666666666666666666666666666666666666666666666666666666666666&666666666666�.��6666666666666�񝧢񝧢�;2;266666666666666�񝧢񝧢�;2;2;2;266666666666�񝢢�2�2�@2C2C2A26666666666�񝢬22�2�2�<2P2Q2:266666666666��22222�2�<2T2R:266666666666��22222�2�<2T2R:2666666666666��2z222x2�2�@2G2T2R2:266666666666@2A2�񝧢y2y2�2}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#3242�2L2R2:26666666666  ?2W2]2Q2:2## 42�2L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;2��42T2R28 "666666666  ?2W2]2Q2:2@2C2A2��2�2�###!a6`"  666666666?2W2S2U2:2?2S2:2��222�2�###" "666666666?2W2S2U2B2A2?2S2:2��22222�2� 66666666?2W2S2U2S2:2?2S2B2A2��22222�2� "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A2��2y2y2�2� "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:2�񝧢񝧢�##666666666?2W2P2Q2U2:2?2S2:2?2�2S2:2#~񝧢�2�666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~񝧢�&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~�2���.�# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2�񝧢񝧢񝧢�#  666666666@2�2B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~񝧢񝧢}##"666666666@2򰱮�2:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2󞶨�2B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2󞺘�2S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:2��66666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232�񝧢�6666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  �񝢢�2�2�66666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  �񝢬22�2�2�66 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"��22222�2�66666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  �񝡜2222�2�66666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232�񝧢�2z222x2�2�66666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  �񝧢񝧢y2y2�2}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  ��2�2񝧢񝧢�2�6666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<2�2_2U2:2?2S2S22232  ��222�2񝧢�2}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "��22222�2�2}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S2�2_2U22232?2S22232 "��22222�2�2�66666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x2�2}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """��2y2y2񝧢�6666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~񝧢}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #6�񝧢�666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "��66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R2�2U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z2�2U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file
diff --git a/data/layouts/Underwater4/border.bin b/data/layouts/Underwater4/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc
new file mode 100644
index 000000000..9e22e4e40
--- /dev/null
+++ b/data/layouts/Underwater4/layout.inc
@@ -0,0 +1,15 @@
+Underwater4_MapBorder::
+ .incbin "data/layouts/Underwater4/border.bin"
+
+Underwater4_MapBlockdata::
+ .incbin "data/layouts/Underwater4/map.bin"
+
+ .align 2
+Underwater4_Layout::
+ .4byte 0x78
+ .4byte 0x28
+ .4byte Underwater4_MapBorder
+ .4byte Underwater4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater4/map.bin b/data/layouts/Underwater4/map.bin
new file mode 100644
index 000000000..23f987681
--- /dev/null
+++ b/data/layouts/Underwater4/map.bin
@@ -0,0 +1 @@
+666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D2�2B2C2A26666666 6666666<2󞶨:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 1�2:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file
diff --git a/data/layouts/Underwater5/border.bin b/data/layouts/Underwater5/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater5/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc
new file mode 100644
index 000000000..6394eec54
--- /dev/null
+++ b/data/layouts/Underwater5/layout.inc
@@ -0,0 +1,15 @@
+Underwater5_MapBorder::
+ .incbin "data/layouts/Underwater5/border.bin"
+
+Underwater5_MapBlockdata::
+ .incbin "data/layouts/Underwater5/map.bin"
+
+ .align 2
+Underwater5_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Underwater5_MapBorder
+ .4byte Underwater5_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater5/map.bin b/data/layouts/Underwater5/map.bin
new file mode 100644
index 000000000..902f0dbdc
--- /dev/null
+++ b/data/layouts/Underwater5/map.bin
@@ -0,0 +1 @@
+��������������������������������������������&����� ���.��� �񝧢񝧢񝧢�2� #�񝧢�2}#~�2� #�񝧢�2���2��񝧢}#��2� "�񝧢}#��2��񝧢�2��񝧢��񝧢�2}#�񝧢�2����񝧢�2}#�񝧢񝧢��񝧢񝧢�2}#�񝧢}"##�񝢢�2񝧢}#��񝧢�2��񝢬22�2�2���񝧢�2}"#����22222�2񝧢񝧢񝧢�#�񝧢�22222�2񝧢񝧢}"# """#���񝧢�2z222x2񝧢�2}"# ""�񝧢��񝧢񝧢y2y2񝧢񝧢� ""�񝢢�2�2�############�񝢬22�2�2� ""&��22222�2���.������񝡜2222�2�#�񝧢񝧢񝧢񝧢񝧢�2z222x2�2��񝧢񝧢񝧢񝧢񝧢񝧢y2y2�2}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file
diff --git a/data/layouts/Underwater6/border.bin b/data/layouts/Underwater6/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater6/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc
new file mode 100644
index 000000000..247af44bd
--- /dev/null
+++ b/data/layouts/Underwater6/layout.inc
@@ -0,0 +1,15 @@
+Underwater6_MapBorder::
+ .incbin "data/layouts/Underwater6/border.bin"
+
+Underwater6_MapBlockdata::
+ .incbin "data/layouts/Underwater6/map.bin"
+
+ .align 2
+Underwater6_Layout::
+ .4byte 0x28
+ .4byte 0x50
+ .4byte Underwater6_MapBorder
+ .4byte Underwater6_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater6/map.bin b/data/layouts/Underwater6/map.bin
new file mode 100644
index 000000000..92bd56031
--- /dev/null
+++ b/data/layouts/Underwater6/map.bin
@@ -0,0 +1 @@
+&/��.�񝧢�2�/�񝧢�2��񝧢�2��񝧢�2��񝧢񝧢�/��񝧢񝧢��񝧢񝧢}##�񝧢񝧢�2���񝧢񝧢}##�񝧢񝧢񝧢��񝧢񝧢񝧢��񝧢񝧢}##�񝧢񝧢�/#~񝧢�2��񝧢�2�#~񝧢�#�񝧢���񝧢񝧢��񝧢񝧢��񝧢񝧢��񝧢񝧢�����񝧢񝧢񝧢񝧢��񝧢񝢢�2񝧢�2�#~񝢬22�2񝧢�/###��22222�2�2���22222�2�2������2z222x2񝧢񝧢񝧢��񝧢y2y2񝧢񝧢񝧢�2��񝧢񝧢񝧢񝧢񝧢�2�####"""##########"""""""""""""""                                # ##   �񝢢�2񝧢� �񝢬22�2�2� ��22222�2� ## ##��22222�2�   #~z222x2�2� #~y2y2񝧢�#~񝧢�2� ~񝧢� ~�2���2�  #�񝧢�2�   �񝧢�2� ��2}## &��2� .��2� �񝧢񝧢񝧢�2�  #~񝧢񝧢񝧢� #~񝧢񝧢�2�#~񝧢񝧢� ####"""    #  ##  # #  # ######"" \ No newline at end of file
diff --git a/data/layouts/Underwater7/border.bin b/data/layouts/Underwater7/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater7/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc
new file mode 100644
index 000000000..5c2670b11
--- /dev/null
+++ b/data/layouts/Underwater7/layout.inc
@@ -0,0 +1,15 @@
+Underwater7_MapBorder::
+ .incbin "data/layouts/Underwater7/border.bin"
+
+Underwater7_MapBlockdata::
+ .incbin "data/layouts/Underwater7/map.bin"
+
+ .align 2
+Underwater7_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte Underwater7_MapBorder
+ .4byte Underwater7_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater7/map.bin b/data/layouts/Underwater7/map.bin
new file mode 100644
index 000000000..660f585ae
--- /dev/null
+++ b/data/layouts/Underwater7/map.bin
@@ -0,0 +1 @@
+9<?WTVVVVVVV9<?WTVVVVVVV������9<?WTVVVVVVV����9<?WTVVVVVVV�9<?WTVVVVVVV�����������9<?WTVVVVVVV�9<?WTVVVVVVV9<?WTVVVVVVV��������������9<?WTVVVVVVV�����&����9<?WTVVVVVVV�������.��9<?WTVVVVVVV�������񝧢񝧢񝧢񝧢񝧢�9<?WTVVVVVVV�񝧢񝧢񝧢񝧢񝧢񝧢񝧢񝧢�2�9<?WTVVVVVVV��񝧢񝧢񝧢񝧢񝧢񝧢񝧢񝧢�2�9<?WTVVVVVVV�񝧢񝧢񝧢񝧢񝧢񝧢񝧢񝧢񝧢�2�9<?WTVVVVVVV�񝧢�2�2񝧢񝧢񝧢񝧢񝧢񝧢񝧢�2���9<?WTVVVVVVV�񝢬22�2񝧢񝧢񝧢񝧢񝧢񝧢�2}#������9<?WTVVVVVVV��22222�2񝧢񝧢񝧢񝧢񝧢}"#�񝧢�2�2񝧢�9<?WTVVVVVVV��22222�2񝧢񝧢񝧢񝧢񝧢��񝢬22�2�2�9<?WTVVVVVVV��2z222x2񝧢}#########��22222�2�9<?WTVVVVVVV�񝧢y2y2񝧢�2����22222�2�9<?WTVVVVVVV#########��2z222x2�2�9<?WTVVVVVVV�񝧢y2y2񝧢�9<?WTVVVVVVV #��񝧢񝧢񝧢�9<?WTVVVVVVV ��񝧢񝧢񝧢�9<?WTVVVVVVV#��񝧢񝧢񝧢�9<?WTVVVVVVV���2}~񝧢�2��9<?WTVVVVVVV���2��񝧢񝧢�2�9<?WTVVVVVVV#��񝧢񝧢�2}~񝧢�2�9<?WTVVVVVVV "&��񝧢񝧢�2��񝧢�2�9<?WTVVVVVVV#��.����񝧢񝧢񝧢񝧢񝧢�9<?WTVVVVVVV #�񝧢񝧢񝧢񝧢񝧢񝧢񝧢񝧢�2�9<?WTVVVVVVV�񝧢񝧢񝧢񝧢񝧢񝧢񝧢񝧢�2�9<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file
diff --git a/data/layouts/Underwater_MarineCave/border.bin b/data/layouts/Underwater_MarineCave/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater_MarineCave/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc
new file mode 100644
index 000000000..52a3a7851
--- /dev/null
+++ b/data/layouts/Underwater_MarineCave/layout.inc
@@ -0,0 +1,15 @@
+Underwater_MarineCave_MapBorder::
+ .incbin "data/layouts/Underwater_MarineCave/border.bin"
+
+Underwater_MarineCave_MapBlockdata::
+ .incbin "data/layouts/Underwater_MarineCave/map.bin"
+
+ .align 2
+Underwater_MarineCave_Layout::
+ .4byte 0x14
+ .4byte 0xa
+ .4byte Underwater_MarineCave_MapBorder
+ .4byte Underwater_MarineCave_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater_MarineCave/map.bin b/data/layouts/Underwater_MarineCave/map.bin
new file mode 100644
index 000000000..1904f4757
--- /dev/null
+++ b/data/layouts/Underwater_MarineCave/map.bin
@@ -0,0 +1 @@
+(((((((2$(2"""""+,-""""" \ No newline at end of file
diff --git a/data/layouts/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater_Route134/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc
new file mode 100644
index 000000000..1534564a4
--- /dev/null
+++ b/data/layouts/Underwater_Route134/layout.inc
@@ -0,0 +1,15 @@
+Underwater_Route134_MapBorder::
+ .incbin "data/layouts/Underwater_Route134/border.bin"
+
+Underwater_Route134_MapBlockdata::
+ .incbin "data/layouts/Underwater_Route134/map.bin"
+
+ .align 2
+Underwater_Route134_Layout::
+ .4byte 0x12
+ .4byte 0xa
+ .4byte Underwater_Route134_MapBorder
+ .4byte Underwater_Route134_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater_Route134/map.bin b/data/layouts/Underwater_Route134/map.bin
new file mode 100644
index 000000000..77bdd37aa
--- /dev/null
+++ b/data/layouts/Underwater_Route134/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
+""""# +,-  " \ No newline at end of file
diff --git a/data/layouts/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater_SeafloorCavern/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc
new file mode 100644
index 000000000..5bce06a6b
--- /dev/null
+++ b/data/layouts/Underwater_SeafloorCavern/layout.inc
@@ -0,0 +1,15 @@
+Underwater_SeafloorCavern_MapBorder::
+ .incbin "data/layouts/Underwater_SeafloorCavern/border.bin"
+
+Underwater_SeafloorCavern_MapBlockdata::
+ .incbin "data/layouts/Underwater_SeafloorCavern/map.bin"
+
+ .align 2
+Underwater_SeafloorCavern_Layout::
+ .4byte 0xe
+ .4byte 0x9
+ .4byte Underwater_SeafloorCavern_MapBorder
+ .4byte Underwater_SeafloorCavern_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater_SeafloorCavern/map.bin b/data/layouts/Underwater_SeafloorCavern/map.bin
new file mode 100644
index 000000000..4cacc495e
--- /dev/null
+++ b/data/layouts/Underwater_SeafloorCavern/map.bin
@@ -0,0 +1,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/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater_SealedChamber/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc
new file mode 100644
index 000000000..5baf5dde8
--- /dev/null
+++ b/data/layouts/Underwater_SealedChamber/layout.inc
@@ -0,0 +1,15 @@
+Underwater_SealedChamber_MapBorder::
+ .incbin "data/layouts/Underwater_SealedChamber/border.bin"
+
+Underwater_SealedChamber_MapBlockdata::
+ .incbin "data/layouts/Underwater_SealedChamber/map.bin"
+
+ .align 2
+Underwater_SealedChamber_Layout::
+ .4byte 0x16
+ .4byte 0x30
+ .4byte Underwater_SealedChamber_MapBorder
+ .4byte Underwater_SealedChamber_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater_SealedChamber/map.bin b/data/layouts/Underwater_SealedChamber/map.bin
new file mode 100644
index 000000000..5ac0b4a73
--- /dev/null
+++ b/data/layouts/Underwater_SealedChamber/map.bin
@@ -0,0 +1 @@
+efgmno򤛮򭪂򤛸󕫺�2򘊐󺦤�2򘊸󨉔�2򘊸󨉔�2򘊸󨉔�2򞐸󢀌󛲄򞐸󢀌󛲄򤛸󢀌󛲄�2򘊮󢀌󛲄�2򘊮󢀌󛲄�2򘊮󢀌󛳔�2򘊮󢀌󛵾�2򘊮󢀌󴜪�2򘊮󢀌󨉔�2񼚀󆒰󨉔򪥊  򘊮󢀌󛵾�2#򘊮󢀌󴜪�2񼚀󢀌󨉔�2򞐸󢀌󨉔�2  򘊸󨉼󛲄򘉞󉙌󛲄#񼚀󢀌󛳔�2  򘊸󨊤󘭌򘋪󉙌󛲄#󀅐󢀌󛳔�2  򘊸󨉔󞶼򘊸󨊤󘭌򘋪󉙌󛲄򘊮󢀌󛲄#󀅐󢀌󛲄  򘊸󨉔�2򘊸󃍮�2򘉞󆓶�2򘊮󞺶�2򘊮󞺶򪥞򭪂򤛮򰱮󞺶󞺶󞸌򭪂򤛮򰱮     󞺶�2򘊮󞵬񿣮򪥊򘊮󞶼򘊮󞶼򘊮󞶼򘊮󞶼򘊮󞶼p򘊮󞶼򘊮󞸌򭪖C2C2C2򭪖򰱮󞶼񼚀󞺶󞺶S2S2S2󞺶󞵬񼙶# 򘊮󞺶�2S2S2S2󞺶󞶼 "#            " \ No newline at end of file
diff --git a/data/layouts/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/Underwater_SootopolisCity/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc
new file mode 100644
index 000000000..4a1b0aa02
--- /dev/null
+++ b/data/layouts/Underwater_SootopolisCity/layout.inc
@@ -0,0 +1,15 @@
+Underwater_SootopolisCity_MapBorder::
+ .incbin "data/layouts/Underwater_SootopolisCity/border.bin"
+
+Underwater_SootopolisCity_MapBlockdata::
+ .incbin "data/layouts/Underwater_SootopolisCity/map.bin"
+
+ .align 2
+Underwater_SootopolisCity_Layout::
+ .4byte 0x14
+ .4byte 0xa
+ .4byte Underwater_SootopolisCity_MapBorder
+ .4byte Underwater_SootopolisCity_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Underwater
+
diff --git a/data/layouts/Underwater_SootopolisCity/map.bin b/data/layouts/Underwater_SootopolisCity/map.bin
new file mode 100644
index 000000000..71346ab72
--- /dev/null
+++ b/data/layouts/Underwater_SootopolisCity/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
+""""#  +,-    " \ No newline at end of file
diff --git a/data/layouts/UnionRoom/border.bin b/data/layouts/UnionRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnionRoom/border.bin
Binary files differ
diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc
new file mode 100644
index 000000000..0c2a065a5
--- /dev/null
+++ b/data/layouts/UnionRoom/layout.inc
@@ -0,0 +1,15 @@
+UnionRoom_MapBorder::
+ .incbin "data/layouts/UnionRoom/border.bin"
+
+UnionRoom_MapBlockdata::
+ .incbin "data/layouts/UnionRoom/map.bin"
+
+ .align 2
+UnionRoom_Layout::
+ .4byte 0xf
+ .4byte 0xc
+ .4byte UnionRoom_MapBorder
+ .4byte UnionRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_UnionRoom
+
diff --git a/data/layouts/UnionRoom/map.bin b/data/layouts/UnionRoom/map.bin
new file mode 100644
index 000000000..cb1b009c3
--- /dev/null
+++ b/data/layouts/UnionRoom/map.bin
@@ -0,0 +1,11 @@
+(   #
+
+
+
+
+
+
+
+
+
+0222222222222222222222222222222222222222222222222222222222222222222222222222222222 2!2"2222222222222222222222222222222222222 222222222222222222 \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/UnknownMap_08417FC4/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/UnknownMap_08417FC4/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc
new file mode 100644
index 000000000..41e954b4e
--- /dev/null
+++ b/data/layouts/UnknownMap_08417FC4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08417FC4_MapBorder::
+ .incbin "data/layouts/UnknownMap_08417FC4/border.bin"
+
+UnknownMap_08417FC4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08417FC4/map.bin"
+
+ .align 2
+UnknownMap_08417FC4_Layout::
+ .4byte 0x50
+ .4byte 0x28
+ .4byte UnknownMap_08417FC4_MapBorder
+ .4byte UnknownMap_08417FC4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/UnknownMap_08417FC4/map.bin
new file mode 100644
index 000000000..17a14a8d5
--- /dev/null
+++ b/data/layouts/UnknownMap_08417FC4/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp��0000000000000�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0000000 0 0 000000�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0000000 0 0 0 0 0 0 0 000�0�ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp�s00�000 0 0 0 0 0 0 0 0 0 000r�pppppppppppppppppppppppppppppppppppppppppppppppppppppppp�0000���00 0 0 0 0 0 0 0 0 0 0 0000�0�ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp�0000����00 0 0 0 0 0 0 0 0 0 0 0 0000�0�ppppPQppppppppppppppppppppppr�qkllmq�vppppuvppppPQprs000�����000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppu�qk�qquqq|uvpp}~pu{vXYrss000��0000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{�qklllmq�vppppuv��q{|||}qt�}~pppppzq|�}sss0000000000�򷠶00 0 0 0 0 01110uuu~�p}~pzqqqk�klm�mq�vppp}~p�y�qqqty�ppu{{vpp�y��fsss00000000000��򷠶򷠶00 0 0 00000uuug�ppuvzqqqsq{|}quqq|ppPQpppp�yyy�ppppzqq|puvpp�fsss00000000000�򷠶򷠶򷠶0 000000uuug�uv}~��qq{�qqqt}qt�ppXYpppuvppppppuv�yy�p}~pp�fss{|||�00000000򷠶򷠶򷠶�400t|||}uug�}~ppp�y�q{|||}qt�puv{vppp}~pppppp}~pppPQpppp�fs{����s0000000004򷠶򷠶򷠶00ut���}ug�ppppPQp�y�����y�pp}~q|ppppppppppPQppppXYppuv�f{����ss0000000000򷠶򷠶4400uut���}g�ppppXYppppppppuvppppy�ppppppppppXYpppppppp}~�n����ss{|||�0000004444t|||}uut���o�puvppppppppppp}~ppppppppppppppppppppppppuvpp��1$1$1$1�s{����{||�0000t||}t���}ur$1$1$1�1�p}~pppppuvppppppppppppuvpppppppppppppppp}~pp�񐿷�1$1�{����{���{|22|}t��}t���}r$1$1$1�1�pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp�𻜟�1$1�����{���{��22��}t��}t����$1$1$1�1�ppppppppppppppppppppuvppzt�ppppppp}~pppppppp�𻜟�1$1$1$1"10x���{���22���}t��z00 1$1$1$1�1�1�pppppppppppppppppppp}~pp��pppppppppppppppppp���񐿷�1$1"10000x����22����z00000 1$1$1�1�1��pppppppppppppppppppppppppppppppppppppppppppppp�𻜟�1$1$1100000000000000000001$1$1�1񗈗�ppppppppppppppppppppppppppppppppppppppppppppppp�𻜟�1$1$1!11000000000000000011$1$1�1񗈗��ppppppppppppppppppppppppppppppppppppppppppppppp�𻜟񐻽$1$1!11100000000000111$1$1$1$1𾡗�1�pppppppppppppppppppppppppppppppppppppppppppppppp�𻜟𻜕$1$1$1$1"100000000011$1$1$1$1$1$1�1񗈗�1�pppppppppppppppppppppppppppppppppppppppppppppppp���𻝥񔀵$1$1$1111111111$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�ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp��𻜟񐿷�1$1$1$1$1$1$1$1$1$1$1$1$1𾡗𻜟�����ppppppppXYpppr{�qqq�vpuv�qq|ppppppppppppppppppppppppp�𻜟𻜟񐿷񔄯񔄯񔄯񔄯񔄯񔄹𻜟��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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_08428450/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc
new file mode 100644
index 000000000..f1695ec66
--- /dev/null
+++ b/data/layouts/UnknownMap_08428450/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08428450_MapBorder::
+ .incbin "data/layouts/UnknownMap_08428450/border.bin"
+
+UnknownMap_08428450_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08428450/map.bin"
+
+ .align 2
+UnknownMap_08428450_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_08428450_MapBorder
+ .4byte UnknownMap_08428450_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/UnknownMap_08428450/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/layouts/UnknownMap_08428450/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/UnknownMap_084294C4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_084294C4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc
new file mode 100644
index 000000000..f19bd682d
--- /dev/null
+++ b/data/layouts/UnknownMap_084294C4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084294C4_MapBorder::
+ .incbin "data/layouts/UnknownMap_084294C4/border.bin"
+
+UnknownMap_084294C4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_084294C4/map.bin"
+
+ .align 2
+UnknownMap_084294C4_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_084294C4_MapBorder
+ .4byte UnknownMap_084294C4_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/UnknownMap_084294C4/map.bin
new file mode 100644
index 000000000..37f05b971
--- /dev/null
+++ b/data/layouts/UnknownMap_084294C4/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/UnknownMap_084294E8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_084294E8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc
new file mode 100644
index 000000000..e351524e1
--- /dev/null
+++ b/data/layouts/UnknownMap_084294E8/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084294E8_MapBorder::
+ .incbin "data/layouts/UnknownMap_084294E8/border.bin"
+
+UnknownMap_084294E8_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_084294E8/map.bin"
+
+ .align 2
+UnknownMap_084294E8_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_084294E8_MapBorder
+ .4byte UnknownMap_084294E8_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/UnknownMap_084294E8/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/layouts/UnknownMap_084294E8/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/UnknownMap_0843E6C0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6C0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc
new file mode 100644
index 000000000..fd01ddc10
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6C0/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E6C0_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E6C0/border.bin"
+
+UnknownMap_0843E6C0_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E6C0/map.bin"
+
+ .align 2
+UnknownMap_0843E6C0_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E6C0_MapBorder
+ .4byte UnknownMap_0843E6C0_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/UnknownMap_0843E6C0/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6C0/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/UnknownMap_0843E6E4/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6E4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc
new file mode 100644
index 000000000..80ad93127
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6E4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E6E4_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E6E4/border.bin"
+
+UnknownMap_0843E6E4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E6E4/map.bin"
+
+ .align 2
+UnknownMap_0843E6E4_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E6E4_MapBorder
+ .4byte UnknownMap_0843E6E4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/UnknownMap_0843E6E4/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E6E4/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/UnknownMap_0843E708/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E708/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc
new file mode 100644
index 000000000..16d4e400c
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E708/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E708_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E708/border.bin"
+
+UnknownMap_0843E708_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E708/map.bin"
+
+ .align 2
+UnknownMap_0843E708_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E708_MapBorder
+ .4byte UnknownMap_0843E708_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/UnknownMap_0843E708/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E708/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/UnknownMap_0843E72C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E72C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc
new file mode 100644
index 000000000..c6541b3ea
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E72C/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E72C_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E72C/border.bin"
+
+UnknownMap_0843E72C_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E72C/map.bin"
+
+ .align 2
+UnknownMap_0843E72C_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E72C_MapBorder
+ .4byte UnknownMap_0843E72C_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/UnknownMap_0843E72C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E72C/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/UnknownMap_0843E750/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E750/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc
new file mode 100644
index 000000000..e566a93b7
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E750/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E750_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E750/border.bin"
+
+UnknownMap_0843E750_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E750/map.bin"
+
+ .align 2
+UnknownMap_0843E750_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E750_MapBorder
+ .4byte UnknownMap_0843E750_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/UnknownMap_0843E750/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E750/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/UnknownMap_0843E774/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E774/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc
new file mode 100644
index 000000000..ce1a438eb
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E774/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E774_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E774/border.bin"
+
+UnknownMap_0843E774_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E774/map.bin"
+
+ .align 2
+UnknownMap_0843E774_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E774_MapBorder
+ .4byte UnknownMap_0843E774_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/UnknownMap_0843E774/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E774/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/UnknownMap_0843E798/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E798/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc
new file mode 100644
index 000000000..179e0d881
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E798/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E798_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E798/border.bin"
+
+UnknownMap_0843E798_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E798/map.bin"
+
+ .align 2
+UnknownMap_0843E798_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E798_MapBorder
+ .4byte UnknownMap_0843E798_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/UnknownMap_0843E798/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E798/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/UnknownMap_0843E7BC/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7BC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc
new file mode 100644
index 000000000..907ec6266
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7BC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E7BC_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E7BC/border.bin"
+
+UnknownMap_0843E7BC_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E7BC/map.bin"
+
+ .align 2
+UnknownMap_0843E7BC_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E7BC_MapBorder
+ .4byte UnknownMap_0843E7BC_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/UnknownMap_0843E7BC/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7BC/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/UnknownMap_0843E7E0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7E0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc
new file mode 100644
index 000000000..c56046ef1
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7E0/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E7E0_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E7E0/border.bin"
+
+UnknownMap_0843E7E0_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E7E0/map.bin"
+
+ .align 2
+UnknownMap_0843E7E0_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E7E0_MapBorder
+ .4byte UnknownMap_0843E7E0_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/UnknownMap_0843E7E0/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E7E0/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/UnknownMap_0843E804/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E804/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc
new file mode 100644
index 000000000..49e32dbc7
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E804/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E804_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E804/border.bin"
+
+UnknownMap_0843E804_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E804/map.bin"
+
+ .align 2
+UnknownMap_0843E804_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E804_MapBorder
+ .4byte UnknownMap_0843E804_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/UnknownMap_0843E804/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E804/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/UnknownMap_0843E828/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E828/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc
new file mode 100644
index 000000000..3cbe67299
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E828/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E828_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E828/border.bin"
+
+UnknownMap_0843E828_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E828/map.bin"
+
+ .align 2
+UnknownMap_0843E828_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E828_MapBorder
+ .4byte UnknownMap_0843E828_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/UnknownMap_0843E828/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E828/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/UnknownMap_0843E84C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E84C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc
new file mode 100644
index 000000000..7449536bf
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E84C/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E84C_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E84C/border.bin"
+
+UnknownMap_0843E84C_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E84C/map.bin"
+
+ .align 2
+UnknownMap_0843E84C_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E84C_MapBorder
+ .4byte UnknownMap_0843E84C_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/UnknownMap_0843E84C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E84C/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/UnknownMap_0843E870/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E870/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc
new file mode 100644
index 000000000..23880a79c
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E870/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E870_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E870/border.bin"
+
+UnknownMap_0843E870_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E870/map.bin"
+
+ .align 2
+UnknownMap_0843E870_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E870_MapBorder
+ .4byte UnknownMap_0843E870_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/UnknownMap_0843E870/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E870/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/UnknownMap_0843E894/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E894/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc
new file mode 100755
index 000000000..e42bfcdd9
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E894/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0843E894_MapBorder::
+ .incbin "data/layouts/UnknownMap_0843E894/border.bin"
+
+UnknownMap_0843E894_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0843E894/map.bin"
+
+ .align 2
+UnknownMap_0843E894_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_0843E894_MapBorder
+ .4byte UnknownMap_0843E894_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/UnknownMap_0843E894/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_0843E894/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/UnknownMap_08447028/border.bin
new file mode 100644
index 000000000..9e4b3fb7a
--- /dev/null
+++ b/data/layouts/UnknownMap_08447028/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc
new file mode 100644
index 000000000..39d7bb18a
--- /dev/null
+++ b/data/layouts/UnknownMap_08447028/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08447028_MapBorder::
+ .incbin "data/layouts/UnknownMap_08447028/border.bin"
+
+UnknownMap_08447028_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08447028/map.bin"
+
+ .align 2
+UnknownMap_08447028_Layout::
+ .4byte 0x3A
+ .4byte 0x1A
+ .4byte UnknownMap_08447028_MapBorder
+ .4byte UnknownMap_08447028_MapBlockdata
+ .4byte gTileset_General
+ .4byte 0
+
diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/UnknownMap_08447028/map.bin
new file mode 100644
index 000000000..028da0526
--- /dev/null
+++ b/data/layouts/UnknownMap_08447028/map.bin
@@ -0,0 +1,3 @@
+22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 � � � �662222222222222222222222222������ � � � ���� � �
+�2266662����BBBB��2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222� � �
+騃IIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22 � � � �22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222: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
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/UnknownMap_0845A394/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc
new file mode 100644
index 000000000..a180340f8
--- /dev/null
+++ b/data/layouts/UnknownMap_0845A394/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0845A394_MapBorder::
+ .incbin "data/layouts/UnknownMap_0845A394/border.bin"
+
+UnknownMap_0845A394_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0845A394/map.bin"
+
+ .align 2
+UnknownMap_0845A394_Layout::
+ .4byte 0x13
+ .4byte 0x13
+ .4byte UnknownMap_0845A394_MapBorder
+ .4byte UnknownMap_0845A394_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/UnknownMap_0845A394/map.bin
new file mode 100644
index 000000000..fd294d9b6
--- /dev/null
+++ b/data/layouts/UnknownMap_0845A394/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/UnknownMap_0845D470/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/UnknownMap_0845D470/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc
new file mode 100644
index 000000000..ce6a4c819
--- /dev/null
+++ b/data/layouts/UnknownMap_0845D470/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0845D470_MapBorder::
+ .incbin "data/layouts/UnknownMap_0845D470/border.bin"
+
+UnknownMap_0845D470_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0845D470/map.bin"
+
+ .align 2
+UnknownMap_0845D470_Layout::
+ .4byte 0x3C
+ .4byte 0x28
+ .4byte UnknownMap_0845D470_MapBorder
+ .4byte UnknownMap_0845D470_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/UnknownMap_0845D470/map.bin
new file mode 100644
index 000000000..cd136de41
--- /dev/null
+++ b/data/layouts/UnknownMap_0845D470/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/UnknownMap_0845ECB4/border.bin b/data/layouts/UnknownMap_0845ECB4/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/UnknownMap_0845ECB4/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc
new file mode 100644
index 000000000..535c4a6e9
--- /dev/null
+++ b/data/layouts/UnknownMap_0845ECB4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0845ECB4_MapBorder::
+ .incbin "data/layouts/UnknownMap_0845ECB4/border.bin"
+
+UnknownMap_0845ECB4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0845ECB4/map.bin"
+
+ .align 2
+UnknownMap_0845ECB4_Layout::
+ .4byte 0x1B
+ .4byte 0x2E
+ .4byte UnknownMap_0845ECB4_MapBorder
+ .4byte UnknownMap_0845ECB4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/UnknownMap_0845ECB4/map.bin
new file mode 100644
index 000000000..ec344933f
--- /dev/null
+++ b/data/layouts/UnknownMap_0845ECB4/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/UnknownMap_08469200/border.bin b/data/layouts/UnknownMap_08469200/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/layouts/UnknownMap_08469200/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc
new file mode 100644
index 000000000..22191c61c
--- /dev/null
+++ b/data/layouts/UnknownMap_08469200/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08469200_MapBorder::
+ .incbin "data/layouts/UnknownMap_08469200/border.bin"
+
+UnknownMap_08469200_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08469200/map.bin"
+
+ .align 2
+UnknownMap_08469200_Layout::
+ .4byte 0x3C
+ .4byte 0x3C
+ .4byte UnknownMap_08469200_MapBorder
+ .4byte UnknownMap_08469200_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Sootopolis
+
diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/UnknownMap_08469200/map.bin
new file mode 100644
index 000000000..67085fd37
--- /dev/null
+++ b/data/layouts/UnknownMap_08469200/map.bin
@@ -0,0 +1,12 @@
+�����������������2�󱙂��������9����������󱙂󱙂�2��������9��󱙂󱙂�2������������������󱙂���9���KLM�������������������9����2���������9���󱙂�2�󱙂�2���� 
+  ��2��������󱙂󱙂󱙂󱙂 
+ ���2��������������󱙂�2�� 
+ 󱙂%7'�󱙂��󱙂󱙂��KLM󱙂󱙂 
+ ����������� 
+ U����������󱙂-?/��󱙂��@AAAB Z�󱙂�2�����������2#$_���󱙂󱙂󱙂� 󱙂󱙂󱙂󱙂�2����2���󱙂�2��󱙂󱙂�2 󱙂���KLM�󱙂+,_���󱙂��D2E2�󱙂󱙂󱙂󱙂󱙂󱙂󱙂�󱙂�2�󱙂�2�2�@AAAAAAAB�2��� @AAF�2G\��󱙂�2�󱙂󱙂󱙂󱙂@AF󱙂GAAAB��󱙂�����D2������������󱙂��%6'�2��bD2c���󱙂�2�󱙂󱙂󱙂󱙂��bD2E2c�����������󱙂󱙂������9����󱙂��->/�2��2�D2����󱙂�2����������󱙂󱙂󱙂󱙂�2���������D2�����������AAAAAB��2�󱙂󱙂󱙂󱙂��󱙂�������������D2E2���������D2������ 
+ ��������������������D2E2�����������������D2E2�����2����󱙂󱙂󱙂��󱙂�󱙂�2��������󱙂󱙂󱙂�2�������2����������D2E2��2������􎓪󱙂󱙂�2� �󱙂������2�����82�2����D2E2��2������󱙂󱙂󱙂󱙂󱙂�2��������9���󱙂�2��󱙂���󱙂󱙂󱙂��2���󱙂󱙂󱙂����@AF󱙂GAAAAAAAAB��������󱙂󱙂�󱙂󱙂����2�����2�T 
+ B󱙂󱙂󱙂��2���2�bD2E2c�QR[RS��󱙂���TA 
+ ��󱙂󱙂��282󱙂󱙂��2;󱙂󱙂�^#$󱙂�2��D2E2��2���2�󱙂󱙂� �!2�"������2�^�2#$��󱙂󱙂�����2󱙂�2�^+,󱙂�2��D2E2�����2�󱙂󱙂�()2)2)2*�󱙂�2���^�2+,���󱙂󱙂 
+ � 
+ �KLM^󱙂󱙂󱙂��󱙂󱙂�2���n󱙂o�0q0q0q02�󱙂󱙂��^󱙂󱙂��2�D2E2�� �2� ^󱙂󱙂󱙂��󱙂󱙂�2���bD2E2c�q0�6q0�6q0���󱙂��^󱙂󱙂���D2E2��%7'�2�%7']AAAB󱙂��󱙂��D2���q0q0q0q0q0q0�6q0�6q0q0q0�����^󱙂󱙂󱙂󱙂�2�����-?/�2AAB�-?/�2����D2E2��󱙂��D2���q0q0q0q0q0q0q0q0q0q0q0q0q0q0���]AB󱙂󱙂󱙂�2�󱙂�2��������������󱙂󱙂󱙂�󱙂��󱙂�2�q0q0q0q0q0q0q0q0q0q0q0q0q0q0������D2E2�KLM�����󱙂󱙂�������2��KLM�D2E2������󱙂�2�q0q0t||||||||||�����TB󱙂�2 �󱙂�2��󱙂󱙂�KL󱙂�TYZB󱙂�������D2E2�ty}����������s����^󱙂󱙂�󱙂󱙂�󱙂󱙂�2 󱙂�^󱙂�2����󱙂�q0q0t}������������{y���^󱙂󱙂��2��󱙂󱙂%6'󱙂�^󱙂�2��k6l6l6m6�q0q0u���������������s��^󱙂󱙂󱙂�2�� �2�󱙂󱙂->/󱙂�^󱙂󱙂󱙂��0123�q0q0u���������������s��]AAB󱙂󱙂�2��2��󱙂AAAAB��]AAAAB���89:;�q0q0u���������������s��{|}~�󱙂󱙂�󱙂�󱙂󱙂��������������ABw�q0q0u���������������s�TPQRS�󱙂󱙂��D2�󱙂��󱙂���2���󱙂�2�����󱙂󱙂�2�q0q0u���������������s�^XYZ[�󱙂󱙂󱙂�2�󱙂�2�󱙂�󱙂�󱙂󱙂�2�󱙂󱙂󱙂󱙂��q0q0u���������������s�^abv��D2E2�󱙂�2��������󱙂���KLM�󱙂󱙂�2�D2E2�q0q0q0u���󞑯�1���󉅊����s�^󱙂󱙂󱙂󱙂����󱙂�2��2��󱙂���TYZB󱙂󱙂��q0q0q0q0q0q0u���000000010����s�^󱙂󱙂󱙂󱙂222�9����2�󱙂�2��2�^󱙂󱙂��q0q0q0q0q0q0t}���00000010����s�]B󱙂@AF󱙂 222���2��2�����^󱙂󱙂�q0t��D2E2yz����00000000����s���D2E2��N󱙂 
+ ���2���󱙂��2^󱙂󱙂󱙂�2�q0r��0000����00000000����{yyyD2E2��N󱙂����������2]B󱙂󱙂���q0r��0000�����������������04000p�N󱙂󱙂�2��2���2�󱙂���������tyyz0����������������������00000p�V@AAAAAAB�������2��qty����yz0000����������������������00000p�����������������2�qqr0����000000������������������������000xyyyy�qqq���������2�qqr0����000000������������������������00000000x������������2�qqr000��000000������������������������000000000��pq��������2�qqr000��000000���������������������������0000󏎉��pq��������2�qqr0000000󏎉00���������������������������0000����pqq�������2��qr0000000��00���������������������������0000����pqq�����������iiij000���������������������������������������pqq���������������ij0���������������������������������������p������������������r0�����������������������������������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
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnknownMap_084693AC/border.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc
new file mode 100644
index 000000000..0106c666a
--- /dev/null
+++ b/data/layouts/UnknownMap_084693AC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084693AC_MapBorder::
+ .incbin "data/layouts/UnknownMap_084693AC/border.bin"
+
+UnknownMap_084693AC_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_084693AC/map.bin"
+
+ .align 2
+UnknownMap_084693AC_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_084693AC_MapBorder
+ .4byte UnknownMap_084693AC_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattlePike
+
diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/UnknownMap_084693AC/map.bin
new file mode 100644
index 000000000..a179d8997
--- /dev/null
+++ b/data/layouts/UnknownMap_084693AC/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08470BD8/border.bin b/data/layouts/UnknownMap_08470BD8/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/layouts/UnknownMap_08470BD8/border.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc
new file mode 100644
index 000000000..671127587
--- /dev/null
+++ b/data/layouts/UnknownMap_08470BD8/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08470BD8_MapBorder::
+ .incbin "data/layouts/UnknownMap_08470BD8/border.bin"
+
+UnknownMap_08470BD8_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08470BD8/map.bin"
+
+ .align 2
+UnknownMap_08470BD8_Layout::
+ .4byte 0x28
+ .4byte 0x8C
+ .4byte UnknownMap_08470BD8_MapBorder
+ .4byte UnknownMap_08470BD8_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
+
diff --git a/data/layouts/UnknownMap_08470BD8/map.bin b/data/layouts/UnknownMap_08470BD8/map.bin
new file mode 100644
index 000000000..0f7bbb958
--- /dev/null
+++ b/data/layouts/UnknownMap_08470BD8/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/UnknownMap_08480DAC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_08480DAC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc
new file mode 100644
index 000000000..b44036239
--- /dev/null
+++ b/data/layouts/UnknownMap_08480DAC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08480DAC_MapBorder::
+ .incbin "data/layouts/UnknownMap_08480DAC/border.bin"
+
+UnknownMap_08480DAC_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08480DAC/map.bin"
+
+ .align 2
+UnknownMap_08480DAC_Layout::
+ .4byte 0xD
+ .4byte 0xD
+ .4byte UnknownMap_08480DAC_MapBorder
+ .4byte UnknownMap_08480DAC_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Lab
+
diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/UnknownMap_08480DAC/map.bin
new file mode 100644
index 000000000..d1277f280
--- /dev/null
+++ b/data/layouts/UnknownMap_08480DAC/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/UnknownMap_08480F54/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_08480F54/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc
new file mode 100644
index 000000000..4593a8ba4
--- /dev/null
+++ b/data/layouts/UnknownMap_08480F54/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08480F54_MapBorder::
+ .incbin "data/layouts/UnknownMap_08480F54/border.bin"
+
+UnknownMap_08480F54_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08480F54/map.bin"
+
+ .align 2
+UnknownMap_08480F54_Layout::
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMap_08480F54_MapBorder
+ .4byte UnknownMap_08480F54_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/UnknownMap_08480F54/map.bin
new file mode 100644
index 000000000..f0d9c299c
--- /dev/null
+++ b/data/layouts/UnknownMap_08480F54/map.bin
@@ -0,0 +1 @@
+''''''''';<=''/////////CD2E//򞑌򞑌򞑌򞑌򞑌򞑌򞑌򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊89999:򛌊򛌊򛌊򛌊@AAAAB򛌊򛌊򛌊򛌊AAAAAA򛌊򛌊򛌊򛌊AAAAAA򛌊򛌊򛌊򛌊AAAAAA򛌊򛌊򛌊򛌊IMMMMJ򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊"2#2򛌊򛌊򛌊 \ No newline at end of file
diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/UnknownMap_084810FC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_084810FC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc
new file mode 100644
index 000000000..6b73bfdce
--- /dev/null
+++ b/data/layouts/UnknownMap_084810FC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084810FC_MapBorder::
+ .incbin "data/layouts/UnknownMap_084810FC/border.bin"
+
+UnknownMap_084810FC_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_084810FC/map.bin"
+
+ .align 2
+UnknownMap_084810FC_Layout::
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMap_084810FC_MapBorder
+ .4byte UnknownMap_084810FC_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/UnknownMap_084810FC/map.bin
new file mode 100644
index 000000000..908158cf4
--- /dev/null
+++ b/data/layouts/UnknownMap_084810FC/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_084812A4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc
new file mode 100644
index 000000000..a394c8ef3
--- /dev/null
+++ b/data/layouts/UnknownMap_084812A4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084812A4_MapBorder::
+ .incbin "data/layouts/UnknownMap_084812A4/border.bin"
+
+UnknownMap_084812A4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_084812A4/map.bin"
+
+ .align 2
+UnknownMap_084812A4_Layout::
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMap_084812A4_MapBorder
+ .4byte UnknownMap_084812A4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/UnknownMap_084812A4/map.bin
new file mode 100644
index 000000000..d033bc4d2
--- /dev/null
+++ b/data/layouts/UnknownMap_084812A4/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CL2E/CD2E/CD2E/򞑌򞑌򞑌򞑌�2򞑌򞑂򛌊򛌊򛌊�2򛌊򛌊򛌊򛌊�2򛌊򛌊򛌊򛌊򛌊�289999:򛌊򛌊򛌊򛌊@AAAAA򛌊򛌊򛌊򛌊AAAAAA򛌊򛌊򛌊򛌊AAAAAA򛌊򛌊򛌊򛌊AAAAAA򛌊򛌊򛌊򛌊IMMMMJ򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊 \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownMap_0848144C/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_0848144C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc
new file mode 100644
index 000000000..cabe0b25b
--- /dev/null
+++ b/data/layouts/UnknownMap_0848144C/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_0848144C_MapBorder::
+ .incbin "data/layouts/UnknownMap_0848144C/border.bin"
+
+UnknownMap_0848144C_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_0848144C/map.bin"
+
+ .align 2
+UnknownMap_0848144C_Layout::
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMap_0848144C_MapBorder
+ .4byte UnknownMap_0848144C_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/UnknownMap_0848144C/map.bin
new file mode 100644
index 000000000..eeccae9ae
--- /dev/null
+++ b/data/layouts/UnknownMap_0848144C/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_084815F4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc
new file mode 100644
index 000000000..73ed49c79
--- /dev/null
+++ b/data/layouts/UnknownMap_084815F4/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_084815F4_MapBorder::
+ .incbin "data/layouts/UnknownMap_084815F4/border.bin"
+
+UnknownMap_084815F4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_084815F4/map.bin"
+
+ .align 2
+UnknownMap_084815F4_Layout::
+ .4byte 0xE
+ .4byte 0xE
+ .4byte UnknownMap_084815F4_MapBorder
+ .4byte UnknownMap_084815F4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/UnknownMap_084815F4/map.bin
new file mode 100644
index 000000000..8507a4932
--- /dev/null
+++ b/data/layouts/UnknownMap_084815F4/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CL2E////CD2E//򞑌򞑌򞑌򞑌�26򞑌򞑌򛌊򛌊򛌊򛌊6򛌊򛌊򛌊򛌊8999999:򛌊򛌊򛌊@AAAAAAB򛌊򛌊򛌊AAAAAAAA򛌊򛌊򛌊AAAAAAAA򛌊򛌊򛌊AAAAAAAA򛌊򛌊򛌊AAAAAAAA򛌊򛌊򛌊AAAAAAAA򛌊򛌊򛌊IMMMMMMJ򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊򛌊�2 \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/UnknownMap_08481B24/border.bin
new file mode 100644
index 000000000..e9d1c658c
--- /dev/null
+++ b/data/layouts/UnknownMap_08481B24/border.bin
@@ -0,0 +1 @@
+���� \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc
new file mode 100644
index 000000000..250528be0
--- /dev/null
+++ b/data/layouts/UnknownMap_08481B24/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08481B24_MapBorder::
+ .incbin "data/layouts/UnknownMap_08481B24/border.bin"
+
+UnknownMap_08481B24_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08481B24/map.bin"
+
+ .align 2
+UnknownMap_08481B24_Layout::
+ .4byte 0x1B
+ .4byte 0x18
+ .4byte UnknownMap_08481B24_MapBorder
+ .4byte UnknownMap_08481B24_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
+
diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/UnknownMap_08481B24/map.bin
new file mode 100644
index 000000000..2a47bca91
--- /dev/null
+++ b/data/layouts/UnknownMap_08481B24/map.bin
@@ -0,0 +1 @@
+���������������������������������������������������������������������������������d2d2d2�6d2d2d2�6d2d2d2񫊞񫊞񫊞�6d2d2d2�6d2d2d2�6d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m𸫔n';<='''''''''//////////j𸫔k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[��������������������������������������������������������������������������������������������������������������������������������������� \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/UnknownMap_08481DBC/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/UnknownMap_08481DBC/border.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc
new file mode 100644
index 000000000..465b92dc8
--- /dev/null
+++ b/data/layouts/UnknownMap_08481DBC/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_08481DBC_MapBorder::
+ .incbin "data/layouts/UnknownMap_08481DBC/border.bin"
+
+UnknownMap_08481DBC_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08481DBC/map.bin"
+
+ .align 2
+UnknownMap_08481DBC_Layout::
+ .4byte 0xB
+ .4byte 0x8
+ .4byte UnknownMap_08481DBC_MapBorder
+ .4byte UnknownMap_08481DBC_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_MysteryEventsHouse
+
diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/UnknownMap_08481DBC/map.bin
new file mode 100644
index 000000000..603f55c93
--- /dev/null
+++ b/data/layouts/UnknownMap_08481DBC/map.bin
@@ -0,0 +1,2 @@
+'
+  +/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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_25_29/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc
new file mode 100644
index 000000000..bb7002a20
--- /dev/null
+++ b/data/layouts/UnknownMap_25_29/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_29_MapBorder::
+ .incbin "data/layouts/UnknownMap_25_29/border.bin"
+
+UnknownMap_25_29_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_25_29/map.bin"
+
+ .align 2
+UnknownMap_25_29_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_25_29_MapBorder
+ .4byte UnknownMap_25_29_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownMap_25_29/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_25_30/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc
new file mode 100644
index 000000000..5937a2195
--- /dev/null
+++ b/data/layouts/UnknownMap_25_30/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_30_MapBorder::
+ .incbin "data/layouts/UnknownMap_25_30/border.bin"
+
+UnknownMap_25_30_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_25_30/map.bin"
+
+ .align 2
+UnknownMap_25_30_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_25_30_MapBorder
+ .4byte UnknownMap_25_30_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownMap_25_30/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_25_31/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc
new file mode 100644
index 000000000..3dcbc7986
--- /dev/null
+++ b/data/layouts/UnknownMap_25_31/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_31_MapBorder::
+ .incbin "data/layouts/UnknownMap_25_31/border.bin"
+
+UnknownMap_25_31_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_25_31/map.bin"
+
+ .align 2
+UnknownMap_25_31_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_25_31_MapBorder
+ .4byte UnknownMap_25_31_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownMap_25_31/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_25_32/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc
new file mode 100644
index 000000000..0ffe4c0b7
--- /dev/null
+++ b/data/layouts/UnknownMap_25_32/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_32_MapBorder::
+ .incbin "data/layouts/UnknownMap_25_32/border.bin"
+
+UnknownMap_25_32_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_25_32/map.bin"
+
+ .align 2
+UnknownMap_25_32_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_25_32_MapBorder
+ .4byte UnknownMap_25_32_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownMap_25_32/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_25_33/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc
new file mode 100644
index 000000000..3f8113a6f
--- /dev/null
+++ b/data/layouts/UnknownMap_25_33/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_33_MapBorder::
+ .incbin "data/layouts/UnknownMap_25_33/border.bin"
+
+UnknownMap_25_33_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_25_33/map.bin"
+
+ .align 2
+UnknownMap_25_33_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_25_33_MapBorder
+ .4byte UnknownMap_25_33_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownMap_25_33/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_25_34/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc
new file mode 100644
index 000000000..6001d8fe7
--- /dev/null
+++ b/data/layouts/UnknownMap_25_34/layout.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_34_MapBorder::
+ .incbin "data/layouts/UnknownMap_25_34/border.bin"
+
+UnknownMap_25_34_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_25_34/map.bin"
+
+ .align 2
+UnknownMap_25_34_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_25_34_MapBorder
+ .4byte UnknownMap_25_34_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/layouts/UnknownMap_25_34/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/layouts/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/layouts/VerdanturfTown/border.bin
Binary files differ
diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc
new file mode 100644
index 000000000..ce58c0798
--- /dev/null
+++ b/data/layouts/VerdanturfTown/layout.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_MapBorder::
+ .incbin "data/layouts/VerdanturfTown/border.bin"
+
+VerdanturfTown_MapBlockdata::
+ .incbin "data/layouts/VerdanturfTown/map.bin"
+
+ .align 2
+VerdanturfTown_Layout::
+ .4byte 0x14
+ .4byte 0x14
+ .4byte VerdanturfTown_MapBorder
+ .4byte VerdanturfTown_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Mauville
+
diff --git a/data/layouts/VerdanturfTown/map.bin b/data/layouts/VerdanturfTown/map.bin
new file mode 100644
index 000000000..8ed6ea56b
--- /dev/null
+++ b/data/layouts/VerdanturfTown/map.bin
Binary files differ
diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc
new file mode 100644
index 000000000..21fca6953
--- /dev/null
+++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_BattleTentBattleRoom_MapBorder::
+ .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin"
+
+VerdanturfTown_BattleTentBattleRoom_MapBlockdata::
+ .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin"
+
+ .align 2
+VerdanturfTown_BattleTentBattleRoom_Layout::
+ .4byte 0xd
+ .4byte 0x9
+ .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder
+ .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_BattleTent
+
diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin
new file mode 100644
index 000000000..c405aabfc
--- /dev/null
+++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin
Binary files differ
diff --git a/data/layouts/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/VerdanturfTown_WandasHouse/border.bin
Binary files differ
diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
new file mode 100644
index 000000000..ae5d1a7cf
--- /dev/null
+++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_WandasHouse_MapBorder::
+ .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin"
+
+VerdanturfTown_WandasHouse_MapBlockdata::
+ .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin"
+
+ .align 2
+VerdanturfTown_WandasHouse_Layout::
+ .4byte 0x11
+ .4byte 0x8
+ .4byte VerdanturfTown_WandasHouse_MapBorder
+ .4byte VerdanturfTown_WandasHouse_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
+
diff --git a/data/layouts/VerdanturfTown_WandasHouse/map.bin b/data/layouts/VerdanturfTown_WandasHouse/map.bin
new file mode 100644
index 000000000..95d14d3c4
--- /dev/null
+++ b/data/layouts/VerdanturfTown_WandasHouse/map.bin
Binary files differ
diff --git a/data/layouts/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc
new file mode 100644
index 000000000..31e0fede3
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/layout.inc
@@ -0,0 +1,15 @@
+VictoryRoad_1F_MapBorder::
+ .incbin "data/layouts/VictoryRoad_1F/border.bin"
+
+VictoryRoad_1F_MapBlockdata::
+ .incbin "data/layouts/VictoryRoad_1F/map.bin"
+
+ .align 2
+VictoryRoad_1F_Layout::
+ .4byte 0x2e
+ .4byte 0x2d
+ .4byte VictoryRoad_1F_MapBorder
+ .4byte VictoryRoad_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin
new file mode 100644
index 000000000..a78316ef9
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/map.bin
@@ -0,0 +1,10 @@
+2222222222622222222222'222222222226222    XYZ #   
+222         #222        #F222222222222BBBBBBBBBBBB2222BBBBBBBBBBBBBB2222BBBBBBBBBBBBBB#  #
+222222     
+BBBBBBBBBBBB  B B B"22222#BBBBBB籅籅糂糂紹紹BBB籅籅简简简简简紹糂 B B B B"BBBBBB肂肂腂腂臖臖BBB肂肂尿尿尿尿尿臖腂BBBBBBB22222BB2222222BB222222222222BB222222222222222222222222222BB22222222222222222222222BB222     
+2222222222222222222222BB籅籅糂简简简紹糂 B B B"22222222222222222222222BB肂肂腂尿尿尿臖腂BBB22     
+2222   
+2222222222  B B B糂籅简简简简糂紹糂 B"22L6Q6M6222P6BBB腂肂尿尿膨膨腂臖腂B2222222222222228#2222222222222222222228#
+222222222222222222228222222222222222222     
+2228222222222222222222  B B B"2228#   #22222222BBB籅籅简简简糂紹糂 B B B"22222222222222#22BBB肂肂尿尿尿腂臖腂BBB222222222222222 #B2222282222222222   ###B222228222222222#  B B#B#BB22222222222@QI22222222  ## #  B#BBBBBB22222'62222222822222222  B B B B B B#BBBBBBBB#   
+2262222222822     #              ##   "#     XYZ   # #      #            ## "#               #   #  ##"#                      ##                            # \ No newline at end of file
diff --git a/data/layouts/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/VictoryRoad_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc
new file mode 100644
index 000000000..9ce7223e1
--- /dev/null
+++ b/data/layouts/VictoryRoad_B1F/layout.inc
@@ -0,0 +1,15 @@
+VictoryRoad_B1F_MapBorder::
+ .incbin "data/layouts/VictoryRoad_B1F/border.bin"
+
+VictoryRoad_B1F_MapBlockdata::
+ .incbin "data/layouts/VictoryRoad_B1F/map.bin"
+
+ .align 2
+VictoryRoad_B1F_Layout::
+ .4byte 0x2e
+ .4byte 0x1f
+ .4byte VictoryRoad_B1F_MapBorder
+ .4byte VictoryRoad_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/VictoryRoad_B1F/map.bin b/data/layouts/VictoryRoad_B1F/map.bin
new file mode 100644
index 000000000..c1ea2f657
--- /dev/null
+++ b/data/layouts/VictoryRoad_B1F/map.bin
@@ -0,0 +1,25 @@
+BBBBBBBBB2222222BBBB2222222P22222222#
+222BBBB2  
+2282222222222 
+222#
+222BBBB222R2222  
+2#222#
+22 #BBBB2222222   
+2# #22#2#BBBBB#
+2  
+22  B B B B糂籅简简紹糂 B B B B
+2fBBBf#"2222BBBB腂肂尿尿臖腂BBBB2BBBBB2222222222222BfBB#    
+2#2222222#"#  "2222222222P2222222222#"2222222  
+22228222# 
+22222 ##       ## 
+228222#  
+22  B B#B #22R222 #B B B B糂籅简简紹紹BBB222222622#   
+22BBBB腂肂尿尿臖臖BBB2222222222222222222BBB22222222222222 #2222BBB22#      
+2222222222#22BB #22# 
+2222# 
+2222#22BB22222#222#    #222BB22#22# 
+22222BB22#
+222#
+222222#
+2222222222222222222222222P222#
+222222222222222222222282222222222222 #2222222222R222#                 ##              ##                                          ##                                            # \ No newline at end of file
diff --git a/data/layouts/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/layouts/VictoryRoad_B2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc
new file mode 100644
index 000000000..23c500cbe
--- /dev/null
+++ b/data/layouts/VictoryRoad_B2F/layout.inc
@@ -0,0 +1,15 @@
+VictoryRoad_B2F_MapBorder::
+ .incbin "data/layouts/VictoryRoad_B2F/border.bin"
+
+VictoryRoad_B2F_MapBlockdata::
+ .incbin "data/layouts/VictoryRoad_B2F/map.bin"
+
+ .align 2
+VictoryRoad_B2F_Layout::
+ .4byte 0x2e
+ .4byte 0x1f
+ .4byte VictoryRoad_B2F_MapBorder
+ .4byte VictoryRoad_B2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
diff --git a/data/layouts/VictoryRoad_B2F/map.bin b/data/layouts/VictoryRoad_B2F/map.bin
new file mode 100644
index 000000000..24c4f646a
--- /dev/null
+++ b/data/layouts/VictoryRoad_B2F/map.bin
@@ -0,0 +1 @@
+������������������������2�{{{{{{{{{{{{{{{{{{{{{{�2222�{{{{{{{{{{{{{{{{{{{{{{�22222222�{{{{{{{{{{{{{{{{{{{{{{�222222222�{{{{{TUUUV{{{{{{{{{{{{�22222222222W3W3W3y{�W3W3W3W3W3W3W3W3y{{{�222  "22222222222�{�22222222W3W3y{� #B22#B"222222222222�{�222222222222�{�222222222222222�{����22222222222�{����222222222������222222222������222�Z[�tuv�����222222222����{�222�XY{{{{{{{{�22222222222�tuv������{�����{PQ{{{{{{{����22222222�{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222��UUUUV{{{{{{{{{TUUUUUUUUUUV{{�  2#2222222#     "�V{{{TUUUU�         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B籅籅籅简简简紹紹紹B222222222BB籅籅籅籅简简简籅籅籅 B B B B#BBBBBBB肂肂肂尿尿尿臖臖臖B2222BB肂肂肂肂尿尿尿肂肂肂BBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222222222222222222222222222222222222262222222222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file