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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/AbandonedShip_Underwater2/map.bin1
-rw-r--r--data/layouts/AncientTomb/border.bin1
-rw-r--r--data/layouts/AncientTomb/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/AquaHideout_B2F/map.bin51
-rw-r--r--data/layouts/BattleTower_BattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleTower_BattleRoom/layout.inc14
-rw-r--r--data/layouts/BattleTower_BattleRoom/map.bin1
-rw-r--r--data/layouts/BattleTower_Corridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleTower_Corridor/layout.inc14
-rw-r--r--data/layouts/BattleTower_Corridor/map.binbin0 -> 170 bytes
-rw-r--r--data/layouts/BattleTower_Elevator/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleTower_Elevator/layout.inc14
-rw-r--r--data/layouts/BattleTower_Elevator/map.bin1
-rw-r--r--data/layouts/BattleTower_Lobby/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/BattleTower_Lobby/layout.inc14
-rw-r--r--data/layouts/BattleTower_Lobby/map.binbin0 -> 252 bytes
-rw-r--r--data/layouts/BattleTower_Outside/border.bin1
-rw-r--r--data/layouts/BattleTower_Outside/layout.inc14
-rw-r--r--data/layouts/BattleTower_Outside/map.bin1
-rw-r--r--data/layouts/CableCarStation/border.bin1
-rw-r--r--data/layouts/CableCarStation/layout.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/CaveOfOrigin_B1F/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B2F/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B2F/layout.inc14
-rw-r--r--data/layouts/CaveOfOrigin_B2F/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B3F/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B3F/layout.inc14
-rw-r--r--data/layouts/CaveOfOrigin_B3F/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B4F/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_B4F/layout.inc14
-rw-r--r--data/layouts/CaveOfOrigin_B4F/map.bin1
-rw-r--r--data/layouts/CaveOfOrigin_Entrance/border.bin1
-rw-r--r--data/layouts/CaveOfOrigin_Entrance/layout.inc14
-rw-r--r--data/layouts/CaveOfOrigin_Entrance/map.bin1
-rw-r--r--data/layouts/ContestHall/border.bin1
-rw-r--r--data/layouts/ContestHall/layout.inc14
-rw-r--r--data/layouts/ContestHall/map.bin1
-rw-r--r--data/layouts/ContestLobby/border.bin1
-rw-r--r--data/layouts/ContestLobby/layout.inc14
-rw-r--r--data/layouts/ContestLobby/map.bin1
-rw-r--r--data/layouts/DesertRuins/border.bin1
-rw-r--r--data/layouts/DesertRuins/layout.inc14
-rw-r--r--data/layouts/DesertRuins/map.binbin0 -> 1122 bytes
-rw-r--r--data/layouts/DewfordTown/border.bin1
-rw-r--r--data/layouts/DewfordTown/layout.inc14
-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.inc14
-rw-r--r--data/layouts/DewfordTown_Gym/map.bin50
-rw-r--r--data/layouts/DewfordTown_Hall/border.bin1
-rw-r--r--data/layouts/DewfordTown_Hall/layout.inc14
-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.inc14
-rw-r--r--data/layouts/DoubleBattleColosseum/map.bin1
-rw-r--r--data/layouts/EverGrandeCity/border.bin1
-rw-r--r--data/layouts/EverGrandeCity/layout.inc14
-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.inc14
-rw-r--r--data/layouts/EverGrandeCity_ChampionsRoom/map.binbin0 -> 338 bytes
-rw-r--r--data/layouts/EverGrandeCity_Corridor4/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_Corridor4/layout.inc14
-rw-r--r--data/layouts/EverGrandeCity_Corridor4/map.bin1
-rw-r--r--data/layouts/EverGrandeCity_DrakesRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_DrakesRoom/layout.inc14
-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.inc14
-rw-r--r--data/layouts/EverGrandeCity_GlaciasRoom/map.bin2
-rw-r--r--data/layouts/EverGrandeCity_HallOfFame/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_HallOfFame/layout.inc14
-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.inc14
-rw-r--r--data/layouts/EverGrandeCity_PhoebesRoom/map.bin2
-rw-r--r--data/layouts/EverGrandeCity_PokemonLeague/border.bin1
-rw-r--r--data/layouts/EverGrandeCity_PokemonLeague/layout.inc14
-rw-r--r--data/layouts/EverGrandeCity_PokemonLeague/map.bin2
-rw-r--r--data/layouts/EverGrandeCity_ShortCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_ShortCorridor/layout.inc14
-rw-r--r--data/layouts/EverGrandeCity_ShortCorridor/map.bin1
-rw-r--r--data/layouts/EverGrandeCity_SidneysRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/EverGrandeCity_SidneysRoom/layout.inc14
-rw-r--r--data/layouts/EverGrandeCity_SidneysRoom/map.bin2
-rw-r--r--data/layouts/FallarborTown/border.bin1
-rw-r--r--data/layouts/FallarborTown/layout.inc14
-rw-r--r--data/layouts/FallarborTown/map.binbin0 -> 800 bytes
-rw-r--r--data/layouts/FieryPath/border.bin1
-rw-r--r--data/layouts/FieryPath/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/FortreeCity_Gym/map.bin2
-rw-r--r--data/layouts/FortreeCity_House1/border.bin1
-rw-r--r--data/layouts/FortreeCity_House1/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/GraniteCave_StevensRoom/map.bin4
-rw-r--r--data/layouts/Harbor/border.bin1
-rw-r--r--data/layouts/Harbor/layout.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/House2/map.bin1
-rw-r--r--data/layouts/House3/border.bin1
-rw-r--r--data/layouts/House3/layout.inc14
-rw-r--r--data/layouts/House3/map.bin1
-rw-r--r--data/layouts/House4/border.bin1
-rw-r--r--data/layouts/House4/layout.inc14
-rw-r--r--data/layouts/House4/map.bin1
-rw-r--r--data/layouts/HouseWithBed/border.bin1
-rw-r--r--data/layouts/HouseWithBed/layout.inc14
-rw-r--r--data/layouts/HouseWithBed/map.bin1
-rw-r--r--data/layouts/InsideOfTruck/border.bin1
-rw-r--r--data/layouts/InsideOfTruck/layout.inc14
-rw-r--r--data/layouts/InsideOfTruck/map.bin2
-rw-r--r--data/layouts/IslandCave/border.bin1
-rw-r--r--data/layouts/IslandCave/layout.inc14
-rw-r--r--data/layouts/IslandCave/map.binbin0 -> 1122 bytes
-rw-r--r--data/layouts/JaggedPass/border.bin1
-rw-r--r--data/layouts/JaggedPass/layout.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/LavaridgeTown_Gym_1F/map.bin2
-rw-r--r--data/layouts/LavaridgeTown_Gym_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LavaridgeTown_Gym_B1F/layout.inc14
-rw-r--r--data/layouts/LavaridgeTown_Gym_B1F/map.bin1
-rw-r--r--data/layouts/LavaridgeTown_HerbShop/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/LavaridgeTown_HerbShop/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/LilycoveCity_DepartmentStore_5F/map.binbin0 -> 288 bytes
-rw-r--r--data/layouts/LilycoveCity_EmptyMap/border.bin1
-rw-r--r--data/layouts/LilycoveCity_EmptyMap/layout.inc14
-rw-r--r--data/layouts/LilycoveCity_EmptyMap/map.bin1
-rw-r--r--data/layouts/LilycoveCity_House2/border.bin1
-rw-r--r--data/layouts/LilycoveCity_House2/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin2
-rw-r--r--data/layouts/LinkContestRoom1/border.bin1
-rw-r--r--data/layouts/LinkContestRoom1/layout.inc14
-rw-r--r--data/layouts/LinkContestRoom1/map.bin1
-rw-r--r--data/layouts/LinkContestRoom2/border.bin1
-rw-r--r--data/layouts/LinkContestRoom2/layout.inc14
-rw-r--r--data/layouts/LinkContestRoom2/map.bin1
-rw-r--r--data/layouts/LinkContestRoom3/border.bin1
-rw-r--r--data/layouts/LinkContestRoom3/layout.inc14
-rw-r--r--data/layouts/LinkContestRoom3/map.bin1
-rw-r--r--data/layouts/LinkContestRoom4/border.bin1
-rw-r--r--data/layouts/LinkContestRoom4/layout.inc14
-rw-r--r--data/layouts/LinkContestRoom4/map.bin1
-rw-r--r--data/layouts/LinkContestRoom5/border.bin1
-rw-r--r--data/layouts/LinkContestRoom5/layout.inc14
-rw-r--r--data/layouts/LinkContestRoom5/map.bin1
-rw-r--r--data/layouts/LinkContestRoom6/border.bin1
-rw-r--r--data/layouts/LinkContestRoom6/layout.inc14
-rw-r--r--data/layouts/LinkContestRoom6/map.bin1
-rw-r--r--data/layouts/LittlerootTown/border.bin1
-rw-r--r--data/layouts/LittlerootTown/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin4
-rw-r--r--data/layouts/MagmaHideout_1F/border.bin1
-rw-r--r--data/layouts/MagmaHideout_1F/layout.inc14
-rw-r--r--data/layouts/MagmaHideout_1F/map.binbin0 -> 1680 bytes
-rw-r--r--data/layouts/MagmaHideout_B1F/border.bin1
-rw-r--r--data/layouts/MagmaHideout_B1F/layout.inc14
-rw-r--r--data/layouts/MagmaHideout_B1F/map.bin95
-rw-r--r--data/layouts/MagmaHideout_B2F/border.bin1
-rw-r--r--data/layouts/MagmaHideout_B2F/layout.inc14
-rw-r--r--data/layouts/MagmaHideout_B2F/map.bin49
-rw-r--r--data/layouts/MauvilleCity/border.bin1
-rw-r--r--data/layouts/MauvilleCity/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/MauvilleCity_Gym/map.bin3
-rw-r--r--data/layouts/MeteorFalls_1F_1R/border.bin1
-rw-r--r--data/layouts/MeteorFalls_1F_1R/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/MeteorFalls_B1F_2R/map.bin1
-rw-r--r--data/layouts/MossdeepCity/border.bin1
-rw-r--r--data/layouts/MossdeepCity/layout.inc14
-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.inc14
-rw-r--r--data/layouts/MossdeepCity_GameCorner_1F/map.bin2
-rw-r--r--data/layouts/MossdeepCity_GameCorner_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/MossdeepCity_GameCorner_B1F/layout.inc14
-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.inc14
-rw-r--r--data/layouts/MossdeepCity_Gym/map.bin50
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_1F/border.bin1
-rw-r--r--data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/MossdeepCity_StevensHouse/map.bin1
-rw-r--r--data/layouts/MtChimney/border.bin1
-rw-r--r--data/layouts/MtChimney/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/MtPyre_Summit/map.binbin0 -> 3700 bytes
-rw-r--r--data/layouts/NewMauville_Entrance/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/NewMauville_Entrance/layout.inc14
-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.inc14
-rw-r--r--data/layouts/NewMauville_Inside/map.bin1
-rw-r--r--data/layouts/OldaleTown/border.bin1
-rw-r--r--data/layouts/OldaleTown/layout.inc14
-rw-r--r--data/layouts/OldaleTown/map.bin1
-rw-r--r--data/layouts/PacifidlogTown/border.bin1
-rw-r--r--data/layouts/PacifidlogTown/layout.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/PacifidlogTown_House2/map.bin1
-rw-r--r--data/layouts/PetalburgCity/border.bin1
-rw-r--r--data/layouts/PetalburgCity/layout.inc14
-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.inc14
-rw-r--r--data/layouts/PetalburgCity_Gym/map.bin10
-rw-r--r--data/layouts/PetalburgWoods/border.bin1
-rw-r--r--data/layouts/PetalburgWoods/layout.inc14
-rw-r--r--data/layouts/PetalburgWoods/map.bin1
-rw-r--r--data/layouts/PokeMart/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/PokeMart/layout.inc14
-rw-r--r--data/layouts/PokeMart/map.bin3
-rw-r--r--data/layouts/PokemonCenter_1F/border.bin1
-rw-r--r--data/layouts/PokemonCenter_1F/layout.inc14
-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.inc14
-rw-r--r--data/layouts/PokemonCenter_2F/map.bin1
-rw-r--r--data/layouts/RecordCorner/border.bin1
-rw-r--r--data/layouts/RecordCorner/layout.inc14
-rw-r--r--data/layouts/RecordCorner/map.bin1
-rw-r--r--data/layouts/Route101/border.bin1
-rw-r--r--data/layouts/Route101/layout.inc14
-rw-r--r--data/layouts/Route101/map.bin1
-rw-r--r--data/layouts/Route102/border.bin1
-rw-r--r--data/layouts/Route102/layout.inc14
-rw-r--r--data/layouts/Route102/map.bin1
-rw-r--r--data/layouts/Route103/border.bin1
-rw-r--r--data/layouts/Route103/layout.inc14
-rw-r--r--data/layouts/Route103/map.bin1
-rw-r--r--data/layouts/Route104/border.bin1
-rw-r--r--data/layouts/Route104/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Route104_Prototype/map.bin1
-rw-r--r--data/layouts/Route105/border.bin1
-rw-r--r--data/layouts/Route105/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Route108/map.bin1
-rw-r--r--data/layouts/Route109/border.bin1
-rw-r--r--data/layouts/Route109/layout.inc14
-rw-r--r--data/layouts/Route109/map.binbin0 -> 4800 bytes
-rw-r--r--data/layouts/Route109_SeashoreHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route109_SeashoreHouse/layout.inc14
-rw-r--r--data/layouts/Route109_SeashoreHouse/map.bin3
-rw-r--r--data/layouts/Route110/border.bin1
-rw-r--r--data/layouts/Route110/layout.inc14
-rw-r--r--data/layouts/Route110/map.binbin0 -> 8000 bytes
-rw-r--r--data/layouts/Route110_SeasideCyclingRoadEntrace/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc14
-rw-r--r--data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin1
-rw-r--r--data/layouts/Route110_TrickHouseCorridor/border.bin1
-rw-r--r--data/layouts/Route110_TrickHouseCorridor/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Route113/map.bin288
-rw-r--r--data/layouts/Route114/border.bin1
-rw-r--r--data/layouts/Route114/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Route114_LanettesHouse/map.bin2
-rw-r--r--data/layouts/Route115/border.bin1
-rw-r--r--data/layouts/Route115/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Route117/map.bin11
-rw-r--r--data/layouts/Route117_PokemonDayCare/border.bin1
-rw-r--r--data/layouts/Route117_PokemonDayCare/layout.inc14
-rw-r--r--data/layouts/Route117_PokemonDayCare/map.bin2
-rw-r--r--data/layouts/Route118/border.bin1
-rw-r--r--data/layouts/Route118/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Route121_SafariZoneEntrance/map.bin1
-rw-r--r--data/layouts/Route122/border.bin1
-rw-r--r--data/layouts/Route122/layout.inc14
-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.inc14
-rw-r--r--data/layouts/Route123/map.bin2
-rw-r--r--data/layouts/Route124/border.bin1
-rw-r--r--data/layouts/Route124/layout.inc14
-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.inc14
-rw-r--r--data/layouts/Route124_DivingTreasureHuntersHouse/map.bin1
-rw-r--r--data/layouts/Route125/border.bin1
-rw-r--r--data/layouts/Route125/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Route130/map.bin1
-rw-r--r--data/layouts/Route131/border.bin1
-rw-r--r--data/layouts/Route131/layout.inc14
-rw-r--r--data/layouts/Route131/map.bin1
-rw-r--r--data/layouts/Route132/border.bin1
-rw-r--r--data/layouts/Route132/layout.inc14
-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.inc14
-rw-r--r--data/layouts/Route133/map.bin1
-rw-r--r--data/layouts/Route134/border.bin1
-rw-r--r--data/layouts/Route134/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/RusturfTunnel/map.bin2
-rw-r--r--data/layouts/SSTidalCorridor/border.bin1
-rw-r--r--data/layouts/SSTidalCorridor/layout.inc14
-rw-r--r--data/layouts/SSTidalCorridor/map.bin1
-rw-r--r--data/layouts/SSTidalLowerDeck/border.bin1
-rw-r--r--data/layouts/SSTidalLowerDeck/layout.inc14
-rw-r--r--data/layouts/SSTidalLowerDeck/map.bin1
-rw-r--r--data/layouts/SSTidalRooms/border.bin1
-rw-r--r--data/layouts/SSTidalRooms/layout.inc14
-rw-r--r--data/layouts/SSTidalRooms/map.bin1
-rw-r--r--data/layouts/SafariZone_Northeast/border.bin1
-rw-r--r--data/layouts/SafariZone_Northeast/layout.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/SafariZone_RestHouse/map.bin1
-rw-r--r--data/layouts/SafariZone_Southeast/border.bin1
-rw-r--r--data/layouts/SafariZone_Southeast/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/SeafloorCavern_Room2/map.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room3/border.bin1
-rw-r--r--data/layouts/SeafloorCavern_Room3/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/ShoalCave_LowTideStairsRoom/map.bin1
-rw-r--r--data/layouts/SingleBattleColosseum/border.bin1
-rw-r--r--data/layouts/SingleBattleColosseum/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/SkyPillar_Outside/map.bin1
-rw-r--r--data/layouts/SkyPillar_Top/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SkyPillar_Top/layout.inc14
-rw-r--r--data/layouts/SkyPillar_Top/map.bin1
-rw-r--r--data/layouts/SlateportCity/border.bin1
-rw-r--r--data/layouts/SlateportCity/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/SootopolisCity/map.bin12
-rw-r--r--data/layouts/SootopolisCity_Gym_1F/border.bin1
-rw-r--r--data/layouts/SootopolisCity_Gym_1F/layout.inc14
-rw-r--r--data/layouts/SootopolisCity_Gym_1F/map.bin3
-rw-r--r--data/layouts/SootopolisCity_Gym_B1F/border.bin1
-rw-r--r--data/layouts/SootopolisCity_Gym_B1F/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/SootopolisCity_House3/map.bin1
-rw-r--r--data/layouts/SootopolisCity_House8/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/SootopolisCity_House8/layout.inc14
-rw-r--r--data/layouts/SootopolisCity_House8/map.bin1
-rw-r--r--data/layouts/SouthernIsland_Exterior/border.bin1
-rw-r--r--data/layouts/SouthernIsland_Exterior/layout.inc14
-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.inc14
-rw-r--r--data/layouts/SouthernIsland_Interior/map.bin1
-rw-r--r--data/layouts/TradeCenter/border.bin1
-rw-r--r--data/layouts/TradeCenter/layout.inc14
-rw-r--r--data/layouts/TradeCenter/map.bin2
-rw-r--r--data/layouts/Underwater1/border.bin1
-rw-r--r--data/layouts/Underwater1/layout.inc14
-rw-r--r--data/layouts/Underwater1/map.bin17
-rw-r--r--data/layouts/Underwater2/border.bin1
-rw-r--r--data/layouts/Underwater2/layout.inc14
-rw-r--r--data/layouts/Underwater2/map.bin35
-rw-r--r--data/layouts/Underwater3/border.bin1
-rw-r--r--data/layouts/Underwater3/layout.inc14
-rw-r--r--data/layouts/Underwater3/map.bin1
-rw-r--r--data/layouts/Underwater4/border.bin1
-rw-r--r--data/layouts/Underwater4/layout.inc14
-rw-r--r--data/layouts/Underwater4/map.bin1
-rw-r--r--data/layouts/Underwater_Route134/border.bin1
-rw-r--r--data/layouts/Underwater_Route134/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/Underwater_SootopolisCity/map.bin2
-rw-r--r--data/layouts/UnknownMap_082CF564/border.bin1
-rw-r--r--data/layouts/UnknownMap_082CF564/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082CF564/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082D05D8/border.bin1
-rw-r--r--data/layouts/UnknownMap_082D05D8/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082D05D8/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082D05FC/border.bin1
-rw-r--r--data/layouts/UnknownMap_082D05FC/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082D05FC/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E55C8/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E55C8/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E55C8/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E55EC/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E55EC/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E55EC/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E5610/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E5610/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E5610/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E5634/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E5634/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E5634/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E5658/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E5658/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E5658/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E567C/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E567C/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E567C/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E56A0/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E56A0/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E56A0/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E56C4/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E56C4/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E56C4/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E56E8/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E56E8/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E56E8/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E570C/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E570C/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E570C/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E5730/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E5730/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E5730/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E5754/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E5754/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E5754/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E5778/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E5778/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E5778/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082E579C/border.bin1
-rw-r--r--data/layouts/UnknownMap_082E579C/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082E579C/map.binbin0 -> 4 bytes
-rw-r--r--data/layouts/UnknownMap_082EDF30/border.bin1
-rw-r--r--data/layouts/UnknownMap_082EDF30/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082EDF30/map.bin3
-rw-r--r--data/layouts/UnknownMap_082FF894/border.bin1
-rw-r--r--data/layouts/UnknownMap_082FF894/layout.inc14
-rw-r--r--data/layouts/UnknownMap_082FF894/map.binbin0 -> 724 bytes
-rw-r--r--data/layouts/UnknownMap_08302970/border.bin1
-rw-r--r--data/layouts/UnknownMap_08302970/layout.inc14
-rw-r--r--data/layouts/UnknownMap_08302970/map.bin1
-rw-r--r--data/layouts/UnknownMap_083041B4/border.bin1
-rw-r--r--data/layouts/UnknownMap_083041B4/layout.inc14
-rw-r--r--data/layouts/UnknownMap_083041B4/map.bin1
-rw-r--r--data/layouts/UnknownMap_25_29/border.bin1
-rw-r--r--data/layouts/UnknownMap_25_29/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/UnknownMap_25_34/map.bin1
-rw-r--r--data/layouts/UnreferencedMap/border.bin1
-rw-r--r--data/layouts/UnreferencedMap/layout.inc14
-rw-r--r--data/layouts/UnreferencedMap/map.bin1
-rw-r--r--data/layouts/VerdanturfTown/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/VerdanturfTown/layout.inc14
-rw-r--r--data/layouts/VerdanturfTown/map.binbin0 -> 800 bytes
-rw-r--r--data/layouts/VerdanturfTown_WandasHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/layouts/VerdanturfTown_WandasHouse/layout.inc14
-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.inc14
-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.inc14
-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.inc14
-rw-r--r--data/layouts/VictoryRoad_B2F/map.bin1
996 files changed, 7504 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..a274ac523
--- /dev/null
+++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
+ .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
+
+AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8
+ .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
+
+ .align 2
+AbandonedShip_CaptainsOffice_Layout:: @ 82E7558
+ .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..24d3eea96
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
+ .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
+
+AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC
+ .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
+
+ .align 2
+AbandonedShip_Corridors_1F_Layout:: @ 82E6B5C
+ .4byte 0x12
+ .4byte 0xc
+ .4byte AbandonedShip_Corridors_1F_MapBorder
+ .4byte AbandonedShip_Corridors_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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 662222222
+2 6222222222222222226201222220111122222012222201111222220122222011112222201222220111122262%#&2222%$"#&2222-+6.2222-2,*+6.262222222222222222222222222222222222 \ 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..5e8c95959
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
+ .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
+
+AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00
+ .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Corridors_B1F_Layout:: @ 82E6F04
+ .4byte 0xd
+ .4byte 0xa
+ .4byte AbandonedShip_Corridors_B1F_MapBorder
+ .4byte AbandonedShip_Corridors_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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)0112011112201122%#$"&22%#$22-+6,*2.22-+6,22222222222222222222222226222222222222262220111111122222011111112 \ 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..abd9a205a
--- /dev/null
+++ b/data/layouts/AbandonedShip_Deck/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Deck_MapBorder:: @ 82E65BC
+ .incbin "data/layouts/AbandonedShip_Deck/border.bin"
+
+AbandonedShip_Deck_MapBlockdata:: @ 82E65C4
+ .incbin "data/layouts/AbandonedShip_Deck/map.bin"
+
+ .align 2
+AbandonedShip_Deck_Layout:: @ 82E698C
+ .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`(''('((((`(*/`(//(/((((`(* ]]]2hiiiiiiii(((`(((33*2*22*22ef(hiiiiif(2(2ei (((00((( ]]]2002]]]]]]]](((33*2*22*22*22*22*2*2*2*2*2*2*2(((((((2(2(2(2(2(2(2(2(2(2(2(2iiiiiiiiiiiif(2(2eiiiiiii00 00  22 44pppppppp \ 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..afc4d6a17
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
+ .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
+
+AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48
+ .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
+
+ .align 2
+AbandonedShip_HiddenFloorCorridors_Layout:: @ 82F9D68
+ .4byte 0xd
+ .4byte 0xb
+ .4byte AbandonedShip_HiddenFloorCorridors_MapBorder
+ .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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 @@
+    222222222222262242222224222222011111112266201111111222220111111122222%#$"#$"#&22-36,*36,*+6.22V2222222222GVx2222222222 \ 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..cea6993b2
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
+ .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
+
+AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00
+ .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
+
+ .align 2
+AbandonedShip_HiddenFloorRooms_Layout:: @ 82FF328
+ .4byte 0x2c
+ .4byte 0xf
+ .4byte AbandonedShip_HiddenFloorRooms_MapBorder
+ .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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;266;2;2;2;2ON:2;2;2;2;2;2;2g2;2;266;2?>=28282828282a2828282826?>682a2^6_682b6682828282;2;2<28282b68282828282826682?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>682^6_6828282828282`282?>=2`2828282828282828282a282?>682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a2828282826?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;266;2?>=282828282a2828282V6W682?>=28282828282`2828282b6826?>682828282V6W68282826682?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>682`2828282828282828282?>=2V6W682828282828282828282?>=282828282828282828282826?>=282828282d2e2828282826?>=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..17341a15f
--- /dev/null
+++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
+ .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
+
+AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4
+ .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Room_B1F_Layout:: @ 82E7364
+ .4byte 0x9
+ .4byte 0x8
+ .4byte AbandonedShip_Room_B1F_MapBorder
+ .4byte AbandonedShip_Room_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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..52c4a4f2e
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
+ .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
+
+AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384
+ .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms2_1F_Layout:: @ 82E74B8
+ .4byte 0x9
+ .4byte 0x11
+ .4byte AbandonedShip_Rooms2_1F_MapBorder
+ .4byte AbandonedShip_Rooms2_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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@kc''7>Hs6//?>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..b3c205318
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
+ .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
+
+AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4
+ .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms2_B1F_Layout:: @ 82E7214
+ .4byte 0x12
+ .4byte 0x8
+ .4byte AbandonedShip_Rooms2_B1F_MapBorder
+ .4byte AbandonedShip_Rooms2_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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=282VW6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=282828282826?>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..7563bfbba
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
+ .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
+
+AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C
+ .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms_1F_Layout:: @ 82E6DE0
+ .4byte 0x12
+ .4byte 0x11
+ .4byte AbandonedShip_Rooms_1F_MapBorder
+ .4byte AbandonedShip_Rooms_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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@kc''7>//6//?>Hs6//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=28282826?>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?>=2VW8282826?>=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..89bd595c9
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
+ .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
+
+AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24
+ .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
+
+ .align 2
+AbandonedShip_Rooms_B1F_Layout:: @ 82E70D4
+ .4byte 0x1b
+ .4byte 0x8
+ .4byte AbandonedShip_Rooms_B1F_MapBorder
+ .4byte AbandonedShip_Rooms_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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@kmE@kc''@kmE7>Hs2uMHs6//Hs2uM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<28282826:2;2<28282;2;2?>=2VW8282826=282=28282a2828282?>=2^_82`28282=2pVp82=2`2828282b82?>6828282828282=2VGV82=282828282826? \ 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..d738f437d
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater1/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Underwater1_MapBorder:: @ 82E722C
+ .incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
+
+AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234
+ .incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
+
+ .align 2
+AbandonedShip_Underwater1_Layout:: @ 82E72B4
+ .4byte 0x8
+ .4byte 0x8
+ .4byte AbandonedShip_Underwater1_MapBorder
+ .4byte AbandonedShip_Underwater1_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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 @@
+222222222222222222222222222222222222222222222222 \ 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..86dad6567
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater2/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Underwater2_MapBorder:: @ 82E7570
+ .incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
+
+AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578
+ .incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
+
+ .align 2
+AbandonedShip_Underwater2_Layout:: @ 82E76A0
+ .4byte 0x15
+ .4byte 0x7
+ .4byte AbandonedShip_Underwater2_MapBorder
+ .4byte AbandonedShip_Underwater2_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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 @@
+2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ 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..da28d0642
--- /dev/null
+++ b/data/layouts/AncientTomb/layout.inc
@@ -0,0 +1,14 @@
+AncientTomb_MapBorder:: @ 82F717C
+ .incbin "data/layouts/AncientTomb/border.bin"
+
+AncientTomb_MapBlockdata:: @ 82F7184
+ .incbin "data/layouts/AncientTomb/map.bin"
+
+ .align 2
+AncientTomb_Layout:: @ 82F75E8
+ .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..bb87de307
--- /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..74361e986
--- /dev/null
+++ b/data/layouts/AquaHideout_1F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_1F_MapBorder:: @ 82DBBD4
+ .incbin "data/layouts/AquaHideout_1F/border.bin"
+
+AquaHideout_1F_MapBlockdata:: @ 82DBBDC
+ .incbin "data/layouts/AquaHideout_1F/map.bin"
+
+ .align 2
+AquaHideout_1F_Layout:: @ 82DC26C
+ .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)22)22)2'
+
+!!! k2l22(2(2(2(2k2l22(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`q1q1q1q1q1q1q1q1q1q12(2(2(2(2(2
+
+'/22(2(2`q1p1p1p1p1p1p1p1p1q12(2(2(2(2(2
+
+/22(2(2(2hiiiiiiiiii2(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(2/
+
+)2(2(2]iiiiiif(2(2eiiiiii^2(2'
+
+)2(2(2`t||||||00||||||2(2/
+
+)2(2(2`us2(2*2
+
+)2(2(2`upppppppppppps2(2(2
+
+22(2`upppppppppppps2(2(2
+
+2uppppppppppppsy2(2(2
+
+2*BBBBtppppprBBBBB*2(2(2
+
+)2*22((BBBBuypppxsBBBBB((222
+
+)2(2(2t|||}ppp{||||2
+
+)2(2(2`uppps2
+
+)2(2(2`upppppppppppps2*2*2
+
+22(2`upppppppppppps2(2(2
+
+2`upppppppppppps222
+
+2uppppppppppppsy2
+
+)2*22*BBBBBtppprBBBBBB*2
+
+)2(2(2((BBBBBuypxsB(B(B(B(B(B((2*2*2
+
+mmmmmmmmougsnmmmmmmmmm
+
+qqqqqqqqusqqqqqqqqq
+llllllllllllllllllllll \ 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..451148de4
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_B1F_MapBorder:: @ 82DC284
+ .incbin "data/layouts/AquaHideout_B1F/border.bin"
+
+AquaHideout_B1F_MapBlockdata:: @ 82DC28C
+ .incbin "data/layouts/AquaHideout_B1F/map.bin"
+
+ .align 2
+AquaHideout_B1F_Layout:: @ 82DCC1C
+ .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..5d13df58d
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/map.bin
@@ -0,0 +1,83 @@
+ 01!2
+112!
+!!2!!
+
+!!!
+ST8292)22)22
+92922)22)2
+')22)22)2'
+
+)2)2)2
+
+!2[\ )2(2(2(2(2(2
+)2(2(2(2(2(27
+/2(2(2(2(2/
+
+72(227
+
+)22)22cd2)2(2(2(2(2(2
+)2(2(2(2(22*2*27
+)22(2(2(22(2
+
+)2*22(2(2*2*27
+
+)2(2(2(2k2l22(2(2(2(2(2(2  2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 
+)22(2(22(2(22(2
+
+)2(2(2(22A2B2222(2(2(2+,-.
+iiiiiii^
+
+)2(2(2(2IJ222(2(2(2
+$#$!!!
+0013456
+
+`2222222
+
+)2(2(2(2222A2B22(2(2(2
+37733366
+828292;<=>
+
+hiiiiiii
+
+)2(2(2(2222IJ(2(2(2
+3337733333
+)263(2CDEF
+
+)22(2(22(2(22(2
+
+)2(2(2(2222222(2(2(2
+3333333323
+)2(2(2KLMN
+
+iiiiiii^
+  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 3333333333 )2(2(2(2UV)2
+
+`2222222
+)22(2(2(2(2(2
+
+hiiiiiii
+
+!!!!!!!!!!!!! !!!!!!!!!!  2Y2Y2Y2Y2Y2Y2 
+)22(2(22(2(22(2
+
+)2)2)2)2)2)2)2)2)2)2)2)2)22)2222222223
+iiiiiii^
+
+)2(22(2(2(2(2(2(2(2(2(2(2(2(23  2227 !!!!!!!
+
+`2222222
+
+iiiiiiiiiiiii^222D322222)2)2
+
+hiiiiiii
+
+`2222222222222222222222222222(2(2
+
+)22(2(22(2(22(2
+
+`2O1O1O1O1O1O1O1O1O1O1O1O12A2B2222A2B23322222(2(2
+  2Y2Y2Y2Y2Y2Y2Y2Y2 
+hiiiiiiiiiiiii2IJ222IJ22222(22
+
+)2*22*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..860cc1790
--- /dev/null
+++ b/data/layouts/AquaHideout_B2F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_B2F_MapBorder:: @ 82DCC34
+ .incbin "data/layouts/AquaHideout_B2F/border.bin"
+
+AquaHideout_B2F_MapBlockdata:: @ 82DCC3C
+ .incbin "data/layouts/AquaHideout_B2F/map.bin"
+
+ .align 2
+AquaHideout_B2F_Layout:: @ 82DD29C
+ .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 [\012
+!!23456!!3456!!!
+cd82922)22
+)2)22)22;<=>)2)2;<=>)2)2)2
+
+!2!
+k2l22(2(2(2(2
+)2(2(2(2(2CDEF2(2CDEF2(2(2
+
+)22)22)2
+)2(2(2(2(2(2(2
+)2(2(2(2(2KLMN2(2KLMN2(2(2
+
+)2(2(2(2(2
+)2(2(22A2B22
+)2(2(2(2(2(2UV2(2(2(2UV2(2(2(2
+
+)2(2(2
+)2(2(22IJ
+)2(222(2(2*2*22(2(2(2*2*22(2(2(2
+
+)2//(2
+)2(2(22222
+)2(22(222(2(222(222(2(2(2
+
+)277/2
+)22(22222
+)2(2202(2222(2
+  2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 )2(2*2*22822(2:22(2(2
+)2(2(2(2(2(2*2*22(2*2*22*2*22(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(22(2 )2(2(22(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/// !!!!!!!!
+
+2iiiiiii^2)2)2)2)2)2)2)2)2
+
+VVVVVVVVppp2(2(2(2(2(2(22(2
+
+GGGGGGGVVVVVVVVpppppy2(2(2(2(2
+
+GGGGGGGGGGGGGGVVVVVp*22(2(2(2(2''//
+
+GGGGGGGGGGGGGGGGGGVp2(2(2(2(2//)22
+ GGGGGGGGGGGGGGGGGGVp2Y2Y2Y2Y2 2 2 2Y2 GGGGGGGGGGGGGGGGGGVpb iiiiiiiiiiiiiiiiiiiiij !!!!!!!!  \ No newline at end of file
diff --git a/data/layouts/BattleTower_BattleRoom/border.bin b/data/layouts/BattleTower_BattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleTower_BattleRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleTower_BattleRoom/layout.inc b/data/layouts/BattleTower_BattleRoom/layout.inc
new file mode 100644
index 000000000..7003c0bc3
--- /dev/null
+++ b/data/layouts/BattleTower_BattleRoom/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_BattleRoom_MapBorder:: @ 82F2694
+ .incbin "data/layouts/BattleTower_BattleRoom/border.bin"
+
+BattleTower_BattleRoom_MapBlockdata:: @ 82F269C
+ .incbin "data/layouts/BattleTower_BattleRoom/map.bin"
+
+ .align 2
+BattleTower_BattleRoom_Layout:: @ 82F2750
+ .4byte 0xa
+ .4byte 0x9
+ .4byte BattleTower_BattleRoom_MapBorder
+ .4byte BattleTower_BattleRoom_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTower
diff --git a/data/layouts/BattleTower_BattleRoom/map.bin b/data/layouts/BattleTower_BattleRoom/map.bin
new file mode 100644
index 000000000..42d99b5a6
--- /dev/null
+++ b/data/layouts/BattleTower_BattleRoom/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/BattleTower_Corridor/border.bin b/data/layouts/BattleTower_Corridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleTower_Corridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleTower_Corridor/layout.inc b/data/layouts/BattleTower_Corridor/layout.inc
new file mode 100644
index 000000000..9932107ef
--- /dev/null
+++ b/data/layouts/BattleTower_Corridor/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Corridor_MapBorder:: @ 82F25C8
+ .incbin "data/layouts/BattleTower_Corridor/border.bin"
+
+BattleTower_Corridor_MapBlockdata:: @ 82F25D0
+ .incbin "data/layouts/BattleTower_Corridor/map.bin"
+
+ .align 2
+BattleTower_Corridor_Layout:: @ 82F267C
+ .4byte 0x11
+ .4byte 0x5
+ .4byte BattleTower_Corridor_MapBorder
+ .4byte BattleTower_Corridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTower
diff --git a/data/layouts/BattleTower_Corridor/map.bin b/data/layouts/BattleTower_Corridor/map.bin
new file mode 100644
index 000000000..0b0803f91
--- /dev/null
+++ b/data/layouts/BattleTower_Corridor/map.bin
Binary files differ
diff --git a/data/layouts/BattleTower_Elevator/border.bin b/data/layouts/BattleTower_Elevator/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleTower_Elevator/border.bin
Binary files differ
diff --git a/data/layouts/BattleTower_Elevator/layout.inc b/data/layouts/BattleTower_Elevator/layout.inc
new file mode 100644
index 000000000..6246ce767
--- /dev/null
+++ b/data/layouts/BattleTower_Elevator/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Elevator_MapBorder:: @ 82F2570
+ .incbin "data/layouts/BattleTower_Elevator/border.bin"
+
+BattleTower_Elevator_MapBlockdata:: @ 82F2578
+ .incbin "data/layouts/BattleTower_Elevator/map.bin"
+
+ .align 2
+BattleTower_Elevator_Layout:: @ 82F25B0
+ .4byte 0x4
+ .4byte 0x7
+ .4byte BattleTower_Elevator_MapBorder
+ .4byte BattleTower_Elevator_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTower
diff --git a/data/layouts/BattleTower_Elevator/map.bin b/data/layouts/BattleTower_Elevator/map.bin
new file mode 100644
index 000000000..8777c1471
--- /dev/null
+++ b/data/layouts/BattleTower_Elevator/map.bin
@@ -0,0 +1 @@
+hiijpqqrxyyz\2]2]2]2d2e2e2f2d2e2e2f2d2O2W2f2 \ No newline at end of file
diff --git a/data/layouts/BattleTower_Lobby/border.bin b/data/layouts/BattleTower_Lobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/BattleTower_Lobby/border.bin
Binary files differ
diff --git a/data/layouts/BattleTower_Lobby/layout.inc b/data/layouts/BattleTower_Lobby/layout.inc
new file mode 100644
index 000000000..b330b3c72
--- /dev/null
+++ b/data/layouts/BattleTower_Lobby/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Lobby_MapBorder:: @ 82F1D68
+ .incbin "data/layouts/BattleTower_Lobby/border.bin"
+
+BattleTower_Lobby_MapBlockdata:: @ 82F1D70
+ .incbin "data/layouts/BattleTower_Lobby/map.bin"
+
+ .align 2
+BattleTower_Lobby_Layout:: @ 82F1E6C
+ .4byte 0xe
+ .4byte 0x9
+ .4byte BattleTower_Lobby_MapBorder
+ .4byte BattleTower_Lobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTower
diff --git a/data/layouts/BattleTower_Lobby/map.bin b/data/layouts/BattleTower_Lobby/map.bin
new file mode 100644
index 000000000..8ff3182a6
--- /dev/null
+++ b/data/layouts/BattleTower_Lobby/map.bin
Binary files differ
diff --git a/data/layouts/BattleTower_Outside/border.bin b/data/layouts/BattleTower_Outside/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/BattleTower_Outside/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/BattleTower_Outside/layout.inc b/data/layouts/BattleTower_Outside/layout.inc
new file mode 100644
index 000000000..f260dd98f
--- /dev/null
+++ b/data/layouts/BattleTower_Outside/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Outside_MapBorder:: @ 82F1E84
+ .incbin "data/layouts/BattleTower_Outside/border.bin"
+
+BattleTower_Outside_MapBlockdata:: @ 82F1E8C
+ .incbin "data/layouts/BattleTower_Outside/map.bin"
+
+ .align 2
+BattleTower_Outside_Layout:: @ 82F2558
+ .4byte 0x1d
+ .4byte 0x1e
+ .4byte BattleTower_Outside_MapBorder
+ .4byte BattleTower_Outside_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Dewford
diff --git a/data/layouts/BattleTower_Outside/map.bin b/data/layouts/BattleTower_Outside/map.bin
new file mode 100644
index 000000000..6e9f6adb6
--- /dev/null
+++ b/data/layouts/BattleTower_Outside/map.bin
@@ -0,0 +1 @@
+ppppppprIJJxyz{bJJ`tp1ppppppppppprIJJxyz{bJJ`tpppppppprk0rIJJxyz{bJJ`s0mtppppprks0jIJJxyz{bJJ`k00mtpppxsqsk00HIJJxyz{bJJ`a22umtppskssHIJJxyz{bJJ`auuqutpssqss0HIJJKLMNOJJ`a2uuquuyssqss00PQRRSTUVWRRhi22uuquuyssks0X2Y2Z2Z2[\]^_Z2Z2p2q22uuquusssqs000w2o22c2d2e2f2g2222222uuquusssqs00w2o2l2m2n22222uut}usssqs0000000t2u2v2000000t}uuqusssq{00000|2}2~200000ut}ut}ss{qs0000000000000t}uquus{sq{000000000ut}t}up{s{|{00000t}uququps{qsq{||||000||||}t}ququpp{{{||000}qququppsqsqqqqt000qqqt|}t}pppsq{||||}q]^0^0^0_q{|||}qquppp{||]^0^0^0_|||}pppp]^0^0^0_pppppppppppppp]^0^0^0^0V0V0V0V0V0V0Wppppppppppppppppp]^0^0^0^0^0^0^0^0^0^0_pppppppppppppppp22pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
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..c35f3739e
--- /dev/null
+++ b/data/layouts/CableCarStation/layout.inc
@@ -0,0 +1,14 @@
+CableCarStation_MapBorder:: @ 82D4CCC
+ .incbin "data/layouts/CableCarStation/border.bin"
+
+CableCarStation_MapBlockdata:: @ 82D4CD4
+ .incbin "data/layouts/CableCarStation/map.bin"
+
+ .align 2
+CableCarStation_Layout:: @ 82D4E0C
+ .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..fd4e2ee77
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_1F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
+ .incbin "data/layouts/CaveOfOrigin_1F/border.bin"
+
+CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14
+ .incbin "data/layouts/CaveOfOrigin_1F/map.bin"
+
+ .align 2
+CaveOfOrigin_1F_Layout:: @ 82E0238
+ .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..3d9dc9cec
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B1F_MapBorder:: @ 82E0250
+ .incbin "data/layouts/CaveOfOrigin_B1F/border.bin"
+
+CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258
+ .incbin "data/layouts/CaveOfOrigin_B1F/map.bin"
+
+ .align 2
+CaveOfOrigin_B1F_Layout:: @ 82E067C
+ .4byte 0x17
+ .4byte 0x17
+ .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..0ffbdaaa0
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/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_B2F/border.bin b/data/layouts/CaveOfOrigin_B2F/border.bin
new file mode 100644
index 000000000..4117717f2
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B2F/border.bin
@@ -0,0 +1 @@
+#### \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_B2F/layout.inc b/data/layouts/CaveOfOrigin_B2F/layout.inc
new file mode 100644
index 000000000..403f393b8
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B2F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B2F_MapBorder:: @ 82E0694
+ .incbin "data/layouts/CaveOfOrigin_B2F/border.bin"
+
+CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C
+ .incbin "data/layouts/CaveOfOrigin_B2F/map.bin"
+
+ .align 2
+CaveOfOrigin_B2F_Layout:: @ 82E0A10
+ .4byte 0x15
+ .4byte 0x15
+ .4byte CaveOfOrigin_B2F_MapBorder
+ .4byte CaveOfOrigin_B2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/CaveOfOrigin_B2F/map.bin b/data/layouts/CaveOfOrigin_B2F/map.bin
new file mode 100644
index 000000000..4c1fd5ab8
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B2F/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_B3F/border.bin b/data/layouts/CaveOfOrigin_B3F/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B3F/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_B3F/layout.inc b/data/layouts/CaveOfOrigin_B3F/layout.inc
new file mode 100644
index 000000000..797bc7569
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B3F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
+ .incbin "data/layouts/CaveOfOrigin_B3F/border.bin"
+
+CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30
+ .incbin "data/layouts/CaveOfOrigin_B3F/map.bin"
+
+ .align 2
+CaveOfOrigin_B3F_Layout:: @ 82E0D50
+ .4byte 0x13
+ .4byte 0x15
+ .4byte CaveOfOrigin_B3F_MapBorder
+ .4byte CaveOfOrigin_B3F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/CaveOfOrigin_B3F/map.bin b/data/layouts/CaveOfOrigin_B3F/map.bin
new file mode 100644
index 000000000..ea574b224
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B3F/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/CaveOfOrigin_B4F/border.bin b/data/layouts/CaveOfOrigin_B4F/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B4F/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/CaveOfOrigin_B4F/layout.inc b/data/layouts/CaveOfOrigin_B4F/layout.inc
new file mode 100644
index 000000000..be6bc0bf6
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B4F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
+ .incbin "data/layouts/CaveOfOrigin_B4F/border.bin"
+
+CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70
+ .incbin "data/layouts/CaveOfOrigin_B4F/map.bin"
+
+ .align 2
+CaveOfOrigin_B4F_Layout:: @ 82E1044
+ .4byte 0x13
+ .4byte 0x13
+ .4byte CaveOfOrigin_B4F_MapBorder
+ .4byte CaveOfOrigin_B4F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/CaveOfOrigin_B4F/map.bin b/data/layouts/CaveOfOrigin_B4F/map.bin
new file mode 100644
index 000000000..efec94a9e
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B4F/map.bin
@@ -0,0 +1 @@
+)))))))))))))))))3)))))))))))))3J"3"3333333333333 3 "*3)))))))))3( ""3*))))))@(3  ""3"*333333A3( 3J ""3"333)333  3  ""3""33END33  3  ""3""3ENOND3  3  ""3""3GNOOONF3  3L ""3"3GNOOONF3  3  ""3""3$3?NON>$33 3  "M3"$3$3?N>$33$ 3  ""3$"33$3B3$333 $3  "$3"$2222222$ 3$ "3"3$222222222$33 "3$22223332222$3 "333333$222$333333 $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..242a7b45a
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
+ .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin"
+
+CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18
+ .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin"
+
+ .align 2
+CaveOfOrigin_Entrance_Layout:: @ 82DFDF4
+ .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/ContestHall/border.bin b/data/layouts/ContestHall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/ContestHall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ContestHall/layout.inc b/data/layouts/ContestHall/layout.inc
new file mode 100644
index 000000000..b108a3178
--- /dev/null
+++ b/data/layouts/ContestHall/layout.inc
@@ -0,0 +1,14 @@
+ContestHall_MapBorder:: @ 82CF1A4
+ .incbin "data/layouts/ContestHall/border.bin"
+
+ContestHall_MapBlockdata:: @ 82CF1AC
+ .incbin "data/layouts/ContestHall/map.bin"
+
+ .align 2
+ContestHall_Layout:: @ 82CF4A0
+ .4byte 0x15
+ .4byte 0x12
+ .4byte ContestHall_MapBorder
+ .4byte ContestHall_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
diff --git a/data/layouts/ContestHall/map.bin b/data/layouts/ContestHall/map.bin
new file mode 100644
index 000000000..d65e7c489
--- /dev/null
+++ b/data/layouts/ContestHall/map.bin
@@ -0,0 +1 @@
+/////////////////////nnnbbbbbbbbbbbbbbbbbbbbb 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%2pq2q2q22qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q22q2qq2r%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`22_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/ContestLobby/border.bin b/data/layouts/ContestLobby/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/ContestLobby/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/ContestLobby/layout.inc b/data/layouts/ContestLobby/layout.inc
new file mode 100644
index 000000000..975c86922
--- /dev/null
+++ b/data/layouts/ContestLobby/layout.inc
@@ -0,0 +1,14 @@
+ContestLobby_MapBorder:: @ 82CF0B0
+ .incbin "data/layouts/ContestLobby/border.bin"
+
+ContestLobby_MapBlockdata:: @ 82CF0B8
+ .incbin "data/layouts/ContestLobby/map.bin"
+
+ .align 2
+ContestLobby_Layout:: @ 82CF18C
+ .4byte 0xf
+ .4byte 0x7
+ .4byte ContestLobby_MapBorder
+ .4byte ContestLobby_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
diff --git a/data/layouts/ContestLobby/map.bin b/data/layouts/ContestLobby/map.bin
new file mode 100644
index 000000000..87407546a
--- /dev/null
+++ b/data/layouts/ContestLobby/map.bin
@@ -0,0 +1 @@
+[\]NMcdebVbbbbTb 2!2!2222U2!2!2!2!2!2"2(2`2`2f2`2`2`2`292(2`2`22_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/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..75de33542
--- /dev/null
+++ b/data/layouts/DesertRuins/layout.inc
@@ -0,0 +1,14 @@
+DesertRuins_MapBorder:: @ 82D7AEC
+ .incbin "data/layouts/DesertRuins/border.bin"
+
+DesertRuins_MapBlockdata:: @ 82D7AF4
+ .incbin "data/layouts/DesertRuins/map.bin"
+
+ .align 2
+DesertRuins_Layout:: @ 82D7F58
+ .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..bb87de307
--- /dev/null
+++ b/data/layouts/DesertRuins/map.bin
Binary files differ
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..ddee6afbe
--- /dev/null
+++ b/data/layouts/DewfordTown/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_MapBorder:: @ 8291A2C
+ .incbin "data/layouts/DewfordTown/border.bin"
+
+DewfordTown_MapBlockdata:: @ 8291A34
+ .incbin "data/layouts/DewfordTown/map.bin"
+
+ .align 2
+DewfordTown_Layout:: @ 8291D54
+ .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%pyy:::$12222$1$1%ppppyyy$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$192C$1$1$1$134567$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$149292:CCCCC9292929292929292929292CC92CC92 \ 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..517522216
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_Gym_MapBorder:: @ 82CE42C
+ .incbin "data/layouts/DewfordTown_Gym/border.bin"
+
+DewfordTown_Gym_MapBlockdata:: @ 82CE434
+ .incbin "data/layouts/DewfordTown_Gym/map.bin"
+
+ .align 2
+DewfordTown_Gym_Layout:: @ 82CE824
+ .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..19ea81674
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/map.bin
@@ -0,0 +1,50 @@
+                 
+         
+          
+          )***
+          +292:22;82$222242
+'12222& ,2-2.2/2#2#2-2/2#2
+  +22
+  +2
+  +22
+ +2
+  +22
+  +2
+  +22
+ +2+22
+  72&  +22
+ +2+22
+  
+    +22
+'7252.2.2622&  
++22
+          
+ +22 
+ ,2-2/2$22
+ 
+ +2
+ +2242.2.2.2/2#2-2.2.2& 
+ +2
+ +22
+    +2
+    
+'72& +22
+    +2
+    
+   '722<  +2
+    
+    
+  +2
+    
+ ,2+2
+    
+ ,2+2+2
+    
+'12"2#2#2#2#22252.2/2$2
+    
+ '122222
+   +2
+    
+    +22 
+  '72&    
+  '82$2242&         22 \ No newline at end of file
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..c1f232111
--- /dev/null
+++ b/data/layouts/DewfordTown_Hall/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_Hall_MapBorder:: @ 82CE83C
+ .incbin "data/layouts/DewfordTown_Hall/border.bin"
+
+DewfordTown_Hall_MapBlockdata:: @ 82CE844
+ .incbin "data/layouts/DewfordTown_Hall/map.bin"
+
+ .align 2
+DewfordTown_Hall_Layout:: @ 82CE978
+ .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..04dc2e303
--- /dev/null
+++ b/data/layouts/DoubleBattleColosseum/layout.inc
@@ -0,0 +1,14 @@
+DoubleBattleColosseum_MapBorder:: @ 82E9610
+ .incbin "data/layouts/DoubleBattleColosseum/border.bin"
+
+DoubleBattleColosseum_MapBlockdata:: @ 82E9618
+ .incbin "data/layouts/DoubleBattleColosseum/map.bin"
+
+ .align 2
+DoubleBattleColosseum_Layout:: @ 82E9714
+ .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_22L2M22222M2N2222U2`2U2U2b2c2U2U2a2U222U2T2U2U2d2e2U2U2V2U222U2`2U2U2f2g2U2U2a2U222U2\2]2]2]2]2]2]2^2U22!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..f8465ad0f
--- /dev/null
+++ b/data/layouts/EverGrandeCity/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_MapBorder:: @ 828FA8C
+ .incbin "data/layouts/EverGrandeCity/border.bin"
+
+EverGrandeCity_MapBlockdata:: @ 828FA94
+ .incbin "data/layouts/EverGrandeCity/map.bin"
+
+ .align 2
+EverGrandeCity_Layout:: @ 8291394
+ .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..befca0f66
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
+ .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin"
+
+EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0
+ .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin"
+
+ .align 2
+EverGrandeCity_ChampionsRoom_Layout:: @ 82D4A44
+ .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_Corridor4/border.bin b/data/layouts/EverGrandeCity_Corridor4/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Corridor4/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_Corridor4/layout.inc b/data/layouts/EverGrandeCity_Corridor4/layout.inc
new file mode 100644
index 000000000..e21b1481d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Corridor4/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
+ .incbin "data/layouts/EverGrandeCity_Corridor4/border.bin"
+
+EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4
+ .incbin "data/layouts/EverGrandeCity_Corridor4/map.bin"
+
+ .align 2
+EverGrandeCity_Corridor4_Layout:: @ 82FFDA0
+ .4byte 0xb
+ .4byte 0x22
+ .4byte EverGrandeCity_Corridor4_MapBorder
+ .4byte EverGrandeCity_Corridor4_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
diff --git a/data/layouts/EverGrandeCity_Corridor4/map.bin b/data/layouts/EverGrandeCity_Corridor4/map.bin
new file mode 100644
index 000000000..580ae095a
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Corridor4/map.bin
@@ -0,0 +1 @@
+D     E     2222222222222222222222222222J222J222J222J222J222J222222J222J222222222J222J222222222222J222J222222222222222222222222222222 \ No newline at end of file
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..aa7d4c7ee
--- /dev/null
+++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
+ .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin"
+
+EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764
+ .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin"
+
+ .align 2
+EverGrandeCity_DrakesRoom_Layout:: @ 82D48D0
+ .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 @@
+      
+      2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222HIHI222HIHI \ 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..9dbcba92e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
+ .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin"
+
+EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8
+ .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin"
+
+ .align 2
+EverGrandeCity_GlaciasRoom_Layout:: @ 82D4744
+ .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 @@
+      
+      r2r2r2r2r2222r2r2r2r2r2v22p2s2s2s2t222wu}~22x2y2z2{2|222}222222222q22x2222|22222x2222|222222222222222222222222222222222222222222222HIHI222HIHI \ 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..fe6bfd983
--- /dev/null
+++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
+ .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin"
+
+EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4
+ .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin"
+
+ .align 2
+EverGrandeCity_HallOfFame_Layout:: @ 82FC5E4
+ .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 @@
+2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222262226 \ 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..0757ef56c
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
+ .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin"
+
+EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C
+ .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin"
+
+ .align 2
+EverGrandeCity_PhoebesRoom_Layout:: @ 82D45B8
+ .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\2HIHId2d2d2HIHI \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_PokemonLeague/border.bin b/data/layouts/EverGrandeCity_PokemonLeague/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_PokemonLeague/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc
new file mode 100644
index 000000000..268f4df65
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
+ .incbin "data/layouts/EverGrandeCity_PokemonLeague/border.bin"
+
+EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8
+ .incbin "data/layouts/EverGrandeCity_PokemonLeague/map.bin"
+
+ .align 2
+EverGrandeCity_PokemonLeague_Layout:: @ 82F2AB0
+ .4byte 0x13
+ .4byte 0xc
+ .4byte EverGrandeCity_PokemonLeague_MapBorder
+ .4byte EverGrandeCity_PokemonLeague_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_PokemonCenter
diff --git a/data/layouts/EverGrandeCity_PokemonLeague/map.bin b/data/layouts/EverGrandeCity_PokemonLeague/map.bin
new file mode 100644
index 000000000..d2acdf2dd
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague/map.bin
@@ -0,0 +1,2 @@
+  JK        "#RSI22Hs2*+2[Q$22222222P}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'22^222@2@2@202{222{232@2@2@2@2^2
+2f22@2@2@282|222|2;2@2@2@2&2f 2@2&2=>@2@2@2~2|2|22@2@2@2=>@2'2 2@242EF&2@2@2@2A2B2@2@2@2@2EF42'2 2@2@2@242@2@2@2@2@2@2@2@2@22&242@2'2(22@2@2@2@2@2@222@2@2@2@2@2@2@27 \ No newline at end of file
diff --git a/data/layouts/EverGrandeCity_ShortCorridor/border.bin b/data/layouts/EverGrandeCity_ShortCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortCorridor/border.bin
Binary files differ
diff --git a/data/layouts/EverGrandeCity_ShortCorridor/layout.inc b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc
new file mode 100644
index 000000000..cd04f317b
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_ShortCorridor_MapBorder:: @ 82D4A5C
+ .incbin "data/layouts/EverGrandeCity_ShortCorridor/border.bin"
+
+EverGrandeCity_ShortCorridor_MapBlockdata:: @ 82D4A64
+ .incbin "data/layouts/EverGrandeCity_ShortCorridor/map.bin"
+
+ .align 2
+EverGrandeCity_ShortCorridor_Layout:: @ 82D4B84
+ .4byte 0xb
+ .4byte 0xd
+ .4byte EverGrandeCity_ShortCorridor_MapBorder
+ .4byte EverGrandeCity_ShortCorridor_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_EliteFour
diff --git a/data/layouts/EverGrandeCity_ShortCorridor/map.bin b/data/layouts/EverGrandeCity_ShortCorridor/map.bin
new file mode 100644
index 000000000..75812b238
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortCorridor/map.bin
@@ -0,0 +1 @@
+DHIHI E HIHI2222222222222222222222222222222222222222222222 \ 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..10905e89b
--- /dev/null
+++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
+ .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin"
+
+EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0
+ .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin"
+
+ .align 2
+EverGrandeCity_SidneysRoom_Layout:: @ 82D442C
+ .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,2HIHI424242HIHI \ 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..d8e51258c
--- /dev/null
+++ b/data/layouts/FallarborTown/layout.inc
@@ -0,0 +1,14 @@
+FallarborTown_MapBorder:: @ 82920AC
+ .incbin "data/layouts/FallarborTown/border.bin"
+
+FallarborTown_MapBlockdata:: @ 82920B4
+ .incbin "data/layouts/FallarborTown/map.bin"
+
+ .align 2
+FallarborTown_Layout:: @ 82923D4
+ .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..08f68b6ea
--- /dev/null
+++ b/data/layouts/FallarborTown/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..5e5e77404
--- /dev/null
+++ b/data/layouts/FieryPath/layout.inc
@@ -0,0 +1,14 @@
+FieryPath_MapBorder:: @ 82FB574
+ .incbin "data/layouts/FieryPath/border.bin"
+
+FieryPath_MapBlockdata:: @ 82FB57C
+ .incbin "data/layouts/FieryPath/map.bin"
+
+ .align 2
+FieryPath_Layout:: @ 82FBFE0
+ .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..1e5bfcbd3
--- /dev/null
+++ b/data/layouts/FortreeCity/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_MapBorder:: @ 828A5AC
+ .incbin "data/layouts/FortreeCity/border.bin"
+
+FortreeCity_MapBlockdata:: @ 828A5B4
+ .incbin "data/layouts/FortreeCity/map.bin"
+
+ .align 2
+FortreeCity_Layout:: @ 828ABF4
+ .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+,-./**+,-./+,-./34567D\DHIJK3456734567**34567*3<B>B>B7PQRS3<B=B>B?BVBVB;B<B>B>B?BVBVBVB;B<B=B>B?BVBVB;B<B>B>B7XYZ[CFEFGDDCFFFGDDDCFEFGDDCFEFG0`abcMHIJMHIJM00000X2Y2Y2SSa2PQRcddddea2PQRa2SSS00000000`2a2a2a2a2a2Aa2SAa2a2a2b2000000000h2a2a2a2a2sS`2U2sa2a2a2j200000000000h2a2a2a20`2]*Sa2a2j20000000(0)0)0+00`2a2K2$%&**0111`2a2a2a2a20$%&01230`2K2+,-./0X2Y2Y2Y2Y2a2K2*Sa2a2a2+,-./89:;0`234567K2K2K2K2K2K20h2i2i234567`ABCX2a23<B=B>B?BVBVBVBVBVBVBVBVBVBVBVBVBVBVBVBNNNNVB;B<B>B>B7000X2a2a2SCFEFGDDDDDDDDDDDDDDD00X2Y2DCFEF6GX2Y2a2a2a2a2SSMHIJL2Y2a2a2S6S6S6MK2K2a2a2a2a2a2a2a2PQRHIJK2a2a2a2a2a2a2K2K2K2a2a2a2a2D\DPQRK2K2a2a2a2K2**K2K2K2K2*D\DK2K2K2 \ 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..b6cc3eba2
--- /dev/null
+++ b/data/layouts/FortreeCity_DecorationShop/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
+ .incbin "data/layouts/FortreeCity_DecorationShop/border.bin"
+
+FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC
+ .incbin "data/layouts/FortreeCity_DecorationShop/map.bin"
+
+ .align 2
+FortreeCity_DecorationShop_Layout:: @ 82EFB4C
+ .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 @@
+333333333333733337 \ 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..75c619802
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_Gym_MapBorder:: @ 82D1B54
+ .incbin "data/layouts/FortreeCity_Gym/border.bin"
+
+FortreeCity_Gym_MapBlockdata:: @ 82D1B5C
+ .incbin "data/layouts/FortreeCity_Gym/map.bin"
+
+ .align 2
+FortreeCity_Gym_Layout:: @ 82D1F44
+ .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..a8ee94ae1
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/map.bin
@@ -0,0 +1,2 @@
+ 22222202222222222232222222222"2"2"202223422222222222   32242$2 2 22222342222,2222)22"2"21222222222 (22  32322222 22)242     22#2"2$22222 222222 222222 2222222     (
+22222222 222222 2 2 2 2 2323-22222 32422222 ()2"2"2$2     2   2222 222222222222.222'2222 2"2"2022222222 2 2/22/23   3222223  22222)   )#2 2222)  222 22          %& \ No newline at end of file
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..0c604c064
--- /dev/null
+++ b/data/layouts/FortreeCity_House1/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_House1_MapBorder:: @ 82D1AD4
+ .incbin "data/layouts/FortreeCity_House1/border.bin"
+
+FortreeCity_House1_MapBlockdata:: @ 82D1ADC
+ .incbin "data/layouts/FortreeCity_House1/map.bin"
+
+ .align 2
+FortreeCity_House1_Layout:: @ 82D1B3C
+ .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 @@
+33333333333333333333733337 \ 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..2ab8ee1c3
--- /dev/null
+++ b/data/layouts/FortreeCity_House2/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_House2_MapBorder:: @ 82D1F5C
+ .incbin "data/layouts/FortreeCity_House2/border.bin"
+
+FortreeCity_House2_MapBlockdata:: @ 82D1F64
+ .incbin "data/layouts/FortreeCity_House2/map.bin"
+
+ .align 2
+FortreeCity_House2_Layout:: @ 82D1FC4
+ .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 @@
+37733333333333333333733337 \ 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..a41a08112
--- /dev/null
+++ b/data/layouts/GraniteCave_1F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_1F_MapBorder:: @ 82D7F70
+ .incbin "data/layouts/GraniteCave_1F/border.bin"
+
+GraniteCave_1F_MapBlockdata:: @ 82D7F78
+ .incbin "data/layouts/GraniteCave_1F/map.bin"
+
+ .align 2
+GraniteCave_1F_Layout:: @ 82D8464
+ .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..fed45feaa
--- /dev/null
+++ b/data/layouts/GraniteCave_B1F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_B1F_MapBorder:: @ 82D847C
+ .incbin "data/layouts/GraniteCave_B1F/border.bin"
+
+GraniteCave_B1F_MapBlockdata:: @ 82D8484
+ .incbin "data/layouts/GraniteCave_B1F/map.bin"
+
+ .align 2
+GraniteCave_B1F_Layout:: @ 82D8B04
+ .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#!#!#!#!!!!!!!#222222020222222222222222222222222222222222222222222222222>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..3ec6961df
--- /dev/null
+++ b/data/layouts/GraniteCave_B2F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_B2F_MapBorder:: @ 82D8B1C
+ .incbin "data/layouts/GraniteCave_B2F/border.bin"
+
+GraniteCave_B2F_MapBlockdata:: @ 82D8B24
+ .incbin "data/layouts/GraniteCave_B2F/map.bin"
+
+ .align 2
+GraniteCave_B2F_Layout:: @ 82D91A4
+ .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..fc036e27e
--- /dev/null
+++ b/data/layouts/GraniteCave_StevensRoom/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
+ .incbin "data/layouts/GraniteCave_StevensRoom/border.bin"
+
+GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84
+ .incbin "data/layouts/GraniteCave_StevensRoom/map.bin"
+
+ .align 2
+GraniteCave_StevensRoom_Layout:: @ 82F9C28
+ .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..11d740254
--- /dev/null
+++ b/data/layouts/Harbor/layout.inc
@@ -0,0 +1,14 @@
+Harbor_MapBorder:: @ 82D0A78
+ .incbin "data/layouts/Harbor/border.bin"
+
+Harbor_MapBlockdata:: @ 82D0A80
+ .incbin "data/layouts/Harbor/map.bin"
+
+ .align 2
+Harbor_Layout:: @ 82D0D50
+ .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[3UVVVVVVVF77VVVV222222222%222%222%22`77776*622222222222222222`77777722222222222222222`*6*6*6*677222222222222222`(6(6(6(677 \ 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..c92a5232f
--- /dev/null
+++ b/data/layouts/House1/layout.inc
@@ -0,0 +1,14 @@
+House1_MapBorder:: @ 82CDEC0
+ .incbin "data/layouts/House1/border.bin"
+
+House1_MapBlockdata:: @ 82CDEC8
+ .incbin "data/layouts/House1/map.bin"
+
+ .align 2
+House1_Layout:: @ 82CDF7C
+ .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   222222$2$2$2$29252626262626272#2#292=H6I62>2>2?2#2#292=P6Q62>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..fae098aa3
--- /dev/null
+++ b/data/layouts/House2/layout.inc
@@ -0,0 +1,14 @@
+House2_MapBorder:: @ 82CDF94
+ .incbin "data/layouts/House2/border.bin"
+
+House2_MapBlockdata:: @ 82CDF9C
+ .incbin "data/layouts/House2/map.bin"
+
+ .align 2
+House2_Layout:: @ 82CE04C
+ .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   hlm2282$2$2$2$2p2t2u2292#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#22#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..3664d8849
--- /dev/null
+++ b/data/layouts/House3/layout.inc
@@ -0,0 +1,14 @@
+House3_MapBorder:: @ 82CE36C
+ .incbin "data/layouts/House3/border.bin"
+
+House3_MapBlockdata:: @ 82CE374
+ .incbin "data/layouts/House3/map.bin"
+
+ .align 2
+House3_Layout:: @ 82CE414
+ .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 @@
+222!2!2@22222!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..35f609029
--- /dev/null
+++ b/data/layouts/House4/layout.inc
@@ -0,0 +1,14 @@
+House4_MapBorder:: @ 82CE990
+ .incbin "data/layouts/House4/border.bin"
+
+House4_MapBlockdata:: @ 82CE998
+ .incbin "data/layouts/House4/map.bin"
+
+ .align 2
+House4_Layout:: @ 82CEA4C
+ .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 @@
+22266!2!2!222!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..6d732d4f7
--- /dev/null
+++ b/data/layouts/HouseWithBed/layout.inc
@@ -0,0 +1,14 @@
+HouseWithBed_MapBorder:: @ 82D0054
+ .incbin "data/layouts/HouseWithBed/border.bin"
+
+HouseWithBed_MapBlockdata:: @ 82D005C
+ .incbin "data/layouts/HouseWithBed/map.bin"
+
+ .align 2
+HouseWithBed_Layout:: @ 82D00FC
+ .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..f32874b46
--- /dev/null
+++ b/data/layouts/InsideOfTruck/layout.inc
@@ -0,0 +1,14 @@
+InsideOfTruck_MapBorder:: @ 82EA08C
+ .incbin "data/layouts/InsideOfTruck/border.bin"
+
+InsideOfTruck_MapBlockdata:: @ 82EA094
+ .incbin "data/layouts/InsideOfTruck/map.bin"
+
+ .align 2
+InsideOfTruck_Layout:: @ 82EA0C8
+ .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..095996bc5
--- /dev/null
+++ b/data/layouts/IslandCave/layout.inc
@@ -0,0 +1,14 @@
+IslandCave_MapBorder:: @ 82F6CF8
+ .incbin "data/layouts/IslandCave/border.bin"
+
+IslandCave_MapBlockdata:: @ 82F6D00
+ .incbin "data/layouts/IslandCave/map.bin"
+
+ .align 2
+IslandCave_Layout:: @ 82F7164
+ .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/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..8679ed58d
--- /dev/null
+++ b/data/layouts/JaggedPass/layout.inc
@@ -0,0 +1,14 @@
+JaggedPass_MapBorder:: @ 82FAA8C
+ .incbin "data/layouts/JaggedPass/border.bin"
+
+JaggedPass_MapBlockdata:: @ 82FAA94
+ .incbin "data/layouts/JaggedPass/map.bin"
+
+ .align 2
+JaggedPass_Layout:: @ 82FB55C
+ .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..a87a5332e
--- /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..c75599acc
--- /dev/null
+++ b/data/layouts/LavaridgeTown/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_MapBorder:: @ 8291D6C
+ .incbin "data/layouts/LavaridgeTown/border.bin"
+
+LavaridgeTown_MapBlockdata:: @ 8291D74
+ .incbin "data/layouts/LavaridgeTown/map.bin"
+
+ .align 2
+LavaridgeTown_Layout:: @ 8292094
+ .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{tttzq22222xttttttttr{2t2|qqqNKLOq6rr2222JHIMyy0123rr2332PQRS2289:;44rr2222XYZ[55`ABC44rr`abc550 1"1044rr2222220 1"10000 1"1000rr2222220 1"1000 1"1000rrBB00 1!11111!1!1111rr22200(1)1)1)1)1)1)1)1)1)1)1rr111111000000000000rr0000 0 0
+00 0 0
+00rr0000rr000  4rr11000 !" !"4rr000000000000400004m00000000000000044qqrm0000000000000044qqllllllllllllllll \ 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..4ccf34bae
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
+ .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin"
+
+LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C
+ .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin"
+
+ .align 2
+LavaridgeTown_Gym_1F_Layout:: @ 82CED4C
+ .4byte 0xb
+ .4byte 0x18
+ .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..7f2b02f90
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin
@@ -0,0 +1,2 @@
+66666666662222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+2 2 2 2 2222222222222222222222222222222222222222222222 222 22222222222222222222222222222222222222222222222222222 2222222222(22222 \ 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..4439d7e16
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
+ .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin"
+
+LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C
+ .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin"
+
+ .align 2
+LavaridgeTown_Gym_B1F_Layout:: @ 82CEF7C
+ .4byte 0xb
+ .4byte 0x18
+ .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..035719ffe
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
@@ -0,0 +1 @@
+666666666662222222222222222222222   22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222!22!22!22)))22222222222222222222222222222222222222222222 \ 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..e16d8d26e
--- /dev/null
+++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
+ .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin"
+
+LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C
+ .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin"
+
+ .align 2
+LavaridgeTown_HerbShop_Layout:: @ 82CEB1C
+ .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 @@
+32222x2p2p2p2p22h2h2h2x2p2p2p2p2p2y2h2h2h232h2h2h2h2h2h2h2h2h22g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ 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..878764cf4
--- /dev/null
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
+ .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin"
+
+LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C
+ .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin"
+
+ .align 2
+LavaridgeTown_PokemonCenter_1F_Layout:: @ 82CF098
+ .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"#RSI2222P*+2[Q$2222 2&222X!!!Y<222'2 24222`2l2m2n2o22%222'222222021222322222'26B228292:2;2242=>'222222@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..b9dd45070
--- /dev/null
+++ b/data/layouts/LilycoveCity/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_MapBorder:: @ 828AC0C
+ .incbin "data/layouts/LilycoveCity/border.bin"
+
+LilycoveCity_MapBlockdata:: @ 828AC14
+ .incbin "data/layouts/LilycoveCity/map.bin"
+
+ .align 2
+LilycoveCity_Layout:: @ 828C514
+ .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..d17bd748d
--- /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..49b886534
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestHall/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
+ .incbin "data/layouts/LilycoveCity_ContestHall/border.bin"
+
+LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC
+ .incbin "data/layouts/LilycoveCity_ContestHall/map.bin"
+
+ .align 2
+LilycoveCity_ContestHall_Layout:: @ 82D3514
+ .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%2pq2q2q22qwBqr%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%2pq2q2q22q2qq2r%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`22222222222222f2`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`2222f2`2`2`2`2`2`2`2`2`2`2`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_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%2pq2q2q22qwBqr%2%2&f2Y2`2`2`2`2`2X2`2$%2%2pq2q2q22qwBqr%2%2&f2Q2`2Q2`2*2(2`2X2`2X2`2$%2%2pq2q2q22q2qq2r%2%2&f2`2`2`2`2`2`2`2`2$%2%2pq2q2q22q2qq2r%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%2xyy222yyz%2%2&f2Q2`2`2`2`2`2P2`2$%2%2xyy222yyz%2%2&f2I2`2I2`2*2(2`2P2`2P2`22222222222222f2Y2`2`2`2`2`2X2`22222222222222f2Q2`2Q2`2*2(2`2X2`2X2`2222f2`2`2`2`2`2`2`2`2222f2Y2`2Y2`2*2(2`2`2`2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`22_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..588aa758c
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
+ .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin"
+
+LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4
+ .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin"
+
+ .align 2
+LilycoveCity_ContestLobby_Layout:: @ 82D27CC
+ .4byte 0x17
+ .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..3d8c96b04
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/map.bin
@@ -0,0 +1 @@
+[\]:;M[\]c6debbBCbbc6debbbbT 2!2!2222222U2!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`22_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*282`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`2A2(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`292@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 \ 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..6a995c0be
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin"
+
+LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin"
+
+ .align 2
+LilycoveCity_CoveLilyMotel_1F_Layout:: @ 82FC6DC
+ .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!2222!2!2@22!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..ba54855aa
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin"
+
+LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC
+ .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin"
+
+ .align 2
+LilycoveCity_CoveLilyMotel_2F_Layout:: @ 82FC7D4
+ .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 @@
+a2!2!2!2!2!2!2!22222!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..8e6e35fdf
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin"
+
+LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStoreElevator_Layout:: @ 82F2F00
+ .4byte 0x4
+ .4byte 0x6
+ .4byte LilycoveCity_DepartmentStoreElevator_MapBorder
+ .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_BattleTower
diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
new file mode 100644
index 000000000..1b3bf23c0
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
@@ -0,0 +1 @@
+hiijpqqrxyyz\2]2]2]2d2e2e2f2d2O2W2f2 \ 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..d72a2a96b
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin"
+
+LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280
+ .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStoreRooftop_Layout:: @ 82F0430
+ .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/622J2J2J2J2J2J2M2M23VW=z'6J2J2J2J2J2J2J2J2J2^_ET2S2/622J2J2J2J2J2J2J2J2J2M2M2M2M2676J2J266J2J266J2J2J2J2J267>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..146db41fb
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin"
+
+LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_1F_Layout:: @ 82EFD60
+ .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 @@
+|}~  Px2222p2p22222x2p2p2p2p2p22h2h2h2h2h22h2h2h2n2h22g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h22g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt \ 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..e1cd81700
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin"
+
+LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_2F_Layout:: @ 82EFEA0
+ .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 22222222222222222222222222222222222m22222222222222u2234222234222222 2222222m2222222222222222u \ 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..c8f82faee
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin"
+
+LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_3F_Layout:: @ 82EFFE0
+ .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 222222C2222 22222222222222222222+,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..fbd10dea0
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin"
+
+LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_4F_Layout:: @ 82F0120
+ .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 2222222222222222222222222222222222222222222222222222222662222266662266222 22222666622222222222222222 \ 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..877794bb7
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin"
+
+LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140
+ .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin"
+
+ .align 2
+LilycoveCity_DepartmentStore_5F_Layout:: @ 82F0260
+ .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_EmptyMap/border.bin b/data/layouts/LilycoveCity_EmptyMap/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/LilycoveCity_EmptyMap/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/LilycoveCity_EmptyMap/layout.inc b/data/layouts/LilycoveCity_EmptyMap/layout.inc
new file mode 100644
index 000000000..9006217c0
--- /dev/null
+++ b/data/layouts/LilycoveCity_EmptyMap/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
+ .incbin "data/layouts/LilycoveCity_EmptyMap/border.bin"
+
+LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4
+ .incbin "data/layouts/LilycoveCity_EmptyMap/map.bin"
+
+ .align 2
+LilycoveCity_EmptyMap_Layout:: @ 82D36A8
+ .4byte 0x1
+ .4byte 0x1
+ .4byte LilycoveCity_EmptyMap_MapBorder
+ .4byte LilycoveCity_EmptyMap_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
diff --git a/data/layouts/LilycoveCity_EmptyMap/map.bin b/data/layouts/LilycoveCity_EmptyMap/map.bin
new file mode 100644
index 000000000..f70d7bba4
--- /dev/null
+++ b/data/layouts/LilycoveCity_EmptyMap/map.bin
@@ -0,0 +1 @@
+42 \ No newline at end of file
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..a5f900854
--- /dev/null
+++ b/data/layouts/LilycoveCity_House2/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_House2_MapBorder:: @ 82CF4B8
+ .incbin "data/layouts/LilycoveCity_House2/border.bin"
+
+LilycoveCity_House2_MapBlockdata:: @ 82CF4C0
+ .incbin "data/layouts/LilycoveCity_House2/map.bin"
+
+ .align 2
+LilycoveCity_House2_Layout:: @ 82CF540
+ .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 @@
+222!2!2222Y2N6O6)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..57b9802da
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin"
+
+LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin"
+
+ .align 2
+LilycoveCity_LilycoveMuseum_1F_Layout:: @ 82D2328
+ .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..4e426f5f5
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin"
+
+LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348
+ .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin"
+
+ .align 2
+LilycoveCity_LilycoveMuseum_2F_Layout:: @ 82D2584
+ .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 @@
+yyyzjklxyyyrstq2p2q2p2q2p2q2q2p2q2q2p2p2q2p2q2p2i2h2i2h2i2h2i2h2i2h2i2h2i2p2q2p2q2q2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2p2nno2h2i2h2nno2h2i2h2nno2q2XYw{2i2h2i2XYw{2i2h2i2XYw{2p2|2}2~222h2i2h2|2}2~222h2i2h2|2}2~222q2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2h2p2i2h2i2h2nno2h2i2h2nno2h2i2h2i2q2h2i2h2i2XYw{2i2h2i2XYw{2i2h2i2h2p2i2h2i2h2|2}2~222h2i2h2|2}2~222h2i2h2i2q2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2 \ 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..4c93258ae
--- /dev/null
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
+ .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin"
+
+LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534
+ .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin"
+
+ .align 2
+LilycoveCity_PokemonTrainerFanClub_Layout:: @ 82D3684
+ .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$22292#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 322#2#2#2#2#2#2222#2#2#2#2#2#2 526262626272
+hi22$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..1f71a862d
--- /dev/null
+++ b/data/layouts/LinkContestRoom1/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom1_MapBorder:: @ 82E972C
+ .incbin "data/layouts/LinkContestRoom1/border.bin"
+
+LinkContestRoom1_MapBlockdata:: @ 82E9734
+ .incbin "data/layouts/LinkContestRoom1/map.bin"
+
+ .align 2
+LinkContestRoom1_Layout:: @ 82E9880
+ .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%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%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..77a027169
--- /dev/null
+++ b/data/layouts/LinkContestRoom2/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom2_MapBorder:: @ 82E9970
+ .incbin "data/layouts/LinkContestRoom2/border.bin"
+
+LinkContestRoom2_MapBlockdata:: @ 82E9978
+ .incbin "data/layouts/LinkContestRoom2/map.bin"
+
+ .align 2
+LinkContestRoom2_Layout:: @ 82E9AC4
+ .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%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&222222222222262226 \ 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..250f1f851
--- /dev/null
+++ b/data/layouts/LinkContestRoom3/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom3_MapBorder:: @ 82E9ADC
+ .incbin "data/layouts/LinkContestRoom3/border.bin"
+
+LinkContestRoom3_MapBlockdata:: @ 82E9AE4
+ .incbin "data/layouts/LinkContestRoom3/map.bin"
+
+ .align 2
+LinkContestRoom3_Layout:: @ 82E9C30
+ .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%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ 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..f29c386a8
--- /dev/null
+++ b/data/layouts/LinkContestRoom4/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom4_MapBorder:: @ 82E9C48
+ .incbin "data/layouts/LinkContestRoom4/border.bin"
+
+LinkContestRoom4_MapBlockdata:: @ 82E9C50
+ .incbin "data/layouts/LinkContestRoom4/map.bin"
+
+ .align 2
+LinkContestRoom4_Layout:: @ 82E9D9C
+ .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%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ 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..033bc94e4
--- /dev/null
+++ b/data/layouts/LinkContestRoom5/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom5_MapBorder:: @ 82E9DB4
+ .incbin "data/layouts/LinkContestRoom5/border.bin"
+
+LinkContestRoom5_MapBlockdata:: @ 82E9DBC
+ .incbin "data/layouts/LinkContestRoom5/map.bin"
+
+ .align 2
+LinkContestRoom5_Layout:: @ 82E9F08
+ .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%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ 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..8101c42ba
--- /dev/null
+++ b/data/layouts/LinkContestRoom6/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom6_MapBorder:: @ 82E9F20
+ .incbin "data/layouts/LinkContestRoom6/border.bin"
+
+LinkContestRoom6_MapBlockdata:: @ 82E9F28
+ .incbin "data/layouts/LinkContestRoom6/map.bin"
+
+ .align 2
+LinkContestRoom6_Layout:: @ 82EA074
+ .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%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ 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..2d29b6839
--- /dev/null
+++ b/data/layouts/LittlerootTown/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MapBorder:: @ 82913AC
+ .incbin "data/layouts/LittlerootTown/border.bin"
+
+LittlerootTown_MapBlockdata:: @ 82913B4
+ .incbin "data/layouts/LittlerootTown/map.bin"
+
+ .align 2
+LittlerootTown_Layout:: @ 82916D4
+ .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 @@
+5000000000000000000000000000000000000002 2 2 2
+20000002 2 2 2
+2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000000000000000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-0000000011000&4I5'00000000110000200000000110000000000000011111111111111 \ 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..e2470e498
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin"
+
+LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin"
+
+ .align 2
+LittlerootTown_BrendansHouse_1F_Layout:: @ 82CDAEC
+ .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..e848645e5
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin"
+
+LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C
+ .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin"
+
+ .align 2
+LittlerootTown_BrendansHouse_2F_Layout:: @ 82CDB9C
+ .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..9de4bae2a
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
@@ -0,0 +1 @@
+RTPTV'   Z[Ue/b2c2x2f2]2x2222{2|2}22222222222222BB222222222222222222222 \ 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..b65b9596c
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
+ .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin"
+
+LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC
+ .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin"
+
+ .align 2
+LittlerootTown_MaysHouse_1F_Layout:: @ 82CDC84
+ .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..12b4f86c2
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
@@ -0,0 +1 @@
+nnnnno m&&CD120vwux22KL9:82222y22F22222222222@A22222252.2J2H2I26222222222222222 2!2"#$2%2222(2)2*2+2,2-22 \ 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..e732253a9
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
+ .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin"
+
+LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4
+ .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
+
+ .align 2
+LittlerootTown_MaysHouse_2F_Layout:: @ 82CDD34
+ .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..b51210332
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
@@ -0,0 +1,2 @@
+ 
+'VTPTQ/eUXYE2222]2g22`2a2222222222222222222222BB2222222222222222 \ 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..8dc767516
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
+ .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin"
+
+LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54
+ .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin"
+
+ .align 2
+LittlerootTown_ProfessorBirchsLab_Layout:: @ 82CDEA8
+ .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..0b62afcdf
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
@@ -0,0 +1,4 @@
+  <
+   
+
+ !2D"2#2>2"232"232>2>2(2*2*2A22222)2:222222222221B2'$2%2627222222?2?22/2,-,-22222224545222222=2>2>2>2222222G2?2220222222222;.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..19d906679
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/border.bin
@@ -0,0 +1 @@
+ \ 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..3aa438e2f
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_1F_MapBorder:: @ 82FFDB8
+ .incbin "data/layouts/MagmaHideout_1F/border.bin"
+
+MagmaHideout_1F_MapBlockdata:: @ 82FFDC0
+ .incbin "data/layouts/MagmaHideout_1F/map.bin"
+
+ .align 2
+MagmaHideout_1F_Layout:: @ 8300450
+ .4byte 0x1c
+ .4byte 0x1e
+ .4byte MagmaHideout_1F_MapBorder
+ .4byte MagmaHideout_1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
diff --git a/data/layouts/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin
new file mode 100644
index 000000000..52c2d57eb
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/map.bin
Binary files differ
diff --git a/data/layouts/MagmaHideout_B1F/border.bin b/data/layouts/MagmaHideout_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MagmaHideout_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_B1F/layout.inc b/data/layouts/MagmaHideout_B1F/layout.inc
new file mode 100644
index 000000000..9bc8f8860
--- /dev/null
+++ b/data/layouts/MagmaHideout_B1F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_B1F_MapBorder:: @ 8300468
+ .incbin "data/layouts/MagmaHideout_B1F/border.bin"
+
+MagmaHideout_B1F_MapBlockdata:: @ 8300470
+ .incbin "data/layouts/MagmaHideout_B1F/map.bin"
+
+ .align 2
+MagmaHideout_B1F_Layout:: @ 8301010
+ .4byte 0x3e
+ .4byte 0x18
+ .4byte MagmaHideout_B1F_MapBorder
+ .4byte MagmaHideout_B1F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
diff --git a/data/layouts/MagmaHideout_B1F/map.bin b/data/layouts/MagmaHideout_B1F/map.bin
new file mode 100644
index 000000000..b423ca1a9
--- /dev/null
+++ b/data/layouts/MagmaHideout_B1F/map.bin
@@ -0,0 +1,95 @@
+ 01!2
+012!!!!!!!3333
+
+!!!
+STST8292)22)22
+82922)22)2)2)2)2)2)2)27777//
+
+)2)2)2
+
+!2[\01!!
+2[\
+)2(2(2(2(2(2
+)2(2(2(2(22A2B222(2(2*2*27777
+
+72(227
+
+)22)22cd8292)2)2
+'2)22cd
+)2(2(2(2(2(2
+)2(2(2(2(22IJ2(2(2(2(2*2*2*2*2
+
+)2*22(2(2*2*27
+
+)2(2(2(2k2l2(22(2(2
+/2(2(2k2l2
+)2(2(2(22(2
+)2(2(2(2(222222(2(2(22(2(2(2(2
+
+)22(2(22(2(22(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(22(2(2
+/62(2(2(2(2
+)22IJ2
+vq0q0q0q0q0q0q0w
+  2Y2Y2Y2Y2Y2Y2Y2Y2Y2 )222(2(2(2
+)222222
+$#$!!
+001!3333
+
+~yyyyyyy
+)2(2(2(2(2(2
+)2(2(2(2(2(2
+77333
+828292)2
+
+)22(2(22(2(22(2
+ !!!!!!!!!!  2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2 3333333
+)2(2(2(2*2*2
+
+mmmmmmmo
++,-.333333332
+)2(22(2(22*2*2
+
+vq0q0q0q0q0q0q0w
+
+345601
+0011!! 333333333  2Y2Y2Y2Y2Y2Y2Y2 
+~yyyyyyy
+
+;<=>8292
+82829292)2)2
+)22(2(22(2(22(2
+
+CDEF)22
+)2(22(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)22(2  2Y2Y2Y2Y2Y2Y2Y2Y223222222222222(2(2
+
+~yyyyyyy
+
+)2)2)2)2(2(2  2A2B222@2B2332(2(2
+
+)22(2(22(2(22(2
+
+)2(2(2(233
+!!!!!!!!! 2IJ22HJ2(2(2
+  2Y2Y2Y2Y2Y2Y2Y2Y2 
+)2(233
+)2)2)2)2)2)2)2)2)222222222222222(22
+
+3377(2(2
+)2(22(2(2(2(2(2(2(22222222222222(2(2
+ !!!!!!!!!  7777  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  !!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_B2F/border.bin b/data/layouts/MagmaHideout_B2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/MagmaHideout_B2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/MagmaHideout_B2F/layout.inc b/data/layouts/MagmaHideout_B2F/layout.inc
new file mode 100644
index 000000000..b245f7b91
--- /dev/null
+++ b/data/layouts/MagmaHideout_B2F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_B2F_MapBorder:: @ 8301028
+ .incbin "data/layouts/MagmaHideout_B2F/border.bin"
+
+MagmaHideout_B2F_MapBlockdata:: @ 8301030
+ .incbin "data/layouts/MagmaHideout_B2F/map.bin"
+
+ .align 2
+MagmaHideout_B2F_Layout:: @ 8301690
+ .4byte 0x22
+ .4byte 0x18
+ .4byte MagmaHideout_B2F_MapBorder
+ .4byte MagmaHideout_B2F_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Facility
diff --git a/data/layouts/MagmaHideout_B2F/map.bin b/data/layouts/MagmaHideout_B2F/map.bin
new file mode 100644
index 000000000..68afb0063
--- /dev/null
+++ b/data/layouts/MagmaHideout_B2F/map.bin
@@ -0,0 +1,49 @@
+ST|}~|}~ [\012
+!!23456!!3456!!!
+cd82922)22
+)2)22)22;<=>)2)2;<=>)2)2)2
+
+2! k2l22(2(2(2(2
+)2(2(2(2(2CDEF(2(2CDEF2(2(2
+
+'2)22)22)2(2(2(2(2(2(2
+)2(2(2(2(2KLMN(2(2KLMN22(2
+
+/(2(2(2(22A2B222(2(2(2
+)222(2(2(2UV2(2(2(2UV2(2(2(2
+
+/(2(2(2(22IJ2(2(2(2
+)222(2(2(2(2(2(2(2*2*22(2(2(2
+
+)2(2(2(2(222222(2(2(2
+)2:22(2(2(2(2(2(222(222(2(2
+
+)2(2(2(2(222222(2(2(2
+)2*2*22(2(2(2(2(2(2(222(2
+  2Y22Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2Y22(2(2:22(2
+(2(2*2*22*2*22(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(22(2)2(22(2(2(2(2(2(2(2(2(2(2(2
+)22
+)2(2(2(2(2(2(2(2(2(2 iiiiiiiiiiii^ !!!
+
+)2(2
+)2(2(2(2piiiif22)2)2)2
+
+)2(2 )2(2(2(2`pppppVVVVVVb2(22(2
+
+)2(2)2(2(2(2`ppppppVVVVVGGGGGVb2(2(2(2
+
+)2(2 )2(2(2(2xpppVVVGGGGGGGGGGVb2(2(2(2
+
+)2(22)2(2(2(2*2pVVGGGGGGGGGGGGGVb2(2(2(2
+
+)2(2(2(2(2(2(2VGGGGGGGGGGGGGGGVb2(2(2(2
+  2Y2Y2Y2Y2Y22`VGGGGGGGGGGGGGGGVb{3(2(2(2 `VGGGGGGGGGGGGGGGVb !!!!!! hiiiiiiiiiiiiiiiiiiij !!!  \ 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..a40712576
--- /dev/null
+++ b/data/layouts/MauvilleCity/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_MapBorder:: @ 8288C6C
+ .incbin "data/layouts/MauvilleCity/border.bin"
+
+MauvilleCity_MapBlockdata:: @ 8288C74
+ .incbin "data/layouts/MauvilleCity/map.bin"
+
+ .align 2
+MauvilleCity_Layout:: @ 82892B4
+ .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..b4f7c402f
--- /dev/null
+++ b/data/layouts/MauvilleCity_BikeShop/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
+ .incbin "data/layouts/MauvilleCity_BikeShop/border.bin"
+
+MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34
+ .incbin "data/layouts/MauvilleCity_BikeShop/map.bin"
+
+ .align 2
+MauvilleCity_BikeShop_Layout:: @ 82D100C
+ .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..7393c3274
--- /dev/null
+++ b/data/layouts/MauvilleCity_GameCorner/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_GameCorner_MapBorder:: @ 82D1024
+ .incbin "data/layouts/MauvilleCity_GameCorner/border.bin"
+
+MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C
+ .incbin "data/layouts/MauvilleCity_GameCorner/map.bin"
+
+ .align 2
+MauvilleCity_GameCorner_Layout:: @ 82D1210
+ .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..9e8004009
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_Gym_MapBorder:: @ 82D0D68
+ .incbin "data/layouts/MauvilleCity_Gym/border.bin"
+
+MauvilleCity_Gym_MapBlockdata:: @ 82D0D70
+ .incbin "data/layouts/MauvilleCity_Gym/map.bin"
+
+ .align 2
+MauvilleCity_Gym_Layout:: @ 82D0F14
+ .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..73847264c
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/map.bin
@@ -0,0 +1,3 @@
+&'666622222222222222222 2!22222@() 222222H22222 222232P62232222:2;2C:2;2@22 222222H 2 2222Q2 2!2P622()2222222 2222222222222222
+222
+222222222222222222 \ No newline at end of file
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..131e63ec0
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_1F_1R_MapBorder:: @ 82D565C
+ .incbin "data/layouts/MeteorFalls_1F_1R/border.bin"
+
+MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664
+ .incbin "data/layouts/MeteorFalls_1F_1R/map.bin"
+
+ .align 2
+MeteorFalls_1F_1R_Layout:: @ 82D603C
+ .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..bcfb05fd2
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/map.bin
@@ -0,0 +1 @@
+4deDDDLDDDDDDDDDDDDDDdeDDDDfg<4lmDDDTDDDDDDfgDDDDDDlmDDDDno<4tuDDD\DDEFGDnoDDDDDDtuDDDDno<42222242DMN2ODvwDDD<22222242vw<42222 242222242(<222222422<422222?2>2>2>2>2?2ppp(<222222?222<42222422ppp(<222224222<42222?2pppppppp(<2222242222<4>2>2>2?2ppppppppp(=2>2>2>2>2?2222<46666>272yppppppx5262>2>2>2<4deDDDD/.DDfgDDDdeD2D<4lmDDDD/.DDnoDDDlmD2D<4tuDDDD/.LDnoDDDtuD2D<42242DD/.TDnoDD<2222<42242*D/LLLLLLLL.\DvwD(<22222<4>2>2?2*TTTTTTTTZ[22((=2>2>2>2>2<422ppppppppppXY(<4>2>2>2?2pppp8pBqBqBqBqBrB9pp(<BBBBB<42pppx(<BBBBB4B`BaaabB<BBBBBB<42222ppp<B4BhBiiijB=B3}~<42222222222222(<B4B*q0(<<4222222222222(<B4B*p((=>>><42>2>2>2>2>2>222222(=B?B*pp(01111<4>2?2LDD2Dde<2222272yp011111<4fgTDD2Dlm=2>2>2?2DLDD/.DDDDD<4no\)2)2)2)2tu.DDD/DTDD/.DDDDD<4vw)2)2)2)2)2)2)2.DDD/\DD/.DDDDL<4)2)2)2)2)2)2)2)2)2)2)2)2)2)2*DD/.DEFGT<4)2)2)2U2V2W2)2)2)2)2)2)2**D/.DMN2O\<411]^_1111212**/LLL.<2222<4*)2U2W2U2V2V2W2)2)2)2)2)2***TTT(<222<42]_]^^_112112**ppp(<2222<41U2V2V2V2W2U2W2)2)2)2)**ppp(<2222<41]^^^_]_121112*ppp(<2222<4*U2W2U2V2V2W2U2V2W2)2)2)2)2*ppp(<2222<4*]_]^^_]^_)222)22pPQ(=222<4*U2V2V2V2W2U2V2V2W2)222)2*pXY0=2>2<4*]^^^_]^^_21112pppp0111<4*)2)2)2)2)2)2)2)2)2)2)2)2)2pppppZ[<42)2)2)2$2)2)2)2)2)2)2)2)26)2ppppPQppXY<4XXYHIJY")2)2)2)2)2)26ppppXYpppp<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..aacce1de4
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_1F_2R_MapBorder:: @ 82D6054
+ .incbin "data/layouts/MeteorFalls_1F_2R/border.bin"
+
+MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C
+ .incbin "data/layouts/MeteorFalls_1F_2R/map.bin"
+
+ .align 2
+MeteorFalls_1F_2R_Layout:: @ 82D67DC
+ .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..cea93a39b
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/map.bin
@@ -0,0 +1,2 @@
+>>>>>>>>>>>>>>4111111111111<4222222222222(=>>>>?22222222222201111=>>>>>>>>?2>2>2>2>2>2U2V2V2W2U2W2=>>01111111111212111]^^_]_11=>>>>>11111112>2>2>2>2>2U2W2U2V2V2V2W2=01111114112111]_]^^^_1111<>>>>?*>2>2>2>2>2U2V2W2U2W2U2V2V2W2=>>(<4111121211]^_]_]^^_11(<4*11112>2>2>2U2W2U2V2V2W22U2V2V2W2=((=>4**4111121]_]^^_]^^_(01<4**?2222222U2V2V2W2222222011(<4**2222222]^^_2U2W2U2V2W2=>((<4** 22222U2V2V2W2222]_]^_1((<4**2222]^^_2222222(((<4**
+2222222<42U2W2U2V2V2W2(((<4**>?2222U2V2W2=?2]_]^^_(((<4**?22]^_2222222(((<4**?22222222222222222(((<4**22 2222222222222222(((<4**22222Z[22222222223(<4**pXY222222(<(<4**pppppPQpppp2222 22((34**dQppPQXYpppp222222(((<4**lYPQXYpppppp222222(((<4**pXYppppp6262622223((<4**pppppppp222222(<((<4**pp626262626262222222(<3(<4**pp222222222222(<(<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..e5aef8279
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
+ .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin"
+
+MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC
+ .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin"
+
+ .align 2
+MeteorFalls_B1F_1R_Layout:: @ 82D7098
+ .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*2222222222p(((<4*BBBBBB*p(((<4*BBBBBB*ppppppppppp((=4*BBRRR
+*ppppppppppp((0<4*BB<R4R*ppppppppppp0(<4*BB<R R4R*pppBqBqBqBqBpp0((<4*BB<RR4R*px(<B
+*yp((<4*BB=R>R?R*p(<B=?*pp(<4*BB1*p(<Bc*pp(<4*BBB211p(<BBB BB*pp(<4*BBB222p(<BBBBB*pp(<4*BBB222pp(<BBBBB*pp(<4*BBB222pp(<BBBB*pp(<4*BBBBBBkBzBqBqBzBkBBBB12pp(<4*BBBBBBBBBBBBBBB*pp(<4*6RRRRRRRR
+BBBBB>BB*pppp(<4*RRRRRR4RBBBBB12pppp(<4R RRRRR>R?RBBBBB*pppp(<4RRR4RBBBBB*pppppp(<4RRRR4RBBBBBBB*pppppp(<4RRRR4RBBBBBBB2pppppxk(<6
+B*ppppx(<(<R4
+*ppppp(<(<R4*ppppp(<(<R4*ppppp(<R4*ppppp(<<R4*ppppp(<<R4*ppppp(<<R4*2222222<<R4*222222<<R4*222222<<R66}~ \ 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..8d6f7041a
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
+ .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin"
+
+MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8
+ .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin"
+
+ .align 2
+MeteorFalls_B1F_2R_Layout:: @ 82D7244
+ .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/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..33ebb078e
--- /dev/null
+++ b/data/layouts/MossdeepCity/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_MapBorder:: @ 828C52C
+ .incbin "data/layouts/MossdeepCity/border.bin"
+
+MossdeepCity_MapBlockdata:: @ 828C534
+ .incbin "data/layouts/MossdeepCity/map.bin"
+
+ .align 2
+MossdeepCity_Layout:: @ 828DE34
+ .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..29b167286
--- /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..c569215c5
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
+ .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin"
+
+MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88
+ .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin"
+
+ .align 2
+MossdeepCity_GameCorner_1F_Layout:: @ 82FEB38
+ .4byte 0xb
+ .4byte 0x8
+ .4byte MossdeepCity_GameCorner_1F_MapBorder
+ .4byte MossdeepCity_GameCorner_1F_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
new file mode 100644
index 000000000..bad63f412
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
@@ -0,0 +1,2 @@
+0no
+2  hvw22$2$2$2$2$282p2~2292#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#292#2#2#2#2#2#2#2#2"2"292#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..1ab9e6129
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
+ .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin"
+
+MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58
+ .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin"
+
+ .align 2
+MossdeepCity_GameCorner_B1F_Layout:: @ 82FEC30
+ .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$2692#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#22#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..0d999df58
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_Gym_MapBorder:: @ 82D36C0
+ .incbin "data/layouts/MossdeepCity_Gym/border.bin"
+
+MossdeepCity_Gym_MapBlockdata:: @ 82D36C8
+ .incbin "data/layouts/MossdeepCity_Gym/map.bin"
+
+ .align 2
+MossdeepCity_Gym_Layout:: @ 82D3B78
+ .4byte 0x14
+ .4byte 0x1e
+ .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..cd6eb09f9
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/map.bin
@@ -0,0 +1,50 @@
+@@@@@@@@@@@@@@@@@@@@HHHHHHHHHHHHHHHHHHHH222222 2 2 2 2 2 2 2 2 22222-2222222222222
+2(22222-222222222222 
+2(22222-22222 2222222(
+2(2222222&2%F*2E&2&2&2&22-2282(.2B B B B B B B1 B B B B B/2-2222(.2=7557>226'2G6 /2-2222#4?2,2,2?24
+24,2?24  -22222(2(8222(
+2(22(
+2(-22222(202222(
+2(22(
+2(6662
+2(2662
+2(
+2#
+2(-2&2&2+2*2E+2E&2&2+2*2E*2&2&22(
+2(O2BB))B)BBB))B)BB/20
+2(O2 G32226326G3222622G/28
+2(O2 ?22
+2424?22
+24
+2?2222( 
+2 2
+2(2(222
+2(
+2 2222
+2((
+2(2
+2(20222
+2#2
+2((
+2(2
+2(22222222222 
+2((
+2(2
+2022222222222(
+2((
+202
+2 2 2 22
+2((
+2222222222222222(
+2((22 2 2 2 2 2 2 2 2 2 2 2 2 2(
+2((
+22228222222222(2(
+2((
+2 22222222222202(
+2((
+2(2222<2222<2222 2 2(
+2((
+2#D222D$
+2((
+2 2 2 2 2 2;2222;2222222
+2(022222222!"222222220 \ 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..97248346a
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin"
+
+MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin"
+
+ .align 2
+MossdeepCity_SpaceCenter_1F_Layout:: @ 82F6280
+ .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..46c85be57
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin"
+
+MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0
+ .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin"
+
+ .align 2
+MossdeepCity_SpaceCenter_2F_Layout:: @ 82F63E0
+ .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..ec6c7cc3e
--- /dev/null
+++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
+ .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin"
+
+MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4
+ .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin"
+
+ .align 2
+MossdeepCity_StevensHouse_Layout:: @ 8304284
+ .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     ii22p2$2$2$2$2$2$2q2q292#2#2#26666#2#2[392#2#2#26666#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..ca97f1797
--- /dev/null
+++ b/data/layouts/MtChimney/layout.inc
@@ -0,0 +1,14 @@
+MtChimney_MapBorder:: @ 82DA25C
+ .incbin "data/layouts/MtChimney/border.bin"
+
+MtChimney_MapBlockdata:: @ 82DA264
+ .incbin "data/layouts/MtChimney/map.bin"
+
+ .align 2
+MtChimney_Layout:: @ 82DB114
+ .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..09eb5a906
--- /dev/null
+++ b/data/layouts/MtChimney/map.bin
@@ -0,0 +1 @@
+h~qpqqpqpqrrrq2rx|q2{zppppqrrqqqrqqpqqpqqpqpqrrr{z|xtz{~6ppppqrrqqqrqqpqh~qqph~qrrrr{yyyqppppqrrqqqrq{pqpqqqppqqrrrrh~pppqrrqq{zqrpqpqqqppqqrrrrph~pxtzrqqrqqrpqpqqqppq{zrrr~pph~2q2q2q2rqqrqqrpqpqqqpxtzq22227qpppq2q2q2q2rq{zqqrpqpqqqpq2q2q2q2q2q2q2q2h~ppq2q2q2q2rqrqq{zpqpqqqpq2q2q2q2{tttpqppq2q2q2q2rqrqqrqpqx|qqpq2q2q2q2rrr~~h~pq2q2q2{zqrq{zqx|qpqqphijq2rrpqh~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{ttttt2ttz{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{ttt2z{tz{{zqq{qqqx|q2pq6pqqqqxtt|xtttzq2q2q2q2{zq2q2r6r{ttzqqqqx|t|xttttt|qxtttttttt2zq2q2q2rqrrq2q262qqqqp66qpqqqqqqxtttttt|q2q2q2q2q2q2q2q2r{rq6qq6qqqqxtt|pqq2qqpq2q2q2q2q2{ttzr6r22{tt|qqqqqqppqq2qqq2&2'2!2!2"2q2q2xttt2tzq2q2q2r{z6r2qxtt|qqqppq22q&2.6/))*Z2Z2Z2Z2Z2Z2Z2Z2T2S2q2{zr26{z2tt|pqqqppq6q-67112q2q2q2q2q2q2q2q2\2[2R2Qq2r6{z266qqpxt|2pxt|62->?9:%q2q2q2q2q2q2q2q2d6q2q2YRQqrq6{|qxt|pt||5FGABWq2q2q2q2q2q2q2q2q2q2q2rqYRQq{z6pq2qpp66qpp22q2q2q2q2q2q2q2q24q2q2q222q2rqrqYRQ{tp22pxt|qp6p666q2q2q2q2q2q2q2q2q2q2q2q266{z{2rqYPap66t|p2x|pqq2q2q2q2{z{6r2rrYx|66qppqpt|q2q2q2q2q2q2q2q2q2q2{z{z66{zrrrqt|qpp6qp66qt6226ttz{z2q2q2rq26rrrq66qp2px|2|6277226{zq26{zq2{zrrtt|qpx|p666|776rq2q2{z2q2rq2rr22p2pqpt|p{z22rq2q2r2rrpp2p6q6p6p6r2r2662rrrpp6xtt|x|x|6r6r22rrr \ 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..c39f56fa2
--- /dev/null
+++ b/data/layouts/MtPyre_1F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_1F_MapBorder:: @ 82DB12C
+ .incbin "data/layouts/MtPyre_1F/border.bin"
+
+MtPyre_1F_MapBlockdata:: @ 82DB134
+ .incbin "data/layouts/MtPyre_1F/map.bin"
+
+ .align 2
+MtPyre_1F_Layout:: @ 82DB478
+ .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 @@
+22222&7&722222222222662666266'7222266266626622222222226622222222222222222222666266&7622222666266&762222222222222662222222222266222222222&7622662222266&7622662222266222222222222 \ 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..8b68101c9
--- /dev/null
+++ b/data/layouts/MtPyre_2F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_2F_MapBorder:: @ 82DB490
+ .incbin "data/layouts/MtPyre_2F/border.bin"
+
+MtPyre_2F_MapBlockdata:: @ 82DB498
+ .incbin "data/layouts/MtPyre_2F/map.bin"
+
+ .align 2
+MtPyre_2F_Layout:: @ 82DB5EC
+ .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..628d2262e
--- /dev/null
+++ b/data/layouts/MtPyre_2F/map.bin
@@ -0,0 +1 @@
+22222222&&2222&2222222222&2222222&222222222222222222222222222&222222&2222232222222222222&22222&22222 \ 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..459fae9e7
--- /dev/null
+++ b/data/layouts/MtPyre_3F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_3F_MapBorder:: @ 82DB604
+ .incbin "data/layouts/MtPyre_3F/border.bin"
+
+MtPyre_3F_MapBlockdata:: @ 82DB60C
+ .incbin "data/layouts/MtPyre_3F/map.bin"
+
+ .align 2
+MtPyre_3F_Layout:: @ 82DB760
+ .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..fabbe8cb3
--- /dev/null
+++ b/data/layouts/MtPyre_3F/map.bin
@@ -0,0 +1 @@
+22&2222&&&2222&&2222222222222222222&222222&222222222222222222222&222&2222222222222222222222222323 \ 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..97363cb82
--- /dev/null
+++ b/data/layouts/MtPyre_4F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_4F_MapBorder:: @ 82DB778
+ .incbin "data/layouts/MtPyre_4F/border.bin"
+
+MtPyre_4F_MapBlockdata:: @ 82DB780
+ .incbin "data/layouts/MtPyre_4F/map.bin"
+
+ .align 2
+MtPyre_4F_Layout:: @ 82DB8D4
+ .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&&222&'&2222002200&222&&&&&222&&2222222222222222222222&226223222&22222&232222222222 \ 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..252899515
--- /dev/null
+++ b/data/layouts/MtPyre_5F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_5F_MapBorder:: @ 82DB8EC
+ .incbin "data/layouts/MtPyre_5F/border.bin"
+
+MtPyre_5F_MapBlockdata:: @ 82DB8F4
+ .incbin "data/layouts/MtPyre_5F/map.bin"
+
+ .align 2
+MtPyre_5F_Layout:: @ 82DBA48
+ .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&222&2&2222222&222&&&&&222&&2222222222222222222222&2222222226223&222222222&222222222223 \ 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..46c419157
--- /dev/null
+++ b/data/layouts/MtPyre_6F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_6F_MapBorder:: @ 82DBA60
+ .incbin "data/layouts/MtPyre_6F/border.bin"
+
+MtPyre_6F_MapBlockdata:: @ 82DBA68
+ .incbin "data/layouts/MtPyre_6F/map.bin"
+
+ .align 2
+MtPyre_6F_Layout:: @ 82DBBBC
+ .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..54f599ec2
--- /dev/null
+++ b/data/layouts/MtPyre_6F/map.bin
@@ -0,0 +1 @@
+2&222&&222222&22222226622222222262222&2222226622222&22&&272&&22&22222222222232222222222222222222222&2222222 \ 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..09cfeaecf
--- /dev/null
+++ b/data/layouts/MtPyre_Exterior/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_Exterior_MapBorder:: @ 82FC8C0
+ .incbin "data/layouts/MtPyre_Exterior/border.bin"
+
+MtPyre_Exterior_MapBlockdata:: @ 82FC8C8
+ .incbin "data/layouts/MtPyre_Exterior/map.bin"
+
+ .align 2
+MtPyre_Exterior_Layout:: @ 82FD7EC
+ .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..b587bdee8
--- /dev/null
+++ b/data/layouts/MtPyre_Summit/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_Summit_MapBorder:: @ 82FD804
+ .incbin "data/layouts/MtPyre_Summit/border.bin"
+
+MtPyre_Summit_MapBlockdata:: @ 82FD80C
+ .incbin "data/layouts/MtPyre_Summit/map.bin"
+
+ .align 2
+MtPyre_Summit_Layout:: @ 82FE680
+ .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/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..f86a45691
--- /dev/null
+++ b/data/layouts/NewMauville_Entrance/layout.inc
@@ -0,0 +1,14 @@
+NewMauville_Entrance_MapBorder:: @ 82E57B4
+ .incbin "data/layouts/NewMauville_Entrance/border.bin"
+
+NewMauville_Entrance_MapBlockdata:: @ 82E57BC
+ .incbin "data/layouts/NewMauville_Entrance/map.bin"
+
+ .align 2
+NewMauville_Entrance_Layout:: @ 82E5860
+ .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||||ut2suu33333suu33333suu33333suu33333suu33333suslllllll \ 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..25aa29e7d
--- /dev/null
+++ b/data/layouts/NewMauville_Inside/layout.inc
@@ -0,0 +1,14 @@
+NewMauville_Inside_MapBorder:: @ 82E5878
+ .incbin "data/layouts/NewMauville_Inside/border.bin"
+
+NewMauville_Inside_MapBlockdata:: @ 82E5880
+ .incbin "data/layouts/NewMauville_Inside/map.bin"
+
+ .align 2
+NewMauville_Inside_Layout:: @ 82E65A4
+ .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 @@
+hjhjp'''''rp''rpu222u2/2/26/22222u2226u22266rp}22727272726727222'''''''}222266}26666}2266rp}2'''''''}22/2/2/2/2/26/2/2/2~22222/2~26666}222/2rh}2jp}22727272727267272222222222/2/2/2~2222rp'}2rp}2''''''''}22222222>22222rpu22/2~2222rh}2jp}22222222222ry2o2222o272p}2'rxy27272727272727272727272727272zp'w}2w'rp2/2~22/222r'''''''''''''''pu2/2/2~22/2/2rp}262222.22rp}2.2222622rxy2727272727272zy2722227272'''''''p}2''rhjp66u2~22/2/2rp''''rp66}22222rpu222u2/2222u26622rpu2/2~22222}22222222}266}22rp}222222'}22222222}22/2~22rp2222222/26/2~222222222~2222.2rpX6266222726222272727272272o27272o272pX62222''}22'''''w''ry2o272o272o272p}222/2/2/2/2u2/2/2/222rp'w'wwrp}22226222}222222`''ajpu2/2/2/22/22rp}222222}222222'u222/222'''rp}2227222272722222222/26/2~2222222/2/2/2rp6222''}2'}22222726222222227222rp2622222/26/2/2/2/2~2222u2/2~2222''}222222'}2rp2222227262222222}222222rxy27272727272zp}2rp222''}222222~222222r''''''p}2rxy222227272zxy272727272727272727272727272zp}2r'}22''''''''''''''''p}2rp}22rp}2rp}22rhjh\n]p}2rp}22rp'rpv2a}2rp}2222u22222222/2/2/222}2rp}22'''}22}2222'''}22222222226/2~2rp}222/22222/2/2/2~22}2.2222/26/2/2/2~22222o2727272267272zxy27272727272727272722222~22222726727222222w''''''''''''''}2222222''''}222622/222/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..621c4bd0d
--- /dev/null
+++ b/data/layouts/OldaleTown/layout.inc
@@ -0,0 +1,14 @@
+OldaleTown_MapBorder:: @ 82916EC
+ .incbin "data/layouts/OldaleTown/border.bin"
+
+OldaleTown_MapBlockdata:: @ 82916F4
+ .incbin "data/layouts/OldaleTown/map.bin"
+
+ .align 2
+OldaleTown_Layout:: @ 8291A14
+ .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..e6ff2362e
--- /dev/null
+++ b/data/layouts/OldaleTown/map.bin
@@ -0,0 +1 @@
+01101110000011110000000011110(0)0)000l2m2m2n2111100123000tuuv1111189:;000|}~11111`ABC00011111111110001111000111111100111111001111111020111111100011111100211111111111111110110001111111111000000H0I02211111l2m2m2n2000PQRS11110tuuv110XYZ[11110|}~0`abc1111000011111000011000111110000111x211111111 \ 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..c2be2f4cf
--- /dev/null
+++ b/data/layouts/PacifidlogTown/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_MapBorder:: @ 829272C
+ .incbin "data/layouts/PacifidlogTown/border.bin"
+
+PacifidlogTown_MapBlockdata:: @ 8292734
+ .incbin "data/layouts/PacifidlogTown/map.bin"
+
+ .align 2
+PacifidlogTown_Layout:: @ 8292D74
+ .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|}{}pppppuv 
+  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{{{{qqqqkllqqqqqlllmqqkllqqqqqqqqqqqqllqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ 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..b09e191ca
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House1/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_House1_MapBorder:: @ 82CF6AC
+ .incbin "data/layouts/PacifidlogTown_House1/border.bin"
+
+PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4
+ .incbin "data/layouts/PacifidlogTown_House1/map.bin"
+
+ .align 2
+PacifidlogTown_House1_Layout:: @ 82CF768
+ .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 @@
+3333373333333333333333333333733333333333333333733333333373333337 \ 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..ecb3d28f0
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House2/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_House2_MapBorder:: @ 82CF780
+ .incbin "data/layouts/PacifidlogTown_House2/border.bin"
+
+PacifidlogTown_House2_MapBlockdata:: @ 82CF788
+ .incbin "data/layouts/PacifidlogTown_House2/map.bin"
+
+ .align 2
+PacifidlogTown_House2_Layout:: @ 82CF83C
+ .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 @@
+3333333333733333333373333333333333333333333333333333333373333337 \ 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..76cb0186f
--- /dev/null
+++ b/data/layouts/PetalburgCity/layout.inc
@@ -0,0 +1,14 @@
+PetalburgCity_MapBorder:: @ 8287264
+ .incbin "data/layouts/PetalburgCity/border.bin"
+
+PetalburgCity_MapBlockdata:: @ 828726C
+ .incbin "data/layouts/PetalburgCity/map.bin"
+
+ .align 2
+PetalburgCity_Layout:: @ 8287974
+ .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 @@
+UNMNMNVD   
+F000LL55T  L??0 !"LLL001100LLL00 1"100LLL00 1"10<2fL111L5500 1"1deT0011101T00000P2Q2XY0000 1"1000000 1!1"110000000123550000 1"1000000 1!1"1000000089:;001111!1!1111111!1!1"10000000`ABC11(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110000000 1"100PQRS00 1"10000000 1"100XYZ[00 1"1050 0 0
+000 1"10`abc00 1"100000 1!111111111!1!1100 00 1!1)1)1)1)1)1)1)1)1)1)1*10055 !"00 1"1000000000111100020000 1"10<2=2=2=2=2=2=2>200000000 1"10D  
+EEF00000000 1"10LL110 1"10T L0 1"100 !"00L0 1!111111000L0(1)1)1)1)1)1*1000T11111111111100001111 \ 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..9e5eb5509
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+PetalburgCity_Gym_MapBorder:: @ 82CF854
+ .incbin "data/layouts/PetalburgCity_Gym/border.bin"
+
+PetalburgCity_Gym_MapBlockdata:: @ 82CF85C
+ .incbin "data/layouts/PetalburgCity_Gym/map.bin"
+
+ .align 2
+PetalburgCity_Gym_Layout:: @ 82D003C
+ .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..665783c7b
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/map.bin
@@ -0,0 +1,10 @@
+xyz{
+    222222222 222222222 222(2)2*2222 222021222222 2228292:2222 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 222222222 222222222 2@222222@22 2H6+22222H6+2 22322222232 \ 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..47192ac1a
--- /dev/null
+++ b/data/layouts/PetalburgWoods/layout.inc
@@ -0,0 +1,14 @@
+PetalburgWoods_MapBorder:: @ 82D91BC
+ .incbin "data/layouts/PetalburgWoods/border.bin"
+
+PetalburgWoods_MapBlockdata:: @ 82D91C4
+ .incbin "data/layouts/PetalburgWoods/map.bin"
+
+ .align 2
+PetalburgWoods_Layout:: @ 82DA244
+ .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 0IIII000001111 0 0 000000000000005555 0 0 0000000000000000 0 0000000 0 0 0 04000000 0 0000000 0 0 0000 0 0 0 0 0 00000000 0 0 00111111 0 0000000 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0555555 0 0 000000000 0 0 0 0 0111111000011111111111111110000 0 00 0 0 05555550000555555555555555000 0 0 000000000100 0 0 00000500 0 0 0000 00000010 0 0 00 0 0 0 0 0 00000000000000000050 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0000000000 0 0 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000000 011111111000011111111110000005555555500005555555555000000000000 000000 000000 0 000000000 000000 0 0 00000000000000 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 00110 0 0 0 0 0 0 00 0 0 0 0 0 0 0 0000000000000000 0 0 0 0550 0 0 0 0 0 0 0 0 0 0 0 0 0111111000000111111 0 0 0 011 0 0 0 011 0 0 0 0 0 0555000000555555 0 0 0 05 0 0 0 05 0 0 0 0 0 00000000 0 0 01111 0 0 0 0 0 0000 0 0 0 0 0 0 000000000000 0 0 0 0 0 0 0 0 040000000 0 0 0 0110 0 0 0 0 0 000000000 0 0 0 0 000005000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 01111111100000011111111111111000 0 00 0 0500000055000 0 0 0 0 00000000000 0 011IIIIIIII5 \ No newline at end of file
diff --git a/data/layouts/PokeMart/border.bin b/data/layouts/PokeMart/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/PokeMart/border.bin
Binary files differ
diff --git a/data/layouts/PokeMart/layout.inc b/data/layouts/PokeMart/layout.inc
new file mode 100644
index 000000000..830d398ac
--- /dev/null
+++ b/data/layouts/PokeMart/layout.inc
@@ -0,0 +1,14 @@
+PokeMart_MapBorder:: @ 82CE29C
+ .incbin "data/layouts/PokeMart/border.bin"
+
+PokeMart_MapBlockdata:: @ 82CE2A4
+ .incbin "data/layouts/PokeMart/map.bin"
+
+ .align 2
+PokeMart_Layout:: @ 82CE354
+ .4byte 0xb
+ .4byte 0x8
+ .4byte PokeMart_MapBorder
+ .4byte PokeMart_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
diff --git a/data/layouts/PokeMart/map.bin b/data/layouts/PokeMart/map.bin
new file mode 100644
index 000000000..73d90bf31
--- /dev/null
+++ b/data/layouts/PokeMart/map.bin
@@ -0,0 +1,3 @@
+"#$#$D*()() 222 2220212!212%28292:2222222-@AB222+,22+
+22222234223
+222222;<22;222222222 \ 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..a4d067758
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+PokemonCenter_1F_MapBorder:: @ 82CE064
+ .incbin "data/layouts/PokemonCenter_1F/border.bin"
+
+PokemonCenter_1F_MapBlockdata:: @ 82CE06C
+ .incbin "data/layouts/PokemonCenter_1F/map.bin"
+
+ .align 2
+PokemonCenter_1F_Layout:: @ 82CE168
+ .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'222222021222322222'26B228292:2;2242=>'222222@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..033580519
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/layout.inc
@@ -0,0 +1,14 @@
+PokemonCenter_2F_MapBorder:: @ 82CE180
+ .incbin "data/layouts/PokemonCenter_2F/border.bin"
+
+PokemonCenter_2F_MapBlockdata:: @ 82CE188
+ .incbin "data/layouts/PokemonCenter_2F/map.bin"
+
+ .align 2
+PokemonCenter_2F_Layout:: @ 82CE284
+ .4byte 0xe
+ .4byte 0x9
+ .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..40cf9afd7
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/map.bin
@@ -0,0 +1 @@
+  ?L\?M\?N\?GTd6GUd6GVd6G222Oh22Oh22Oh22Ob2 222Wp]Wp]Wp]W/2222ek22_k22_k22_/2Bg2%22g2%22g2%22g2c2222^22222^22222'2 222f42&242&2f42&242&2'2(622222222222276 \ 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..9252de7db
--- /dev/null
+++ b/data/layouts/RecordCorner/layout.inc
@@ -0,0 +1,14 @@
+RecordCorner_MapBorder:: @ 82E9460
+ .incbin "data/layouts/RecordCorner/border.bin"
+
+RecordCorner_MapBlockdata:: @ 82E9468
+ .incbin "data/layouts/RecordCorner/map.bin"
+
+ .align 2
+RecordCorner_Layout:: @ 82E95F8
+ .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 @@
+22222222222222222222222222222222222222222222222222222222222222222222"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..276a580b0
--- /dev/null
+++ b/data/layouts/Route101/layout.inc
@@ -0,0 +1,14 @@
+Route101_MapBorder:: @ 8292D8C
+ .incbin "data/layouts/Route101/border.bin"
+
+Route101_MapBlockdata:: @ 8292D94
+ .incbin "data/layouts/Route101/map.bin"
+
+ .align 2
+Route101_Layout:: @ 82930B4
+ .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 @@
+11101110 0 0 000000000 0 0 05 0 0 0 0000000 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0 0 011 0 0 000000011 0 0 0 0 0 0 000n11 0 000000000011011000000001110001110 0 0011110111110 0 0 0 0 001110111110 0 0 0 0 0 00110011100 0 0 0 0 0 0000 0 0000011 0 0 0011 0 0 0 0 00000000 0 00011 0 0 0 00000001111 0 0 0 000000011111111000000 \ 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..c2e36ea4e
--- /dev/null
+++ b/data/layouts/Route102/layout.inc
@@ -0,0 +1,14 @@
+Route102_MapBorder:: @ 82930CC
+ .incbin "data/layouts/Route102/border.bin"
+
+Route102_MapBlockdata:: @ 82930D4
+ .incbin "data/layouts/Route102/map.bin"
+
+ .align 2
+Route102_Layout:: @ 82938A4
+ .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 00000000000026620 0 0 0 0 0 0 000011110000011110 0 0 0 0 0 0 0 0 0 0 0 0 0011111111000000000000000 0 0 0 0 0 0 0 0 0 0 0 00111q2y211110000000000110000 0 0 0000 0 0 0 0 0 0 0011100111100000 0 00000 0 0 0 00001r210000 0 0 0 0 00110000000000000000000000000 0 0 0 0 0 0 00{00000000000001111111100000 0 0 0 0 0 0 00011000000000000011 0 0 0 0 0 000000000011110000000 0 0 0 000000000111111100011 0 000 0 0 00011000 0 0111111111000 0 01100011000 0 0 0 0111111101111 0 0 0000000000 0 0 0 0 000111111000 0 0 001100 0 0 00000 0 0 0000111001111 0 0 0 00 0 0 0 0 0 0 0000000000000001111111111 0 0 00000011111111 0 0 0 0000011111111 \ 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..15d321a66
--- /dev/null
+++ b/data/layouts/Route103/layout.inc
@@ -0,0 +1,14 @@
+Route103_MapBorder:: @ 82938BC
+ .incbin "data/layouts/Route103/border.bin"
+
+Route103_MapBlockdata:: @ 82938C4
+ .incbin "data/layouts/Route103/map.bin"
+
+ .align 2
+Route103_Layout:: @ 8294544
+ .4byte 0x50
+ .4byte 0x14
+ .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..6c5205b4c
--- /dev/null
+++ b/data/layouts/Route103/map.bin
@@ -0,0 +1 @@
+ppppppppppppppsqqsqqqsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquuvpppppppppuvp{|sqqq{qqqqt|||||||qqqqqqqqt}qqqqqu000000 0 0 0 0 0 0}~ppppppppp}~ps{qqq{||||}qtq{||||||||}qqqqqqu00001111 0 0 0 0ppppppuvPQpppppp{sqt||}qqq{|||||||} 0 0000011110 0 0 0 0 0puvppp}~XYppuvpps{|}tyyy 0 0 0 04444444o4 0 0 0 0dQpp}~uvPQpppPQ}~uvPesqqqu0K1L5L5L5M1 0 0 0 0 0 0 000004444444lYuvpp}~XYpppXYpp}~Xm{|||z011111000000 0 0 0 0 0 0 000000000000p}~pppppppppppppppp0000000000000000000 0 0 0 0 0 0 00000111110000ppppppppppppppppppppppp00000000000000000011 0 0 0 0 00040111111000ppppppppppppppppppppppppp011110000000000011111 0 0 0 000000001111000ppppppppppppppppppppppppp0(1)1!1!1111100000011!1!1)1)1)1 0 0 0 0000000 0 0 0 00000ppppppppppppppppppppppppp000(1)1)1)1!1!1111111111111111!1!1)1*10004444444444 0 0 0 0 000000yppppppppppppppppppppppp0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*1000000000000 0 0 0 0 0 0 0111111dQPQppppppppppuvppppp0000000000000000000000000000000 0 0 0 0 0 0 05555lYXYuvppppPQPQ}~puvpx000000000001100000011111122yp}~uvPQXYXYpPQ}~Pe0000000000000005ppp}~XYpppppXYppXm000000000110000uvppppppppppppppp550000}~ppppppppppppppx00000pppppppppppppppp \ 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..c6f807405
--- /dev/null
+++ b/data/layouts/Route104/layout.inc
@@ -0,0 +1,14 @@
+Route104_MapBorder:: @ 829455C
+ .incbin "data/layouts/Route104/border.bin"
+
+Route104_MapBlockdata:: @ 8294564
+ .incbin "data/layouts/Route104/map.bin"
+
+ .align 2
+Route104_Layout:: @ 8295E64
+ .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..c265b931d
--- /dev/null
+++ b/data/layouts/Route104_MrBrineysHouse/layout.inc
@@ -0,0 +1,14 @@
+Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
+ .incbin "data/layouts/Route104_MrBrineysHouse/border.bin"
+
+Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4
+ .incbin "data/layouts/Route104_MrBrineysHouse/map.bin"
+
+ .align 2
+Route104_MrBrineysHouse_Layout:: @ 82D20BC
+ .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 @@
+222!22!2!22222266)2)2)2)2)2)2)2)2)2)26)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..35012e71b
--- /dev/null
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
@@ -0,0 +1,14 @@
+Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
+ .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin"
+
+Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4
+ .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin"
+
+ .align 2
+Route104_PrettyPetalFlowerShop_Layout:: @ 82D4CB4
+ .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..9ddf033e1
--- /dev/null
+++ b/data/layouts/Route104_Prototype/layout.inc
@@ -0,0 +1,14 @@
+Route104_Prototype_MapBorder:: @ 82F9A58
+ .incbin "data/layouts/Route104_Prototype/border.bin"
+
+Route104_Prototype_MapBlockdata:: @ 82F9A60
+ .incbin "data/layouts/Route104_Prototype/map.bin"
+
+ .align 2
+Route104_Prototype_Layout:: @ 82F9A64
+ .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..d918e73ff
--- /dev/null
+++ b/data/layouts/Route105/layout.inc
@@ -0,0 +1,14 @@
+Route105_MapBorder:: @ 8295E7C
+ .incbin "data/layouts/Route105/border.bin"
+
+Route105_MapBlockdata:: @ 8295E84
+ .incbin "data/layouts/Route105/map.bin"
+
+ .align 2
+Route105_Layout:: @ 8297784
+ .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..152aad670
--- /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..60ff843f3
--- /dev/null
+++ b/data/layouts/Route106/layout.inc
@@ -0,0 +1,14 @@
+Route106_MapBorder:: @ 829779C
+ .incbin "data/layouts/Route106/border.bin"
+
+Route106_MapBlockdata:: @ 82977A4
+ .incbin "data/layouts/Route106/map.bin"
+
+ .align 2
+Route106_Layout:: @ 8298424
+ .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..d65a278a4
--- /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..06b6f3020
--- /dev/null
+++ b/data/layouts/Route107/layout.inc
@@ -0,0 +1,14 @@
+Route107_MapBorder:: @ 829843C
+ .incbin "data/layouts/Route107/border.bin"
+
+Route107_MapBlockdata:: @ 8298444
+ .incbin "data/layouts/Route107/map.bin"
+
+ .align 2
+Route107_Layout:: @ 8298DA4
+ .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..1c4e97eec
--- /dev/null
+++ b/data/layouts/Route108/layout.inc
@@ -0,0 +1,14 @@
+Route108_MapBorder:: @ 8298DBC
+ .incbin "data/layouts/Route108/border.bin"
+
+Route108_MapBlockdata:: @ 8298DC4
+ .incbin "data/layouts/Route108/map.bin"
+
+ .align 2
+Route108_Layout:: @ 8299724
+ .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..0a82f9924
--- /dev/null
+++ b/data/layouts/Route108/map.bin
@@ -0,0 +1 @@
+ppppppppppppppppPQpp111111111111pppppppppppppPQpppppppppppPQppppppppppppppXYp11511^5_515^5_511bQppppppppppppXYpppppppppPQXY11pPQpppppppppPc^5_5155n5o551n5o555jYppp11111pPQppppuvpuvPQXYpPc^5_5bQXY11pPQppXkn5o5111^5_51Q3R3S3T35puvPc^5_515bQXYuvpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvpn5o5X7YZ[\7]p}~Xkn5o551jYpp}~PQpPQppppppppppXkn5o5jYpp}~pppppp1`abcdepppp11pppppXYpXYpppppppppppppppppppppppppppi3j3k3ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp11pppppppppppppppPQpppppppppppppppppppp}~ppppppppp11pXY1511ppppppppppppppXYpppppppppppppp111ppppPQppPQpp5ppp1511pp11ppppppPQppPQuvppppp11p51ppuvXYuvXYpppuvppPc^5_5bQpppppXYppXY}~uvppPc^5_5bQpPQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~ppPQPQXYpppppppppXYpPQXY}~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..9ea7a20ce
--- /dev/null
+++ b/data/layouts/Route109/layout.inc
@@ -0,0 +1,14 @@
+Route109_MapBorder:: @ 829973C
+ .incbin "data/layouts/Route109/border.bin"
+
+Route109_MapBlockdata:: @ 8299744
+ .incbin "data/layouts/Route109/map.bin"
+
+ .align 2
+Route109_Layout:: @ 829AA04
+ .4byte 0x28
+ .4byte 0x3c
+ .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..eb83de870
--- /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..a4c1542ca
--- /dev/null
+++ b/data/layouts/Route109_SeashoreHouse/layout.inc
@@ -0,0 +1,14 @@
+Route109_SeashoreHouse_MapBorder:: @ 82EDF48
+ .incbin "data/layouts/Route109_SeashoreHouse/border.bin"
+
+Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50
+ .incbin "data/layouts/Route109_SeashoreHouse/map.bin"
+
+ .align 2
+Route109_SeashoreHouse_Layout:: @ 82EE07C
+ .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..df2399715
--- /dev/null
+++ b/data/layouts/Route110/layout.inc
@@ -0,0 +1,14 @@
+Route110_MapBorder:: @ 829AA1C
+ .incbin "data/layouts/Route110/border.bin"
+
+Route110_MapBlockdata:: @ 829AA24
+ .incbin "data/layouts/Route110/map.bin"
+
+ .align 2
+Route110_Layout:: @ 829C964
+ .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..e10394048
--- /dev/null
+++ b/data/layouts/Route110/map.bin
Binary files differ
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin
Binary files differ
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc
new file mode 100644
index 000000000..4841f1891
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc
@@ -0,0 +1,14 @@
+Route110_SeasideCyclingRoadEntrace_MapBorder:: @ 82EFB64
+ .incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin"
+
+Route110_SeasideCyclingRoadEntrace_MapBlockdata:: @ 82EFB6C
+ .incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin"
+
+ .align 2
+Route110_SeasideCyclingRoadEntrace_Layout:: @ 82EFC20
+ .4byte 0xf
+ .4byte 0x6
+ .4byte Route110_SeasideCyclingRoadEntrace_MapBorder
+ .4byte Route110_SeasideCyclingRoadEntrace_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Shop
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin
new file mode 100644
index 000000000..e9fc770d4
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin
@@ -0,0 +1 @@
+x2p2p2p2p2622226x2p2p2p22h2h2h2h26666662h2h2h2\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..a85dd2b14
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
+ .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin"
+
+Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C
+ .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin"
+
+ .align 2
+Route110_TrickHouseCorridor_Layout:: @ 82EE52C
+ .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!22!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2!2)2)2!2)2)2!2)2)22!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)2)2!2)2)2!2)2)2!2)2)2!2)2)22!22!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..d0c414069
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEnd/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseEnd_MapBorder:: @ 82EE174
+ .incbin "data/layouts/Route110_TrickHouseEnd/border.bin"
+
+Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C
+ .incbin "data/layouts/Route110_TrickHouseEnd/map.bin"
+
+ .align 2
+Route110_TrickHouseEnd_Layout:: @ 82EE23C
+ .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 @@
+26 26!22222!2!2!22!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..6ccef43ff
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
+ .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin"
+
+Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C
+ .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin"
+
+ .align 2
+Route110_TrickHouseEntrance_Layout:: @ 82EE15C
+ .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!2222!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..8ad11d641
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
+ .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin"
+
+Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C
+ .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle1_Layout:: @ 82EE7E0
+ .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..c809b7482
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin
@@ -0,0 +1,2 @@
+o233333333334
+w6 #$+$$$+$$$$!222Z2Z2*Z2Z2Z2*Z2Z2Z2Z2*22222222222222222222,222,2222,2222#$$+$$$$+$$$$%2Z2Z2Z2"Z2Z2Z2Z2*Z2Z2Z2Z2Z22222"2222222222222,2222,22222012 $%2 $$$$+$%Z2Z22*Z2Z22"Z2Z2Z2Z2*Z2Z22222222"2222222222,222,2222,222#$$$+$$$$+$$%22Z2Z2Z2Z2"Z2Z2Z2Z2*Z2Z2Z2222222"22222222222222,2222,2222#$%2#$$+$$$%201Z2Z2Z22Z2Z2Z2"Z2Z2Z2Z22Z2Z22222222*22222222222222Z22222222 \ 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..a7750390b
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
+ .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin"
+
+Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800
+ .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle2_Layout:: @ 82EEA94
+ .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..819080ced
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin
@@ -0,0 +1,2 @@
+o         
+w6 222X22222222222222222222222i2222222i222222222222222222222222222222222222222X22222222222222i22222222222i22222222222222222222222222222222X2222222222222222222222222222222222222222X2 \ 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..8f49ea03a
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
+ .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin"
+
+Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4
+ .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle3_Layout:: @ 82EED48
+ .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..4dc43a00d
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin
@@ -0,0 +1,2 @@
+o         
+w6 &22&22&22&X22&22-X22-22-K2L2-22-K2L2522:225S2T2:22MS2T2q222B22q222B22U222K2L2829222./225S2T25@AM22:675X22~22X222U222Bq2q2q222./&K2L2K2L2&22K2L2567"S2T2:S2T2"2X2MS2T2q2q2q2"22B22"22U22222-X228292-829222522M22:@A5@A:22q222U222B22q222B228292./2222K2L25@A567:22M22:S2T2q222q2q2q2B22U222B2222K2L2K2L28292./5225S2T25S2T25@A567q222q22X2q222q222q2q2q2222222222222222 \ 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..20706bed7
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
+ .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin"
+
+Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68
+ .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle4_Layout:: @ 82EEFFC
+ .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..e0b8cf33f
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222222222222222222 \ 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..f01f23322
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
+ .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin"
+
+Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C
+ .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle5_Layout:: @ 82EF2B0
+ .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..a64ea34b6
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 hhhhh22222hh222hhh2222222222hhhh22222222222hhh222222hh2222hhh2222hhhhh2222hh2222hhhhh2222hh222hhhhh22222hhhhhhhhh22222hhhhhhhh222222hhhhhhhh222222hhhhhhhh222222hhhhhhhhh2222hhhhhhhhhhh222hhhhhhhhhhhhh22hhhhhhhhhhhhhh2hhhhhhhhhhhhh222hhhhhhhhhhh22222hhhhh2222222222hhhhh22hhh22222hhhhh22hhhh222hhhhhh \ 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..a49bb680f
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
+ .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin"
+
+Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0
+ .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle6_Layout:: @ 82EF564
+ .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..ec8447889
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 222222222222222222222222222222222222222222222222222222222222222222222222622222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ 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..dcd1b9367
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
+ .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin"
+
+Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584
+ .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle7_Layout:: @ 82EF818
+ .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..5859601f6
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 222222g2F262222222g2e22g222e22d2f22222g2>62g22`222f222f2g22g22>6f22zW2V2W2W2W2W2V2[2W2W2{2[2V2t2uBnB]nBnBmBmB\mBuByBuBnBnBnBnBp^2pNNp^2}OpO}}}px2v2x2N2N2x2v22O2x2O2222x2d2f22f2f2d2f2g22>g222222f2d2f2f2f2g222g2d22222>2e2f2f2g222g2c2e2e2e2e2e2f2f2f2g2e2e2e2e2e2e2e2e2e2a2f2f2f2g22222d2d2d2d2g2f2e2f2f2f2g22g2e2e2e2e2e2g22e2f2f2f2f2g22g2g2e2e2e22g22>6f2f222g222g22222g222c2f222g222e2e2e2e2e22g2f2222G222e22e2e2e2e2e2e2f222222e2e2222g2222f22222e2e22222d2d2d2d2f2 \ 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..1c8212684
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
+ .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin"
+
+Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838
+ .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin"
+
+ .align 2
+Route110_TrickHousePuzzle8_Layout:: @ 82EFACC
+ .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..d8c131da6
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 666666666666226k2k2k2k2k2k2k2k2k2k2k2l6k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2l6l6k2k2k2k2k2l6l6l6l6l6k2l6l6l6l6l6l6l6l6222266266226222666266666626662k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2l6k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2226666666666222222266666662222 \ 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..ff3aa42c4
--- /dev/null
+++ b/data/layouts/Route111/layout.inc
@@ -0,0 +1,14 @@
+Route111_MapBorder:: @ 829C97C
+ .incbin "data/layouts/Route111/border.bin"
+
+Route111_MapBlockdata:: @ 829C984
+ .incbin "data/layouts/Route111/map.bin"
+
+ .align 2
+Route111_Layout:: @ 829F544
+ .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..50fc935bd
--- /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..fc7caacb7
--- /dev/null
+++ b/data/layouts/Route112/layout.inc
@@ -0,0 +1,14 @@
+Route112_MapBorder:: @ 829F55C
+ .incbin "data/layouts/Route112/border.bin"
+
+Route112_MapBlockdata:: @ 829F564
+ .incbin "data/layouts/Route112/map.bin"
+
+ .align 2
+Route112_Layout:: @ 82A0824
+ .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..bc194cbc5
--- /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..f56fc6b9b
--- /dev/null
+++ b/data/layouts/Route113/layout.inc
@@ -0,0 +1,14 @@
+Route113_MapBorder:: @ 82A083C
+ .incbin "data/layouts/Route113/border.bin"
+
+Route113_MapBlockdata:: @ 82A0844
+ .incbin "data/layouts/Route113/map.bin"
+
+ .align 2
+Route113_Layout:: @ 82A17E4
+ .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..1d6c6b283
--- /dev/null
+++ b/data/layouts/Route113/map.bin
@@ -0,0 +1,288 @@
+yyyyyyyyyyyppp.n6mnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmnmn  mnmnmnmnmnmn llllllllyyyyyyyyyyppp vu  vuvuvu  vuvuvuvuvuvu                  mnmnmn        mnm22n           2 qkllllllpppn6m22nmnmnm22nmnmnmnm22
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2/222      222/2222      /
+2
+2
+2kqqqqqqiiiiiiiiiiiixpp vu        mnmn       
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2222222
+2
+222)222222222222
+2
+2
+2 qqkllqqqqqqqiiiiiiiiiiiiixpn6m%    222
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+22262
+2
+2
+2
+2
+2222222)22222222
+2
+2
+2 qq{||qqqt|||iiiiiiiiiiiiiix vu 22)222222222
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 qq 
+2
+2
+22222
+2
+2
+2
+2
+2
+22222222222222
+2
+2
+2||||{|||}qqqq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2n6m22222
+2
+222)2222222
+2
+2
+2
+2
+2
+2
+2
+2
+2222 qq 222
+2
+2
+2
+2
+2
+2
+2
+2
+222222222222
+2
+2
+2
+22220xyqqqqqty22222y222222y22y22 vu 22
+2
+2
+2
+222222222
+2
+2
+2
+2
+2
+2
+2
+222222 qq 222
+2
+2
+2
+2
+2
+2
+2
+2
+2 q  mnmn '
+2
+2
+2
+22222000xyyyyyz022222y222222y2y2222  2
+2
+2
+2
+2
+2
+2&%22222
+2
+2
+2
+2
+2222y'
+2
+2
+2
+2
+2
+2222 q 2u   
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+222200000000001122222y222222y222&
+2
+2
+2
+2
+2
+2
+2
+2
+2
+22222222
+2
+2
+2 qqq 2222222
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2222y  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+222200000000000(1)1y2y2y2y2y2y2y2y2y2y2y2y2y22222222
+2
+2
+2
+2
+2
+2
+2
+2
+2&22
+2
+2
+2 qqq 2222222
+2
+2
+2
+2
+2
+2
+2$222'22
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2220000000000000022222y222222y22222222222
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+222222
+2
+2 qqq 222222222
+2
+2
+2
+2
+222222222222
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+222220000hiiiiiiiii22222222222y22222222222
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2222222 qqq222222
+2
+2
+2
+22222222222222
+2
+2
+2
+2iiiiqqqklllll22222y22222222222222222
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2222222 qqqqq 222222222222222222 qkllllllllllmsqqqqq22222222222l6ml6  m222222222
+2
+2
+2
+2
+2
+222222222qqqq 2222 qq 2n  mnmn  mn   kllkllllllmqqukqqqqqststs66ts6tst22uvuvuvuvu  mnm2yyyy2n  m2 qq ' v22uvuv22uv222 sqqqsqqqqt|}qqusqqqqqq6k6l6k22l6k622l6k6l6mnmn  mn  m2 qqqqqqq   m222222nm22n  qq22nmnmnmnmnmnmn  sqqq{||||}qt||}sqqqqqq22sts6t6ststs6t6stuvuv22uv22u  qqqqqqqqq 222uvuvuvuvuvuv2 qqqq 2uvuvuvuvuvuvuv2 qq{|qqqqqt||}qqq{||||||k6l6k6l6klk6l6k6l6klk6l6k6nmnmnmnmnm2 qqqqqqqqq  mnmnmnmnmnmnmn  qqqq  mnmnmnmnmnmnmn  qqqq{|||||}qqqqqqqqqqqqqststs6t6ststs6t6stsv6uvuvuvuvu yyyyyyyyy2uvuvuvuvuvuvuv2yyyy2uvuvuvuvuvuvuv2yyyyyyyyyyyyyyyyyyy \ No newline at end of file
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..440eaf330
--- /dev/null
+++ b/data/layouts/Route114/layout.inc
@@ -0,0 +1,14 @@
+Route114_MapBorder:: @ 82A17FC
+ .incbin "data/layouts/Route114/border.bin"
+
+Route114_MapBlockdata:: @ 82A1804
+ .incbin "data/layouts/Route114/map.bin"
+
+ .align 2
+Route114_Layout:: @ 82A3104
+ .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..0d92450f4
--- /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..10011c507
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc
@@ -0,0 +1,14 @@
+Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
+ .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin"
+
+Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C
+ .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin"
+
+ .align 2
+Route114_FossilManiacsHouse_Layout:: @ 82D4ECC
+ .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 @@
+622!22233@2!2)2)2)2)277222!2NOD2)222)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..0bd281050
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
@@ -0,0 +1,14 @@
+Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
+ .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin"
+
+Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC
+ .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin"
+
+ .align 2
+Route114_FossilManiacsTunnel_Layout:: @ 82D5190
+ .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..586216000
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin
@@ -0,0 +1 @@
+w2whiiiiiijw2w2w2whxhiiiijrw2ww2wphxhiijrzjwww2pphx33rzjrw2wwppp332zjrrw6wwppp6y233rrrw6wwppp3y2y26rrrw6wwppp3y2y22rrrwwwpp7y2y22rrrw6wwp7p3y26rrrwwww6pp3y22rrrw6w6ww6ppp3y26rrw6w6ww6ppp62r6rzjw6ww6ppp32r3zjrw6ww6ppp32r3y6rrw6ww6ppp32r3y6rrw6whxp32r3y6rrw6wp2p2p 3r77rrw6wp6p2p 3zj3rzjwp2p6p 33r3r3rwp2p2p32r3r7rwp2p2p36r3zjrhx2p7p32r77rrpy62phx32zj3rrpy62pp3333r3rrpy62pp3222r3rr \ 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..2018011c3
--- /dev/null
+++ b/data/layouts/Route114_LanettesHouse/layout.inc
@@ -0,0 +1,14 @@
+Route114_LanettesHouse_MapBorder:: @ 82D51A8
+ .incbin "data/layouts/Route114_LanettesHouse/border.bin"
+
+Route114_LanettesHouse_MapBlockdata:: @ 82D51B0
+ .incbin "data/layouts/Route114_LanettesHouse/map.bin"
+
+ .align 2
+Route114_LanettesHouse_Layout:: @ 82D5260
+ .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..fb1b3d99b
--- /dev/null
+++ b/data/layouts/Route115/layout.inc
@@ -0,0 +1,14 @@
+Route115_MapBorder:: @ 82A311C
+ .incbin "data/layouts/Route115/border.bin"
+
+Route115_MapBlockdata:: @ 82A3124
+ .incbin "data/layouts/Route115/map.bin"
+
+ .align 2
+Route115_Layout:: @ 82A4A24
+ .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..d6e8e9f1c
--- /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..d7c24705b
--- /dev/null
+++ b/data/layouts/Route116/layout.inc
@@ -0,0 +1,14 @@
+Route116_MapBorder:: @ 82A4A3C
+ .incbin "data/layouts/Route116/border.bin"
+
+Route116_MapBlockdata:: @ 82A4A44
+ .incbin "data/layouts/Route116/map.bin"
+
+ .align 2
+Route116_Layout:: @ 82A59E4
+ .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..055562dbb
--- /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..7a2a6997c
--- /dev/null
+++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc
@@ -0,0 +1,14 @@
+Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
+ .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin"
+
+Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280
+ .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin"
+
+ .align 2
+Route116_TunnelersRestHouse_Layout:: @ 82D5334
+ .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 @@
+222!2!2!2!2222!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..552c03c84
--- /dev/null
+++ b/data/layouts/Route117/layout.inc
@@ -0,0 +1,14 @@
+Route117_MapBorder:: @ 82A59FC
+ .incbin "data/layouts/Route117/border.bin"
+
+Route117_MapBlockdata:: @ 82A5A04
+ .incbin "data/layouts/Route117/map.bin"
+
+ .align 2
+Route117_Layout:: @ 82A6364
+ .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..9aaa06fef
--- /dev/null
+++ b/data/layouts/Route117/map.bin
@@ -0,0 +1,11 @@
+5670 2 000000000 0 0
+20000000000 0 00000h4s4q0u4i0j4000 2 0000040 0 0 0 00000000 0 0 0 0 0 0 00000000p4{4|4}4q0r440 0 000000 0000 0 0
+00000008IIIIII:0000000p4q0q0t4y4z40 0 00000 0 200 2004000@2 22
+222B000000
+2x4y4y4z400 00 04000000 20 000000@22 22
+22B000000000000 !"@222 22
+2B000000000
+20200000000000000000000000000020@2222 22B011111110000020001111111111111110000000000IIIIIIIHI0000IJ0 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202000000000 1"1000000000011111!1!1!1!1*10(1)1!1!1!1111000002202020011111111!1"100 20000(1)1!1!1!1!1!1!1*10110(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100200000(1)1!1!1!1"10000 1!1*1000000020202000000000000000000000(1!1!1"1000 1"100000000II@@@@II8II000II:0 0 00200000 1!1!110K1L5L5L5M1001!1"10000000000@22 22
+222B 0 0 00 0 0 00(1!1!1"101111100 1!1*10000@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*100H0IIIIIIJ@@@------%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*1000000000000000000%0%0 0 0 00000000000000000000%0%0%00000 \ 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..2fa028a7b
--- /dev/null
+++ b/data/layouts/Route117_PokemonDayCare/layout.inc
@@ -0,0 +1,14 @@
+Route117_PokemonDayCare_MapBorder:: @ 82D534C
+ .incbin "data/layouts/Route117_PokemonDayCare/border.bin"
+
+Route117_PokemonDayCare_MapBlockdata:: @ 82D5354
+ .incbin "data/layouts/Route117_PokemonDayCare/map.bin"
+
+ .align 2
+Route117_PokemonDayCare_Layout:: @ 82D542C
+ .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..f61ce1f82
--- /dev/null
+++ b/data/layouts/Route118/layout.inc
@@ -0,0 +1,14 @@
+Route118_MapBorder:: @ 82A637C
+ .incbin "data/layouts/Route118/border.bin"
+
+Route118_MapBlockdata:: @ 82A6384
+ .incbin "data/layouts/Route118/map.bin"
+
+ .align 2
+Route118_Layout:: @ 82A7004
+ .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..c8b0865d0
--- /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..ed5f8777a
--- /dev/null
+++ b/data/layouts/Route119/layout.inc
@@ -0,0 +1,14 @@
+Route119_MapBorder:: @ 82A701C
+ .incbin "data/layouts/Route119/border.bin"
+
+Route119_MapBlockdata:: @ 82A7024
+ .incbin "data/layouts/Route119/map.bin"
+
+ .align 2
+Route119_Layout:: @ 82A9BE4
+ .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..cd1c748d9
--- /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..bc0f92dfe
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
@@ -0,0 +1,14 @@
+Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
+ .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin"
+
+Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0
+ .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin"
+
+ .align 2
+Route119_WeatherInstitute_1F_Layout:: @ 82F2CD8
+ .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,-,-gglmv2kj2z2z2k4545j222z2222tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R22w2R2R22w2R2R2R2R2R2R2U22fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z22R2R2R22z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]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..df864d9de
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
@@ -0,0 +1,14 @@
+Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
+ .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin"
+
+Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8
+ .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin"
+
+ .align 2
+Route119_WeatherInstitute_2F_Layout:: @ 82F2EB0
+ .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_ggk,-,-,-,-,-g66gj222z2k4545454545j22z22z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2i2i2i2i2i2i2i2i2r2i2i2i22w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2i2i2i2i2i2i2i2i2r2\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..bc1d57778
--- /dev/null
+++ b/data/layouts/Route120/layout.inc
@@ -0,0 +1,14 @@
+Route120_MapBorder:: @ 82A9BFC
+ .incbin "data/layouts/Route120/border.bin"
+
+Route120_MapBlockdata:: @ 82A9C04
+ .incbin "data/layouts/Route120/map.bin"
+
+ .align 2
+Route120_Layout:: @ 82ABB44
+ .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..bb98e751c
--- /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..a65e5c17d
--- /dev/null
+++ b/data/layouts/Route121/layout.inc
@@ -0,0 +1,14 @@
+Route121_MapBorder:: @ 82ABB5C
+ .incbin "data/layouts/Route121/border.bin"
+
+Route121_MapBlockdata:: @ 82ABB64
+ .incbin "data/layouts/Route121/map.bin"
+
+ .align 2
+Route121_Layout:: @ 82AC7E4
+ .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..5c5397c0b
--- /dev/null
+++ b/data/layouts/Route121/map.bin
@@ -0,0 +1 @@
+urX011120Z6ururX011120Zururs6L5L5u6X0000000001112000Zur00000000000000000000ur{211}255X000000008999:000Zur000000000000000000||||}r 0 0 0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQRD55 0 0 0 000000 0 0 0000000110BD-EC0tyy}r00000000 0 0 0 0 0000000000 0 0 0 00Z0000000000000000000000000000 0 0 0 0 000000000000r00tz000000000 0 0 0 0 0 0 000000 0 0 0 0 0 0Z0000000000000000000000000000 0 0 0 0 0000001100000r&'rPQQQQR00PQQR000PR00PQQQQQQQQR000000000001111111100000000 0 0 0 0 0 0 00000t00yyz00r 0 0000000000Z000XZ00X00000000Z00000000011!1!1)1)1)1)1)1*10 0 0 0PQQQQQQQQQQQR00r0000000r 0 0 0PQQQQR0PR000XZ00PQQQQQQQQR000011111!1!1!1*100000 0 0 0 0 0 0 0 0 0 0 00t|||||00||||z0000000r 0 0 0 0 0 0 00000Z 0 00XZ0000 0 0 0 0 0 000001155)1)1)1)1)1*10011111111 0 0 0 0t|||}t00yyyy00zPQQQQQQQQQQR 0 0 0XZ000 0 0 0 0 0 000000555500000000t|||}tz000000000000 0 0 0 0 0000000000000 0 0 0 0 0XZPQQQQQQQQR000055t|00000000555utz00000tyy00yy0000 0 0 0 0 0 0 0000000000 0 0 0 0 0XZ011111100000t|||}yyyyyy||||||||}u00000t|||}]^0^0^0_{|||| 0 0 0 0 0 0 00000000 0 0 0 0 0 0PR026666200000uPPPPPPt}t||||}]^0^0^0^0_{||||||||||||||||||||||||||||||||||}p1p1p1p111P55t||}q0q0q0q0q0q0t}pPe]^0^0^0^0_dQppp1p1p1p1Pt|}t||||||}ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p155t}q0q0uppppppppPQe^0^0^0^0gpXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}pppppppppppppppppXYpppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1 \ 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..db083c158
--- /dev/null
+++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc
@@ -0,0 +1,14 @@
+Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
+ .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin"
+
+Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C
+ .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin"
+
+ .align 2
+Route121_SafariZoneEntrance_Layout:: @ 82D5644
+ .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 @@
+]x2p2p2p2p2p22222e2x2p2p2p2p22h2h2h2h2h22h22h2h22\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h22d6h2h2h2h2ababh2h2h2h2h2h2h22h2h2h222\2h2h2h2dh2h2h2x22h2h2h222h2h2h222h2h2h2\2h2h2h2q22d6h2h2t6 \ 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..ce89713e3
--- /dev/null
+++ b/data/layouts/Route122/layout.inc
@@ -0,0 +1,14 @@
+Route122_MapBorder:: @ 82AC7FC
+ .incbin "data/layouts/Route122/border.bin"
+
+Route122_MapBlockdata:: @ 82AC804
+ .incbin "data/layouts/Route122/map.bin"
+
+ .align 2
+Route122_Layout:: @ 82AD484
+ .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..0acdf7008
--- /dev/null
+++ b/data/layouts/Route123/layout.inc
@@ -0,0 +1,14 @@
+Route123_MapBorder:: @ 82AD49C
+ .incbin "data/layouts/Route123/border.bin"
+
+Route123_MapBlockdata:: @ 82AD4A4
+ .incbin "data/layouts/Route123/map.bin"
+
+ .align 2
+Route123_Layout:: @ 82AEA84
+ .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..9b5573cc5
--- /dev/null
+++ b/data/layouts/Route123/map.bin
@@ -0,0 +1,2 @@
+pppppppppppppppppppppE00Gppppppppppppppppp@000000000@00hiiiiiiiiiiiij 0 0 0 0 00 0 04K1L5L5L5M1pppppppppppppppppppE00Gppppppppppppppppp@AIIIIIIII90@00000pqqqqqqqqqqqqr0 0 0 0 0 0 0 0 0 0 001111100pppppppppppppppppE00Gppppppppppppppppp@Bs6u60s6u60s6u6@00 0 0
+00@00000040xyyyyqqqqqr00 0 0 0 0 0 0 0 0 0 0000000ppppppppppppppppE00Gppppppppppppppppp@B{2}20{2}20{2}2@00@00000000 0 0xqqqqr000 0 0 0 0 0 0 0 0 0 0 00000000pppppppppppppppE00Gppppppppppppppppp@Bs6u60s6u60s6u6@0 0@0000000 0 0 0 0xyyw44444440 0 0000 0 00000 0 000000000pppppppppppppE00Gppppppppppppppppp0@B{2}20{2}20{2}2@0 !"0@00000000 0 0 0 0 04o000000000 0000000000 0 0 0 0 00pppppppppppE00Gpppppppppppppp000@3II0000II2400000@04000000000 0 0 0 0 0 00000000000000000000 0 0 0 0 0 0 00ppppppppppE00Gpppppppppppp00000@0000000000000000@000000000000%0%0 0 0 0 0000000000000400000%0 0 0 0 0 0 00ppppppppE00Gppppppppp00000000@00000000011000@000000000000000004000%0 0 0 00004444440 0 0 000000%0 0 0 0 0 0 00pppE00Gpp000000000@000000000011000@0000000000000000000 0 00000000000%0 0 00000%0 0 0 0 0 00000000000>4>4>40000>4>4>4000000000HIIIIIIIIII0110II200440444444o400000000000000 0 0 0 04000 0 0 000040001100400000000000400000000001100000000000000000000000000%0 0 0 0 0000000000000000000 0 0 00000001!1"1000000000000000000000000000000011000000000000000000004444444%0%0 0 00000000000400000000 0 0 0 0 00K1L5L5L5M100111!1!1*10000000011111111111111111111111111111111000444444o0000000 000001111011111000000 0 0 0 0 0 0 000001111111!1!1!1!1*1000000000000111111111111111111111111111111110000000000001111111000111!1!1)1*10(1)1)1!1!1111140 0 0 0 0 0 0 00011111111111!1!1!1)1)1*1004000000000000000000000000000000000000000111111110000(1)1)1)1)1!1!11111100(1)1)1)1*1000000(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*10000000@4I0IIIIIIIIIII@4@4IIIII0@40000000(1)1)1)1)1)1)1*1000000000(1)1)1)1)1)1*10000000040000000000%0%0%0%0 0000000004000000000000000000000000000000000000000400000000000000400000000000000000040000000000000000000000000000000000000000000000000000 \ 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..dddf9ad05
--- /dev/null
+++ b/data/layouts/Route124/layout.inc
@@ -0,0 +1,14 @@
+Route124_MapBorder:: @ 82AEA9C
+ .incbin "data/layouts/Route124/border.bin"
+
+Route124_MapBlockdata:: @ 82AEAA4
+ .incbin "data/layouts/Route124/map.bin"
+
+ .align 2
+Route124_Layout:: @ 82B1CA4
+ .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..212135178
--- /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..31f8a8ebf
--- /dev/null
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
@@ -0,0 +1,14 @@
+Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
+ .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin"
+
+Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4
+ .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin"
+
+ .align 2
+Route124_DivingTreasureHuntersHouse_Layout:: @ 82FC8A8
+ .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 22222$2$2$2$2$29252626262626272#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..43bb875c9
--- /dev/null
+++ b/data/layouts/Route125/layout.inc
@@ -0,0 +1,14 @@
+Route125_MapBorder:: @ 82B1CBC
+ .incbin "data/layouts/Route125/border.bin"
+
+Route125_MapBlockdata:: @ 82B1CC4
+ .incbin "data/layouts/Route125/map.bin"
+
+ .align 2
+Route125_Layout:: @ 82B35C4
+ .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..12dab2a0b
--- /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..ad03b109b
--- /dev/null
+++ b/data/layouts/Route126/layout.inc
@@ -0,0 +1,14 @@
+Route126_MapBorder:: @ 82B35DC
+ .incbin "data/layouts/Route126/border.bin"
+
+Route126_MapBlockdata:: @ 82B35E4
+ .incbin "data/layouts/Route126/map.bin"
+
+ .align 2
+Route126_Layout:: @ 82B67E4
+ .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..dcb0e27bc
--- /dev/null
+++ b/data/layouts/Route127/layout.inc
@@ -0,0 +1,14 @@
+Route127_MapBorder:: @ 82B67FC
+ .incbin "data/layouts/Route127/border.bin"
+
+Route127_MapBlockdata:: @ 82B6804
+ .incbin "data/layouts/Route127/map.bin"
+
+ .align 2
+Route127_Layout:: @ 82B9A04
+ .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..3d4690c18
--- /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..056baadf4
--- /dev/null
+++ b/data/layouts/Route128/layout.inc
@@ -0,0 +1,14 @@
+Route128_MapBorder:: @ 82B9A1C
+ .incbin "data/layouts/Route128/border.bin"
+
+Route128_MapBlockdata:: @ 82B9A24
+ .incbin "data/layouts/Route128/map.bin"
+
+ .align 2
+Route128_Layout:: @ 82BBFA4
+ .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..ba264dc1e
--- /dev/null
+++ b/data/layouts/Route129/layout.inc
@@ -0,0 +1,14 @@
+Route129_MapBorder:: @ 82BBFBC
+ .incbin "data/layouts/Route129/border.bin"
+
+Route129_MapBlockdata:: @ 82BBFC4
+ .incbin "data/layouts/Route129/map.bin"
+
+ .align 2
+Route129_Layout:: @ 82BD8C4
+ .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..234824abf
--- /dev/null
+++ b/data/layouts/Route130/layout.inc
@@ -0,0 +1,14 @@
+Route130_MapBorder:: @ 82F0448
+ .incbin "data/layouts/Route130/border.bin"
+
+Route130_MapBlockdata:: @ 82F0450
+ .incbin "data/layouts/Route130/map.bin"
+
+ .align 2
+Route130_Layout:: @ 82F1D50
+ .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{{{{{{vppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppprqkllmqvppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{qklllmqvppppuvq{|||}qt}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqkklmmqvppp}~pyqqqtyppu{{vppyppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~qq{qqqt}qtppXYpppuvppppppuvyypXYpp}~ppppppXYpppppppppppppppppppppPQppp}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQpyypp}~q|ppppppppppPQppppXYppPQpppppppu{q{vpppppppppppppppuvu{qq|pppXYppppppppuvppppyppppppppppXYppppppppXYpppppuvqqqqvpppppppppppppp}~zqqqtppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~pyyyyyuvppppppu{{vpuvpyyyuvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{kmv}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuvyyppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppztppppppp}~pppppppppppppppppppppppp}~PQyyqqtp}~ppppppppppppppppppppppppp}~ppppppppppppppppppppppppppppppppppppppXYpppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppppuvy}~pppppppppppppppppppppppppppppu{{qqqqqqv}~qqtpPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ 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..86467c2d4
--- /dev/null
+++ b/data/layouts/Route131/layout.inc
@@ -0,0 +1,14 @@
+Route131_MapBorder:: @ 82BF1FC
+ .incbin "data/layouts/Route131/border.bin"
+
+Route131_MapBlockdata:: @ 82BF204
+ .incbin "data/layouts/Route131/map.bin"
+
+ .align 2
+Route131_Layout:: @ 82C04C4
+ .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..ca8079e0f
--- /dev/null
+++ b/data/layouts/Route131/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut|}ppVOOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqqqqt||}qqt}upppVOOOOOOOOOOOOOOOOOVppppppppppppppppp||||||||}qqqt|}t}pppppppVOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqt|||}qt}pppppppVOOOOOOOOOOOOOOOVppppppppppppppppppqqt||}qqqt|}ppppppppVOOOOOOOOOOOOOOOVpppppppppppppppppp||}qt|||}ppuvppppppVOOOOOOOOOOOOOOVpppppppppppppppppp|}uvpu{vp}~ppppppVOOOOOOOOOOOOOVpppppppppppppppppppZ[ppppp}~pzq|ppppppppppVOOOOOOOOOOOOVpppppppPQpppppppppppXYppppuvppppypppppppuvpVOOOOOOOOOOOOVppuvu{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pVOOOOOOOOOOOVpuv}~zq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vVOOOOOOOOOOVp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|VOOOOOOOOOVpuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppypVOOOOOOOOVu|pppuvpppuqqvpppppppppppXYppppp}~pppXYppppppuvpVOOOOOOVpzq|ppp}~PQpyyyyPQppppppppppppppppppppuvppppppp}~uvVVVVVVuvypppppXYuvpppppXYu{pppppppppppppppppp}~u{vpppppp}~ppppPQ}~pppppppppp}~pppppppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppppppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|ppppppppp}~ppppppppppppppppppppppppppppppppp}~pppppppPQzqqq|pppppppppppPQppppppppppppppppppppppppppppppppppppppppXYyyypppppppppppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYppuvppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vpppp}~uvppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvppppp}~puqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~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..f59bbc923
--- /dev/null
+++ b/data/layouts/Route132/layout.inc
@@ -0,0 +1,14 @@
+Route132_MapBorder:: @ 82C04DC
+ .incbin "data/layouts/Route132/border.bin"
+
+Route132_MapBlockdata:: @ 82C04E4
+ .incbin "data/layouts/Route132/map.bin"
+
+ .align 2
+Route132_Layout:: @ 82C1DE4
+ .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..f122b2865
--- /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..e9be93e17
--- /dev/null
+++ b/data/layouts/Route133/layout.inc
@@ -0,0 +1,14 @@
+Route133_MapBorder:: @ 82C1DFC
+ .incbin "data/layouts/Route133/border.bin"
+
+Route133_MapBlockdata:: @ 82C1E04
+ .incbin "data/layouts/Route133/map.bin"
+
+ .align 2
+Route133_Layout:: @ 82C3704
+ .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..dfb44fe81
--- /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}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQcccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2WcccccXYcccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2111_ccccPQccccccccccccccccccccccccccccc^111111111111_ccccccc}~11111111111^WWWW_OgccccXYccccccccccccccccccccfGGN111111111_ccccVF2F2F2F21111^WWWWWWWtyo_cccccccccccccccccccccccccccccfGGN111111_cccc^^W_11111ftyyo11_cccccccccccccccccccVF2F2F2WccccccccccfGN1111_cccV>2f_11^Wtyyyyyo111OGgcccccccccccccccccccc^111?2F2F2WccccccccfGGGGgccc^^WWtyyo1111111OGgccccccccccccccccccfN11111?2F2F2WcccccccccccccV>2f1111111OGGgcccccu{{{{{{{{{{{{tccfN1111111?2F2F2Wccccccccccc^1ftyyyyo1OGGGGGgcccu{{{{tccfN111111111?2F2F2Wccccccccc^1nyyo111111_ccccccccutyyyyyyyyyy{tccfN11111111111?2F2F2Wccccccccccc^1111111OGGGgcccccu{{tyy$1$1$1$1$1$1$1$1$1$1yyy|ccfN1111111111111_cccccccccccfGN1111Ogccccccccccccu{tyyy$1111111$1$111111$1$1$1tccccfGGGGGGGGGGGGGgccccccccccfGGGGgcccccccccccccztyo11111111111111nytcccccccccccccccccccPQcccccccccccccccccccccccccc}~ppp}y~cccccccccccccccccccXYcccccccccccccccccccccccccccppppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccPQPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{tPQXYccXYcPQXYXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYppppputyyyyytyyyyy~XYcccccccXYppppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{to1111n1111?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{tyyo111111no111111?2WccpppppppppppPQXYO1O1O1O1O11_cccccccccuv}~llllcccccccccccpputo11111^_111111^_111_cppppppppppppXYO1O1O1O1O1O1O11_ccccccccc}~llllccccccccccccccc}yyyo11111no1111111fg^_1_ccpppppppppppPQO1O1O1O1O1O1O11_cccccccccclllccccccccccccccccccccc^1111^_111111111nofg1_cccppppppppppXYO1O1O1O1O1O1O11_ccccccccccccccccccccccccccccccccccfGN11fg1111111111no1_cccccpppppppccPQO1O1O1O1O1O11_cccccccccccccccccccccccccccccccccccc^11no1111OGGGN1111OgcccccccppPQccXYPQO1O1O1O11_cccccccccc\\\cccccccccccccccccccccccfN11111OGgcccfGGGGgccccccccccXYccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfN111OgccccccccccccccccccccccccccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYppccuvccccccccccuvpp}~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..91e9cab8a
--- /dev/null
+++ b/data/layouts/Route134/layout.inc
@@ -0,0 +1,14 @@
+Route134_MapBorder:: @ 82C371C
+ .incbin "data/layouts/Route134/border.bin"
+
+Route134_MapBlockdata:: @ 82C3724
+ .incbin "data/layouts/Route134/map.bin"
+
+ .align 2
+Route134_Layout:: @ 82C5024
+ .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..fbb491539
--- /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..7f37d8f74
--- /dev/null
+++ b/data/layouts/RustboroCity/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_MapBorder:: @ 82892CC
+ .incbin "data/layouts/RustboroCity/border.bin"
+
+RustboroCity_MapBlockdata:: @ 82892D4
+ .incbin "data/layouts/RustboroCity/map.bin"
+
+ .align 2
+RustboroCity_Layout:: @ 828A594
+ .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..d8921ec3f
--- /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..c13b660d9
--- /dev/null
+++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
+ .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin"
+
+RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4
+ .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin"
+
+ .align 2
+RustboroCity_CuttersHouse_Layout:: @ 82D1ABC
+ .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 @@
+yzfg8898x88no@@A@VW33v3w3+3+3+3+33^3_3+3{3|3|3}3,3,3,3,3,3,3+33>2>23,3,3,3j7k7E3+33>2>23,3,3D3r7s7E3+33333,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..d5c85b2a6
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
+ .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin"
+
+RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230
+ .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin"
+
+ .align 2
+RustboroCity_DevonCorp_1F_Layout:: @ 82D1388
+ .4byte 0x13
+ .4byte 0x9
+ .4byte RustboroCity_DevonCorp_1F_MapBorder
+ .4byte RustboroCity_DevonCorp_1F_MapBlockdata
+ .4byte gTileset_General
+ .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..78cc0c199
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
@@ -0,0 +1 @@
+333333333333333333333333333333333333333333333333333333333333333333333333333333333333322333333333333 \ 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..aa13c9810
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
+ .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin"
+
+RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8
+ .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin"
+
+ .align 2
+RustboroCity_DevonCorp_2F_Layout:: @ 82D1500
+ .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 @@
+33333333333333333333333333333333333337773377337733773333377333733333333333333333333333333333333333377337733773333333333333333333333 \ 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..b033a84f1
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
+ .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin"
+
+RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770
+ .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin"
+
+ .align 2
+RustboroCity_DevonCorp_3F_Layout:: @ 82F28C8
+ .4byte 0x13
+ .4byte 0x9
+ .4byte RustboroCity_DevonCorp_3F_MapBorder
+ .4byte RustboroCity_DevonCorp_3F_MapBlockdata
+ .4byte gTileset_General
+ .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..8333a8bc3
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
@@ -0,0 +1 @@
+IJK33333333Q3R3S333333333333333333333333333332333H33333233333P33333333233333333333333333333333333333333333333333333333 \ 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..449157295
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
+ .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin"
+
+RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4
+ .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin"
+
+ .align 2
+RustboroCity_Flat1_1F_Layout:: @ 82FF994
+ .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+33^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,332H6I623+3p7q7E3,3,3,3,33>2P6Q623F3G3,3,3,3,3,3,3333333N7O7,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..804f8af4f
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
+ .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin"
+
+RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4
+ .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin"
+
+ .align 2
+RustboroCity_Flat1_2F_Layout:: @ 82FFA94
+ .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..17a611343
--- /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~777E3,3,33>2>2>23,3+3,3777E3,3,33>2>2>23,3+3G3G3,3,3,3,3,333333,3+3O7O7,3,3,3,3,3,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..8f25d160e
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
+ .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin"
+
+RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000
+ .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin"
+
+ .align 2
+RustboroCity_Flat2_1F_Layout:: @ 82FC0FC
+ .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..3d08ed34e
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
+ .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin"
+
+RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C
+ .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin"
+
+ .align 2
+RustboroCity_Flat2_2F_Layout:: @ 82FC218
+ .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..c4b09da1c
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
+ .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin"
+
+RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238
+ .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin"
+
+ .align 2
+RustboroCity_Flat2_3F_Layout:: @ 82FC334
+ .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..5c17a62ef
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Gym_MapBorder:: @ 82D1518
+ .incbin "data/layouts/RustboroCity_Gym/border.bin"
+
+RustboroCity_Gym_MapBlockdata:: @ 82D1520
+ .incbin "data/layouts/RustboroCity_Gym/map.bin"
+
+ .align 2
+RustboroCity_Gym_Layout:: @ 82D16C4
+ .4byte 0xb
+ .4byte 0x13
+ .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..bc69d8879
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/map.bin
@@ -0,0 +1,2 @@
+         
+%262222262  2726$222$622 22222222222"2&2&2!2222 2!22-2)(.222)*/21)*%22222)*/21)062!2222)*/215.222./211%2"2#2222"2'26241/2)*/222+*1/2)*/22222)*1/2)*/222 2&23*,/2./222. 2722272222222 22222222222 222222222 222222222 \ 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..9d523190e
--- /dev/null
+++ b/data/layouts/RustboroCity_House/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_House_MapBorder:: @ 82D1804
+ .incbin "data/layouts/RustboroCity_House/border.bin"
+
+RustboroCity_House_MapBlockdata:: @ 82D180C
+ .incbin "data/layouts/RustboroCity_House/map.bin"
+
+ .align 2
+RustboroCity_House_Layout:: @ 82D18E4
+ .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 @@
+yz89888819fgIA@@JKAno33Q3+3+3+3R3S363+3v3w3+3,3,3{3|3|3|3|3}3,3,3,3+3,3,332H^23,3,3,3+3,3,332PQ23,3,3,3+3,3,3333333,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..8635c91af
--- /dev/null
+++ b/data/layouts/RustboroCity_House1/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_House1_MapBorder:: @ 82D18FC
+ .incbin "data/layouts/RustboroCity_House1/border.bin"
+
+RustboroCity_House1_MapBlockdata:: @ 82D1904
+ .incbin "data/layouts/RustboroCity_House1/map.bin"
+
+ .align 2
+RustboroCity_House1_Layout:: @ 82D19D4
+ .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~777E3,33>2>23,3+3,3D3777,3,33333,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..7c284c712
--- /dev/null
+++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
+ .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin"
+
+RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4
+ .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin"
+
+ .align 2
+RustboroCity_PokemonSchool_Layout:: @ 82D17EC
+ .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..94e2c858b
--- /dev/null
+++ b/data/layouts/RusturfTunnel/layout.inc
@@ -0,0 +1,14 @@
+RusturfTunnel_MapBorder:: @ 82D725C
+ .incbin "data/layouts/RusturfTunnel/border.bin"
+
+RusturfTunnel_MapBlockdata:: @ 82D7264
+ .incbin "data/layouts/RusturfTunnel/map.bin"
+
+ .align 2
+RusturfTunnel_Layout:: @ 82D7924
+ .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..7e6ce5d5e
--- /dev/null
+++ b/data/layouts/SSTidalCorridor/layout.inc
@@ -0,0 +1,14 @@
+SSTidalCorridor_MapBorder:: @ 82F63F8
+ .incbin "data/layouts/SSTidalCorridor/border.bin"
+
+SSTidalCorridor_MapBlockdata:: @ 82F6400
+ .incbin "data/layouts/SSTidalCorridor/map.bin"
+
+ .align 2
+SSTidalCorridor_Layout:: @ 82F65D4
+ .4byte 0x12
+ .4byte 0xd
+ .4byte SSTidalCorridor_MapBorder
+ .4byte SSTidalCorridor_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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 @@
+2222222222222222 6222222222222222222201111111111222222011111111112222220111111111122222201111111111222222%#$"#$"#$"#&22222-+6{*+6{*+6{*+622222222222222222222 22222222222222222 \ 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..5054d8c1d
--- /dev/null
+++ b/data/layouts/SSTidalLowerDeck/layout.inc
@@ -0,0 +1,14 @@
+SSTidalLowerDeck_MapBorder:: @ 82F65EC
+ .incbin "data/layouts/SSTidalLowerDeck/border.bin"
+
+SSTidalLowerDeck_MapBlockdata:: @ 82F65F4
+ .incbin "data/layouts/SSTidalLowerDeck/map.bin"
+
+ .align 2
+SSTidalLowerDeck_Layout:: @ 82F67B0
+ .4byte 0x11
+ .4byte 0xd
+ .4byte SSTidalLowerDeck_MapBorder
+ .4byte SSTidalLowerDeck_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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 @@
+22222222 22 22 22 2 2 22 2222 2222 22222 2 2 22222222 222 2222 2 2 22222 2 22222 2 2222222222222222 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2222222222 222 222 2 22222 2662222222 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..cbfe5ba5c
--- /dev/null
+++ b/data/layouts/SSTidalRooms/layout.inc
@@ -0,0 +1,14 @@
+SSTidalRooms_MapBorder:: @ 82F67C8
+ .incbin "data/layouts/SSTidalRooms/border.bin"
+
+SSTidalRooms_MapBlockdata:: @ 82F67D0
+ .incbin "data/layouts/SSTidalRooms/map.bin"
+
+ .align 2
+SSTidalRooms_Layout:: @ 82F6CE0
+ .4byte 0x24
+ .4byte 0x12
+ .4byte SSTidalRooms_MapBorder
+ .4byte SSTidalRooms_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Ship
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@kcmE@kcmE@kc''@kcmE7>HsuMHsuMHs////uM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282828282\]?>:;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;2qr66;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz828282\]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_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..9fa27626e
--- /dev/null
+++ b/data/layouts/SafariZone_Northeast/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Northeast_MapBorder:: @ 82EAD80
+ .incbin "data/layouts/SafariZone_Northeast/border.bin"
+
+SafariZone_Northeast_MapBlockdata:: @ 82EAD88
+ .incbin "data/layouts/SafariZone_Northeast/map.bin"
+
+ .align 2
+SafariZone_Northeast_Layout:: @ 82EBA08
+ .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..d5e7fd825
--- /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..b3a82fd0f
--- /dev/null
+++ b/data/layouts/SafariZone_Northwest/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Northwest_MapBorder:: @ 82EA0E0
+ .incbin "data/layouts/SafariZone_Northwest/border.bin"
+
+SafariZone_Northwest_MapBlockdata:: @ 82EA0E8
+ .incbin "data/layouts/SafariZone_Northwest/map.bin"
+
+ .align 2
+SafariZone_Northwest_Layout:: @ 82EAD68
+ .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..127289873
--- /dev/null
+++ b/data/layouts/SafariZone_RestHouse/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_RestHouse_MapBorder:: @ 830476C
+ .incbin "data/layouts/SafariZone_RestHouse/border.bin"
+
+SafariZone_RestHouse_MapBlockdata:: @ 8304774
+ .incbin "data/layouts/SafariZone_RestHouse/map.bin"
+
+ .align 2
+SafariZone_RestHouse_Layout:: @ 8304828
+ .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#24266<2#2#2#2#292#24266<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_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..8893cb6a1
--- /dev/null
+++ b/data/layouts/SafariZone_Southeast/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Southeast_MapBorder:: @ 82EC6C0
+ .incbin "data/layouts/SafariZone_Southeast/border.bin"
+
+SafariZone_Southeast_MapBlockdata:: @ 82EC6C8
+ .incbin "data/layouts/SafariZone_Southeast/map.bin"
+
+ .align 2
+SafariZone_Southeast_Layout:: @ 82ED348
+ .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..540798144
--- /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..58f199ac6
--- /dev/null
+++ b/data/layouts/SafariZone_Southwest/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Southwest_MapBorder:: @ 82EBA20
+ .incbin "data/layouts/SafariZone_Southwest/border.bin"
+
+SafariZone_Southwest_MapBlockdata:: @ 82EBA28
+ .incbin "data/layouts/SafariZone_Southwest/map.bin"
+
+ .align 2
+SafariZone_Southwest_Layout:: @ 82EC6A8
+ .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..52d172a89
--- /dev/null
+++ b/data/layouts/ScorchedSlab/layout.inc
@@ -0,0 +1,14 @@
+ScorchedSlab_MapBorder:: @ 82FF340
+ .incbin "data/layouts/ScorchedSlab/border.bin"
+
+ScorchedSlab_MapBlockdata:: @ 82FF348
+ .incbin "data/layouts/ScorchedSlab/map.bin"
+
+ .align 2
+ScorchedSlab_Layout:: @ 82FF5A0
+ .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 @@
+222222222222222222222222222222222ppppppppppppppppppppppppppppppppppppppppppppppppppppGG^^^^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..bfdb7cdbd
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Entrance/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
+ .incbin "data/layouts/SeafloorCavern_Entrance/border.bin"
+
+SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8
+ .incbin "data/layouts/SeafloorCavern_Entrance/map.bin"
+
+ .align 2
+SeafloorCavern_Entrance_Layout:: @ 82DD6F8
+ .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..3861044dd
--- /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$111111$1$1$1$1$1
+ $1$1$1111111111$1$1$1
+ $1$111111111111$1$1
+ $1111111$1
+ 111ppppp11$1
+ 11ppppppp11
+ 11ppppppppp11
+ 11ppppppppp11
+1ppVVVVppppVVpVV \ 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..3ebfd886f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room1/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room1_MapBorder:: @ 82DD710
+ .incbin "data/layouts/SeafloorCavern_Room1/border.bin"
+
+SeafloorCavern_Room1_MapBlockdata:: @ 82DD718
+ .incbin "data/layouts/SeafloorCavern_Room1/map.bin"
+
+ .align 2
+SeafloorCavern_Room1_Layout:: @ 82DDA60
+ .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 @@
+222322222222222222222222222222222222222622222226222222222222222222222222222222222222226666222222266662222<22266666222662222222222222222222222 \ 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..86a7134ed
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room2_MapBorder:: @ 82DDA78
+ .incbin "data/layouts/SeafloorCavern_Room2/border.bin"
+
+SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80
+ .incbin "data/layouts/SeafloorCavern_Room2/map.bin"
+
+ .align 2
+SeafloorCavern_Room2_Layout:: @ 82DDD74
+ .4byte 0x12
+ .4byte 0x15
+ .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..01b66f2f3
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/map.bin
@@ -0,0 +1 @@
+33222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ 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..0e660f4f3
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
+ .incbin "data/layouts/SeafloorCavern_Room3/border.bin"
+
+SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94
+ .incbin "data/layouts/SeafloorCavern_Room3/map.bin"
+
+ .align 2
+SeafloorCavern_Room3_Layout:: @ 82DDFB4
+ .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..b5e92ca20
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/map.bin
@@ -0,0 +1 @@
+666666663666662226666622266666222666662226662226662226662222222222222222222222222222222222222QQQM2222222222222222226666666 \ 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..013e2d74e
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room4/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
+ .incbin "data/layouts/SeafloorCavern_Room4/border.bin"
+
+SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4
+ .incbin "data/layouts/SeafloorCavern_Room4/map.bin"
+
+ .align 2
+SeafloorCavern_Room4_Layout:: @ 82DE280
+ .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 @@
+3362222222622222226LQQM22262222222292222222222229222222222222222222666222222222222223222222229222222222229222222LQQQM2222222222 \ 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..ede193527
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room5/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room5_MapBorder:: @ 82DE298
+ .incbin "data/layouts/SeafloorCavern_Room5/border.bin"
+
+SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0
+ .incbin "data/layouts/SeafloorCavern_Room5/map.bin"
+
+ .align 2
+SeafloorCavern_Room5_Layout:: @ 82DE5C0
+ .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 @@
+32222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ 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..0b6b1026e
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
+ .incbin "data/layouts/SeafloorCavern_Room6/border.bin"
+
+SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0
+ .incbin "data/layouts/SeafloorCavern_Room6/map.bin"
+
+ .align 2
+SeafloorCavern_Room6_Layout:: @ 82DEA30
+ .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..3776cc4c7
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/map.bin
@@ -0,0 +1 @@
+z2xzzy2y2y2y2xxzzy2y2y2y2pxxzzy2y2y2y2ppppppppppppxxzzy2y2y2y2ppppuvvvwpppxxzzpppu~~~wppxxzzppppppp}ppxxzzppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppppxxzzppppppxxzzpppppppppppppxxzzppppppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppxxzzppppppppppxxzzpppppppppppuvzzpppppuo2o2o2vwpuv~~~~vvvvvz~22~2x~v~~~~~~~~~~~~~~~~~~~~~~~~~ \ 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..c4d799bfd
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room7_MapBorder:: @ 82DEA48
+ .incbin "data/layouts/SeafloorCavern_Room7/border.bin"
+
+SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50
+ .incbin "data/layouts/SeafloorCavern_Room7/map.bin"
+
+ .align 2
+SeafloorCavern_Room7_Layout:: @ 82DEED0
+ .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..c1afaebcf
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/map.bin
@@ -0,0 +1 @@
+z2~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2xzzpppxxzzpppppppppppppppppxxzzppxxzzpppppppppppppppxxzzppxxzzppppppppppppppxxzzpppppppxxzzpppppppppppppppxxzzpppppxxzzpppppppppppxxzzpppppppppppxxzzpppxxzzpppppppppppppxxzzpppppppppppppxxzzpppxxz66q2ypppppppppppppxxzy6z6y2pppppppppppppxxzy6z6y2q2q2q2q2q2yppppppppxxz66y2y2y2y2y2y2ppppppppxxzzy22y2y2sy2tppppppppxxqqvvvvvvvvvv \ 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..3c5ba6912
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room8/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
+ .incbin "data/layouts/SeafloorCavern_Room8/border.bin"
+
+SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0
+ .incbin "data/layouts/SeafloorCavern_Room8/map.bin"
+
+ .align 2
+SeafloorCavern_Room8_Layout:: @ 82DF024
+ .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 @@
+632222222222222222222222222222222222LQM22222222222 \ 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..c0cf63b78
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room9_MapBorder:: @ 82DF03C
+ .incbin "data/layouts/SeafloorCavern_Room9/border.bin"
+
+SeafloorCavern_Room9_MapBlockdata:: @ 82DF044
+ .incbin "data/layouts/SeafloorCavern_Room9/map.bin"
+
+ .align 2
+SeafloorCavern_Room9_Layout:: @ 82DF9F8
+ .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 @@
+222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  222 222    2222222 2222222222 2222222    # 222    #2222 #  2222      2222 #    2222  222 # OO 222OOOO222pNOOOONp222ppNNNNpp22222pppppppp22222 ppppppppp22222222#2s2lpppppppp222222222#2lpppppjs2s2$222222222#2s2s2s2s2s2$22222222222222222222222 \ 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..2bd90e419
--- /dev/null
+++ b/data/layouts/SealedChamber_InnerRoom/layout.inc
@@ -0,0 +1,14 @@
+SealedChamber_InnerRoom_MapBorder:: @ 82FE698
+ .incbin "data/layouts/SealedChamber_InnerRoom/border.bin"
+
+SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0
+ .incbin "data/layouts/SealedChamber_InnerRoom/map.bin"
+
+ .align 2
+SealedChamber_InnerRoom_Layout:: @ 82FEA68
+ .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 @@
+222222222222777222222222222222222222222222222222222222722222722222222222222222222222222222222222222222222222222722222222272222222222222222222222222222222222222222222222222722222722222222222222 \ 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..f248eff53
--- /dev/null
+++ b/data/layouts/SealedChamber_OuterRoom/layout.inc
@@ -0,0 +1,14 @@
+SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
+ .incbin "data/layouts/SealedChamber_OuterRoom/border.bin"
+
+SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0
+ .incbin "data/layouts/SealedChamber_OuterRoom/map.bin"
+
+ .align 2
+SealedChamber_OuterRoom_Layout:: @ 82F83B8
+ .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   
+222255525552222222222222222222222222222222222VVV2222222222VGV22222$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..e07296cc3
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave1_MapBorder:: @ 82E7888
+ .incbin "data/layouts/SecretBase_BlueCave1/border.bin"
+
+SecretBase_BlueCave1_MapBlockdata:: @ 82E7890
+ .incbin "data/layouts/SecretBase_BlueCave1/map.bin"
+
+ .align 2
+SecretBase_BlueCave1_Layout:: @ 82E7958
+ .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..2bed0ca4f
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave2_MapBorder:: @ 82E7E44
+ .incbin "data/layouts/SecretBase_BlueCave2/border.bin"
+
+SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C
+ .incbin "data/layouts/SecretBase_BlueCave2/map.bin"
+
+ .align 2
+SecretBase_BlueCave2_Layout:: @ 82E7F20
+ .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..ef34dff34
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave3_MapBorder:: @ 82E84C4
+ .incbin "data/layouts/SecretBase_BlueCave3/border.bin"
+
+SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC
+ .incbin "data/layouts/SecretBase_BlueCave3/map.bin"
+
+ .align 2
+SecretBase_BlueCave3_Layout:: @ 82E8620
+ .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..b05de46b6
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave4_MapBorder:: @ 82E8C70
+ .incbin "data/layouts/SecretBase_BlueCave4/border.bin"
+
+SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78
+ .incbin "data/layouts/SecretBase_BlueCave4/map.bin"
+
+ .align 2
+SecretBase_BlueCave4_Layout:: @ 82E8DAC
+ .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..8b33aa0a0
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave1_MapBorder:: @ 82E77A0
+ .incbin "data/layouts/SecretBase_BrownCave1/border.bin"
+
+SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8
+ .incbin "data/layouts/SecretBase_BrownCave1/map.bin"
+
+ .align 2
+SecretBase_BrownCave1_Layout:: @ 82E7870
+ .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..afce94e36
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave2_MapBorder:: @ 82E7D28
+ .incbin "data/layouts/SecretBase_BrownCave2/border.bin"
+
+SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30
+ .incbin "data/layouts/SecretBase_BrownCave2/map.bin"
+
+ .align 2
+SecretBase_BrownCave2_Layout:: @ 82E7E2C
+ .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..01ad3ff05
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave3_MapBorder:: @ 82E8358
+ .incbin "data/layouts/SecretBase_BrownCave3/border.bin"
+
+SecretBase_BrownCave3_MapBlockdata:: @ 82E8360
+ .incbin "data/layouts/SecretBase_BrownCave3/map.bin"
+
+ .align 2
+SecretBase_BrownCave3_Layout:: @ 82E84AC
+ .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..cb3b6288c
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave4_MapBorder:: @ 82E8B00
+ .incbin "data/layouts/SecretBase_BrownCave4/border.bin"
+
+SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08
+ .incbin "data/layouts/SecretBase_BrownCave4/map.bin"
+
+ .align 2
+SecretBase_BrownCave4_Layout:: @ 82E8C58
+ .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..0f93b246d
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave1_MapBorder:: @ 82E76B8
+ .incbin "data/layouts/SecretBase_RedCave1/border.bin"
+
+SecretBase_RedCave1_MapBlockdata:: @ 82E76C0
+ .incbin "data/layouts/SecretBase_RedCave1/map.bin"
+
+ .align 2
+SecretBase_RedCave1_Layout:: @ 82E7788
+ .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..f3a14a012
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave2_MapBorder:: @ 82E7C28
+ .incbin "data/layouts/SecretBase_RedCave2/border.bin"
+
+SecretBase_RedCave2_MapBlockdata:: @ 82E7C30
+ .incbin "data/layouts/SecretBase_RedCave2/map.bin"
+
+ .align 2
+SecretBase_RedCave2_Layout:: @ 82E7D10
+ .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..6cd683f8e
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave3_MapBorder:: @ 82E8248
+ .incbin "data/layouts/SecretBase_RedCave3/border.bin"
+
+SecretBase_RedCave3_MapBlockdata:: @ 82E8250
+ .incbin "data/layouts/SecretBase_RedCave3/map.bin"
+
+ .align 2
+SecretBase_RedCave3_Layout:: @ 82E8340
+ .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..1baa61276
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave4_MapBorder:: @ 82E89D0
+ .incbin "data/layouts/SecretBase_RedCave4/border.bin"
+
+SecretBase_RedCave4_MapBlockdata:: @ 82E89D8
+ .incbin "data/layouts/SecretBase_RedCave4/map.bin"
+
+ .align 2
+SecretBase_RedCave4_Layout:: @ 82E8AE8
+ .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..68cbf0df3
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub1_MapBorder:: @ 82E7B40
+ .incbin "data/layouts/SecretBase_Shrub1/border.bin"
+
+SecretBase_Shrub1_MapBlockdata:: @ 82E7B48
+ .incbin "data/layouts/SecretBase_Shrub1/map.bin"
+
+ .align 2
+SecretBase_Shrub1_Layout:: @ 82E7C10
+ .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..8e246a6ad
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub2_MapBorder:: @ 82E8154
+ .incbin "data/layouts/SecretBase_Shrub2/border.bin"
+
+SecretBase_Shrub2_MapBlockdata:: @ 82E815C
+ .incbin "data/layouts/SecretBase_Shrub2/map.bin"
+
+ .align 2
+SecretBase_Shrub2_Layout:: @ 82E8230
+ .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..ddae76b6e
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub3_MapBorder:: @ 82E8890
+ .incbin "data/layouts/SecretBase_Shrub3/border.bin"
+
+SecretBase_Shrub3_MapBlockdata:: @ 82E8898
+ .incbin "data/layouts/SecretBase_Shrub3/map.bin"
+
+ .align 2
+SecretBase_Shrub3_Layout:: @ 82E89B8
+ .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..62ddf14f0
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub4_MapBorder:: @ 82E90F8
+ .incbin "data/layouts/SecretBase_Shrub4/border.bin"
+
+SecretBase_Shrub4_MapBlockdata:: @ 82E9100
+ .incbin "data/layouts/SecretBase_Shrub4/map.bin"
+
+ .align 2
+SecretBase_Shrub4_Layout:: @ 82E9234
+ .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..3b29d0302
--- /dev/null
+++ b/data/layouts/SecretBase_Tree1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree1_MapBorder:: @ 82E7A58
+ .incbin "data/layouts/SecretBase_Tree1/border.bin"
+
+SecretBase_Tree1_MapBlockdata:: @ 82E7A60
+ .incbin "data/layouts/SecretBase_Tree1/map.bin"
+
+ .align 2
+SecretBase_Tree1_Layout:: @ 82E7B28
+ .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..71722bcdb
--- /dev/null
+++ b/data/layouts/SecretBase_Tree2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree2_MapBorder:: @ 82E8054
+ .incbin "data/layouts/SecretBase_Tree2/border.bin"
+
+SecretBase_Tree2_MapBlockdata:: @ 82E805C
+ .incbin "data/layouts/SecretBase_Tree2/map.bin"
+
+ .align 2
+SecretBase_Tree2_Layout:: @ 82E813C
+ .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..425369a5f
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree3_MapBorder:: @ 82E8760
+ .incbin "data/layouts/SecretBase_Tree3/border.bin"
+
+SecretBase_Tree3_MapBlockdata:: @ 82E8768
+ .incbin "data/layouts/SecretBase_Tree3/map.bin"
+
+ .align 2
+SecretBase_Tree3_Layout:: @ 82E8878
+ .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..85b921292
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree4_MapBorder:: @ 82E8F50
+ .incbin "data/layouts/SecretBase_Tree4/border.bin"
+
+SecretBase_Tree4_MapBlockdata:: @ 82E8F58
+ .incbin "data/layouts/SecretBase_Tree4/map.bin"
+
+ .align 2
+SecretBase_Tree4_Layout:: @ 82E90E0
+ .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..6ae6cddf1
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave1_MapBorder:: @ 82E7970
+ .incbin "data/layouts/SecretBase_YellowCave1/border.bin"
+
+SecretBase_YellowCave1_MapBlockdata:: @ 82E7978
+ .incbin "data/layouts/SecretBase_YellowCave1/map.bin"
+
+ .align 2
+SecretBase_YellowCave1_Layout:: @ 82E7A40
+ .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..dc206e31d
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave2_MapBorder:: @ 82E7F38
+ .incbin "data/layouts/SecretBase_YellowCave2/border.bin"
+
+SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40
+ .incbin "data/layouts/SecretBase_YellowCave2/map.bin"
+
+ .align 2
+SecretBase_YellowCave2_Layout:: @ 82E803C
+ .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..af6b14601
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave3_MapBorder:: @ 82E8638
+ .incbin "data/layouts/SecretBase_YellowCave3/border.bin"
+
+SecretBase_YellowCave3_MapBlockdata:: @ 82E8640
+ .incbin "data/layouts/SecretBase_YellowCave3/map.bin"
+
+ .align 2
+SecretBase_YellowCave3_Layout:: @ 82E8748
+ .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..94bf59ab5
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
+ .incbin "data/layouts/SecretBase_YellowCave4/border.bin"
+
+SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC
+ .incbin "data/layouts/SecretBase_YellowCave4/map.bin"
+
+ .align 2
+SecretBase_YellowCave4_Layout:: @ 82E8F38
+ .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..5745b09c2
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
+ .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin"
+
+ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48
+ .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin"
+
+ .align 2
+ShoalCave_HighTideEntranceRoom_Layout:: @ 82E47DC
+ .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 @@
+      2222222222222222822222222222222222|z22822222222222222222|pppppz22@QQQQQ22222pppppz222222222222|pppppz222222222222|ppppppppppppp2222222|pppppppppppppz22pppppppppppppppppppz22|pppppppppppppppppppz22|pppppppppppppppppppppppz22|pppppppppppppppppppppppz22|pppppppppppp11111111112C22]C]CUCUCUCUC^pppppp1111111111122BBBBBB|pppppp1111111111m#222BBBBB|pppppp11111222BBB2ppppppppppp11111    BBB|ppppppppppp11111BBB|pppppppppppppp111mn#  BBB|pppppppppppppp111BBB2ppppppppppppp111BBB1111111111111111111  BBB1111111111111111111   BBB1111111111111111111BBB1111111111111111111BBB#BnBnBnBnBnBnBo111111111111BBBBBBBBBB111111111111#         "111111111111111111u211111        " 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..d95827791
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
+ .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin"
+
+ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC
+ .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
+
+ .align 2
+ShoalCave_HighTideInnerRoom_Layout:: @ 82E55A4
+ .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 @@
+BBBBBBBBBBB22222BBBBBBBBBBB22222BBBBBBBBBBBBBBBBppppppppppppppppppppppppBBBBBBBBBBppppppppppppppppppppppppBBBBBBBBBB[32ppppppppppppppppppppppppBBB22ppp111111111111111111111RRRRR[SRBBB22ppp111111111111111111111RRRRRRBBB22pppmnRnRnRnRnRnRnRnRnRnRnRo111111112BBB2pppR[S  B B B B B B B"#R Ro11BBBpppRRBBBBBBBRR11pppppppppBBBpppppRRBBBBBBBRR11pppppppppBBBpppppRRBBBBRR11pppppppppBBBpppppBBBBRR1111111111111BBBppppp111BBBBRR1111111111111BBBpppppppBBBBRR111111mnRnRnRnRnRnR#RBBBppppppppppBBBBRR111111RRRRR[SRBBBBBBBBBBBRR111111RRRRRRRBBBBBBBBBBB111111RRRRRRRppppppppppB2111111RRRR111pppppppBBBBBB1111RRRR#RnRnRnRnRnRopppppppBBBBBBpppppRRRRRRRRRRppppp11BBBBBBpppppppppRRRRRRRpppppmn#     "pppppppppRRRRRRR1111111111   pppppppppRRRRRRR1111111111pppppppppRRRRRRR1111111111     "11111111111RRRRRRR#RnRnRnRnRnRnRnRnRnRnR#R11111111111RRRRRRRRRRRRRRRRRRR##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..ceb41f7e8
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
+ .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin"
+
+ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0
+ .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideEntranceRoom_Layout:: @ 82E2A44
+ .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 @@
+      2222222222222222822222222222222222   22822222222222222222222@QQQQQ2222222222222222222222222222222222222222i22222222222222222222222222222222222222222222222222222222222222222222222222222222222222           22#     
+2222 2222222222222#B B B B B B
+22222222222222222BBBBBB22222222222222p#222BBBBBB2222222222222BBBB2222h222222   #BBB22222222222222BBB222222222222p # #BBB222222222222222BBB#            #222BBB#2 222222222222222222 #BBB2222222222222222222  #BBB2222222222222222222BBB2222222222211112222BBB#B B B B B B Bq222111111222BBBBBBBBBB222111111222#         "221111111122221111u211122#       "#     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..b2ef09f0e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
+ .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin"
+
+ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4
+ .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideIceRoom_Layout:: @ 8304754
+ .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 @@
+{|{|3333~33~33333}333333333}333333333}3~333323333333|33333~33333333333xyCyCyCz33~}333xCCCC3333|333CCCCww|3xyCCCCCC33333333CCCCCC33333333CCC~CC33333333c|CCC33333333233CCC333~333333}CCCCz333333}333CCCCCyCz333333~3CC~CC}3333z333C}CCCCCz333z33|CCCCC3333333CCCCC3333333|CCC333{3}3}33CCC333{}333333333333333333333333333333233333333333~23333}3233333yyz33~3333333333yyyyyz3333333yyyyyyy \ 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..10a1948ca
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
+ .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin"
+
+ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64
+ .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideInnerRoom_Layout:: @ 82E380C
+ .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 @@
+BBBBBBBBBBB22222BBBBBBBBBBBBB22222BBBBBBBBBBBBBBBBBBRRRRRRRRRRRRRRRRRRRRRRRRBBBBBBBBBBRRRRRRRRRRRRRRRRRRRRRZSRRBBBBBBBBBB[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[SRBBBBBBBBBBBBBBBRR222222RRRRRRRBBBBBBBBBBBBBBBRR222222RRRRRRR22222222B222222RRRRR#   
+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..c57b1b20e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
+ .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin"
+
+ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4
+ .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideLowerRoom_Layout:: @ 82E3E28
+ .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..ded7e7cfb
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
+ .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin"
+
+ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C
+ .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin"
+
+ .align 2
+ShoalCave_LowTideStairsRoom_Layout:: @ 82E3AA4
+ .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..636af1a0f
--- /dev/null
+++ b/data/layouts/SingleBattleColosseum/layout.inc
@@ -0,0 +1,14 @@
+SingleBattleColosseum_MapBorder:: @ 82E924C
+ .incbin "data/layouts/SingleBattleColosseum/border.bin"
+
+SingleBattleColosseum_MapBlockdata:: @ 82E9254
+ .incbin "data/layouts/SingleBattleColosseum/map.bin"
+
+ .align 2
+SingleBattleColosseum_Layout:: @ 82E9350
+ .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_22L2M22222M2N2222U2T2U2U2b2c2U2U2V2U222U2`2U2U2d2e2U2U2a2U222U2T2U2U2f2g2U2U2V2U222U2\2]2]2]2]2]2]2^2U22!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..e53e06ff2
--- /dev/null
+++ b/data/layouts/SkyPillar_1F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_1F_MapBorder:: @ 8303158
+ .incbin "data/layouts/SkyPillar_1F/border.bin"
+
+SkyPillar_1F_MapBlockdata:: @ 8303160
+ .incbin "data/layouts/SkyPillar_1F/map.bin"
+
+ .align 2
+SkyPillar_1F_Layout:: @ 83032E8
+ .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//222222222222222222222222222222222222222289999:2222222@AAAAB222222AAAAAA22222AAAAAA222222AAAAAA222222IMMMMJ2222222222222222222222222222222222"2#222222 \ 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..67cf18b57
--- /dev/null
+++ b/data/layouts/SkyPillar_2F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_2F_MapBorder:: @ 8303300
+ .incbin "data/layouts/SkyPillar_2F/border.bin"
+
+SkyPillar_2F_MapBlockdata:: @ 8303308
+ .incbin "data/layouts/SkyPillar_2F/map.bin"
+
+ .align 2
+SkyPillar_2F_Layout:: @ 8303490
+ .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..533a1ca2d
--- /dev/null
+++ b/data/layouts/SkyPillar_3F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_3F_MapBorder:: @ 83034A8
+ .incbin "data/layouts/SkyPillar_3F/border.bin"
+
+SkyPillar_3F_MapBlockdata:: @ 83034B0
+ .incbin "data/layouts/SkyPillar_3F/map.bin"
+
+ .align 2
+SkyPillar_3F_Layout:: @ 8303638
+ .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/2222222222222222222222222222222222222289999:2222222@AAAAB222222AAAAAA2222222AAAAAA2222222AAAAAA2222222IMMMMJ222222222222222222222222222222222222222 \ 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..c4a651ea1
--- /dev/null
+++ b/data/layouts/SkyPillar_4F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_4F_MapBorder:: @ 8303650
+ .incbin "data/layouts/SkyPillar_4F/border.bin"
+
+SkyPillar_4F_MapBlockdata:: @ 8303658
+ .incbin "data/layouts/SkyPillar_4F/map.bin"
+
+ .align 2
+SkyPillar_4F_Layout:: @ 83037E0
+ .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..ed9c9b0d0
--- /dev/null
+++ b/data/layouts/SkyPillar_5F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_5F_MapBorder:: @ 8304840
+ .incbin "data/layouts/SkyPillar_5F/border.bin"
+
+SkyPillar_5F_MapBlockdata:: @ 8304848
+ .incbin "data/layouts/SkyPillar_5F/map.bin"
+
+ .align 2
+SkyPillar_5F_Layout:: @ 83049D0
+ .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//22222622262222226222226222222228999999:622622@AAAAAAB622262AAAAAAAA226222AAAAAAAA222222AAAAAAAA22222AAAAAAAA262222AAAAAAAA62222IMMMMMMJ22222222222222622622222222222 \ 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..1523383e3
--- /dev/null
+++ b/data/layouts/SkyPillar_Entrance/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Entrance_MapBorder:: @ 8302988
+ .incbin "data/layouts/SkyPillar_Entrance/border.bin"
+
+SkyPillar_Entrance_MapBlockdata:: @ 8302990
+ .incbin "data/layouts/SkyPillar_Entrance/map.bin"
+
+ .align 2
+SkyPillar_Entrance_Layout:: @ 8302C18
+ .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..f535e7bc6
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Outside_MapBorder:: @ 8302C30
+ .incbin "data/layouts/SkyPillar_Outside/border.bin"
+
+SkyPillar_Outside_MapBlockdata:: @ 8302C38
+ .incbin "data/layouts/SkyPillar_Outside/map.bin"
+
+ .align 2
+SkyPillar_Outside_Layout:: @ 8303140
+ .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..4517589d0
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/map.bin
@@ -0,0 +1 @@
+ppppppppppr6666t5pppppppppppppppr66!1!1666tppppppppppr66!1!1!166!1!1!1!1ustppppppprs!1!1!1!1666!1!1uqutppppprss!1!1!1!1!1666!1!1uquuypppxsss!1!1!126666!1uquupppss{!1$1$12222226uquupppssqs$1$1$1$12222222ut}uppps{s$1$1$1$1$1$12222222t}uquppp{ss$1$1$1$1$1$1$122uququpppss{$1$1$1$1$1$1qqu2uququppppssqs$1$1$1$1$1sqqqu2uqut}pppps{{$1$1$1$1{|d|}2ut}uqppPQ{{{$1$1$10t}ut}ppXY{{{$1$1$1$1$1$14$1$1ut}upppppp{{s$1$1$1$1$1$1$1$1t}ut}ppPQppppsqs{$1$1$14$1t|}quuppXYppppPesq{{4$1$1t}qt|}upPQppppppXm{q{{|||}qt}t|}pXYppppPQp{q{|}qupppppppXYpp{|0|}ppppppppppPQpp$1$1$1$1$1Z[ppppppppppXYppppp$1$1$1$1$1pXYu{{{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..e0241fa60
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/border.bin
Binary files differ
diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc
new file mode 100644
index 000000000..ee456e707
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Top_MapBorder:: @ 83049E8
+ .incbin "data/layouts/SkyPillar_Top/border.bin"
+
+SkyPillar_Top_MapBlockdata:: @ 83049F0
+ .incbin "data/layouts/SkyPillar_Top/map.bin"
+
+ .align 2
+SkyPillar_Top_Layout:: @ 8304F00
+ .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..fe6c2ad43
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/map.bin
@@ -0,0 +1 @@
+d2d2d2d2d2d2d2d2d2d2d26d2d2d2d2d26d26d2d2d2d2d2d2d2424242424242427642424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242764242424242424242424242424242424242424242424242424242424242424242427642424242424242424242424242424242424242424242424242424242424242424276424242424242424242424242427642424242424242427642424242424242''''''''''m22n';<='''''''''//////////j22k/CL2E/////////525252525252525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[ \ 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..2d52b7280
--- /dev/null
+++ b/data/layouts/SlateportCity/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_MapBorder:: @ 828798C
+ .incbin "data/layouts/SlateportCity/border.bin"
+
+SlateportCity_MapBlockdata:: @ 8287994
+ .incbin "data/layouts/SlateportCity/map.bin"
+
+ .align 2
+SlateportCity_Layout:: @ 8288C54
+ .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..97046ab59
--- /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..ab05ae00f
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin"
+
+SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin"
+
+ .align 2
+SlateportCity_OceanicMuseum_1F_Layout:: @ 82D08D8
+ .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..75f2d93ae
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin"
+
+SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8
+ .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin"
+
+ .align 2
+SlateportCity_OceanicMuseum_2F_Layout:: @ 82D0A60
+ .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..3013872d5
--- /dev/null
+++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
+ .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin"
+
+SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C
+ .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin"
+
+ .align 2
+SlateportCity_PokemonFanClub_Layout:: @ 82D0750
+ .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..71ae8c7c9
--- /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..59e301313
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
+ .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin"
+
+SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C
+ .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin"
+
+ .align 2
+SlateportCity_SternsShipyard_1F_Layout:: @ 82D0394
+ .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! #!$!"!!"2222
+)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..4e3bcfb46
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
+ .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin"
+
+SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4
+ .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
+
+ .align 2
+SlateportCity_SternsShipyard_2F_Layout:: @ 82D05B4
+ .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 @@
+!!!$#! !!$! !!22222222222222222222222222  22  22@2B2A2B2222222222HJIJ2222PQQQQQQR222222222`cd;<=>2A2B2@2B22222`klCDEF2IJHJ2222`))KLMN222222222`)5)UV)2A2B2@2B22222`(W2(**52IJHJ222`(W2(((W2222222222hiiiij222222222222%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..d5643288d
--- /dev/null
+++ b/data/layouts/SootopolisCity/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_MapBorder:: @ 828DE4C
+ .incbin "data/layouts/SootopolisCity/border.bin"
+
+SootopolisCity_MapBlockdata:: @ 828DE54
+ .incbin "data/layouts/SootopolisCity/map.bin"
+
+ .align 2
+SootopolisCity_Layout:: @ 828FA74
+ .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..4269e22a6
--- /dev/null
+++ b/data/layouts/SootopolisCity/map.bin
@@ -0,0 +1,12 @@
+222922222922222229KLM929222222 
+  222222222 
+ 2222 
+ 22%7'222222KLM2222 
+  
+ U22-?/22@AAAB Z2222#$_222222 222222222222222222 22KLM22+,_22D2E2222222222222222222222@AAAAAAAB2 @AAF2G\22222222222@AF22GAAAB22D222%6'2bD2c22222222222bD2E2c2222922->/22D2222222222222D2AAAAAB22222222222D2E2D2 
+ D2E2D2E222222222222222222222D2E226222222 222822D2E22222222222229222222222222222222@AF22GAAAAAAAAB2222222222T 
+ B22222222bD2E2cQR[RS22TA 
+ 222228222222;2222^#$222D2E2222222 !2"2^2#$22222222^+,222D2E222222()2)2)2*222^2+,2222 
+  
+ KLM^22222222222n22o0q0q0q022222^22222D2E2 2 ^22222222222bD2E2cq06q06q022^2222D2E2%7'2%7']AAAB2222D2q0q0q0q0q0q06q06q0q0q0^222222222-?/2AAB-?/2D2E222D2q0q0q0q0q0q0q0q0q0q0q0q0q0q0]AB222222222222222222222q0q0q0q0q0q0q0q0q0q0q0q0q0q0D2E2KLM22222KLMD2E2222q0q0t||||||||||TB222 2222222KL22TYZB22D2E2ty}s^2222222222222 22^22222q0q0t}yyyyyyyy{y^222222222%6'22^222k6l6l6m6q0q0uyyyyyyyyyys^2222222 22222->/22^2222220123q0q0uyyyyyyyyyyyyys]AAB22222222AAAAB]AAAAB89:;q0q0uyyyyyyys{|}~2222222222ABwq0q0uyyyyysTPQRS2222D22222222222222q0q0uyyyyys^XYZ[222222222222222222222222222q0q0uyyyyys^abvD2E222222KLM22222D2E2q0q0q0uy01110yys^22222222222I222TYZB2222q0q0q0q0q0q0uy000000100yys^22222222222222^2222q0q0q0q0q0q0t}y00000100yys]B22@AF22222 
+ 22^2222q0tD2E2yzy00000000yysD2E2N22 2222^2222222q0r0000yy00000000yy{yyyD2E2N22%7'2]B2222q0r0000yyyy04000pN22-?/2222222tyyz0yyyyyyyyyyyyyyy00000pV@AAAAAAB2qtyyz0000yyyyyyyyyyyyyyyyyyyy00000p2qqr0000000yyyyyyyyyyyyyyyyyyyy000xyyyyqqq2qqr0000000yyyyyyyyyyyyyyyyyyyyyy00000000x2qqr000000000yyyyyyyyyyyyyyyyyyyyyy000000000pq2qqr000000000yyyyyyyyyyyyyyyyyyyyyy000011pq2qqr00000001100yyyyyyyyyyyyyyyyyyyyyyyyy0000pqq2qr000000000yyyyyyyyyyyyyyyyyyyyyyyyy0000pqqiiij000yyyyyyyyyyyyyyyyyyyyyyyyypqqij0yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyypr0yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy`ii0i0i00iijyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyqqqqqryyyyyyyyyyyyyyyyyyyyyyyyiiiiiiqryyyyyyyyyyyyyyyyyyyyyyyyqqqqqqqryyyyyyyyyyyyyyyiiiiqqqqryyyyyyyyyyyqqqqqqqryyyyyyyyyqqqqqiiiiyyiiqqqqqqiiiiiiiiiiiiiiiiiqqqqqqqqqqqqqqqqqqqqqqqqq \ 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..12819766e
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc
new file mode 100644
index 000000000..a38d2f5a2
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
+ .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin"
+
+SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98
+ .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin"
+
+ .align 2
+SootopolisCity_Gym_1F_Layout:: @ 82D3F0C
+ .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..a4a20d477
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/map.bin
@@ -0,0 +1,3 @@
+<JJ
+ !JJJ!
+ JJ9DER)RRR)R@AJLMF21*2+2,21G2HIJRRU?2>2>2>2223242>2>2>2>2PRRXYZJJJ:2;JJJJ`b DERRRRB2CRRRR@ADM22222 222222HADM 2 2 2 2 2 2 2 2 2HADM 2 2 2 2 2 2 2 2 2 2 2HANLM 2 2 2 2 2 2 2 2 2HIJVRU<JJJ:2;JJJ9PRR  DERRB2CRR@A   DM222 2222HADM 2 2 2 2 2 2HANJJLM 2 2 2 2 2 2HIJJJVRRRU<J:2;J9PRRRR    DEB2C@A     DM2 2HANJJJJLM 2 2 2HIJJJJJVRRRRRU 2 2PRRRRRR  XYY[:2;`aab   DERRB2CRR@ADMF2G2G2G2G2G22HADM?22>2>2>22>2HADM?2>2>2>2>2HADM?2G2>2G2>2HA \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin
new file mode 100644
index 000000000..12819766e
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
new file mode 100644
index 000000000..cf568b83a
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
+ .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin"
+
+SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C
+ .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin"
+
+ .align 2
+SootopolisCity_Gym_B1F_Layout:: @ 82D42A0
+ .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..eb73a4d2f
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin
@@ -0,0 +1 @@
+%&&&&&&&&&&&&&'-%           '/--22222222222//--22222222222//--22222222222//&5-22222222222/7&&&527&&...-%   2   '/...--2222222//--2222222//&&&5-2222222/7&&&&&&&527&&&&.....-% 2 '/.....--222//&&&&&5-222/7&&&&&&&&&&&52227&&&&&&...%&&&2&&&'...-%   2   '/--2222222//--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..b202d6bd1
--- /dev/null
+++ b/data/layouts/SootopolisCity_House1/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House1_MapBorder:: @ 82FEC48
+ .incbin "data/layouts/SootopolisCity_House1/border.bin"
+
+SootopolisCity_House1_MapBlockdata:: @ 82FEC50
+ .incbin "data/layouts/SootopolisCity_House1/map.bin"
+
+ .align 2
+SootopolisCity_House1_Layout:: @ 82FECC0
+ .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 @@
+023333332332772333327723333333333333 333 \ 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..e57feaf86
--- /dev/null
+++ b/data/layouts/SootopolisCity_House2/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House2_MapBorder:: @ 82FECD8
+ .incbin "data/layouts/SootopolisCity_House2/border.bin"
+
+SootopolisCity_House2_MapBlockdata:: @ 82FECE0
+ .incbin "data/layouts/SootopolisCity_House2/map.bin"
+
+ .align 2
+SootopolisCity_House2_Layout:: @ 82FED50
+ .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 @@
+vw62223336333277233333772333333333333 333 \ 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..f86339f3b
--- /dev/null
+++ b/data/layouts/SootopolisCity_House3/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House3_MapBorder:: @ 82FED68
+ .incbin "data/layouts/SootopolisCity_House3/border.bin"
+
+SootopolisCity_House3_MapBlockdata:: @ 82FED70
+ .incbin "data/layouts/SootopolisCity_House3/map.bin"
+
+ .align 2
+SootopolisCity_House3_Layout:: @ 82FEDE0
+ .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 @@
+62233322333333337723333377333333333 333 \ No newline at end of file
diff --git a/data/layouts/SootopolisCity_House8/border.bin b/data/layouts/SootopolisCity_House8/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/layouts/SootopolisCity_House8/border.bin
Binary files differ
diff --git a/data/layouts/SootopolisCity_House8/layout.inc b/data/layouts/SootopolisCity_House8/layout.inc
new file mode 100644
index 000000000..05f0fca93
--- /dev/null
+++ b/data/layouts/SootopolisCity_House8/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House8_MapBorder:: @ 82FC34C
+ .incbin "data/layouts/SootopolisCity_House8/border.bin"
+
+SootopolisCity_House8_MapBlockdata:: @ 82FC354
+ .incbin "data/layouts/SootopolisCity_House8/map.bin"
+
+ .align 2
+SootopolisCity_House8_Layout:: @ 82FC3C4
+ .4byte 0x8
+ .4byte 0x7
+ .4byte SootopolisCity_House8_MapBorder
+ .4byte SootopolisCity_House8_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_GenericBuilding
diff --git a/data/layouts/SootopolisCity_House8/map.bin b/data/layouts/SootopolisCity_House8/map.bin
new file mode 100644
index 000000000..ffeea7269
--- /dev/null
+++ b/data/layouts/SootopolisCity_House8/map.bin
@@ -0,0 +1 @@
+XX``22333366333773333327723333333333333 333 \ 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..c043bfaf9
--- /dev/null
+++ b/data/layouts/SouthernIsland_Exterior/layout.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Exterior_MapBorder:: @ 82F9D80
+ .incbin "data/layouts/SouthernIsland_Exterior/border.bin"
+
+SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88
+ .incbin "data/layouts/SouthernIsland_Exterior/map.bin"
+
+ .align 2
+SouthernIsland_Exterior_Layout:: @ 82FA544
+ .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 @@
+qss444444444444444444444440uuuuqss444444444444444444444444t}uuuqss444444444444444444444444uquuuqss444444444444444444444444uquuuqss444444444447744444444444ut}uuqss444444444443344444444444uuquuss04444444444334444444444t}ut}uss{|444444440004444444444uquut}s{qs444444440000440000004ut}uu{sqs444444440000000444000uuquups{s044444444000004444400uuquups{s{64444444400044444t00zuquup{s{44p0444444444t6666z000ut}upssq{|{||444444tz4444t00yzuqupssqqq{44{666|||}tyyyyz0000ut}ps{|||44x444tz0000000t|}upsqqqq{||xyyyz0000000000t}qt}pp{||qqqqs0000000000t||||}t|}pp{||q{|||||00|||}t}pppppp{|]^0^0_}ppppppppppp]^0^0_ppppppppppppppppppppUV0V0V02^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..8a231303c
--- /dev/null
+++ b/data/layouts/SouthernIsland_Interior/layout.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Interior_MapBorder:: @ 82FA55C
+ .incbin "data/layouts/SouthernIsland_Interior/border.bin"
+
+SouthernIsland_Interior_MapBlockdata:: @ 82FA564
+ .incbin "data/layouts/SouthernIsland_Interior/map.bin"
+
+ .align 2
+SouthernIsland_Interior_Layout:: @ 82FAA74
+ .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 @@
+000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000011000000000000001111001112211 \ 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..906fb254a
--- /dev/null
+++ b/data/layouts/TradeCenter/layout.inc
@@ -0,0 +1,14 @@
+TradeCenter_MapBorder:: @ 82E9368
+ .incbin "data/layouts/TradeCenter/border.bin"
+
+TradeCenter_MapBlockdata:: @ 82E9370
+ .incbin "data/layouts/TradeCenter/map.bin"
+
+ .align 2
+TradeCenter_Layout:: @ 82E9448
+ .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/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..e020da990
--- /dev/null
+++ b/data/layouts/Underwater1/layout.inc
@@ -0,0 +1,14 @@
+Underwater1_MapBorder:: @ 82F2F18
+ .incbin "data/layouts/Underwater1/border.bin"
+
+Underwater1_MapBlockdata:: @ 82F2F20
+ .incbin "data/layouts/Underwater1/map.bin"
+
+ .align 2
+Underwater1_Layout:: @ 82F6120
+ .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 @@
+2222222222222222222222222222222222222222222222222222222222222222222222# 22
+"##~222222222222222222222222222222222#  "#####~22222222222}####### 22
+||~22###~22222222#  "22######~2222222222222222222222222222222222222222222222222222}|||| 22
+"22222222222#  "22222222222222222222222222222222222222222222222222#|~222222222222222222#~2222#||~2222222222222222222#|||||||||||~222#~22222#~2222222222222#~2222222222#|||# 22
+"22#  "222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222# 22
+"22}"2222222222222222222y2y222222222222y2y222222222222222# 22
+""~22222222222222222222222#  "222222222222}|"22222222222222222222222222# 22
+|||"2222222222222222222#  "2222"~222222222}|"222# 22
+""|~22222}|"22}|#  ""|||||"22222222222222222222222222222222222222222222222222}||~2222222222222222}"22222222# 22
+"2222"~2222222#  "222222}""|~}"2222222}""|||||22222222222222# 22
+"2222#  "222222"~22222222"~222222222"~22z222
+"22222222222222y2y22222222222222222#~22# 22
+"||||~222222222222#  "#|~2222222222222222222222222222222#|~2222222222222# 22
+"||||||# 22
+"222#  "#  "22222222}"222222222222222
+ "# 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..6ba018c3b
--- /dev/null
+++ b/data/layouts/Underwater2/layout.inc
@@ -0,0 +1,14 @@
+Underwater2_MapBorder:: @ 82C503C
+ .incbin "data/layouts/Underwater2/border.bin"
+
+Underwater2_MapBlockdata:: @ 82C5044
+ .incbin "data/layouts/Underwater2/map.bin"
+
+ .align 2
+Underwater2_Layout:: @ 82C8244
+ .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 @@
+2222222222222222222222222222222222222222222222222222222z222x2#~6y2y222}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222
+    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 2222222222222222222222222222222222222222222222222
+    22222222222222222222222222222222
+" #  222/2222222 222222222222222222222 "#/#   "# 22222
+"222222222222222222222##     " "2222222222222222222222/ "222222
+  222222222222222222
+  22222222222222222/  2222222222/2222222222222/#  22222# 222222222222222222222222
+"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+"2222222222222222222222222222222222222222222222222# 22222222222222222
+   2222222222222222222222222222222222222222
+   "#     22222222222222222222222222222222222
+ " /#           22222222222222/2222222222
+"/ " #/#  22222222/2222222222222
+ " " "# /#/# 2222222222222222222
+ " "/ "#/#/# 2222222222222222222
+" "/ "#/## 2222222222
+"222222
+" " "#/#/# 22222# 222/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/222222
+"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222
+"#/# 22222222222222efg2222222222/ "##   222222222222222222mno2222222222222222222 #  222222222222222222222222222222222222222222
+" "222222 /#  222222222222222222222222222222222222222
+"2222222##    22222222222222222222222222222222
+  " "6222222222/# 222222222222222222222222222222
+"/62222z222x22##  2222222222222222222222222
+  " "622}~2y2y22} #   22222222222222222222
+ "622 |||| ##   222222222222222
+ "/ "622/#  2222222
+     "622##       "/ "62222// "6222222#"222222|~22222 ||||   \ 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..be0ebc363
--- /dev/null
+++ b/data/layouts/Underwater3/layout.inc
@@ -0,0 +1,14 @@
+Underwater3_MapBorder:: @ 82C825C
+ .incbin "data/layouts/Underwater3/border.bin"
+
+Underwater3_MapBlockdata:: @ 82C8264
+ .incbin "data/layouts/Underwater3/map.bin"
+
+ .align 2
+Underwater3_Layout:: @ 82CB464
+ .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..1f7addb2d
--- /dev/null
+++ b/data/layouts/Underwater3/map.bin
@@ -0,0 +1 @@
+666666666666666666666666666666666666666666666666666666666666666666666666666666666666666;2;266666666666666;2;2;2;266666666666@2C2C2A26666666666<2P2Q2:266666666666<2T2R:266666666666<2T2R:2666666666666@2G2T2R2:266666666666@2A2@2G2P2\2R2B2A266666666666@2D2B2A2<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#32422L2R2:26666666666  ?2W2]2Q2:2## 422L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;242T2R28 "666666666  ?2W2]2Q2:2@2C2A2###!a6`"  666666666?2W2S2U2:2?2S2:2# #" "666666666?2W2S2U2B2A2?2S2:266666666?2W2S2U2S2:2?2S2B2A2# "66666666?2W2S2U2S2:23242S2:2 "66666666?2W2S2U2S2:2@2A2# ?2S2B2A2# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:2  666666666?2W2P2Q2U2:2?2S2:2?22S2:2666666666?2W2T2R2U2:2?2S2:2?2S2S2:2#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2#  666666666@22B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#"666666666@2222:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#666666666<2222B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2222S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:266666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232226666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  222266666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  22222266 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"22222266666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  222222266666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232222z222x2266666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"    2222y2y22}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  22222226666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<22_2U2:2?2S2S22232  2222222}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "  2222222}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S22_2U22232?2S22232 "222222266666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"  #~z222x22}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """  2y2y2226666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20"  "#~22}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  "22666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  ##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "  666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "666666666##)) ## >2I242W2T2V2R2U2:2>2 "66666666#  >2>2?2W2T2J2K2U2:2"66666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "66666666 "##>2?2W2T2R2S2U2:2 " "66#6666666#">2?2W2T2R22U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z22U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2 \ 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..cef9e4eb8
--- /dev/null
+++ b/data/layouts/Underwater4/layout.inc
@@ -0,0 +1,14 @@
+Underwater4_MapBorder:: @ 82CB47C
+ .incbin "data/layouts/Underwater4/border.bin"
+
+Underwater4_MapBlockdata:: @ 82CB484
+ .incbin "data/layouts/Underwater4/map.bin"
+
+ .align 2
+Underwater4_Layout:: @ 82CDA04
+ .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`" @2D22B2C2A26666666 6666666<222:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 12: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/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..523c9f5e3
--- /dev/null
+++ b/data/layouts/Underwater_Route134/layout.inc
@@ -0,0 +1,14 @@
+Underwater_Route134_MapBorder:: @ 82F7600
+ .incbin "data/layouts/Underwater_Route134/border.bin"
+
+Underwater_Route134_MapBlockdata:: @ 82F7608
+ .incbin "data/layouts/Underwater_Route134/map.bin"
+
+ .align 2
+Underwater_Route134_Layout:: @ 82F7770
+ .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..fa9352663
--- /dev/null
+++ b/data/layouts/Underwater_SeafloorCavern/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
+ .incbin "data/layouts/Underwater_SeafloorCavern/border.bin"
+
+Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC
+ .incbin "data/layouts/Underwater_SeafloorCavern/map.bin"
+
+ .align 2
+Underwater_SeafloorCavern_Layout:: @ 82DD3B8
+ .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 @@
+6666(22222(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..9bf4ac1bf
--- /dev/null
+++ b/data/layouts/Underwater_SealedChamber/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SealedChamber_MapBorder:: @ 82F7788
+ .incbin "data/layouts/Underwater_SealedChamber/border.bin"
+
+Underwater_SealedChamber_MapBlockdata:: @ 82F7790
+ .incbin "data/layouts/Underwater_SealedChamber/map.bin"
+
+ .align 2
+Underwater_SealedChamber_Layout:: @ 82F7FD0
+ .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 @@
+efgmno22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  2222222#222222222222222222222  222222222222#2222222  222222222222#2222222  222222222222222222222222#222222  22222222222222222222222222222222222222222222     2222222222222222222222222222222p2222222222C2C2C2222222222222S2S2S2222222# 22222S2S2S22222 "#            " \ 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..f5049c9d2
--- /dev/null
+++ b/data/layouts/Underwater_SootopolisCity/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SootopolisCity_MapBorder:: @ 82D793C
+ .incbin "data/layouts/Underwater_SootopolisCity/border.bin"
+
+Underwater_SootopolisCity_MapBlockdata:: @ 82D7944
+ .incbin "data/layouts/Underwater_SootopolisCity/map.bin"
+
+ .align 2
+Underwater_SootopolisCity_Layout:: @ 82D7AD4
+ .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/UnknownMap_082CF564/border.bin b/data/layouts/UnknownMap_082CF564/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_082CF564/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082CF564/layout.inc b/data/layouts/UnknownMap_082CF564/layout.inc
new file mode 100644
index 000000000..df2be91f2
--- /dev/null
+++ b/data/layouts/UnknownMap_082CF564/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082CF564_MapBorder::
+ .incbin "data/layouts/UnknownMap_082CF564/border.bin"
+
+UnknownMap_082CF564_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082CF564/map.bin"
+
+ .align 2
+UnknownMap_082CF564_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082CF564_MapBorder
+ .4byte UnknownMap_082CF564_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
diff --git a/data/layouts/UnknownMap_082CF564/map.bin b/data/layouts/UnknownMap_082CF564/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/layouts/UnknownMap_082CF564/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082D05D8/border.bin b/data/layouts/UnknownMap_082D05D8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05D8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082D05D8/layout.inc b/data/layouts/UnknownMap_082D05D8/layout.inc
new file mode 100644
index 000000000..f35922aea
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05D8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082D05D8_MapBorder::
+ .incbin "data/layouts/UnknownMap_082D05D8/border.bin"
+
+UnknownMap_082D05D8_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082D05D8/map.bin"
+
+ .align 2
+UnknownMap_082D05D8_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082D05D8_MapBorder
+ .4byte UnknownMap_082D05D8_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
diff --git a/data/layouts/UnknownMap_082D05D8/map.bin b/data/layouts/UnknownMap_082D05D8/map.bin
new file mode 100644
index 000000000..37f05b971
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05D8/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082D05FC/border.bin b/data/layouts/UnknownMap_082D05FC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05FC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082D05FC/layout.inc b/data/layouts/UnknownMap_082D05FC/layout.inc
new file mode 100644
index 000000000..646dab5cf
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05FC/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082D05FC_MapBorder::
+ .incbin "data/layouts/UnknownMap_082D05FC/border.bin"
+
+UnknownMap_082D05FC_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082D05FC/map.bin"
+
+ .align 2
+UnknownMap_082D05FC_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082D05FC_MapBorder
+ .4byte UnknownMap_082D05FC_MapBlockdata
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
diff --git a/data/layouts/UnknownMap_082D05FC/map.bin b/data/layouts/UnknownMap_082D05FC/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05FC/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E55C8/border.bin b/data/layouts/UnknownMap_082E55C8/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55C8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E55C8/layout.inc b/data/layouts/UnknownMap_082E55C8/layout.inc
new file mode 100644
index 000000000..c6b6e0347
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55C8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E55C8_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E55C8/border.bin"
+
+UnknownMap_082E55C8_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E55C8/map.bin"
+
+ .align 2
+UnknownMap_082E55C8_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E55C8_MapBorder
+ .4byte UnknownMap_082E55C8_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E55C8/map.bin b/data/layouts/UnknownMap_082E55C8/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55C8/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E55EC/border.bin b/data/layouts/UnknownMap_082E55EC/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55EC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E55EC/layout.inc b/data/layouts/UnknownMap_082E55EC/layout.inc
new file mode 100644
index 000000000..8b1f2c21a
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55EC/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E55EC_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E55EC/border.bin"
+
+UnknownMap_082E55EC_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E55EC/map.bin"
+
+ .align 2
+UnknownMap_082E55EC_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E55EC_MapBorder
+ .4byte UnknownMap_082E55EC_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E55EC/map.bin b/data/layouts/UnknownMap_082E55EC/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55EC/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E5610/border.bin b/data/layouts/UnknownMap_082E5610/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5610/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E5610/layout.inc b/data/layouts/UnknownMap_082E5610/layout.inc
new file mode 100644
index 000000000..87c11b97b
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5610/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5610_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E5610/border.bin"
+
+UnknownMap_082E5610_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E5610/map.bin"
+
+ .align 2
+UnknownMap_082E5610_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E5610_MapBorder
+ .4byte UnknownMap_082E5610_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E5610/map.bin b/data/layouts/UnknownMap_082E5610/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5610/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E5634/border.bin b/data/layouts/UnknownMap_082E5634/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5634/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E5634/layout.inc b/data/layouts/UnknownMap_082E5634/layout.inc
new file mode 100644
index 000000000..a4d1675f4
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5634/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5634_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E5634/border.bin"
+
+UnknownMap_082E5634_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E5634/map.bin"
+
+ .align 2
+UnknownMap_082E5634_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E5634_MapBorder
+ .4byte UnknownMap_082E5634_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E5634/map.bin b/data/layouts/UnknownMap_082E5634/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5634/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E5658/border.bin b/data/layouts/UnknownMap_082E5658/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5658/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E5658/layout.inc b/data/layouts/UnknownMap_082E5658/layout.inc
new file mode 100644
index 000000000..b7608b96d
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5658/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5658_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E5658/border.bin"
+
+UnknownMap_082E5658_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E5658/map.bin"
+
+ .align 2
+UnknownMap_082E5658_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E5658_MapBorder
+ .4byte UnknownMap_082E5658_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E5658/map.bin b/data/layouts/UnknownMap_082E5658/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5658/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E567C/border.bin b/data/layouts/UnknownMap_082E567C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E567C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E567C/layout.inc b/data/layouts/UnknownMap_082E567C/layout.inc
new file mode 100644
index 000000000..6f427bee6
--- /dev/null
+++ b/data/layouts/UnknownMap_082E567C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E567C_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E567C/border.bin"
+
+UnknownMap_082E567C_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E567C/map.bin"
+
+ .align 2
+UnknownMap_082E567C_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E567C_MapBorder
+ .4byte UnknownMap_082E567C_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E567C/map.bin b/data/layouts/UnknownMap_082E567C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E567C/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E56A0/border.bin b/data/layouts/UnknownMap_082E56A0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56A0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E56A0/layout.inc b/data/layouts/UnknownMap_082E56A0/layout.inc
new file mode 100644
index 000000000..24964ef39
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56A0/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56A0_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E56A0/border.bin"
+
+UnknownMap_082E56A0_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E56A0/map.bin"
+
+ .align 2
+UnknownMap_082E56A0_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E56A0_MapBorder
+ .4byte UnknownMap_082E56A0_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E56A0/map.bin b/data/layouts/UnknownMap_082E56A0/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56A0/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E56C4/border.bin b/data/layouts/UnknownMap_082E56C4/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56C4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E56C4/layout.inc b/data/layouts/UnknownMap_082E56C4/layout.inc
new file mode 100644
index 000000000..e0d2eca7d
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56C4/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56C4_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E56C4/border.bin"
+
+UnknownMap_082E56C4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E56C4/map.bin"
+
+ .align 2
+UnknownMap_082E56C4_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E56C4_MapBorder
+ .4byte UnknownMap_082E56C4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E56C4/map.bin b/data/layouts/UnknownMap_082E56C4/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56C4/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E56E8/border.bin b/data/layouts/UnknownMap_082E56E8/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56E8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E56E8/layout.inc b/data/layouts/UnknownMap_082E56E8/layout.inc
new file mode 100644
index 000000000..c163fd44e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56E8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56E8_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E56E8/border.bin"
+
+UnknownMap_082E56E8_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E56E8/map.bin"
+
+ .align 2
+UnknownMap_082E56E8_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E56E8_MapBorder
+ .4byte UnknownMap_082E56E8_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E56E8/map.bin b/data/layouts/UnknownMap_082E56E8/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56E8/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E570C/border.bin b/data/layouts/UnknownMap_082E570C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E570C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E570C/layout.inc b/data/layouts/UnknownMap_082E570C/layout.inc
new file mode 100644
index 000000000..543decba8
--- /dev/null
+++ b/data/layouts/UnknownMap_082E570C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E570C_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E570C/border.bin"
+
+UnknownMap_082E570C_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E570C/map.bin"
+
+ .align 2
+UnknownMap_082E570C_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E570C_MapBorder
+ .4byte UnknownMap_082E570C_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E570C/map.bin b/data/layouts/UnknownMap_082E570C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E570C/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E5730/border.bin b/data/layouts/UnknownMap_082E5730/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5730/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E5730/layout.inc b/data/layouts/UnknownMap_082E5730/layout.inc
new file mode 100644
index 000000000..e1b39f931
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5730/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5730_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E5730/border.bin"
+
+UnknownMap_082E5730_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E5730/map.bin"
+
+ .align 2
+UnknownMap_082E5730_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E5730_MapBorder
+ .4byte UnknownMap_082E5730_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E5730/map.bin b/data/layouts/UnknownMap_082E5730/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5730/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E5754/border.bin b/data/layouts/UnknownMap_082E5754/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5754/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E5754/layout.inc b/data/layouts/UnknownMap_082E5754/layout.inc
new file mode 100644
index 000000000..f1b3970f9
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5754/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5754_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E5754/border.bin"
+
+UnknownMap_082E5754_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E5754/map.bin"
+
+ .align 2
+UnknownMap_082E5754_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E5754_MapBorder
+ .4byte UnknownMap_082E5754_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E5754/map.bin b/data/layouts/UnknownMap_082E5754/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5754/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E5778/border.bin b/data/layouts/UnknownMap_082E5778/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5778/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E5778/layout.inc b/data/layouts/UnknownMap_082E5778/layout.inc
new file mode 100644
index 000000000..457b16610
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5778/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5778_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E5778/border.bin"
+
+UnknownMap_082E5778_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082E5778/map.bin"
+
+ .align 2
+UnknownMap_082E5778_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E5778_MapBorder
+ .4byte UnknownMap_082E5778_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E5778/map.bin b/data/layouts/UnknownMap_082E5778/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5778/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082E579C/border.bin b/data/layouts/UnknownMap_082E579C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/layouts/UnknownMap_082E579C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082E579C/layout.inc b/data/layouts/UnknownMap_082E579C/layout.inc
new file mode 100644
index 000000000..9550a7acc
--- /dev/null
+++ b/data/layouts/UnknownMap_082E579C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E579C_MapBorder::
+ .incbin "data/layouts/UnknownMap_082E579C/border.bin"
+
+UnknownMap_082E579C_MapBlockdata:
+ .incbin "data/layouts/UnknownMap_082E579C/map.bin"
+
+ .align 2
+UnknownMap_082E579C_Layout::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMap_082E579C_MapBorder
+ .4byte UnknownMap_082E579C_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082E579C/map.bin b/data/layouts/UnknownMap_082E579C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E579C/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_082EDF30/border.bin b/data/layouts/UnknownMap_082EDF30/border.bin
new file mode 100644
index 000000000..9e4b3fb7a
--- /dev/null
+++ b/data/layouts/UnknownMap_082EDF30/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082EDF30/layout.inc b/data/layouts/UnknownMap_082EDF30/layout.inc
new file mode 100644
index 000000000..483b21ac5
--- /dev/null
+++ b/data/layouts/UnknownMap_082EDF30/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082EDF30_MapBorder::
+ .incbin "data/layouts/UnknownMap_082EDF30/border.bin"
+
+UnknownMap_082EDF30_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082EDF30/map.bin"
+
+ .align 2
+UnknownMap_082EDF30_Layout::
+ .4byte 0x3A
+ .4byte 0x1A
+ .4byte UnknownMap_082EDF30_MapBorder
+ .4byte UnknownMap_082EDF30_MapBlockdata
+ .4byte gTileset_General
+ .4byte 0
diff --git a/data/layouts/UnknownMap_082EDF30/map.bin b/data/layouts/UnknownMap_082EDF30/map.bin
new file mode 100644
index 000000000..028da0526
--- /dev/null
+++ b/data/layouts/UnknownMap_082EDF30/map.bin
@@ -0,0 +1,3 @@
+22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 662222222222222222222222222 
+2266662BBBB2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222
+IIIIB^_______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_082FF894/border.bin b/data/layouts/UnknownMap_082FF894/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/layouts/UnknownMap_082FF894/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/layouts/UnknownMap_082FF894/layout.inc b/data/layouts/UnknownMap_082FF894/layout.inc
new file mode 100644
index 000000000..b353645bf
--- /dev/null
+++ b/data/layouts/UnknownMap_082FF894/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082FF894_MapBorder::
+ .incbin "data/layouts/UnknownMap_082FF894/border.bin"
+
+UnknownMap_082FF894_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_082FF894/map.bin"
+
+ .align 2
+UnknownMap_082FF894_Layout::
+ .4byte 0x13
+ .4byte 0x13
+ .4byte UnknownMap_082FF894_MapBorder
+ .4byte UnknownMap_082FF894_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_082FF894/map.bin b/data/layouts/UnknownMap_082FF894/map.bin
new file mode 100644
index 000000000..fd294d9b6
--- /dev/null
+++ b/data/layouts/UnknownMap_082FF894/map.bin
Binary files differ
diff --git a/data/layouts/UnknownMap_08302970/border.bin b/data/layouts/UnknownMap_08302970/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/UnknownMap_08302970/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/UnknownMap_08302970/layout.inc b/data/layouts/UnknownMap_08302970/layout.inc
new file mode 100644
index 000000000..7e4299a89
--- /dev/null
+++ b/data/layouts/UnknownMap_08302970/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_08302970_MapBorder::
+ .incbin "data/layouts/UnknownMap_08302970/border.bin"
+
+UnknownMap_08302970_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_08302970/map.bin"
+
+ .align 2
+UnknownMap_08302970_Layout::
+ .4byte 0x3C
+ .4byte 0x28
+ .4byte UnknownMap_08302970_MapBorder
+ .4byte UnknownMap_08302970_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
diff --git a/data/layouts/UnknownMap_08302970/map.bin b/data/layouts/UnknownMap_08302970/map.bin
new file mode 100644
index 000000000..dd82c58d3
--- /dev/null
+++ b/data/layouts/UnknownMap_08302970/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut|}ppp{qs{$14$1$1$1$14$1$1uuqupppppppppppppqqqqqqqqt||}qqt}uppppp{{s$1$1$1$1$1$1$1$1t}ut}ppppppppppppp||||||||}qqqt|}t}pppppppppsqs{$1$1$14$1t|}quupppppppppppppqqqqqt|||}qt}pppppppppPesq{{4$1$1t}qt|}uppppppppppppppqqt||}qqqt|}ppppppppppXm{q{{|||}qt}t|}pppppppppppppp||}qt|||}ppuvpppppPQp{q{|}qupppppppppppppp|}uvpu{vp}~pppppXYpp{|0|}ppppppppppppppppZ[ppppp}~pzq|pppppppppPQpp$1$1$1$1$1Z[ppppPQpppppppppppXYppppuvppppypppppppuvXYppppp$1$1$1$1$1pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~ppppppppuvyq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppy}~ppuvpppppu|ppppppppuqqvpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|ppppppppyyyyPQppppppppppppppppppppuvpppppppppppppppppuvypppppppuvpppppXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~pppppppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppppppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|ppppppppp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|pppppppppppPQppppppppppppppppppppppp}~pppppppppppppppppyyypppppppppppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYppuvppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vpppp}~uvppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvppppp}~puqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/layouts/UnknownMap_083041B4/border.bin b/data/layouts/UnknownMap_083041B4/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/layouts/UnknownMap_083041B4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/layouts/UnknownMap_083041B4/layout.inc b/data/layouts/UnknownMap_083041B4/layout.inc
new file mode 100644
index 000000000..4fd4f176c
--- /dev/null
+++ b/data/layouts/UnknownMap_083041B4/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_083041B4_MapBorder::
+ .incbin "data/layouts/UnknownMap_083041B4/border.bin"
+
+UnknownMap_083041B4_MapBlockdata::
+ .incbin "data/layouts/UnknownMap_083041B4/map.bin"
+
+ .align 2
+UnknownMap_083041B4_Layout::
+ .4byte 0x1B
+ .4byte 0x2E
+ .4byte UnknownMap_083041B4_MapBorder
+ .4byte UnknownMap_083041B4_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnknownMap_083041B4/map.bin b/data/layouts/UnknownMap_083041B4/map.bin
new file mode 100644
index 000000000..ec344933f
--- /dev/null
+++ b/data/layouts/UnknownMap_083041B4/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  222 222    2222222 2222222222 2222222    # 222    #2222 #  2222     2222 #    2222 efg  222 # esdrfg 222efsd_ddrfg222qdd_d__ddp222qd______dp22222es_d____d_p22222 qdd______dp22222222#2#2bdd_d_d_dp222222222#2b_d_d_`a3a3#222222222#2a3a3a3a3a3#22222222222222222222222 \ 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..159e6d561
--- /dev/null
+++ b/data/layouts/UnknownMap_25_29/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_29_MapBorder:: @ 82E9898
+ .incbin "data/layouts/UnknownMap_25_29/border.bin"
+
+UnknownMap_25_29_MapBlockdata:: @ 82E98A0
+ .incbin "data/layouts/UnknownMap_25_29/map.bin"
+
+ .align 2
+UnknownMap_25_29_Layout:: @ 82E98A4
+ .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..b721ecfa1
--- /dev/null
+++ b/data/layouts/UnknownMap_25_30/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_30_MapBorder:: @ 82E98BC
+ .incbin "data/layouts/UnknownMap_25_30/border.bin"
+
+UnknownMap_25_30_MapBlockdata:: @ 82E98C4
+ .incbin "data/layouts/UnknownMap_25_30/map.bin"
+
+ .align 2
+UnknownMap_25_30_Layout:: @ 82E98C8
+ .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..9ac9130f1
--- /dev/null
+++ b/data/layouts/UnknownMap_25_31/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_31_MapBorder:: @ 82E98E0
+ .incbin "data/layouts/UnknownMap_25_31/border.bin"
+
+UnknownMap_25_31_MapBlockdata:: @ 82E98E8
+ .incbin "data/layouts/UnknownMap_25_31/map.bin"
+
+ .align 2
+UnknownMap_25_31_Layout:: @ 82E98EC
+ .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..3b7b4b459
--- /dev/null
+++ b/data/layouts/UnknownMap_25_32/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_32_MapBorder:: @ 82E9904
+ .incbin "data/layouts/UnknownMap_25_32/border.bin"
+
+UnknownMap_25_32_MapBlockdata:: @ 82E990C
+ .incbin "data/layouts/UnknownMap_25_32/map.bin"
+
+ .align 2
+UnknownMap_25_32_Layout:: @ 82E9910
+ .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..6564dfe6b
--- /dev/null
+++ b/data/layouts/UnknownMap_25_33/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_33_MapBorder:: @ 82E9928
+ .incbin "data/layouts/UnknownMap_25_33/border.bin"
+
+UnknownMap_25_33_MapBlockdata:: @ 82E9930
+ .incbin "data/layouts/UnknownMap_25_33/map.bin"
+
+ .align 2
+UnknownMap_25_33_Layout:: @ 82E9934
+ .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..178449d2f
--- /dev/null
+++ b/data/layouts/UnknownMap_25_34/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_34_MapBorder:: @ 82E994C
+ .incbin "data/layouts/UnknownMap_25_34/border.bin"
+
+UnknownMap_25_34_MapBlockdata:: @ 82E9954
+ .incbin "data/layouts/UnknownMap_25_34/map.bin"
+
+ .align 2
+UnknownMap_25_34_Layout:: @ 82E9958
+ .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/UnreferencedMap/border.bin b/data/layouts/UnreferencedMap/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/layouts/UnreferencedMap/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/layouts/UnreferencedMap/layout.inc b/data/layouts/UnreferencedMap/layout.inc
new file mode 100644
index 000000000..14edbb25d
--- /dev/null
+++ b/data/layouts/UnreferencedMap/layout.inc
@@ -0,0 +1,14 @@
+UnreferencedMap_MapBorder:: @ 82BD8DC
+ .incbin "data/layouts/UnreferencedMap/border.bin"
+
+UnreferencedMap_MapBlockdata: @ 82BD8E4
+ .incbin "data/layouts/UnreferencedMap/map.bin"
+
+ .align 2
+UnreferencedMap_Layout:: @ 82BF1E4
+ .4byte 0x50
+ .4byte 0x28
+ .4byte UnreferencedMap_MapBorder
+ .4byte UnreferencedMap_MapBlockdata
+ .4byte gTileset_General
+ .4byte gTileset_Cave
diff --git a/data/layouts/UnreferencedMap/map.bin b/data/layouts/UnreferencedMap/map.bin
new file mode 100644
index 000000000..17a14a8d5
--- /dev/null
+++ b/data/layouts/UnreferencedMap/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp00000000000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000 0 0 0000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000 0 0 0 0 0 0 0 0000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppps00000 0 0 0 0 0 0 0 0 0 000rpppppppppppppppppppppppppppppppppppppppppppppppppppppppp000000 0 0 0 0 0 0 0 0 0 0 00000ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp000000 0 0 0 0 0 0 0 0 0 0 0 00000ppppPQpppppppppppppppppppppprqkllmqvppppuvppppPQprs000000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vXYrss0000000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{qklllmqvppppuvq{|||}qt}~pppppzq|}sss00000000004400 0 0 0 0 01110uuu~p}~pzqqqkklmmqvppp}~pyqqqtyppu{{vppyfsss00000000000444400 0 0 00000uuugppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|puvppfsss000000000004444440 000000uuuguv}~qq{qqqt}qtppXYpppuvppppppuvyyp}~ppfss{|||00000000444444400t|||}uug}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQppppfs{s000000000444444400ut}ugppppPQpyypp}~q|ppppppppppPQppppXYppuvf{ss000000000044444400uut}gppppXYppppppppuvppppyppppppppppXYpppppppp}~nss{|||0000004444t|||}uutopuvppppppppppp}~ppppppppppppppppppppppppuvpp1$1$1$1s{{||0000t||}t}ur$1$1$11p}~pppppuvppppppppppppuvpppppppppppppppp}~pp111$1{{{|22|}t}t}r$1$1$11pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp111$1{{22}t}t$1$1$11ppppppppppppppppppppuvppztppppppp}~pppppppp111$1$1$1"10x{22}tz00 1$1$1$111pppppppppppppppppppp}~pppppppppppppppppppp111$1"10000x22z00000 1$1$111pppppppppppppppppppppppppppppppppppppppppppppp111$1$1100000000000000000001$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp111$1$1!11000000000000000011$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1!11100000000000111$1$1$1$1111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1$1"100000000011$1$1$1$1$1$11111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1111111111$1$1$1$1$1$1$1$111pppppppppPQpppppppuvpppppppppppppppppppppppppppppp1111$1$1$1$1$1$1$1$1$1$1$1$1$1$111111111ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp11111$1$1$1$1$1$1$1$1$1$1$1$11111ppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppp11111111111111111111ppppppppppppppu{{qqqqqqv}~qqtpPQppppppppppppppppppppppppppppppppuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ 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..1e69e75c1
--- /dev/null
+++ b/data/layouts/VerdanturfTown/layout.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_MapBorder:: @ 82923EC
+ .incbin "data/layouts/VerdanturfTown/border.bin"
+
+VerdanturfTown_MapBlockdata:: @ 82923F4
+ .incbin "data/layouts/VerdanturfTown/map.bin"
+
+ .align 2
+VerdanturfTown_Layout:: @ 8292714
+ .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..0dbece956
--- /dev/null
+++ b/data/layouts/VerdanturfTown/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..a6922408b
--- /dev/null
+++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
+ .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin"
+
+VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584
+ .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin"
+
+ .align 2
+VerdanturfTown_WandasHouse_Layout:: @ 82CF694
+ .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..5d0bd41d1
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_1F_MapBorder:: @ 82E105C
+ .incbin "data/layouts/VictoryRoad_1F/border.bin"
+
+VictoryRoad_1F_MapBlockdata:: @ 82E1064
+ .incbin "data/layouts/VictoryRoad_1F/map.bin"
+
+ .align 2
+VictoryRoad_1F_Layout:: @ 82E2090
+ .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#BBBBBBBBBBBBBBBBBBB B B B B"BBBBBBBBBBBBBBBBBBBBBBBBBB22222BB2222222BB222222222222BB222222222222222222222222222BB22222222222222222222222BB222     
+2222222222222222222222BBBBBBB B B B"22222222222222222222222BBBBBBBBBB22     
+2222   
+2222222222  B B BBBBBB B"22L6Q6M6222P6BBBBBBBBB2222222222222228#2222222222222222222228#
+222222222222222222228222222222222222222     
+2228222222222222222222  B B B"2228#   #22222222BBBBBBBB B B B"22222222222222#22BBBBBBBBBBB222222222222222 #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..1613743cf
--- /dev/null
+++ b/data/layouts/VictoryRoad_B1F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_B1F_MapBorder:: @ 82F83D0
+ .incbin "data/layouts/VictoryRoad_B1F/border.bin"
+
+VictoryRoad_B1F_MapBlockdata:: @ 82F83D8
+ .incbin "data/layouts/VictoryRoad_B1F/map.bin"
+
+ .align 2
+VictoryRoad_B1F_Layout:: @ 82F8EFC
+ .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..706c96974
--- /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 BBBBB B B B B
+2fBBBf#"2222BBBBBBBBBBBB2BBBBB2222222222222BfBB#    
+2#2222222#"#  "2222222222P2222222222#"2222222  
+22228222# 
+22222 ##       ## 
+228222#  
+22  B B#B #22R222 #B B B BBBBBBBB222P22622#   
+22BBBBBBBBBBB2222222228222222222BBB2222222222R222 #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..ff4ddb865
--- /dev/null
+++ b/data/layouts/VictoryRoad_B2F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_B2F_MapBorder:: @ 82F8F14
+ .incbin "data/layouts/VictoryRoad_B2F/border.bin"
+
+VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C
+ .incbin "data/layouts/VictoryRoad_B2F/map.bin"
+
+ .align 2
+VictoryRoad_B2F_Layout:: @ 82F9A40
+ .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..682c31764
--- /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{222222222222222222222Z[tuv222222222{222XY{{{{{{{{22222222222tuv{{PQ{{{{{{{22222222{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222###UUUV{{{{{{{{{TUUUUUUUUUUV{{  2#2222222#     "V{{{TUUUU         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B BBBBBBBB222222222BBBBBBBBB B B B B#BBBBBBBBBBBBBB2222BBBBBBBBBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222Q222222222222229222222222222222222622222S2222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file