summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/border.bin1
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/header.inc2
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/map.binbin126 -> 0 bytes
-rw-r--r--data/maps/AbandonedShip_Corridors_1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Corridors_1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Corridors_1F/map.bin3
-rw-r--r--data/maps/AbandonedShip_Corridors_B1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Corridors_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Corridors_B1F/map.bin1
-rw-r--r--data/maps/AbandonedShip_Deck/border.bin1
-rw-r--r--data/maps/AbandonedShip_Deck/header.inc2
-rw-r--r--data/maps/AbandonedShip_Deck/map.bin1
-rw-r--r--data/maps/AbandonedShip_HiddenFloorCorridors/border.bin1
-rw-r--r--data/maps/AbandonedShip_HiddenFloorCorridors/header.inc2
-rw-r--r--data/maps/AbandonedShip_HiddenFloorCorridors/map.bin1
-rw-r--r--data/maps/AbandonedShip_HiddenFloorRooms/border.bin1
-rw-r--r--data/maps/AbandonedShip_HiddenFloorRooms/header.inc2
-rw-r--r--data/maps/AbandonedShip_HiddenFloorRooms/map.bin1
-rw-r--r--data/maps/AbandonedShip_Room_B1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Room_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Room_B1F/map.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms2_1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms2_1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms2_1F/map.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms2_B1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms2_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms2_B1F/map.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms_1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms_1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms_1F/map.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms_B1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Rooms_B1F/header.inc2
-rw-r--r--data/maps/AbandonedShip_Rooms_B1F/map.bin1
-rw-r--r--data/maps/AbandonedShip_Underwater1/border.bin1
-rw-r--r--data/maps/AbandonedShip_Underwater1/header.inc2
-rw-r--r--data/maps/AbandonedShip_Underwater1/map.bin1
-rw-r--r--data/maps/AbandonedShip_Underwater2/border.bin1
-rw-r--r--data/maps/AbandonedShip_Underwater2/header.inc2
-rw-r--r--data/maps/AbandonedShip_Underwater2/map.bin1
-rw-r--r--data/maps/AncientTomb/border.bin1
-rw-r--r--data/maps/AncientTomb/header.inc2
-rw-r--r--data/maps/AncientTomb/map.binbin1122 -> 0 bytes
-rw-r--r--data/maps/AquaHideout_1F/border.bin1
-rw-r--r--data/maps/AquaHideout_1F/header.inc2
-rw-r--r--data/maps/AquaHideout_1F/map.bin55
-rw-r--r--data/maps/AquaHideout_B1F/border.bin1
-rw-r--r--data/maps/AquaHideout_B1F/header.inc2
-rw-r--r--data/maps/AquaHideout_B1F/map.bin83
-rw-r--r--data/maps/AquaHideout_B2F/border.bin1
-rw-r--r--data/maps/AquaHideout_B2F/header.inc2
-rw-r--r--data/maps/AquaHideout_B2F/map.bin51
-rw-r--r--data/maps/BattleTower_BattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleTower_BattleRoom/header.inc2
-rw-r--r--data/maps/BattleTower_BattleRoom/map.bin1
-rw-r--r--data/maps/BattleTower_Corridor/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleTower_Corridor/header.inc2
-rw-r--r--data/maps/BattleTower_Corridor/map.binbin170 -> 0 bytes
-rw-r--r--data/maps/BattleTower_Elevator/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleTower_Elevator/header.inc2
-rw-r--r--data/maps/BattleTower_Elevator/map.bin1
-rw-r--r--data/maps/BattleTower_Lobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleTower_Lobby/header.inc2
-rw-r--r--data/maps/BattleTower_Lobby/map.binbin252 -> 0 bytes
-rw-r--r--data/maps/BattleTower_Outside/border.bin1
-rw-r--r--data/maps/BattleTower_Outside/header.inc2
-rw-r--r--data/maps/BattleTower_Outside/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_1F/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_1F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_1F/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_B1F/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_B1F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_B1F/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_B2F/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_B2F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_B2F/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_B3F/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_B3F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_B3F/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_B4F/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_B4F/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_B4F/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_Entrance/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_Entrance/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_Entrance/map.bin1
-rw-r--r--data/maps/DesertRuins/border.bin1
-rw-r--r--data/maps/DesertRuins/header.inc2
-rw-r--r--data/maps/DesertRuins/map.binbin1122 -> 0 bytes
-rw-r--r--data/maps/DewfordTown/border.bin1
-rw-r--r--data/maps/DewfordTown/header.inc2
-rw-r--r--data/maps/DewfordTown/map.bin2
-rw-r--r--data/maps/DewfordTown_Gym/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/DewfordTown_Gym/header.inc2
-rw-r--r--data/maps/DewfordTown_Gym/map.bin50
-rw-r--r--data/maps/DewfordTown_Hall/border.bin1
-rw-r--r--data/maps/DewfordTown_Hall/header.inc2
-rw-r--r--data/maps/DewfordTown_Hall/map.binbin306 -> 0 bytes
-rw-r--r--data/maps/DewfordTown_House1/border.bin1
-rw-r--r--data/maps/DewfordTown_House1/header.inc2
-rw-r--r--data/maps/DewfordTown_House1/map.bin1
-rw-r--r--data/maps/DewfordTown_House2/border.bin1
-rw-r--r--data/maps/DewfordTown_House2/header.inc2
-rw-r--r--data/maps/DewfordTown_House2/map.bin1
-rw-r--r--data/maps/DewfordTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/DewfordTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/DoubleBattleColosseum/border.bin1
-rw-r--r--data/maps/DoubleBattleColosseum/header.inc2
-rw-r--r--data/maps/DoubleBattleColosseum/map.bin1
-rw-r--r--data/maps/EverGrandeCity/border.bin1
-rw-r--r--data/maps/EverGrandeCity/header.inc2
-rw-r--r--data/maps/EverGrandeCity/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/map.binbin338 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_Corridor1/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_Corridor1/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor1/map.bin1
-rw-r--r--data/maps/EverGrandeCity_Corridor2/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor3/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor4/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_Corridor4/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Corridor4/map.bin1
-rw-r--r--data/maps/EverGrandeCity_Corridor5/header.inc2
-rw-r--r--data/maps/EverGrandeCity_DrakesRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_DrakesRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_DrakesRoom/map.bin2
-rw-r--r--data/maps/EverGrandeCity_GlaciasRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_GlaciasRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_GlaciasRoom/map.bin2
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/header.inc2
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/map.bin1
-rw-r--r--data/maps/EverGrandeCity_PhoebesRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_PhoebesRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PhoebesRoom/map.bin2
-rw-r--r--data/maps/EverGrandeCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague/border.bin1
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague/map.bin2
-rw-r--r--data/maps/EverGrandeCity_SidneysRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_SidneysRoom/header.inc2
-rw-r--r--data/maps/EverGrandeCity_SidneysRoom/map.bin2
-rw-r--r--data/maps/FallarborTown/border.bin1
-rw-r--r--data/maps/FallarborTown/header.inc2
-rw-r--r--data/maps/FallarborTown/map.binbin800 -> 0 bytes
-rw-r--r--data/maps/FallarborTown_ContestHall/border.bin1
-rw-r--r--data/maps/FallarborTown_ContestHall/header.inc2
-rw-r--r--data/maps/FallarborTown_ContestHall/map.bin1
-rw-r--r--data/maps/FallarborTown_ContestLobby/border.bin1
-rw-r--r--data/maps/FallarborTown_ContestLobby/header.inc2
-rw-r--r--data/maps/FallarborTown_ContestLobby/map.bin1
-rw-r--r--data/maps/FallarborTown_House1/header.inc2
-rw-r--r--data/maps/FallarborTown_House2/header.inc2
-rw-r--r--data/maps/FallarborTown_Mart/header.inc2
-rw-r--r--data/maps/FallarborTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/FallarborTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/FieryPath/border.bin1
-rw-r--r--data/maps/FieryPath/header.inc2
-rw-r--r--data/maps/FieryPath/map.bin10
-rw-r--r--data/maps/FortreeCity/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/FortreeCity/header.inc2
-rw-r--r--data/maps/FortreeCity/map.bin1
-rw-r--r--data/maps/FortreeCity_DecorationShop/border.bin1
-rw-r--r--data/maps/FortreeCity_DecorationShop/header.inc2
-rw-r--r--data/maps/FortreeCity_DecorationShop/map.bin1
-rw-r--r--data/maps/FortreeCity_Gym/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/FortreeCity_Gym/header.inc2
-rw-r--r--data/maps/FortreeCity_Gym/map.bin2
-rw-r--r--data/maps/FortreeCity_House1/border.bin1
-rw-r--r--data/maps/FortreeCity_House1/header.inc2
-rw-r--r--data/maps/FortreeCity_House1/map.bin1
-rw-r--r--data/maps/FortreeCity_House2/border.bin1
-rw-r--r--data/maps/FortreeCity_House2/header.inc2
-rw-r--r--data/maps/FortreeCity_House2/map.bin1
-rw-r--r--data/maps/FortreeCity_House3/header.inc2
-rw-r--r--data/maps/FortreeCity_House4/header.inc2
-rw-r--r--data/maps/FortreeCity_House5/header.inc2
-rw-r--r--data/maps/FortreeCity_Mart/header.inc2
-rw-r--r--data/maps/FortreeCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/FortreeCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/GraniteCave_1F/border.bin1
-rw-r--r--data/maps/GraniteCave_1F/header.inc2
-rw-r--r--data/maps/GraniteCave_1F/map.bin5
-rw-r--r--data/maps/GraniteCave_B1F/border.bin1
-rw-r--r--data/maps/GraniteCave_B1F/header.inc2
-rw-r--r--data/maps/GraniteCave_B1F/map.bin10
-rw-r--r--data/maps/GraniteCave_B2F/border.bin1
-rw-r--r--data/maps/GraniteCave_B2F/header.inc2
-rw-r--r--data/maps/GraniteCave_B2F/map.bin2
-rw-r--r--data/maps/GraniteCave_StevensRoom/border.bin1
-rw-r--r--data/maps/GraniteCave_StevensRoom/header.inc2
-rw-r--r--data/maps/GraniteCave_StevensRoom/map.bin4
-rw-r--r--data/maps/House11/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/House11/map.bin1
-rw-r--r--data/maps/House12/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/House12/map.bin1
-rw-r--r--data/maps/InsideOfTruck/border.bin1
-rw-r--r--data/maps/InsideOfTruck/header.inc2
-rw-r--r--data/maps/InsideOfTruck/map.bin2
-rw-r--r--data/maps/IslandCave/border.bin1
-rw-r--r--data/maps/IslandCave/header.inc2
-rw-r--r--data/maps/IslandCave/map.binbin1122 -> 0 bytes
-rw-r--r--data/maps/JaggedPass/border.bin1
-rw-r--r--data/maps/JaggedPass/header.inc2
-rw-r--r--data/maps/JaggedPass/map.binbin2760 -> 0 bytes
-rw-r--r--data/maps/LavaridgeTown/border.bin1
-rw-r--r--data/maps/LavaridgeTown/header.inc2
-rw-r--r--data/maps/LavaridgeTown/map.bin3
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/header.inc2
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/map.bin2
-rw-r--r--data/maps/LavaridgeTown_Gym_B1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LavaridgeTown_Gym_B1F/header.inc2
-rw-r--r--data/maps/LavaridgeTown_Gym_B1F/map.bin1
-rw-r--r--data/maps/LavaridgeTown_HerbShop/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LavaridgeTown_HerbShop/header.inc2
-rw-r--r--data/maps/LavaridgeTown_HerbShop/map.bin1
-rw-r--r--data/maps/LavaridgeTown_House/header.inc2
-rw-r--r--data/maps/LavaridgeTown_Mart/header.inc2
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_1F/border.bin1
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_1F/map.bin1
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity/border.bin1
-rw-r--r--data/maps/LilycoveCity/header.inc2
-rw-r--r--data/maps/LilycoveCity/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_ContestHall/border.bin1
-rw-r--r--data/maps/LilycoveCity_ContestHall/header.inc2
-rw-r--r--data/maps/LilycoveCity_ContestHall/map.bin3
-rw-r--r--data/maps/LilycoveCity_ContestLobby/border.bin1
-rw-r--r--data/maps/LilycoveCity_ContestLobby/header.inc2
-rw-r--r--data/maps/LilycoveCity_ContestLobby/map.bin1
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin1
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin1
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin1
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_1F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/header.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/map.binbin288 -> 0 bytes
-rw-r--r--data/maps/LilycoveCity_EmptyMap/border.bin1
-rw-r--r--data/maps/LilycoveCity_EmptyMap/header.inc2
-rw-r--r--data/maps/LilycoveCity_EmptyMap/map.bin1
-rw-r--r--data/maps/LilycoveCity_Harbor/header.inc2
-rw-r--r--data/maps/LilycoveCity_House1/header.inc2
-rw-r--r--data/maps/LilycoveCity_House2/border.bin1
-rw-r--r--data/maps/LilycoveCity_House2/header.inc2
-rw-r--r--data/maps/LilycoveCity_House2/map.bin1
-rw-r--r--data/maps/LilycoveCity_House3/header.inc2
-rw-r--r--data/maps/LilycoveCity_House4/header.inc2
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin1
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin1
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin1
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin1
-rw-r--r--data/maps/LilycoveCity_MoveDeletersHouse/header.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin1
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin2
-rw-r--r--data/maps/LilycoveCity_UnusedMart/header.inc2
-rw-r--r--data/maps/LinkContestRoom1/border.bin1
-rw-r--r--data/maps/LinkContestRoom1/header.inc2
-rw-r--r--data/maps/LinkContestRoom1/map.bin1
-rw-r--r--data/maps/LinkContestRoom2/border.bin1
-rw-r--r--data/maps/LinkContestRoom2/header.inc2
-rw-r--r--data/maps/LinkContestRoom2/map.bin1
-rw-r--r--data/maps/LinkContestRoom3/border.bin1
-rw-r--r--data/maps/LinkContestRoom3/header.inc2
-rw-r--r--data/maps/LinkContestRoom3/map.bin1
-rw-r--r--data/maps/LinkContestRoom4/border.bin1
-rw-r--r--data/maps/LinkContestRoom4/header.inc2
-rw-r--r--data/maps/LinkContestRoom4/map.bin1
-rw-r--r--data/maps/LinkContestRoom5/border.bin1
-rw-r--r--data/maps/LinkContestRoom5/header.inc2
-rw-r--r--data/maps/LinkContestRoom5/map.bin1
-rw-r--r--data/maps/LinkContestRoom6/border.bin1
-rw-r--r--data/maps/LinkContestRoom6/header.inc2
-rw-r--r--data/maps/LinkContestRoom6/map.bin1
-rw-r--r--data/maps/LittlerootTown/border.bin1
-rw-r--r--data/maps/LittlerootTown/header.inc2
-rw-r--r--data/maps/LittlerootTown/map.bin3
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/header.inc2
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/map.bin1
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/border.bin1
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/header.inc2
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_2F/map.bin1
-rw-r--r--data/maps/LittlerootTown_MaysHouse_1F/border.bin1
-rw-r--r--data/maps/LittlerootTown_MaysHouse_1F/header.inc2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_1F/map.bin1
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/border.bin1
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/header.inc2
-rw-r--r--data/maps/LittlerootTown_MaysHouse_2F/map.bin2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/border.bin1
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/header.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/map.bin4
-rw-r--r--data/maps/MagmaHideout_1F/border.bin1
-rw-r--r--data/maps/MagmaHideout_1F/header.inc2
-rw-r--r--data/maps/MagmaHideout_1F/map.binbin1680 -> 0 bytes
-rw-r--r--data/maps/MagmaHideout_B1F/border.bin1
-rw-r--r--data/maps/MagmaHideout_B1F/header.inc2
-rw-r--r--data/maps/MagmaHideout_B1F/map.bin95
-rw-r--r--data/maps/MagmaHideout_B2F/border.bin1
-rw-r--r--data/maps/MagmaHideout_B2F/header.inc2
-rw-r--r--data/maps/MagmaHideout_B2F/map.bin49
-rw-r--r--data/maps/MauvilleCity/border.bin1
-rw-r--r--data/maps/MauvilleCity/header.inc2
-rw-r--r--data/maps/MauvilleCity/map.binbin1600 -> 0 bytes
-rw-r--r--data/maps/MauvilleCity_BikeShop/border.bin1
-rw-r--r--data/maps/MauvilleCity_BikeShop/header.inc2
-rw-r--r--data/maps/MauvilleCity_BikeShop/map.bin2
-rw-r--r--data/maps/MauvilleCity_GameCorner/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/MauvilleCity_GameCorner/header.inc2
-rw-r--r--data/maps/MauvilleCity_GameCorner/map.bin3
-rw-r--r--data/maps/MauvilleCity_Gym/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/MauvilleCity_Gym/header.inc2
-rw-r--r--data/maps/MauvilleCity_Gym/map.bin3
-rw-r--r--data/maps/MauvilleCity_House1/header.inc2
-rw-r--r--data/maps/MauvilleCity_House2/header.inc2
-rw-r--r--data/maps/MauvilleCity_Mart/header.inc2
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/MeteorFalls_1F_1R/border.bin1
-rw-r--r--data/maps/MeteorFalls_1F_1R/header.inc2
-rw-r--r--data/maps/MeteorFalls_1F_1R/map.bin1
-rw-r--r--data/maps/MeteorFalls_1F_2R/border.bin1
-rw-r--r--data/maps/MeteorFalls_1F_2R/header.inc2
-rw-r--r--data/maps/MeteorFalls_1F_2R/map.bin2
-rw-r--r--data/maps/MeteorFalls_B1F_1R/border.bin1
-rw-r--r--data/maps/MeteorFalls_B1F_1R/header.inc2
-rw-r--r--data/maps/MeteorFalls_B1F_1R/map.bin6
-rw-r--r--data/maps/MeteorFalls_B1F_2R/border.bin1
-rw-r--r--data/maps/MeteorFalls_B1F_2R/header.inc2
-rw-r--r--data/maps/MeteorFalls_B1F_2R/map.bin1
-rw-r--r--data/maps/MossdeepCity/border.bin1
-rw-r--r--data/maps/MossdeepCity/header.inc2
-rw-r--r--data/maps/MossdeepCity/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/map.bin2
-rw-r--r--data/maps/MossdeepCity_GameCorner_B1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/MossdeepCity_GameCorner_B1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_GameCorner_B1F/map.bin2
-rw-r--r--data/maps/MossdeepCity_Gym/border.bin1
-rw-r--r--data/maps/MossdeepCity_Gym/header.inc2
-rw-r--r--data/maps/MossdeepCity_Gym/map.bin50
-rw-r--r--data/maps/MossdeepCity_House1/header.inc2
-rw-r--r--data/maps/MossdeepCity_House2/header.inc2
-rw-r--r--data/maps/MossdeepCity_House3/header.inc2
-rw-r--r--data/maps/MossdeepCity_House4/header.inc2
-rw-r--r--data/maps/MossdeepCity_Mart/header.inc2
-rw-r--r--data/maps/MossdeepCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/border.bin1
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/header.inc2
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/map.binbin320 -> 0 bytes
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/border.bin1
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/header.inc2
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/map.binbin320 -> 0 bytes
-rw-r--r--data/maps/MossdeepCity_StevensHouse/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/MossdeepCity_StevensHouse/header.inc2
-rw-r--r--data/maps/MossdeepCity_StevensHouse/map.bin1
-rw-r--r--data/maps/MtChimney/border.bin1
-rw-r--r--data/maps/MtChimney/header.inc2
-rw-r--r--data/maps/MtChimney/map.bin1
-rw-r--r--data/maps/MtChimney_CableCarStation/header.inc2
-rw-r--r--data/maps/MtPyre_1F/border.bin1
-rw-r--r--data/maps/MtPyre_1F/header.inc2
-rw-r--r--data/maps/MtPyre_1F/map.bin1
-rw-r--r--data/maps/MtPyre_2F/border.bin1
-rw-r--r--data/maps/MtPyre_2F/header.inc2
-rw-r--r--data/maps/MtPyre_2F/map.bin1
-rw-r--r--data/maps/MtPyre_3F/border.bin1
-rw-r--r--data/maps/MtPyre_3F/header.inc2
-rw-r--r--data/maps/MtPyre_3F/map.bin1
-rw-r--r--data/maps/MtPyre_4F/border.bin1
-rw-r--r--data/maps/MtPyre_4F/header.inc2
-rw-r--r--data/maps/MtPyre_4F/map.bin1
-rw-r--r--data/maps/MtPyre_5F/border.bin1
-rw-r--r--data/maps/MtPyre_5F/header.inc2
-rw-r--r--data/maps/MtPyre_5F/map.bin1
-rw-r--r--data/maps/MtPyre_6F/border.bin1
-rw-r--r--data/maps/MtPyre_6F/header.inc2
-rw-r--r--data/maps/MtPyre_6F/map.bin1
-rw-r--r--data/maps/MtPyre_Exterior/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/MtPyre_Exterior/header.inc2
-rw-r--r--data/maps/MtPyre_Exterior/map.binbin3876 -> 0 bytes
-rw-r--r--data/maps/MtPyre_Summit/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/MtPyre_Summit/header.inc2
-rw-r--r--data/maps/MtPyre_Summit/map.binbin3700 -> 0 bytes
-rw-r--r--data/maps/NewMauville_Entrance/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/NewMauville_Entrance/header.inc2
-rw-r--r--data/maps/NewMauville_Entrance/map.bin1
-rw-r--r--data/maps/NewMauville_Inside/border.bin1
-rw-r--r--data/maps/NewMauville_Inside/header.inc2
-rw-r--r--data/maps/NewMauville_Inside/map.bin1
-rw-r--r--data/maps/OldaleTown/border.bin1
-rw-r--r--data/maps/OldaleTown/header.inc2
-rw-r--r--data/maps/OldaleTown/map.bin1
-rw-r--r--data/maps/OldaleTown_House1/header.inc2
-rw-r--r--data/maps/OldaleTown_House2/header.inc2
-rw-r--r--data/maps/OldaleTown_Mart/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/OldaleTown_Mart/header.inc2
-rw-r--r--data/maps/OldaleTown_Mart/map.bin3
-rw-r--r--data/maps/OldaleTown_PokemonCenter_1F/border.bin1
-rw-r--r--data/maps/OldaleTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/OldaleTown_PokemonCenter_1F/map.bin1
-rw-r--r--data/maps/OldaleTown_PokemonCenter_2F/border.bin1
-rw-r--r--data/maps/OldaleTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/OldaleTown_PokemonCenter_2F/map.bin1
-rw-r--r--data/maps/PacifidlogTown/border.bin1
-rw-r--r--data/maps/PacifidlogTown/header.inc2
-rw-r--r--data/maps/PacifidlogTown/map.bin6
-rw-r--r--data/maps/PacifidlogTown_House1/border.bin1
-rw-r--r--data/maps/PacifidlogTown_House1/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House1/map.bin1
-rw-r--r--data/maps/PacifidlogTown_House2/border.bin1
-rw-r--r--data/maps/PacifidlogTown_House2/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House2/map.bin1
-rw-r--r--data/maps/PacifidlogTown_House3/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House4/header.inc2
-rw-r--r--data/maps/PacifidlogTown_House5/header.inc2
-rw-r--r--data/maps/PacifidlogTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/PacifidlogTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/PetalburgCity/border.bin1
-rw-r--r--data/maps/PetalburgCity/header.inc2
-rw-r--r--data/maps/PetalburgCity/map.bin4
-rw-r--r--data/maps/PetalburgCity_Gym/border.bin1
-rw-r--r--data/maps/PetalburgCity_Gym/header.inc2
-rw-r--r--data/maps/PetalburgCity_Gym/map.bin10
-rw-r--r--data/maps/PetalburgCity_House1/header.inc2
-rw-r--r--data/maps/PetalburgCity_House2/border.bin1
-rw-r--r--data/maps/PetalburgCity_House2/header.inc2
-rw-r--r--data/maps/PetalburgCity_House2/map.bin1
-rw-r--r--data/maps/PetalburgCity_Mart/header.inc2
-rw-r--r--data/maps/PetalburgCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/PetalburgCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/PetalburgCity_WallysHouse/header.inc2
-rw-r--r--data/maps/PetalburgWoods/border.bin1
-rw-r--r--data/maps/PetalburgWoods/header.inc2
-rw-r--r--data/maps/PetalburgWoods/map.bin1
-rw-r--r--data/maps/RecordCorner/border.bin1
-rw-r--r--data/maps/RecordCorner/header.inc2
-rw-r--r--data/maps/RecordCorner/map.bin1
-rw-r--r--data/maps/Route101/border.bin1
-rw-r--r--data/maps/Route101/header.inc2
-rw-r--r--data/maps/Route101/map.bin1
-rw-r--r--data/maps/Route102/border.bin1
-rw-r--r--data/maps/Route102/header.inc2
-rw-r--r--data/maps/Route102/map.bin1
-rw-r--r--data/maps/Route103/border.bin1
-rw-r--r--data/maps/Route103/header.inc2
-rw-r--r--data/maps/Route103/map.bin1
-rw-r--r--data/maps/Route104/border.bin1
-rw-r--r--data/maps/Route104/header.inc2
-rw-r--r--data/maps/Route104/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/Route104_MrBrineysHouse/border.bin1
-rw-r--r--data/maps/Route104_MrBrineysHouse/header.inc2
-rw-r--r--data/maps/Route104_MrBrineysHouse/map.bin1
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/header.inc2
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/map.binbin270 -> 0 bytes
-rw-r--r--data/maps/Route104_Prototype/border.bin1
-rw-r--r--data/maps/Route104_Prototype/header.inc2
-rw-r--r--data/maps/Route104_Prototype/map.bin1
-rw-r--r--data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc2
-rw-r--r--data/maps/Route105/border.bin1
-rw-r--r--data/maps/Route105/header.inc2
-rw-r--r--data/maps/Route105/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/Route106/border.bin1
-rw-r--r--data/maps/Route106/header.inc2
-rw-r--r--data/maps/Route106/map.binbin3200 -> 0 bytes
-rw-r--r--data/maps/Route107/border.bin1
-rw-r--r--data/maps/Route107/header.inc2
-rw-r--r--data/maps/Route107/map.binbin2400 -> 0 bytes
-rw-r--r--data/maps/Route108/border.bin1
-rw-r--r--data/maps/Route108/header.inc2
-rw-r--r--data/maps/Route108/map.bin1
-rw-r--r--data/maps/Route109/border.bin1
-rw-r--r--data/maps/Route109/header.inc2
-rw-r--r--data/maps/Route109/map.binbin4800 -> 0 bytes
-rw-r--r--data/maps/Route109_SeashoreHouse/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route109_SeashoreHouse/header.inc2
-rw-r--r--data/maps/Route109_SeashoreHouse/map.bin3
-rw-r--r--data/maps/Route110/border.bin1
-rw-r--r--data/maps/Route110/header.inc2
-rw-r--r--data/maps/Route110/map.binbin8000 -> 0 bytes
-rw-r--r--data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc2
-rw-r--r--data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc2
-rw-r--r--data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin1
-rw-r--r--data/maps/Route110_TrickHouseCorridor/border.bin1
-rw-r--r--data/maps/Route110_TrickHouseCorridor/header.inc2
-rw-r--r--data/maps/Route110_TrickHouseCorridor/map.bin1
-rw-r--r--data/maps/Route110_TrickHouseEnd/border.bin1
-rw-r--r--data/maps/Route110_TrickHouseEnd/header.inc2
-rw-r--r--data/maps/Route110_TrickHouseEnd/map.bin1
-rw-r--r--data/maps/Route110_TrickHouseEntrance/border.bin1
-rw-r--r--data/maps/Route110_TrickHouseEntrance/header.inc2
-rw-r--r--data/maps/Route110_TrickHouseEntrance/map.bin1
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/header.inc2
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/map.bin2
-rw-r--r--data/maps/Route111/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route111/header.inc2
-rw-r--r--data/maps/Route111/map.binbin11200 -> 0 bytes
-rw-r--r--data/maps/Route111_OldLadysRestStop/header.inc2
-rw-r--r--data/maps/Route111_WinstrateFamilysHouse/header.inc2
-rw-r--r--data/maps/Route112/border.bin1
-rw-r--r--data/maps/Route112/header.inc2
-rw-r--r--data/maps/Route112/map.binbin4800 -> 0 bytes
-rw-r--r--data/maps/Route112_CableCarStation/border.bin1
-rw-r--r--data/maps/Route112_CableCarStation/header.inc2
-rw-r--r--data/maps/Route112_CableCarStation/map.binbin312 -> 0 bytes
-rw-r--r--data/maps/Route113/border.bin1
-rw-r--r--data/maps/Route113/header.inc2
-rw-r--r--data/maps/Route113/map.bin288
-rw-r--r--data/maps/Route113_GlassWorkshop/header.inc2
-rw-r--r--data/maps/Route114/border.bin1
-rw-r--r--data/maps/Route114/header.inc2
-rw-r--r--data/maps/Route114/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/Route114_FossilManiacsHouse/border.bin1
-rw-r--r--data/maps/Route114_FossilManiacsHouse/header.inc2
-rw-r--r--data/maps/Route114_FossilManiacsHouse/map.bin1
-rw-r--r--data/maps/Route114_FossilManiacsTunnel/border.bin1
-rw-r--r--data/maps/Route114_FossilManiacsTunnel/header.inc2
-rw-r--r--data/maps/Route114_FossilManiacsTunnel/map.bin1
-rw-r--r--data/maps/Route114_LanettesHouse/border.bin1
-rw-r--r--data/maps/Route114_LanettesHouse/header.inc2
-rw-r--r--data/maps/Route114_LanettesHouse/map.bin2
-rw-r--r--data/maps/Route115/border.bin1
-rw-r--r--data/maps/Route115/header.inc2
-rw-r--r--data/maps/Route115/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/Route116/border.bin1
-rw-r--r--data/maps/Route116/header.inc2
-rw-r--r--data/maps/Route116/map.binbin4000 -> 0 bytes
-rw-r--r--data/maps/Route116_TunnelersRestHouse/border.bin1
-rw-r--r--data/maps/Route116_TunnelersRestHouse/header.inc2
-rw-r--r--data/maps/Route116_TunnelersRestHouse/map.bin1
-rw-r--r--data/maps/Route117/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route117/header.inc2
-rw-r--r--data/maps/Route117/map.bin11
-rw-r--r--data/maps/Route117_PokemonDayCare/border.bin1
-rw-r--r--data/maps/Route117_PokemonDayCare/header.inc2
-rw-r--r--data/maps/Route117_PokemonDayCare/map.bin2
-rw-r--r--data/maps/Route118/border.bin1
-rw-r--r--data/maps/Route118/header.inc2
-rw-r--r--data/maps/Route118/map.binbin3200 -> 0 bytes
-rw-r--r--data/maps/Route119/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route119/header.inc2
-rw-r--r--data/maps/Route119/map.binbin11200 -> 0 bytes
-rw-r--r--data/maps/Route119_House/header.inc2
-rw-r--r--data/maps/Route119_WeatherInstitute_1F/border.bin1
-rw-r--r--data/maps/Route119_WeatherInstitute_1F/header.inc2
-rw-r--r--data/maps/Route119_WeatherInstitute_1F/map.bin1
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/border.bin1
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/header.inc2
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/map.bin1
-rw-r--r--data/maps/Route120/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route120/header.inc2
-rw-r--r--data/maps/Route120/map.binbin8000 -> 0 bytes
-rw-r--r--data/maps/Route121/border.bin1
-rw-r--r--data/maps/Route121/header.inc2
-rw-r--r--data/maps/Route121/map.bin1
-rw-r--r--data/maps/Route121_SafariZoneEntrance/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route121_SafariZoneEntrance/header.inc2
-rw-r--r--data/maps/Route121_SafariZoneEntrance/map.bin1
-rw-r--r--data/maps/Route122/border.bin1
-rw-r--r--data/maps/Route122/header.inc2
-rw-r--r--data/maps/Route122/map.binbin3200 -> 0 bytes
-rw-r--r--data/maps/Route123/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route123/header.inc2
-rw-r--r--data/maps/Route123/map.bin2
-rw-r--r--data/maps/Route123_BerryMastersHouse/header.inc2
-rw-r--r--data/maps/Route124/border.bin1
-rw-r--r--data/maps/Route124/header.inc2
-rw-r--r--data/maps/Route124/map.binbin12800 -> 0 bytes
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/header.inc2
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/map.bin1
-rw-r--r--data/maps/Route125/border.bin1
-rw-r--r--data/maps/Route125/header.inc2
-rw-r--r--data/maps/Route125/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/Route126/border.bin1
-rw-r--r--data/maps/Route126/header.inc2
-rw-r--r--data/maps/Route126/map.binbin12800 -> 0 bytes
-rw-r--r--data/maps/Route127/border.bin1
-rw-r--r--data/maps/Route127/header.inc2
-rw-r--r--data/maps/Route127/map.binbin12800 -> 0 bytes
-rw-r--r--data/maps/Route128/border.bin1
-rw-r--r--data/maps/Route128/header.inc2
-rw-r--r--data/maps/Route128/map.binbin9600 -> 0 bytes
-rw-r--r--data/maps/Route129/border.bin1
-rw-r--r--data/maps/Route129/header.inc2
-rw-r--r--data/maps/Route129/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/Route130/border.bin1
-rw-r--r--data/maps/Route130/header.inc2
-rw-r--r--data/maps/Route130/map.bin1
-rw-r--r--data/maps/Route131/border.bin1
-rw-r--r--data/maps/Route131/header.inc2
-rw-r--r--data/maps/Route131/map.bin1
-rw-r--r--data/maps/Route132/border.bin1
-rw-r--r--data/maps/Route132/header.inc2
-rw-r--r--data/maps/Route132/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/Route133/border.bin1
-rw-r--r--data/maps/Route133/header.inc2
-rw-r--r--data/maps/Route133/map.bin1
-rw-r--r--data/maps/Route134/border.bin1
-rw-r--r--data/maps/Route134/header.inc2
-rw-r--r--data/maps/Route134/map.binbin6400 -> 0 bytes
-rw-r--r--data/maps/RustboroCity/border.bin1
-rw-r--r--data/maps/RustboroCity/header.inc2
-rw-r--r--data/maps/RustboroCity/map.binbin4800 -> 0 bytes
-rw-r--r--data/maps/RustboroCity_CuttersHouse/border.bin1
-rw-r--r--data/maps/RustboroCity_CuttersHouse/header.inc2
-rw-r--r--data/maps/RustboroCity_CuttersHouse/map.bin1
-rw-r--r--data/maps/RustboroCity_DevonCorp_1F/border.bin1
-rw-r--r--data/maps/RustboroCity_DevonCorp_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_DevonCorp_1F/map.bin1
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/border.bin1
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_DevonCorp_2F/map.bin1
-rw-r--r--data/maps/RustboroCity_DevonCorp_3F/border.bin1
-rw-r--r--data/maps/RustboroCity_DevonCorp_3F/header.inc2
-rw-r--r--data/maps/RustboroCity_DevonCorp_3F/map.bin1
-rw-r--r--data/maps/RustboroCity_Flat1_1F/border.bin1
-rw-r--r--data/maps/RustboroCity_Flat1_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat1_1F/map.bin1
-rw-r--r--data/maps/RustboroCity_Flat1_2F/border.bin1
-rw-r--r--data/maps/RustboroCity_Flat1_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat1_2F/map.bin1
-rw-r--r--data/maps/RustboroCity_Flat2_1F/border.bin1
-rw-r--r--data/maps/RustboroCity_Flat2_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat2_1F/map.binbin252 -> 0 bytes
-rw-r--r--data/maps/RustboroCity_Flat2_2F/border.bin1
-rw-r--r--data/maps/RustboroCity_Flat2_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat2_2F/map.binbin252 -> 0 bytes
-rw-r--r--data/maps/RustboroCity_Flat2_3F/border.bin1
-rw-r--r--data/maps/RustboroCity_Flat2_3F/header.inc2
-rw-r--r--data/maps/RustboroCity_Flat2_3F/map.binbin252 -> 0 bytes
-rw-r--r--data/maps/RustboroCity_Gym/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/RustboroCity_Gym/header.inc2
-rw-r--r--data/maps/RustboroCity_Gym/map.bin2
-rw-r--r--data/maps/RustboroCity_House1/border.bin1
-rw-r--r--data/maps/RustboroCity_House1/header.inc2
-rw-r--r--data/maps/RustboroCity_House1/map.bin1
-rw-r--r--data/maps/RustboroCity_House2/border.bin1
-rw-r--r--data/maps/RustboroCity_House2/header.inc2
-rw-r--r--data/maps/RustboroCity_House2/map.bin1
-rw-r--r--data/maps/RustboroCity_House3/header.inc2
-rw-r--r--data/maps/RustboroCity_Mart/header.inc2
-rw-r--r--data/maps/RustboroCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/RustboroCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/RustboroCity_PokemonSchool/border.bin1
-rw-r--r--data/maps/RustboroCity_PokemonSchool/header.inc2
-rw-r--r--data/maps/RustboroCity_PokemonSchool/map.binbin264 -> 0 bytes
-rw-r--r--data/maps/RusturfTunnel/border.bin1
-rw-r--r--data/maps/RusturfTunnel/header.inc2
-rw-r--r--data/maps/RusturfTunnel/map.bin2
-rw-r--r--data/maps/SSTidalCorridor/border.bin1
-rw-r--r--data/maps/SSTidalCorridor/header.inc2
-rw-r--r--data/maps/SSTidalCorridor/map.bin1
-rw-r--r--data/maps/SSTidalLowerDeck/border.bin1
-rw-r--r--data/maps/SSTidalLowerDeck/header.inc2
-rw-r--r--data/maps/SSTidalLowerDeck/map.bin1
-rw-r--r--data/maps/SSTidalRooms/border.bin1
-rw-r--r--data/maps/SSTidalRooms/header.inc2
-rw-r--r--data/maps/SSTidalRooms/map.bin1
-rw-r--r--data/maps/SafariZone_Northeast/border.bin1
-rw-r--r--data/maps/SafariZone_Northeast/header.inc2
-rw-r--r--data/maps/SafariZone_Northeast/map.binbin3200 -> 0 bytes
-rw-r--r--data/maps/SafariZone_Northwest/border.bin1
-rw-r--r--data/maps/SafariZone_Northwest/header.inc2
-rw-r--r--data/maps/SafariZone_Northwest/map.binbin3200 -> 0 bytes
-rw-r--r--data/maps/SafariZone_RestHouse/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SafariZone_RestHouse/header.inc2
-rw-r--r--data/maps/SafariZone_RestHouse/map.bin1
-rw-r--r--data/maps/SafariZone_Southeast/border.bin1
-rw-r--r--data/maps/SafariZone_Southeast/header.inc2
-rw-r--r--data/maps/SafariZone_Southeast/map.binbin3200 -> 0 bytes
-rw-r--r--data/maps/SafariZone_Southwest/border.bin1
-rw-r--r--data/maps/SafariZone_Southwest/header.inc2
-rw-r--r--data/maps/SafariZone_Southwest/map.binbin3200 -> 0 bytes
-rw-r--r--data/maps/ScorchedSlab/border.bin1
-rw-r--r--data/maps/ScorchedSlab/header.inc2
-rw-r--r--data/maps/ScorchedSlab/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Entrance/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Entrance/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Entrance/map.bin11
-rw-r--r--data/maps/SeafloorCavern_Room1/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room1/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room1/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room2/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room2/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room2/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room3/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room3/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room3/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room4/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room4/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room4/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room5/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room5/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room5/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room6/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room6/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room6/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room7/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room7/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room7/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room8/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room8/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room8/map.bin1
-rw-r--r--data/maps/SeafloorCavern_Room9/border.bin1
-rw-r--r--data/maps/SeafloorCavern_Room9/header.inc2
-rw-r--r--data/maps/SeafloorCavern_Room9/map.bin1
-rw-r--r--data/maps/SealedChamber_InnerRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SealedChamber_InnerRoom/header.inc2
-rw-r--r--data/maps/SealedChamber_InnerRoom/map.bin1
-rw-r--r--data/maps/SealedChamber_OuterRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SealedChamber_OuterRoom/header.inc2
-rw-r--r--data/maps/SealedChamber_OuterRoom/map.bin11
-rw-r--r--data/maps/SecretBase_BlueCave1/border.bin1
-rw-r--r--data/maps/SecretBase_BlueCave1/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave1/map.bin50
-rw-r--r--data/maps/SecretBase_BlueCave2/border.bin1
-rw-r--r--data/maps/SecretBase_BlueCave2/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave2/map.bin57
-rw-r--r--data/maps/SecretBase_BlueCave3/border.bin1
-rw-r--r--data/maps/SecretBase_BlueCave3/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave3/map.bin51
-rw-r--r--data/maps/SecretBase_BlueCave4/border.bin1
-rw-r--r--data/maps/SecretBase_BlueCave4/header.inc2
-rw-r--r--data/maps/SecretBase_BlueCave4/map.bin57
-rw-r--r--data/maps/SecretBase_BrownCave1/border.bin1
-rw-r--r--data/maps/SecretBase_BrownCave1/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave1/map.bin54
-rw-r--r--data/maps/SecretBase_BrownCave2/border.bin1
-rw-r--r--data/maps/SecretBase_BrownCave2/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave2/map.bin56
-rw-r--r--data/maps/SecretBase_BrownCave3/border.bin1
-rw-r--r--data/maps/SecretBase_BrownCave3/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave3/map.bin69
-rw-r--r--data/maps/SecretBase_BrownCave4/border.bin1
-rw-r--r--data/maps/SecretBase_BrownCave4/header.inc2
-rw-r--r--data/maps/SecretBase_BrownCave4/map.bin70
-rw-r--r--data/maps/SecretBase_RedCave1/border.bin1
-rw-r--r--data/maps/SecretBase_RedCave1/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave1/map.bin51
-rw-r--r--data/maps/SecretBase_RedCave2/border.bin1
-rw-r--r--data/maps/SecretBase_RedCave2/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave2/map.bin42
-rw-r--r--data/maps/SecretBase_RedCave3/border.bin1
-rw-r--r--data/maps/SecretBase_RedCave3/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave3/map.bin47
-rw-r--r--data/maps/SecretBase_RedCave4/border.bin1
-rw-r--r--data/maps/SecretBase_RedCave4/header.inc2
-rw-r--r--data/maps/SecretBase_RedCave4/map.bin56
-rw-r--r--data/maps/SecretBase_Shrub1/border.bin1
-rw-r--r--data/maps/SecretBase_Shrub1/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub1/map.bin53
-rw-r--r--data/maps/SecretBase_Shrub2/border.bin1
-rw-r--r--data/maps/SecretBase_Shrub2/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub2/map.bin57
-rw-r--r--data/maps/SecretBase_Shrub3/border.bin1
-rw-r--r--data/maps/SecretBase_Shrub3/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub3/map.bin65
-rw-r--r--data/maps/SecretBase_Shrub4/border.bin1
-rw-r--r--data/maps/SecretBase_Shrub4/header.inc2
-rw-r--r--data/maps/SecretBase_Shrub4/map.bin69
-rw-r--r--data/maps/SecretBase_Tree1/border.bin1
-rw-r--r--data/maps/SecretBase_Tree1/header.inc2
-rw-r--r--data/maps/SecretBase_Tree1/map.bin56
-rw-r--r--data/maps/SecretBase_Tree2/border.bin1
-rw-r--r--data/maps/SecretBase_Tree2/header.inc2
-rw-r--r--data/maps/SecretBase_Tree2/map.bin48
-rw-r--r--data/maps/SecretBase_Tree3/border.bin1
-rw-r--r--data/maps/SecretBase_Tree3/header.inc2
-rw-r--r--data/maps/SecretBase_Tree3/map.bin63
-rw-r--r--data/maps/SecretBase_Tree4/border.bin1
-rw-r--r--data/maps/SecretBase_Tree4/header.inc2
-rw-r--r--data/maps/SecretBase_Tree4/map.bin77
-rw-r--r--data/maps/SecretBase_YellowCave1/border.bin1
-rw-r--r--data/maps/SecretBase_YellowCave1/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave1/map.bin57
-rw-r--r--data/maps/SecretBase_YellowCave2/border.bin1
-rw-r--r--data/maps/SecretBase_YellowCave2/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave2/map.bin56
-rw-r--r--data/maps/SecretBase_YellowCave3/border.bin1
-rw-r--r--data/maps/SecretBase_YellowCave3/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave3/map.bin63
-rw-r--r--data/maps/SecretBase_YellowCave4/border.bin1
-rw-r--r--data/maps/SecretBase_YellowCave4/header.inc2
-rw-r--r--data/maps/SecretBase_YellowCave4/map.bin80
-rw-r--r--data/maps/ShoalCave_HighTideEntranceRoom/border.bin1
-rw-r--r--data/maps/ShoalCave_HighTideEntranceRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_HighTideEntranceRoom/map.bin1
-rw-r--r--data/maps/ShoalCave_HighTideInnerRoom/border.bin1
-rw-r--r--data/maps/ShoalCave_HighTideInnerRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_HighTideInnerRoom/map.bin1
-rw-r--r--data/maps/ShoalCave_LowTideEntranceRoom/border.bin1
-rw-r--r--data/maps/ShoalCave_LowTideEntranceRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideEntranceRoom/map.bin3
-rw-r--r--data/maps/ShoalCave_LowTideIceRoom/border.bin1
-rw-r--r--data/maps/ShoalCave_LowTideIceRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideIceRoom/map.bin1
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/border.bin1
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideInnerRoom/map.bin2
-rw-r--r--data/maps/ShoalCave_LowTideLowerRoom/border.bin1
-rw-r--r--data/maps/ShoalCave_LowTideLowerRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideLowerRoom/map.bin4
-rw-r--r--data/maps/ShoalCave_LowTideStairsRoom/border.bin1
-rw-r--r--data/maps/ShoalCave_LowTideStairsRoom/header.inc2
-rw-r--r--data/maps/ShoalCave_LowTideStairsRoom/map.bin1
-rw-r--r--data/maps/SingleBattleColosseum/border.bin1
-rw-r--r--data/maps/SingleBattleColosseum/header.inc2
-rw-r--r--data/maps/SingleBattleColosseum/map.bin1
-rw-r--r--data/maps/SkyPillar_1F/border.bin1
-rw-r--r--data/maps/SkyPillar_1F/header.inc2
-rw-r--r--data/maps/SkyPillar_1F/map.bin1
-rw-r--r--data/maps/SkyPillar_2F/border.bin1
-rw-r--r--data/maps/SkyPillar_2F/header.inc2
-rw-r--r--data/maps/SkyPillar_2F/map.bin1
-rw-r--r--data/maps/SkyPillar_3F/border.bin1
-rw-r--r--data/maps/SkyPillar_3F/header.inc2
-rw-r--r--data/maps/SkyPillar_3F/map.bin1
-rw-r--r--data/maps/SkyPillar_4F/border.bin1
-rw-r--r--data/maps/SkyPillar_4F/header.inc2
-rw-r--r--data/maps/SkyPillar_4F/map.bin1
-rw-r--r--data/maps/SkyPillar_5F/border.bin1
-rw-r--r--data/maps/SkyPillar_5F/header.inc2
-rw-r--r--data/maps/SkyPillar_5F/map.bin1
-rw-r--r--data/maps/SkyPillar_Entrance/border.bin1
-rw-r--r--data/maps/SkyPillar_Entrance/header.inc2
-rw-r--r--data/maps/SkyPillar_Entrance/map.bin1
-rw-r--r--data/maps/SkyPillar_Outside/border.bin1
-rw-r--r--data/maps/SkyPillar_Outside/header.inc2
-rw-r--r--data/maps/SkyPillar_Outside/map.bin1
-rw-r--r--data/maps/SkyPillar_Top/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SkyPillar_Top/header.inc2
-rw-r--r--data/maps/SkyPillar_Top/map.bin1
-rw-r--r--data/maps/SlateportCity/border.bin1
-rw-r--r--data/maps/SlateportCity/header.inc2
-rw-r--r--data/maps/SlateportCity/map.binbin4800 -> 0 bytes
-rw-r--r--data/maps/SlateportCity_ContestHall/header.inc2
-rw-r--r--data/maps/SlateportCity_ContestLobby/header.inc2
-rw-r--r--data/maps/SlateportCity_Harbor/border.bin1
-rw-r--r--data/maps/SlateportCity_Harbor/header.inc2
-rw-r--r--data/maps/SlateportCity_Harbor/map.bin1
-rw-r--r--data/maps/SlateportCity_House1/header.inc2
-rw-r--r--data/maps/SlateportCity_House2/header.inc2
-rw-r--r--data/maps/SlateportCity_Mart/header.inc2
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/header.inc2
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/map.bin2
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_2F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_2F/header.inc2
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_2F/map.bin1
-rw-r--r--data/maps/SlateportCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/SlateportCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/header.inc2
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/map.binbin308 -> 0 bytes
-rw-r--r--data/maps/SlateportCity_SternsShipyard_1F/border.bin1
-rw-r--r--data/maps/SlateportCity_SternsShipyard_1F/header.inc2
-rw-r--r--data/maps/SlateportCity_SternsShipyard_1F/map.bin7
-rw-r--r--data/maps/SlateportCity_SternsShipyard_2F/border.bin1
-rw-r--r--data/maps/SlateportCity_SternsShipyard_2F/header.inc2
-rw-r--r--data/maps/SlateportCity_SternsShipyard_2F/map.bin1
-rw-r--r--data/maps/SootopolisCity/border.bin1
-rw-r--r--data/maps/SootopolisCity/header.inc2
-rw-r--r--data/maps/SootopolisCity/map.bin12
-rw-r--r--data/maps/SootopolisCity_Gym_1F/border.bin1
-rw-r--r--data/maps/SootopolisCity_Gym_1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_Gym_1F/map.bin3
-rw-r--r--data/maps/SootopolisCity_Gym_B1F/border.bin1
-rw-r--r--data/maps/SootopolisCity_Gym_B1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_Gym_B1F/map.bin1
-rw-r--r--data/maps/SootopolisCity_House1/border.bin1
-rw-r--r--data/maps/SootopolisCity_House1/header.inc2
-rw-r--r--data/maps/SootopolisCity_House1/map.bin1
-rw-r--r--data/maps/SootopolisCity_House2/border.bin1
-rw-r--r--data/maps/SootopolisCity_House2/header.inc2
-rw-r--r--data/maps/SootopolisCity_House2/map.bin1
-rw-r--r--data/maps/SootopolisCity_House3/border.bin1
-rw-r--r--data/maps/SootopolisCity_House3/header.inc2
-rw-r--r--data/maps/SootopolisCity_House3/map.bin1
-rw-r--r--data/maps/SootopolisCity_House4/header.inc2
-rw-r--r--data/maps/SootopolisCity_House5/header.inc2
-rw-r--r--data/maps/SootopolisCity_House6/header.inc2
-rw-r--r--data/maps/SootopolisCity_House7/header.inc2
-rw-r--r--data/maps/SootopolisCity_House8/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SootopolisCity_House8/header.inc2
-rw-r--r--data/maps/SootopolisCity_House8/map.bin1
-rw-r--r--data/maps/SootopolisCity_Mart/header.inc2
-rw-r--r--data/maps/SootopolisCity_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/SouthernIsland_Exterior/border.bin1
-rw-r--r--data/maps/SouthernIsland_Exterior/header.inc2
-rw-r--r--data/maps/SouthernIsland_Exterior/map.bin1
-rw-r--r--data/maps/SouthernIsland_Interior/border.bin1
-rw-r--r--data/maps/SouthernIsland_Interior/header.inc2
-rw-r--r--data/maps/SouthernIsland_Interior/map.bin1
-rw-r--r--data/maps/TradeCenter/border.bin1
-rw-r--r--data/maps/TradeCenter/header.inc2
-rw-r--r--data/maps/TradeCenter/map.bin2
-rw-r--r--data/maps/Underwater1/border.bin1
-rw-r--r--data/maps/Underwater1/header.inc2
-rw-r--r--data/maps/Underwater1/map.bin17
-rw-r--r--data/maps/Underwater2/border.bin1
-rw-r--r--data/maps/Underwater2/header.inc2
-rw-r--r--data/maps/Underwater2/map.bin35
-rw-r--r--data/maps/Underwater3/border.bin1
-rw-r--r--data/maps/Underwater3/header.inc2
-rw-r--r--data/maps/Underwater3/map.bin1
-rw-r--r--data/maps/Underwater4/border.bin1
-rw-r--r--data/maps/Underwater4/header.inc2
-rw-r--r--data/maps/Underwater4/map.bin1
-rw-r--r--data/maps/Underwater_Route134/border.bin1
-rw-r--r--data/maps/Underwater_Route134/header.inc2
-rw-r--r--data/maps/Underwater_Route134/map.bin2
-rw-r--r--data/maps/Underwater_SeafloorCavern/border.bin1
-rw-r--r--data/maps/Underwater_SeafloorCavern/header.inc2
-rw-r--r--data/maps/Underwater_SeafloorCavern/map.bin2
-rw-r--r--data/maps/Underwater_SealedChamber/border.bin1
-rw-r--r--data/maps/Underwater_SealedChamber/header.inc2
-rw-r--r--data/maps/Underwater_SealedChamber/map.bin1
-rw-r--r--data/maps/Underwater_SootopolisCity/border.bin1
-rw-r--r--data/maps/Underwater_SootopolisCity/header.inc2
-rw-r--r--data/maps/Underwater_SootopolisCity/map.bin2
-rw-r--r--data/maps/UnknownMap_082CF564/border.bin1
-rw-r--r--data/maps/UnknownMap_082CF564/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082D05D8/border.bin1
-rw-r--r--data/maps/UnknownMap_082D05D8/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082D05FC/border.bin1
-rw-r--r--data/maps/UnknownMap_082D05FC/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E55C8/border.bin1
-rw-r--r--data/maps/UnknownMap_082E55C8/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E55EC/border.bin1
-rw-r--r--data/maps/UnknownMap_082E55EC/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E5610/border.bin1
-rw-r--r--data/maps/UnknownMap_082E5610/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E5634/border.bin1
-rw-r--r--data/maps/UnknownMap_082E5634/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E5658/border.bin1
-rw-r--r--data/maps/UnknownMap_082E5658/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E567C/border.bin1
-rw-r--r--data/maps/UnknownMap_082E567C/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E56A0/border.bin1
-rw-r--r--data/maps/UnknownMap_082E56A0/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E56C4/border.bin1
-rw-r--r--data/maps/UnknownMap_082E56C4/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E56E8/border.bin1
-rw-r--r--data/maps/UnknownMap_082E56E8/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E570C/border.bin1
-rw-r--r--data/maps/UnknownMap_082E570C/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E5730/border.bin1
-rw-r--r--data/maps/UnknownMap_082E5730/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E5754/border.bin1
-rw-r--r--data/maps/UnknownMap_082E5754/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E5778/border.bin1
-rw-r--r--data/maps/UnknownMap_082E5778/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082E579C/border.bin1
-rw-r--r--data/maps/UnknownMap_082E579C/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_082EDF30/border.bin1
-rw-r--r--data/maps/UnknownMap_082EDF30/map.bin3
-rw-r--r--data/maps/UnknownMap_082FF894/border.bin1
-rw-r--r--data/maps/UnknownMap_082FF894/map.binbin724 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_08302970/border.bin1
-rw-r--r--data/maps/UnknownMap_08302970/map.bin1
-rw-r--r--data/maps/UnknownMap_083041B4/border.bin1
-rw-r--r--data/maps/UnknownMap_083041B4/map.bin1
-rw-r--r--data/maps/UnknownMap_25_29/border.bin1
-rw-r--r--data/maps/UnknownMap_25_29/header.inc2
-rw-r--r--data/maps/UnknownMap_25_29/map.bin1
-rw-r--r--data/maps/UnknownMap_25_30/border.bin1
-rw-r--r--data/maps/UnknownMap_25_30/header.inc2
-rw-r--r--data/maps/UnknownMap_25_30/map.bin1
-rw-r--r--data/maps/UnknownMap_25_31/border.bin1
-rw-r--r--data/maps/UnknownMap_25_31/header.inc2
-rw-r--r--data/maps/UnknownMap_25_31/map.bin1
-rw-r--r--data/maps/UnknownMap_25_32/border.bin1
-rw-r--r--data/maps/UnknownMap_25_32/header.inc2
-rw-r--r--data/maps/UnknownMap_25_32/map.bin1
-rw-r--r--data/maps/UnknownMap_25_33/border.bin1
-rw-r--r--data/maps/UnknownMap_25_33/header.inc2
-rw-r--r--data/maps/UnknownMap_25_33/map.bin1
-rw-r--r--data/maps/UnknownMap_25_34/border.bin1
-rw-r--r--data/maps/UnknownMap_25_34/header.inc2
-rw-r--r--data/maps/UnknownMap_25_34/map.bin1
-rw-r--r--data/maps/UnreferencedMap/border.bin1
-rw-r--r--data/maps/UnreferencedMap/map.bin1
-rw-r--r--data/maps/VerdanturfTown/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/VerdanturfTown/header.inc2
-rw-r--r--data/maps/VerdanturfTown/map.binbin800 -> 0 bytes
-rw-r--r--data/maps/VerdanturfTown_ContestHall/header.inc2
-rw-r--r--data/maps/VerdanturfTown_ContestLobby/header.inc2
-rw-r--r--data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc2
-rw-r--r--data/maps/VerdanturfTown_House/header.inc2
-rw-r--r--data/maps/VerdanturfTown_Mart/header.inc2
-rw-r--r--data/maps/VerdanturfTown_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/VerdanturfTown_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/header.inc2
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/map.binbin272 -> 0 bytes
-rw-r--r--data/maps/VictoryRoad_1F/border.bin1
-rw-r--r--data/maps/VictoryRoad_1F/header.inc2
-rw-r--r--data/maps/VictoryRoad_1F/map.bin10
-rw-r--r--data/maps/VictoryRoad_B1F/border.bin1
-rw-r--r--data/maps/VictoryRoad_B1F/header.inc2
-rw-r--r--data/maps/VictoryRoad_B1F/map.bin25
-rw-r--r--data/maps/VictoryRoad_B2F/border.bin1
-rw-r--r--data/maps/VictoryRoad_B2F/header.inc2
-rw-r--r--data/maps/VictoryRoad_B2F/map.bin1
-rw-r--r--data/maps/_assets.inc5338
-rw-r--r--data/maps/attributes_table.inc664
1060 files changed, 1058 insertions, 8588 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/maps/AbandonedShip_CaptainsOffice/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_CaptainsOffice/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index e5e3adc3a..74571dc08 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_CaptainsOffice:: @ 8307454
- .4byte AbandonedShip_CaptainsOffice_MapAttributes
+ .4byte AbandonedShip_CaptainsOffice_Layout
.4byte AbandonedShip_CaptainsOffice_MapEvents
.4byte AbandonedShip_CaptainsOffice_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/maps/AbandonedShip_CaptainsOffice/map.bin
deleted file mode 100644
index c9097fa63..000000000
--- a/data/maps/AbandonedShip_CaptainsOffice/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/maps/AbandonedShip_Corridors_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Corridors_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
index e2bd23252..4caf26a22 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Corridors_1F:: @ 8307374
- .4byte AbandonedShip_Corridors_1F_MapAttributes
+ .4byte AbandonedShip_Corridors_1F_Layout
.4byte AbandonedShip_Corridors_1F_MapEvents
.4byte AbandonedShip_Corridors_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/maps/AbandonedShip_Corridors_1F/map.bin
deleted file mode 100644
index 5ef5ca949..000000000
--- a/data/maps/AbandonedShip_Corridors_1F/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-    22222
-2 662222222
-2 6222222222222222226201222220111122222012222201111222220122222011112222201222220111122262%#&2222%$"#&2222-+6.2222-2,*+6.262222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/maps/AbandonedShip_Corridors_B1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Corridors_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 064e24e92..c979d2d79 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Corridors_B1F:: @ 83073AC
- .4byte AbandonedShip_Corridors_B1F_MapAttributes
+ .4byte AbandonedShip_Corridors_B1F_Layout
.4byte AbandonedShip_Corridors_B1F_MapEvents
.4byte AbandonedShip_Corridors_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/maps/AbandonedShip_Corridors_B1F/map.bin
deleted file mode 100644
index 24b1a7b61..000000000
--- a/data/maps/AbandonedShip_Corridors_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-!!011112!!011)011112)0112011112201122%#$"&22%#$22-+6,*2.22-+6,22222222222222222222222226222222222222262220111111122222011111112 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/maps/AbandonedShip_Deck/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/AbandonedShip_Deck/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
index 1db367db8..5002c48eb 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Deck:: @ 8307358
- .4byte AbandonedShip_Deck_MapAttributes
+ .4byte AbandonedShip_Deck_Layout
.4byte AbandonedShip_Deck_MapEvents
.4byte AbandonedShip_Deck_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/maps/AbandonedShip_Deck/map.bin
deleted file mode 100644
index 67cdde3d7..000000000
--- a/data/maps/AbandonedShip_Deck/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-(((`(`(((((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/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index a841ee87c..8d862d16e 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_HiddenFloorCorridors:: @ 830748C
- .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
+ .4byte AbandonedShip_HiddenFloorCorridors_Layout
.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
deleted file mode 100644
index a4637ccbe..000000000
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-    222222222222262242222224222222011111112266201111111222220111111122222%#$"#$"#&22-36,*36,*+6.22V2222222222GVx2222222222 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/maps/AbandonedShip_HiddenFloorRooms/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index 647b22977..9699a3abd 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_HiddenFloorRooms:: @ 83074A8
- .4byte AbandonedShip_HiddenFloorRooms_MapAttributes
+ .4byte AbandonedShip_HiddenFloorRooms_Layout
.4byte AbandonedShip_HiddenFloorRooms_MapEvents
.4byte AbandonedShip_HiddenFloorRooms_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/maps/AbandonedShip_HiddenFloorRooms/map.bin
deleted file mode 100644
index b63eeabe6..000000000
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/AbandonedShip_Room_B1F/border.bin b/data/maps/AbandonedShip_Room_B1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Room_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
index 7b88baf94..adc37862b 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Room_B1F:: @ 830741C
- .4byte AbandonedShip_Room_B1F_MapAttributes
+ .4byte AbandonedShip_Room_B1F_Layout
.4byte AbandonedShip_Room_B1F_MapEvents
.4byte AbandonedShip_Room_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/maps/AbandonedShip_Room_B1F/map.bin
deleted file mode 100644
index cb8393eb2..000000000
--- a/data/maps/AbandonedShip_Room_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/AbandonedShip_Rooms2_1F/border.bin b/data/maps/AbandonedShip_Rooms2_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Rooms2_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index 44bcd4733..15a2f66da 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms2_1F:: @ 8307438
- .4byte AbandonedShip_Rooms2_1F_MapAttributes
+ .4byte AbandonedShip_Rooms2_1F_Layout
.4byte AbandonedShip_Rooms2_1F_MapEvents
.4byte AbandonedShip_Rooms2_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/maps/AbandonedShip_Rooms2_1F/map.bin
deleted file mode 100644
index c897ce8a0..000000000
--- a/data/maps/AbandonedShip_Rooms2_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/maps/AbandonedShip_Rooms2_B1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index 017b1382b..daaca3671 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms2_B1F:: @ 83073E4
- .4byte AbandonedShip_Rooms2_B1F_MapAttributes
+ .4byte AbandonedShip_Rooms2_B1F_Layout
.4byte AbandonedShip_Rooms2_B1F_MapEvents
.4byte AbandonedShip_Rooms2_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/maps/AbandonedShip_Rooms2_B1F/map.bin
deleted file mode 100644
index 7865bb69d..000000000
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/AbandonedShip_Rooms_1F/border.bin b/data/maps/AbandonedShip_Rooms_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Rooms_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 7e8dbd5b8..2c017f053 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms_1F:: @ 8307390
- .4byte AbandonedShip_Rooms_1F_MapAttributes
+ .4byte AbandonedShip_Rooms_1F_Layout
.4byte AbandonedShip_Rooms_1F_MapEvents
.4byte AbandonedShip_Rooms_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/maps/AbandonedShip_Rooms_1F/map.bin
deleted file mode 100644
index 20529b3df..000000000
--- a/data/maps/AbandonedShip_Rooms_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/AbandonedShip_Rooms_B1F/border.bin b/data/maps/AbandonedShip_Rooms_B1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Rooms_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index 6ac6e3794..82f026ba7 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms_B1F:: @ 83073C8
- .4byte AbandonedShip_Rooms_B1F_MapAttributes
+ .4byte AbandonedShip_Rooms_B1F_Layout
.4byte AbandonedShip_Rooms_B1F_MapEvents
.4byte AbandonedShip_Rooms_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/maps/AbandonedShip_Rooms_B1F/map.bin
deleted file mode 100644
index b18509507..000000000
--- a/data/maps/AbandonedShip_Rooms_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/AbandonedShip_Underwater1/border.bin b/data/maps/AbandonedShip_Underwater1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Underwater1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
index 6313cf6f1..adbf39015 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Underwater1:: @ 8307400
- .4byte AbandonedShip_Underwater1_MapAttributes
+ .4byte AbandonedShip_Underwater1_Layout
.4byte AbandonedShip_Underwater1_MapEvents
.4byte AbandonedShip_Underwater1_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/maps/AbandonedShip_Underwater1/map.bin
deleted file mode 100644
index 2c73cfe86..000000000
--- a/data/maps/AbandonedShip_Underwater1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/maps/AbandonedShip_Underwater2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AbandonedShip_Underwater2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
index c81b78357..66036ff55 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Underwater2:: @ 8307470
- .4byte AbandonedShip_Underwater2_MapAttributes
+ .4byte AbandonedShip_Underwater2_Layout
.4byte AbandonedShip_Underwater2_MapEvents
.4byte AbandonedShip_Underwater2_MapScripts
.4byte 0x0
diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/maps/AbandonedShip_Underwater2/map.bin
deleted file mode 100644
index 9dbd5c71a..000000000
--- a/data/maps/AbandonedShip_Underwater2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/AncientTomb/border.bin b/data/maps/AncientTomb/border.bin
deleted file mode 100644
index c07869a9f..000000000
--- a/data/maps/AncientTomb/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
index 82ac0555d..04ec0679a 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -1,5 +1,5 @@
AncientTomb:: @ 83074E0
- .4byte AncientTomb_MapAttributes
+ .4byte AncientTomb_Layout
.4byte AncientTomb_MapEvents
.4byte AncientTomb_MapScripts
.4byte 0x0
diff --git a/data/maps/AncientTomb/map.bin b/data/maps/AncientTomb/map.bin
deleted file mode 100644
index bb87de307..000000000
--- a/data/maps/AncientTomb/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/AquaHideout_1F/border.bin b/data/maps/AquaHideout_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AquaHideout_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index 94650821d..819590c69 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,5 +1,5 @@
AquaHideout_1F:: @ 8306FF4
- .4byte AquaHideout_1F_MapAttributes
+ .4byte AquaHideout_1F_Layout
.4byte AquaHideout_1F_MapEvents
.4byte AquaHideout_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AquaHideout_1F/map.bin b/data/maps/AquaHideout_1F/map.bin
deleted file mode 100644
index 2330fe015..000000000
--- a/data/maps/AquaHideout_1F/map.bin
+++ /dev/null
@@ -1,55 +0,0 @@
-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/maps/AquaHideout_B1F/border.bin b/data/maps/AquaHideout_B1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AquaHideout_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc
index ef7f4cfdf..e67dba2e5 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -1,5 +1,5 @@
AquaHideout_B1F:: @ 8307010
- .4byte AquaHideout_B1F_MapAttributes
+ .4byte AquaHideout_B1F_Layout
.4byte AquaHideout_B1F_MapEvents
.4byte AquaHideout_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/maps/AquaHideout_B1F/map.bin
deleted file mode 100644
index 5d13df58d..000000000
--- a/data/maps/AquaHideout_B1F/map.bin
+++ /dev/null
@@ -1,83 +0,0 @@
- 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/maps/AquaHideout_B2F/border.bin b/data/maps/AquaHideout_B2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AquaHideout_B2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc
index 38b3f546f..dc10f234e 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -1,5 +1,5 @@
AquaHideout_B2F:: @ 830702C
- .4byte AquaHideout_B2F_MapAttributes
+ .4byte AquaHideout_B2F_Layout
.4byte AquaHideout_B2F_MapEvents
.4byte AquaHideout_B2F_MapScripts
.4byte 0x0
diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/maps/AquaHideout_B2F/map.bin
deleted file mode 100644
index 2e843a8e4..000000000
--- a/data/maps/AquaHideout_B2F/map.bin
+++ /dev/null
@@ -1,51 +0,0 @@
-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/maps/BattleTower_BattleRoom/border.bin b/data/maps/BattleTower_BattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleTower_BattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc
index 3104824ed..92dee0182 100644
--- a/data/maps/BattleTower_BattleRoom/header.inc
+++ b/data/maps/BattleTower_BattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleTower_BattleRoom:: @ 8307C88
- .4byte BattleTower_BattleRoom_MapAttributes
+ .4byte BattleTower_BattleRoom_Layout
.4byte BattleTower_BattleRoom_MapEvents
.4byte BattleTower_BattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleTower_BattleRoom/map.bin b/data/maps/BattleTower_BattleRoom/map.bin
deleted file mode 100644
index 42d99b5a6..000000000
--- a/data/maps/BattleTower_BattleRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-///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/maps/BattleTower_Corridor/border.bin b/data/maps/BattleTower_Corridor/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleTower_Corridor/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc
index 016e178ac..311ae6862 100644
--- a/data/maps/BattleTower_Corridor/header.inc
+++ b/data/maps/BattleTower_Corridor/header.inc
@@ -1,5 +1,5 @@
BattleTower_Corridor:: @ 8307C6C
- .4byte BattleTower_Corridor_MapAttributes
+ .4byte BattleTower_Corridor_Layout
.4byte BattleTower_Corridor_MapEvents
.4byte BattleTower_Corridor_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleTower_Corridor/map.bin b/data/maps/BattleTower_Corridor/map.bin
deleted file mode 100644
index 0b0803f91..000000000
--- a/data/maps/BattleTower_Corridor/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleTower_Elevator/border.bin b/data/maps/BattleTower_Elevator/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleTower_Elevator/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc
index 0a7285261..324b3ecc1 100644
--- a/data/maps/BattleTower_Elevator/header.inc
+++ b/data/maps/BattleTower_Elevator/header.inc
@@ -1,5 +1,5 @@
BattleTower_Elevator:: @ 8307C50
- .4byte BattleTower_Elevator_MapAttributes
+ .4byte BattleTower_Elevator_Layout
.4byte BattleTower_Elevator_MapEvents
.4byte BattleTower_Elevator_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleTower_Elevator/map.bin b/data/maps/BattleTower_Elevator/map.bin
deleted file mode 100644
index 8777c1471..000000000
--- a/data/maps/BattleTower_Elevator/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-hiijpqqrxyyz\2]2]2]2d2e2e2f2d2e2e2f2d2O2W2f2 \ No newline at end of file
diff --git a/data/maps/BattleTower_Lobby/border.bin b/data/maps/BattleTower_Lobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleTower_Lobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc
index c8c0b0473..b8d527444 100644
--- a/data/maps/BattleTower_Lobby/header.inc
+++ b/data/maps/BattleTower_Lobby/header.inc
@@ -1,5 +1,5 @@
BattleTower_Lobby:: @ 8307C34
- .4byte BattleTower_Lobby_MapAttributes
+ .4byte BattleTower_Lobby_Layout
.4byte BattleTower_Lobby_MapEvents
.4byte BattleTower_Lobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleTower_Lobby/map.bin b/data/maps/BattleTower_Lobby/map.bin
deleted file mode 100644
index 8ff3182a6..000000000
--- a/data/maps/BattleTower_Lobby/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleTower_Outside/border.bin b/data/maps/BattleTower_Outside/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/BattleTower_Outside/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc
index 01bbc2fd9..a80d3e318 100644
--- a/data/maps/BattleTower_Outside/header.inc
+++ b/data/maps/BattleTower_Outside/header.inc
@@ -1,5 +1,5 @@
BattleTower_Outside:: @ 8307C18
- .4byte BattleTower_Outside_MapAttributes
+ .4byte BattleTower_Outside_Layout
.4byte BattleTower_Outside_MapEvents
.4byte BattleTower_Outside_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleTower_Outside/map.bin b/data/maps/BattleTower_Outside/map.bin
deleted file mode 100644
index 6e9f6adb6..000000000
--- a/data/maps/BattleTower_Outside/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/CaveOfOrigin_1F/border.bin b/data/maps/CaveOfOrigin_1F/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
index b49287535..18901b68b 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_1F:: @ 8307198
- .4byte CaveOfOrigin_1F_MapAttributes
+ .4byte CaveOfOrigin_1F_Layout
.4byte CaveOfOrigin_1F_MapEvents
.4byte CaveOfOrigin_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/maps/CaveOfOrigin_1F/map.bin
deleted file mode 100644
index c3c5e7abf..000000000
--- a/data/maps/CaveOfOrigin_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-)))))))))))))))))))))"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/maps/CaveOfOrigin_B1F/border.bin b/data/maps/CaveOfOrigin_B1F/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
index 97e5e68c8..f1e768089 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_B1F:: @ 83071B4
- .4byte CaveOfOrigin_B1F_MapAttributes
+ .4byte CaveOfOrigin_B1F_Layout
.4byte CaveOfOrigin_B1F_MapEvents
.4byte CaveOfOrigin_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/maps/CaveOfOrigin_B1F/map.bin
deleted file mode 100644
index 0ffbdaaa0..000000000
--- a/data/maps/CaveOfOrigin_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/CaveOfOrigin_B2F/border.bin b/data/maps/CaveOfOrigin_B2F/border.bin
deleted file mode 100644
index 4117717f2..000000000
--- a/data/maps/CaveOfOrigin_B2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-#### \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc
index 79e76f693..b20d4a577 100644
--- a/data/maps/CaveOfOrigin_B2F/header.inc
+++ b/data/maps/CaveOfOrigin_B2F/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_B2F:: @ 83071D0
- .4byte CaveOfOrigin_B2F_MapAttributes
+ .4byte CaveOfOrigin_B2F_Layout
.4byte CaveOfOrigin_B2F_MapEvents
.4byte CaveOfOrigin_B2F_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_B2F/map.bin b/data/maps/CaveOfOrigin_B2F/map.bin
deleted file mode 100644
index 4c1fd5ab8..000000000
--- a/data/maps/CaveOfOrigin_B2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-)))))###))))##)"#####()))*))())*# "#))))))))*##()))) "#"##))))))))))##  "#"##"))))))))(#  "*)*"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/maps/CaveOfOrigin_B3F/border.bin b/data/maps/CaveOfOrigin_B3F/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_B3F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc
index 746d187f3..a7e6b8a19 100644
--- a/data/maps/CaveOfOrigin_B3F/header.inc
+++ b/data/maps/CaveOfOrigin_B3F/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_B3F:: @ 83071EC
- .4byte CaveOfOrigin_B3F_MapAttributes
+ .4byte CaveOfOrigin_B3F_Layout
.4byte CaveOfOrigin_B3F_MapEvents
.4byte CaveOfOrigin_B3F_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_B3F/map.bin b/data/maps/CaveOfOrigin_B3F/map.bin
deleted file mode 100644
index ea574b224..000000000
--- a/data/maps/CaveOfOrigin_B3F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-)))))))))))))))))")))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/maps/CaveOfOrigin_B4F/border.bin b/data/maps/CaveOfOrigin_B4F/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_B4F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc
index 0cb1ad83b..97a58ddd6 100644
--- a/data/maps/CaveOfOrigin_B4F/header.inc
+++ b/data/maps/CaveOfOrigin_B4F/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_B4F:: @ 8307208
- .4byte CaveOfOrigin_B4F_MapAttributes
+ .4byte CaveOfOrigin_B4F_Layout
.4byte CaveOfOrigin_B4F_MapEvents
.4byte CaveOfOrigin_B4F_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_B4F/map.bin b/data/maps/CaveOfOrigin_B4F/map.bin
deleted file mode 100644
index efec94a9e..000000000
--- a/data/maps/CaveOfOrigin_B4F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-)))))))))))))))))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/maps/CaveOfOrigin_Entrance/border.bin b/data/maps/CaveOfOrigin_Entrance/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
index 606997174..f36fac472 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_Entrance:: @ 830717C
- .4byte CaveOfOrigin_Entrance_MapAttributes
+ .4byte CaveOfOrigin_Entrance_Layout
.4byte CaveOfOrigin_Entrance_MapEvents
.4byte CaveOfOrigin_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/maps/CaveOfOrigin_Entrance/map.bin
deleted file mode 100644
index 4bbffd109..000000000
--- a/data/maps/CaveOfOrigin_Entrance/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/DesertRuins/border.bin b/data/maps/DesertRuins/border.bin
deleted file mode 100644
index c07869a9f..000000000
--- a/data/maps/DesertRuins/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
index 79e681666..cd6552519 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -1,5 +1,5 @@
DesertRuins:: @ 8306E18
- .4byte DesertRuins_MapAttributes
+ .4byte DesertRuins_Layout
.4byte DesertRuins_MapEvents
.4byte DesertRuins_MapScripts
.4byte 0x0
diff --git a/data/maps/DesertRuins/map.bin b/data/maps/DesertRuins/map.bin
deleted file mode 100644
index bb87de307..000000000
--- a/data/maps/DesertRuins/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/DewfordTown/border.bin b/data/maps/DewfordTown/border.bin
deleted file mode 100644
index 281762f5b..000000000
--- a/data/maps/DewfordTown/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-CCCC \ No newline at end of file
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
index 7aed01d94..7bd135bad 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -1,5 +1,5 @@
DewfordTown:: @ 830557C
- .4byte DewfordTown_MapAttributes
+ .4byte DewfordTown_Layout
.4byte DewfordTown_MapEvents
.4byte DewfordTown_MapScripts
.4byte DewfordTown_MapConnections
diff --git a/data/maps/DewfordTown/map.bin b/data/maps/DewfordTown/map.bin
deleted file mode 100644
index e8a1154e8..000000000
--- a/data/maps/DewfordTown/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/DewfordTown_Gym/border.bin b/data/maps/DewfordTown_Gym/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/DewfordTown_Gym/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
index 79227e545..72c8a4c04 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -1,5 +1,5 @@
DewfordTown_Gym:: @ 8305B9C
- .4byte DewfordTown_Gym_MapAttributes
+ .4byte DewfordTown_Gym_Layout
.4byte DewfordTown_Gym_MapEvents
.4byte DewfordTown_Gym_MapScripts
.4byte 0x0
diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/maps/DewfordTown_Gym/map.bin
deleted file mode 100644
index 19ea81674..000000000
--- a/data/maps/DewfordTown_Gym/map.bin
+++ /dev/null
@@ -1,50 +0,0 @@
-                 
-         
-          
-          )***
-          +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/maps/DewfordTown_Hall/border.bin b/data/maps/DewfordTown_Hall/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/DewfordTown_Hall/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc
index 975a257d8..c7fa7c009 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -1,5 +1,5 @@
DewfordTown_Hall:: @ 8305BB8
- .4byte DewfordTown_Hall_MapAttributes
+ .4byte DewfordTown_Hall_Layout
.4byte DewfordTown_Hall_MapEvents
.4byte DewfordTown_Hall_MapScripts
.4byte 0x0
diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/maps/DewfordTown_Hall/map.bin
deleted file mode 100644
index 5fd13209d..000000000
--- a/data/maps/DewfordTown_Hall/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/DewfordTown_House1/border.bin b/data/maps/DewfordTown_House1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/DewfordTown_House1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc
index 95a8a8339..71e25e8b9 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -1,5 +1,5 @@
DewfordTown_House1:: @ 8305B48
- .4byte DewfordTown_House1_MapAttributes
+ .4byte House3_Layout
.4byte DewfordTown_House1_MapEvents
.4byte DewfordTown_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/DewfordTown_House1/map.bin b/data/maps/DewfordTown_House1/map.bin
deleted file mode 100644
index 1f732ba3f..000000000
--- a/data/maps/DewfordTown_House1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/DewfordTown_House2/border.bin b/data/maps/DewfordTown_House2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/DewfordTown_House2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc
index 37aac2ead..6ffc05176 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -1,5 +1,5 @@
DewfordTown_House2:: @ 8305BD4
- .4byte DewfordTown_House2_MapAttributes
+ .4byte House4_Layout
.4byte DewfordTown_House2_MapEvents
.4byte DewfordTown_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/DewfordTown_House2/map.bin b/data/maps/DewfordTown_House2/map.bin
deleted file mode 100644
index 6274e4418..000000000
--- a/data/maps/DewfordTown_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index 9cf0a8f46..b95db3ab0 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
DewfordTown_PokemonCenter_1F:: @ 8305B64
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte DewfordTown_PokemonCenter_1F_MapEvents
.4byte DewfordTown_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
index a54a51c94..44fa18f08 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
DewfordTown_PokemonCenter_2F:: @ 8305B80
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte DewfordTown_PokemonCenter_2F_MapEvents
.4byte DewfordTown_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/maps/DoubleBattleColosseum/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/DoubleBattleColosseum/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
index baf1b8076..86ce13b14 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -1,5 +1,5 @@
DoubleBattleColosseum:: @ 83079CC
- .4byte DoubleBattleColosseum_MapAttributes
+ .4byte DoubleBattleColosseum_Layout
.4byte DoubleBattleColosseum_MapEvents
.4byte DoubleBattleColosseum_MapScripts
.4byte 0x0
diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/maps/DoubleBattleColosseum/map.bin
deleted file mode 100644
index 77606e818..000000000
--- a/data/maps/DoubleBattleColosseum/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/EverGrandeCity/border.bin b/data/maps/EverGrandeCity/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/EverGrandeCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
index 0c1f6eab0..4d25d6198 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity:: @ 8305528
- .4byte EverGrandeCity_MapAttributes
+ .4byte EverGrandeCity_Layout
.4byte EverGrandeCity_MapEvents
.4byte EverGrandeCity_MapScripts
.4byte EverGrandeCity_MapConnections
diff --git a/data/maps/EverGrandeCity/map.bin b/data/maps/EverGrandeCity/map.bin
deleted file mode 100644
index 33b271d5d..000000000
--- a/data/maps/EverGrandeCity/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/maps/EverGrandeCity_ChampionsRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_ChampionsRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 154d5ba29..d1f9e4fd1 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_ChampionsRoom:: @ 8306B08
- .4byte EverGrandeCity_ChampionsRoom_MapAttributes
+ .4byte EverGrandeCity_ChampionsRoom_Layout
.4byte EverGrandeCity_ChampionsRoom_MapEvents
.4byte EverGrandeCity_ChampionsRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/maps/EverGrandeCity_ChampionsRoom/map.bin
deleted file mode 100644
index a234307b5..000000000
--- a/data/maps/EverGrandeCity_ChampionsRoom/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_Corridor1/border.bin b/data/maps/EverGrandeCity_Corridor1/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_Corridor1/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc
index 68d16484e..0843d41af 100644
--- a/data/maps/EverGrandeCity_Corridor1/header.inc
+++ b/data/maps/EverGrandeCity_Corridor1/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Corridor1:: @ 8306B24
- .4byte EverGrandeCity_Corridor1_MapAttributes
+ .4byte EverGrandeCity_ShortCorridor_Layout
.4byte EverGrandeCity_Corridor1_MapEvents
.4byte EverGrandeCity_Corridor1_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Corridor1/map.bin b/data/maps/EverGrandeCity_Corridor1/map.bin
deleted file mode 100644
index 75812b238..000000000
--- a/data/maps/EverGrandeCity_Corridor1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-DHIHI E HIHI2222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc
index 0dab21f9a..be2df3915 100644
--- a/data/maps/EverGrandeCity_Corridor2/header.inc
+++ b/data/maps/EverGrandeCity_Corridor2/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Corridor2:: @ 8306B40
- .4byte EverGrandeCity_Corridor2_MapAttributes
+ .4byte EverGrandeCity_ShortCorridor_Layout
.4byte EverGrandeCity_Corridor2_MapEvents
.4byte EverGrandeCity_Corridor2_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc
index 3d20a6a41..d3b67d33d 100644
--- a/data/maps/EverGrandeCity_Corridor3/header.inc
+++ b/data/maps/EverGrandeCity_Corridor3/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Corridor3:: @ 8306B5C
- .4byte EverGrandeCity_Corridor3_MapAttributes
+ .4byte EverGrandeCity_ShortCorridor_Layout
.4byte EverGrandeCity_Corridor3_MapEvents
.4byte EverGrandeCity_Corridor3_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Corridor4/border.bin b/data/maps/EverGrandeCity_Corridor4/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_Corridor4/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc
index 56a5297d7..002f42171 100644
--- a/data/maps/EverGrandeCity_Corridor4/header.inc
+++ b/data/maps/EverGrandeCity_Corridor4/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Corridor4:: @ 8306B78
- .4byte EverGrandeCity_Corridor4_MapAttributes
+ .4byte EverGrandeCity_Corridor4_Layout
.4byte EverGrandeCity_Corridor4_MapEvents
.4byte EverGrandeCity_Corridor4_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Corridor4/map.bin b/data/maps/EverGrandeCity_Corridor4/map.bin
deleted file mode 100644
index 580ae095a..000000000
--- a/data/maps/EverGrandeCity_Corridor4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-D     E     2222222222222222222222222222J222J222J222J222J222J222222J222J222222222J222J222222222222J222J222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc
index 2ca1fef86..b53de1a2e 100644
--- a/data/maps/EverGrandeCity_Corridor5/header.inc
+++ b/data/maps/EverGrandeCity_Corridor5/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Corridor5:: @ 8306B94
- .4byte EverGrandeCity_Corridor5_MapAttributes
+ .4byte EverGrandeCity_ShortCorridor_Layout
.4byte EverGrandeCity_Corridor5_MapEvents
.4byte EverGrandeCity_Corridor5_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/maps/EverGrandeCity_DrakesRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_DrakesRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc
index 04c1d9f32..873b3655b 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_DrakesRoom:: @ 8306AEC
- .4byte EverGrandeCity_DrakesRoom_MapAttributes
+ .4byte EverGrandeCity_DrakesRoom_Layout
.4byte EverGrandeCity_DrakesRoom_MapEvents
.4byte EverGrandeCity_DrakesRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/maps/EverGrandeCity_DrakesRoom/map.bin
deleted file mode 100644
index 3b5248d98..000000000
--- a/data/maps/EverGrandeCity_DrakesRoom/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-      
-      2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222HIHI222HIHI \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/maps/EverGrandeCity_GlaciasRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_GlaciasRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index e0a48f9a6..c64a5ae24 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_GlaciasRoom:: @ 8306AD0
- .4byte EverGrandeCity_GlaciasRoom_MapAttributes
+ .4byte EverGrandeCity_GlaciasRoom_Layout
.4byte EverGrandeCity_GlaciasRoom_MapEvents
.4byte EverGrandeCity_GlaciasRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/maps/EverGrandeCity_GlaciasRoom/map.bin
deleted file mode 100644
index 2d7db7377..000000000
--- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-      
-      r2r2r2r2r2222r2r2r2r2r2v22p2s2s2s2t222wu}~22x2y2z2{2|222}222222222q22x2222|22222x2222|222222222222222222222222222222222222222222222HIHI222HIHI \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/maps/EverGrandeCity_HallOfFame/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_HallOfFame/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
index b7816ea86..33928c164 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_HallOfFame:: @ 8306BCC
- .4byte EverGrandeCity_HallOfFame_MapAttributes
+ .4byte EverGrandeCity_HallOfFame_Layout
.4byte EverGrandeCity_HallOfFame_MapEvents
.4byte EverGrandeCity_HallOfFame_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/maps/EverGrandeCity_HallOfFame/map.bin
deleted file mode 100644
index 1df9e4804..000000000
--- a/data/maps/EverGrandeCity_HallOfFame/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222262226 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/maps/EverGrandeCity_PhoebesRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_PhoebesRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
index f9ef5a516..83a9eec14 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PhoebesRoom:: @ 8306AB4
- .4byte EverGrandeCity_PhoebesRoom_MapAttributes
+ .4byte EverGrandeCity_PhoebesRoom_Layout
.4byte EverGrandeCity_PhoebesRoom_MapEvents
.4byte EverGrandeCity_PhoebesRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/maps/EverGrandeCity_PhoebesRoom/map.bin
deleted file mode 100644
index 2e75b706c..000000000
--- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-      
-      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/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index 2b72fc661..4450309d0 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PokemonCenter_1F:: @ 8306BE8
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
index b60e3c3df..6cbd45842 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PokemonCenter_2F:: @ 8306C04
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte EverGrandeCity_PokemonCenter_2F_MapEvents
.4byte EverGrandeCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_PokemonLeague/border.bin b/data/maps/EverGrandeCity_PokemonLeague/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc
index cf24b61dc..a78353193 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PokemonLeague:: @ 8306BB0
- .4byte EverGrandeCity_PokemonLeague_MapAttributes
+ .4byte EverGrandeCity_PokemonLeague_Layout
.4byte EverGrandeCity_PokemonLeague_MapEvents
.4byte EverGrandeCity_PokemonLeague_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.bin b/data/maps/EverGrandeCity_PokemonLeague/map.bin
deleted file mode 100644
index d2acdf2dd..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-  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/maps/EverGrandeCity_SidneysRoom/border.bin b/data/maps/EverGrandeCity_SidneysRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_SidneysRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc
index 7c2ee11f8..03aea95dd 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_SidneysRoom:: @ 8306A98
- .4byte EverGrandeCity_SidneysRoom_MapAttributes
+ .4byte EverGrandeCity_SidneysRoom_Layout
.4byte EverGrandeCity_SidneysRoom_MapEvents
.4byte EverGrandeCity_SidneysRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/maps/EverGrandeCity_SidneysRoom/map.bin
deleted file mode 100644
index ebca00c5c..000000000
--- a/data/maps/EverGrandeCity_SidneysRoom/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-      
-      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/maps/FallarborTown/border.bin b/data/maps/FallarborTown/border.bin
deleted file mode 100644
index 23e2a92e5..000000000
--- a/data/maps/FallarborTown/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-klst \ No newline at end of file
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index bd719a36b..48b0414f7 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,5 +1,5 @@
FallarborTown:: @ 83055B4
- .4byte FallarborTown_MapAttributes
+ .4byte FallarborTown_Layout
.4byte FallarborTown_MapEvents
.4byte FallarborTown_MapScripts
.4byte FallarborTown_MapConnections
diff --git a/data/maps/FallarborTown/map.bin b/data/maps/FallarborTown/map.bin
deleted file mode 100644
index 08f68b6ea..000000000
--- a/data/maps/FallarborTown/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FallarborTown_ContestHall/border.bin b/data/maps/FallarborTown_ContestHall/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/FallarborTown_ContestHall/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc
index aa540e338..9563688ba 100644
--- a/data/maps/FallarborTown_ContestHall/header.inc
+++ b/data/maps/FallarborTown_ContestHall/header.inc
@@ -1,5 +1,5 @@
FallarborTown_ContestHall:: @ 8305CEC
- .4byte FallarborTown_ContestHall_MapAttributes
+ .4byte ContestHall_Layout
.4byte FallarborTown_ContestHall_MapEvents
.4byte FallarborTown_ContestHall_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_ContestHall/map.bin b/data/maps/FallarborTown_ContestHall/map.bin
deleted file mode 100644
index d65e7c489..000000000
--- a/data/maps/FallarborTown_ContestHall/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-/////////////////////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/maps/FallarborTown_ContestLobby/border.bin b/data/maps/FallarborTown_ContestLobby/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/FallarborTown_ContestLobby/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc
index 2f25d3675..dc5eafeaa 100644
--- a/data/maps/FallarborTown_ContestLobby/header.inc
+++ b/data/maps/FallarborTown_ContestLobby/header.inc
@@ -1,5 +1,5 @@
FallarborTown_ContestLobby:: @ 8305CD0
- .4byte FallarborTown_ContestLobby_MapAttributes
+ .4byte ContestLobby_Layout
.4byte FallarborTown_ContestLobby_MapEvents
.4byte FallarborTown_ContestLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_ContestLobby/map.bin b/data/maps/FallarborTown_ContestLobby/map.bin
deleted file mode 100644
index 87407546a..000000000
--- a/data/maps/FallarborTown_ContestLobby/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-[\]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/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index da9739789..5b6ee96fe 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -1,5 +1,5 @@
FallarborTown_House1:: @ 8305D40
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte FallarborTown_House1_MapEvents
.4byte FallarborTown_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc
index ff1949cf9..d5e0e3faa 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -1,5 +1,5 @@
FallarborTown_House2:: @ 8305D5C
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte FallarborTown_House2_MapEvents
.4byte FallarborTown_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc
index b60fa85c8..c13e63f04 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -1,5 +1,5 @@
FallarborTown_Mart:: @ 8305CB4
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte FallarborTown_Mart_MapEvents
.4byte FallarborTown_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index 8ffb95e0c..36b6adbd5 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
FallarborTown_PokemonCenter_1F:: @ 8305D08
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte FallarborTown_PokemonCenter_1F_MapEvents
.4byte FallarborTown_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
index 45120890d..09f92a948 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
FallarborTown_PokemonCenter_2F:: @ 8305D24
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte FallarborTown_PokemonCenter_2F_MapEvents
.4byte FallarborTown_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/FieryPath/border.bin b/data/maps/FieryPath/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/FieryPath/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index ccca2e656..d44eeb9ba 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,5 +1,5 @@
FieryPath:: @ 8306EF8
- .4byte FieryPath_MapAttributes
+ .4byte FieryPath_Layout
.4byte FieryPath_MapEvents
.4byte FieryPath_MapScripts
.4byte 0x0
diff --git a/data/maps/FieryPath/map.bin b/data/maps/FieryPath/map.bin
deleted file mode 100644
index 5928fb173..000000000
--- a/data/maps/FieryPath/map.bin
+++ /dev/null
@@ -1,10 +0,0 @@
-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/maps/FortreeCity/border.bin b/data/maps/FortreeCity/border.bin
deleted file mode 100644
index addb5d6ce..000000000
--- a/data/maps/FortreeCity/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
index 4c96de2b2..164805b62 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -1,5 +1,5 @@
FortreeCity:: @ 83054B8
- .4byte FortreeCity_MapAttributes
+ .4byte FortreeCity_Layout
.4byte FortreeCity_MapEvents
.4byte FortreeCity_MapScripts
.4byte FortreeCity_MapConnections
diff --git a/data/maps/FortreeCity/map.bin b/data/maps/FortreeCity/map.bin
deleted file mode 100644
index a2aa40e98..000000000
--- a/data/maps/FortreeCity/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-$%&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/maps/FortreeCity_DecorationShop/border.bin b/data/maps/FortreeCity_DecorationShop/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/FortreeCity_DecorationShop/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
index 5334ca92c..5bbe52710 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -1,5 +1,5 @@
FortreeCity_DecorationShop:: @ 8306504
- .4byte FortreeCity_DecorationShop_MapAttributes
+ .4byte FortreeCity_DecorationShop_Layout
.4byte FortreeCity_DecorationShop_MapEvents
.4byte FortreeCity_DecorationShop_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/maps/FortreeCity_DecorationShop/map.bin
deleted file mode 100644
index 6ca8b4e61..000000000
--- a/data/maps/FortreeCity_DecorationShop/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-333333333333733337 \ No newline at end of file
diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/maps/FortreeCity_Gym/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/FortreeCity_Gym/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc
index 378a73b52..7313a9a9d 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -1,5 +1,5 @@
FortreeCity_Gym:: @ 8306424
- .4byte FortreeCity_Gym_MapAttributes
+ .4byte FortreeCity_Gym_Layout
.4byte FortreeCity_Gym_MapEvents
.4byte FortreeCity_Gym_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/maps/FortreeCity_Gym/map.bin
deleted file mode 100644
index a8ee94ae1..000000000
--- a/data/maps/FortreeCity_Gym/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- 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/maps/FortreeCity_House1/border.bin b/data/maps/FortreeCity_House1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/FortreeCity_House1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc
index ad8198c43..299c3d5e6 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House1:: @ 8306408
- .4byte FortreeCity_House1_MapAttributes
+ .4byte FortreeCity_House1_Layout
.4byte FortreeCity_House1_MapEvents
.4byte FortreeCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_House1/map.bin b/data/maps/FortreeCity_House1/map.bin
deleted file mode 100644
index 5a3ac8cb6..000000000
--- a/data/maps/FortreeCity_House1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-33333333333333333333733337 \ No newline at end of file
diff --git a/data/maps/FortreeCity_House2/border.bin b/data/maps/FortreeCity_House2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/FortreeCity_House2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc
index 3c803636b..404d3560f 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House2:: @ 8306494
- .4byte FortreeCity_House2_MapAttributes
+ .4byte FortreeCity_House2_Layout
.4byte FortreeCity_House2_MapEvents
.4byte FortreeCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_House2/map.bin b/data/maps/FortreeCity_House2/map.bin
deleted file mode 100644
index 3fbcd6043..000000000
--- a/data/maps/FortreeCity_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-37733333333333333333733337 \ No newline at end of file
diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc
index 40bf85478..c1d287181 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House3:: @ 83064B0
- .4byte FortreeCity_House3_MapAttributes
+ .4byte FortreeCity_House1_Layout
.4byte FortreeCity_House3_MapEvents
.4byte FortreeCity_House3_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc
index bed750ecb..f498ba201 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House4:: @ 83064CC
- .4byte FortreeCity_House4_MapAttributes
+ .4byte FortreeCity_House2_Layout
.4byte FortreeCity_House4_MapEvents
.4byte FortreeCity_House4_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc
index a8bb67d65..2753198b0 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House5:: @ 83064E8
- .4byte FortreeCity_House5_MapAttributes
+ .4byte FortreeCity_House1_Layout
.4byte FortreeCity_House5_MapEvents
.4byte FortreeCity_House5_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc
index 4b8793d36..9c260e3a0 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -1,5 +1,5 @@
FortreeCity_Mart:: @ 8306478
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte FortreeCity_Mart_MapEvents
.4byte FortreeCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
index fcafbe2af..4f593492e 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
FortreeCity_PokemonCenter_1F:: @ 8306440
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte FortreeCity_PokemonCenter_1F_MapEvents
.4byte FortreeCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
index 0421b7880..4b24dcf7d 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
FortreeCity_PokemonCenter_2F:: @ 830645C
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte FortreeCity_PokemonCenter_2F_MapEvents
.4byte FortreeCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/GraniteCave_1F/border.bin b/data/maps/GraniteCave_1F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/GraniteCave_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc
index cf22ded8a..081f54d26 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -1,5 +1,5 @@
GraniteCave_1F:: @ 8306E34
- .4byte GraniteCave_1F_MapAttributes
+ .4byte GraniteCave_1F_Layout
.4byte GraniteCave_1F_MapEvents
.4byte GraniteCave_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/GraniteCave_1F/map.bin b/data/maps/GraniteCave_1F/map.bin
deleted file mode 100644
index 58c7945ab..000000000
--- a/data/maps/GraniteCave_1F/map.bin
+++ /dev/null
@@ -1,5 +0,0 @@
-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/maps/GraniteCave_B1F/border.bin b/data/maps/GraniteCave_B1F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/GraniteCave_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc
index 654803312..64c3eac04 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -1,5 +1,5 @@
GraniteCave_B1F:: @ 8306E50
- .4byte GraniteCave_B1F_MapAttributes
+ .4byte GraniteCave_B1F_Layout
.4byte GraniteCave_B1F_MapEvents
.4byte GraniteCave_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/maps/GraniteCave_B1F/map.bin
deleted file mode 100644
index 27f98c6cf..000000000
--- a/data/maps/GraniteCave_B1F/map.bin
+++ /dev/null
@@ -1,10 +0,0 @@
-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/maps/GraniteCave_B2F/border.bin b/data/maps/GraniteCave_B2F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/GraniteCave_B2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc
index 4d243f3da..8c382b9bd 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -1,5 +1,5 @@
GraniteCave_B2F:: @ 8306E6C
- .4byte GraniteCave_B2F_MapAttributes
+ .4byte GraniteCave_B2F_Layout
.4byte GraniteCave_B2F_MapEvents
.4byte GraniteCave_B2F_MapScripts
.4byte 0x0
diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/maps/GraniteCave_B2F/map.bin
deleted file mode 100644
index bbf8dc7af..000000000
--- a/data/maps/GraniteCave_B2F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/GraniteCave_StevensRoom/border.bin b/data/maps/GraniteCave_StevensRoom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/GraniteCave_StevensRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
index fb9b18436..fdd41a95a 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -1,5 +1,5 @@
GraniteCave_StevensRoom:: @ 8306E88
- .4byte GraniteCave_StevensRoom_MapAttributes
+ .4byte GraniteCave_StevensRoom_Layout
.4byte GraniteCave_StevensRoom_MapEvents
.4byte GraniteCave_StevensRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/maps/GraniteCave_StevensRoom/map.bin
deleted file mode 100644
index 3dc6987c2..000000000
--- a/data/maps/GraniteCave_StevensRoom/map.bin
+++ /dev/null
@@ -1,4 +0,0 @@
-   22222222222222222222222222$!
-22222$
-2222$
-$!!!!!$$!!!!!!!!$$!!!!!!!!!!$ \ No newline at end of file
diff --git a/data/maps/House11/border.bin b/data/maps/House11/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/House11/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/House11/map.bin b/data/maps/House11/map.bin
deleted file mode 100644
index ea185484d..000000000
--- a/data/maps/House11/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/House12/border.bin b/data/maps/House12/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/House12/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/House12/map.bin b/data/maps/House12/map.bin
deleted file mode 100644
index 0e9f07964..000000000
--- a/data/maps/House12/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/InsideOfTruck/border.bin b/data/maps/InsideOfTruck/border.bin
deleted file mode 100644
index 8459c2996..000000000
--- a/data/maps/InsideOfTruck/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
index ee88d280d..b406937ca 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -1,5 +1,5 @@
InsideOfTruck:: @ 8307B38
- .4byte InsideOfTruck_MapAttributes
+ .4byte InsideOfTruck_Layout
.4byte InsideOfTruck_MapEvents
.4byte InsideOfTruck_MapScripts
.4byte 0x0
diff --git a/data/maps/InsideOfTruck/map.bin b/data/maps/InsideOfTruck/map.bin
deleted file mode 100644
index 84b946be5..000000000
--- a/data/maps/InsideOfTruck/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-2 2 22222!"#$  \ No newline at end of file
diff --git a/data/maps/IslandCave/border.bin b/data/maps/IslandCave/border.bin
deleted file mode 100644
index c07869a9f..000000000
--- a/data/maps/IslandCave/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
index f811fe3da..e77e85173 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -1,5 +1,5 @@
IslandCave:: @ 83074C4
- .4byte IslandCave_MapAttributes
+ .4byte IslandCave_Layout
.4byte IslandCave_MapEvents
.4byte IslandCave_MapScripts
.4byte 0x0
diff --git a/data/maps/IslandCave/map.bin b/data/maps/IslandCave/map.bin
deleted file mode 100644
index a7fa61b4d..000000000
--- a/data/maps/IslandCave/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/JaggedPass/border.bin b/data/maps/JaggedPass/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/JaggedPass/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
index 6770756e8..153162e4b 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -1,5 +1,5 @@
JaggedPass:: @ 8306EDC
- .4byte JaggedPass_MapAttributes
+ .4byte JaggedPass_Layout
.4byte JaggedPass_MapEvents
.4byte JaggedPass_MapScripts
.4byte 0x0
diff --git a/data/maps/JaggedPass/map.bin b/data/maps/JaggedPass/map.bin
deleted file mode 100644
index a87a5332e..000000000
--- a/data/maps/JaggedPass/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LavaridgeTown/border.bin b/data/maps/LavaridgeTown/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/LavaridgeTown/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
index e34eec863..ad901d0ff 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown:: @ 8305598
- .4byte LavaridgeTown_MapAttributes
+ .4byte LavaridgeTown_Layout
.4byte LavaridgeTown_MapEvents
.4byte LavaridgeTown_MapScripts
.4byte LavaridgeTown_MapConnections
diff --git a/data/maps/LavaridgeTown/map.bin b/data/maps/LavaridgeTown/map.bin
deleted file mode 100644
index 604ad5f3f..000000000
--- a/data/maps/LavaridgeTown/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-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/maps/LavaridgeTown_Gym_1F/border.bin b/data/maps/LavaridgeTown_Gym_1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LavaridgeTown_Gym_1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
index 929b07ae7..81fe4aae7 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_Gym_1F:: @ 8305C0C
- .4byte LavaridgeTown_Gym_1F_MapAttributes
+ .4byte LavaridgeTown_Gym_1F_Layout
.4byte LavaridgeTown_Gym_1F_MapEvents
.4byte LavaridgeTown_Gym_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/maps/LavaridgeTown_Gym_1F/map.bin
deleted file mode 100644
index 7f2b02f90..000000000
--- a/data/maps/LavaridgeTown_Gym_1F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-66666666662222222222222222222222222222222222222222222222222222222222222222222222222222222222222
-2 2 2 2 2222222222222222222222222222222222222222222222 222 22222222222222222222222222222222222222222222222222222 2222222222(22222 \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/maps/LavaridgeTown_Gym_B1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LavaridgeTown_Gym_B1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
index d8a747789..7a1c7c348 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_Gym_B1F:: @ 8305C28
- .4byte LavaridgeTown_Gym_B1F_MapAttributes
+ .4byte LavaridgeTown_Gym_B1F_Layout
.4byte LavaridgeTown_Gym_B1F_MapEvents
.4byte LavaridgeTown_Gym_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/maps/LavaridgeTown_Gym_B1F/map.bin
deleted file mode 100644
index 035719ffe..000000000
--- a/data/maps/LavaridgeTown_Gym_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-666666666662222222222222222222222   22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222!22!22!22)))22222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/maps/LavaridgeTown_HerbShop/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LavaridgeTown_HerbShop/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc
index f44118c5c..3c193937d 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_HerbShop:: @ 8305BF0
- .4byte LavaridgeTown_HerbShop_MapAttributes
+ .4byte LavaridgeTown_HerbShop_Layout
.4byte LavaridgeTown_HerbShop_MapEvents
.4byte LavaridgeTown_HerbShop_MapScripts
.4byte 0x0
diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/maps/LavaridgeTown_HerbShop/map.bin
deleted file mode 100644
index cc0294a80..000000000
--- a/data/maps/LavaridgeTown_HerbShop/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-32222x2p2p2p2p22h2h2h2x2p2p2p2p2p2y2h2h2h232h2h2h2h2h2h2h2h2h22g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc
index f43ea0bc4..e1e429dc3 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_House:: @ 8305C44
- .4byte LavaridgeTown_House_MapAttributes
+ .4byte House3_Layout
.4byte LavaridgeTown_House_MapEvents
.4byte LavaridgeTown_House_MapScripts
.4byte 0x0
diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc
index 0882a6bf0..a4da19432 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_Mart:: @ 8305C60
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte LavaridgeTown_Mart_MapEvents
.4byte LavaridgeTown_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
index 78576d740..626ae4ab9 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_PokemonCenter_1F:: @ 8305C7C
- .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
+ .4byte LavaridgeTown_PokemonCenter_1F_Layout
.4byte LavaridgeTown_PokemonCenter_1F_MapEvents
.4byte LavaridgeTown_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin
deleted file mode 100644
index d841f9f1a..000000000
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-   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/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
index 3d86fa588..3ff2df867 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_PokemonCenter_2F:: @ 8305C98
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte LavaridgeTown_PokemonCenter_2F_MapEvents
.4byte LavaridgeTown_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity/border.bin b/data/maps/LilycoveCity/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/LilycoveCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
index 204e2098d..0bc87004b 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -1,5 +1,5 @@
LilycoveCity:: @ 83054D4
- .4byte LilycoveCity_MapAttributes
+ .4byte LilycoveCity_Layout
.4byte LilycoveCity_MapEvents
.4byte LilycoveCity_MapScripts
.4byte LilycoveCity_MapConnections
diff --git a/data/maps/LilycoveCity/map.bin b/data/maps/LilycoveCity/map.bin
deleted file mode 100644
index d17bd748d..000000000
--- a/data/maps/LilycoveCity/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/maps/LilycoveCity_ContestHall/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_ContestHall/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
index 47329e0f7..7ab3bd2cd 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_ContestHall:: @ 83065AC
- .4byte LilycoveCity_ContestHall_MapAttributes
+ .4byte LilycoveCity_ContestHall_Layout
.4byte LilycoveCity_ContestHall_MapEvents
.4byte LilycoveCity_ContestHall_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/maps/LilycoveCity_ContestHall/map.bin
deleted file mode 100644
index 06fdae4f7..000000000
--- a/data/maps/LilycoveCity_ContestHall/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-///////////////////////////////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/maps/LilycoveCity_ContestLobby/border.bin b/data/maps/LilycoveCity_ContestLobby/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_ContestLobby/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc
index 5bf98a32b..b109dab11 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_ContestLobby:: @ 8306590
- .4byte LilycoveCity_ContestLobby_MapAttributes
+ .4byte LilycoveCity_ContestLobby_Layout
.4byte LilycoveCity_ContestLobby_MapEvents
.4byte LilycoveCity_ContestLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/maps/LilycoveCity_ContestLobby/map.bin
deleted file mode 100644
index 3d8c96b04..000000000
--- a/data/maps/LilycoveCity_ContestLobby/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-[\]:;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/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
index 141fda863..94a1e4434 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_CoveLilyMotel_1F:: @ 8306520
- .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
+ .4byte LilycoveCity_CoveLilyMotel_1F_Layout
.4byte LilycoveCity_CoveLilyMotel_1F_MapEvents
.4byte LilycoveCity_CoveLilyMotel_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin
deleted file mode 100644
index 5242f8e57..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index 2d6f9de4b..b543a826d 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_CoveLilyMotel_2F:: @ 830653C
- .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
+ .4byte LilycoveCity_CoveLilyMotel_2F_Layout
.4byte LilycoveCity_CoveLilyMotel_2F_MapEvents
.4byte LilycoveCity_CoveLilyMotel_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin
deleted file mode 100644
index 4484b5b55..000000000
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
index 3f1a8ada9..d8c3e1d6b 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStoreElevator:: @ 83067A4
- .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
+ .4byte LilycoveCity_DepartmentStoreElevator_Layout
.4byte LilycoveCity_DepartmentStoreElevator_MapEvents
.4byte LilycoveCity_DepartmentStoreElevator_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
deleted file mode 100644
index 1b3bf23c0..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-hiijpqqrxyyz\2]2]2]2d2e2e2f2d2O2W2f2 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin
deleted file mode 100644
index c1b82435c..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
index 292c621d3..c50694c5e 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStoreRooftop:: @ 8306788
- .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
+ .4byte LilycoveCity_DepartmentStoreRooftop_Layout
.4byte LilycoveCity_DepartmentStoreRooftop_MapEvents
.4byte LilycoveCity_DepartmentStoreRooftop_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin
deleted file mode 100644
index e9125baf0..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-&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/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/maps/LilycoveCity_DepartmentStore_1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
index ecfb77604..31798b5e6 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_1F:: @ 83066FC
- .4byte LilycoveCity_DepartmentStore_1F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_1F_Layout
.4byte LilycoveCity_DepartmentStore_1F_MapEvents
.4byte LilycoveCity_DepartmentStore_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/maps/LilycoveCity_DepartmentStore_1F/map.bin
deleted file mode 100644
index 2d3d15360..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-|}~  Px2222p2p22222x2p2p2p2p2p22h2h2h2h2h22h2h2h2n2h22g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h22g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/maps/LilycoveCity_DepartmentStore_2F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index f10428935..75c8ef43c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_2F:: @ 8306718
- .4byte LilycoveCity_DepartmentStore_2F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_2F_Layout
.4byte LilycoveCity_DepartmentStore_2F_MapEvents
.4byte LilycoveCity_DepartmentStore_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/maps/LilycoveCity_DepartmentStore_2F/map.bin
deleted file mode 100644
index 82ca90b08..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-|}~    PQ 22222222222222222222222222222222222m22222222222222u2234222234222222 2222222m2222222222222222u \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/maps/LilycoveCity_DepartmentStore_3F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 16f453da0..29e214a1d 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_3F:: @ 8306734
- .4byte LilycoveCity_DepartmentStore_3F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_3F_Layout
.4byte LilycoveCity_DepartmentStore_3F_MapEvents
.4byte LilycoveCity_DepartmentStore_3F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/maps/LilycoveCity_DepartmentStore_3F/map.bin
deleted file mode 100644
index c10b776f5..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-|}~6    6QP 222222C2222 22222222222222222222+,2222222222+,2222342222222222342222;<2222222222;<22222222222222222222 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/maps/LilycoveCity_DepartmentStore_4F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index 169f21d92..595f28d19 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_4F:: @ 8306750
- .4byte LilycoveCity_DepartmentStore_4F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_4F_Layout
.4byte LilycoveCity_DepartmentStore_4F_MapEvents
.4byte LilycoveCity_DepartmentStore_4F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/maps/LilycoveCity_DepartmentStore_4F/map.bin
deleted file mode 100644
index bc1a09e2c..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-|}~    PQ 2222222222222222222222222222222222222222222222222222222662222266662266222 22222666622222222222222222 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/maps/LilycoveCity_DepartmentStore_5F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index 19b45696c..ae3033a5d 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_5F:: @ 830676C
- .4byte LilycoveCity_DepartmentStore_5F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_5F_Layout
.4byte LilycoveCity_DepartmentStore_5F_MapEvents
.4byte LilycoveCity_DepartmentStore_5F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/maps/LilycoveCity_DepartmentStore_5F/map.bin
deleted file mode 100644
index 80acc3900..000000000
--- a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LilycoveCity_EmptyMap/border.bin b/data/maps/LilycoveCity_EmptyMap/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/LilycoveCity_EmptyMap/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc
index a83e7139d..6c3149eaf 100644
--- a/data/maps/LilycoveCity_EmptyMap/header.inc
+++ b/data/maps/LilycoveCity_EmptyMap/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_EmptyMap:: @ 8306654
- .4byte LilycoveCity_EmptyMap_MapAttributes
+ .4byte LilycoveCity_EmptyMap_Layout
.4byte LilycoveCity_EmptyMap_MapEvents
.4byte LilycoveCity_EmptyMap_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_EmptyMap/map.bin b/data/maps/LilycoveCity_EmptyMap/map.bin
deleted file mode 100644
index f70d7bba4..000000000
--- a/data/maps/LilycoveCity_EmptyMap/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-42 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
index 022eb0356..d29ac7057 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_Harbor:: @ 8306638
- .4byte LilycoveCity_Harbor_MapAttributes
+ .4byte Harbor_Layout
.4byte LilycoveCity_Harbor_MapEvents
.4byte LilycoveCity_Harbor_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc
index f4246c98f..ec41783d0 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House1:: @ 830668C
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte LilycoveCity_House1_MapEvents
.4byte LilycoveCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/maps/LilycoveCity_House2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_House2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc
index 8aac9185c..491e60776 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House2:: @ 83066A8
- .4byte LilycoveCity_House2_MapAttributes
+ .4byte LilycoveCity_House2_Layout
.4byte LilycoveCity_House2_MapEvents
.4byte LilycoveCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/maps/LilycoveCity_House2/map.bin
deleted file mode 100644
index e381f20eb..000000000
--- a/data/maps/LilycoveCity_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
index f1c7f73b7..e984e5576 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House3:: @ 83066C4
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte LilycoveCity_House3_MapEvents
.4byte LilycoveCity_House3_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc
index 47d5c21e7..0faae2952 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House4:: @ 83066E0
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte LilycoveCity_House4_MapEvents
.4byte LilycoveCity_House4_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
index d48ffc94f..7f2d6d8a8 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_LilycoveMuseum_1F:: @ 8306558
- .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
+ .4byte LilycoveCity_LilycoveMuseum_1F_Layout
.4byte LilycoveCity_LilycoveMuseum_1F_MapEvents
.4byte LilycoveCity_LilycoveMuseum_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin
deleted file mode 100644
index 6e92a8b58..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-          !"#$% &'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/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
index 460ed87f9..5b1207331 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_LilycoveMuseum_2F:: @ 8306574
- .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
+ .4byte LilycoveCity_LilycoveMuseum_2F_Layout
.4byte LilycoveCity_LilycoveMuseum_2F_MapEvents
.4byte LilycoveCity_LilycoveMuseum_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin
deleted file mode 100644
index 76a918838..000000000
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index 5f6798646..b30bb8b6e 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_MoveDeletersHouse:: @ 8306670
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte LilycoveCity_MoveDeletersHouse_MapEvents
.4byte LilycoveCity_MoveDeletersHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
index a1eb040ae..32d4df792 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_PokemonCenter_1F:: @ 83065C8
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte LilycoveCity_PokemonCenter_1F_MapEvents
.4byte LilycoveCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
index 341ce8590..aacc4ca10 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_PokemonCenter_2F:: @ 83065E4
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte LilycoveCity_PokemonCenter_2F_MapEvents
.4byte LilycoveCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
index 4e75b2193..292e02d96 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_PokemonTrainerFanClub:: @ 830661C
- .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
+ .4byte LilycoveCity_PokemonTrainerFanClub_Layout
.4byte LilycoveCity_PokemonTrainerFanClub_MapEvents
.4byte LilycoveCity_PokemonTrainerFanClub_MapScripts
.4byte 0x0
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin
deleted file mode 100644
index cddfe5d9d..000000000
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
index 43137d33b..c1027addb 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_UnusedMart:: @ 8306600
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte LilycoveCity_UnusedMart_MapEvents
.4byte LilycoveCity_UnusedMart_MapScripts
.4byte 0x0
diff --git a/data/maps/LinkContestRoom1/border.bin b/data/maps/LinkContestRoom1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LinkContestRoom1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
index 9e265d9c9..bc747d21e 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom1:: @ 83079E8
- .4byte LinkContestRoom1_MapAttributes
+ .4byte LinkContestRoom1_Layout
.4byte LinkContestRoom1_MapEvents
.4byte LinkContestRoom1_MapScripts
.4byte 0x0
diff --git a/data/maps/LinkContestRoom1/map.bin b/data/maps/LinkContestRoom1/map.bin
deleted file mode 100644
index a8853f6ae..000000000
--- a/data/maps/LinkContestRoom1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-```````````````              $%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/maps/LinkContestRoom2/border.bin b/data/maps/LinkContestRoom2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LinkContestRoom2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
index f492eab03..e8a4ec4fd 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom2:: @ 8307AAC
- .4byte LinkContestRoom2_MapAttributes
+ .4byte LinkContestRoom2_Layout
.4byte LinkContestRoom2_MapEvents
.4byte LinkContestRoom2_MapScripts
.4byte 0x0
diff --git a/data/maps/LinkContestRoom2/map.bin b/data/maps/LinkContestRoom2/map.bin
deleted file mode 100644
index 7cb63b40d..000000000
--- a/data/maps/LinkContestRoom2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-```````````````              $%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/maps/LinkContestRoom3/border.bin b/data/maps/LinkContestRoom3/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LinkContestRoom3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
index 90de4491d..930f19137 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom3:: @ 8307AC8
- .4byte LinkContestRoom3_MapAttributes
+ .4byte LinkContestRoom3_Layout
.4byte LinkContestRoom3_MapEvents
.4byte LinkContestRoom3_MapScripts
.4byte 0x0
diff --git a/data/maps/LinkContestRoom3/map.bin b/data/maps/LinkContestRoom3/map.bin
deleted file mode 100644
index 59e9e9182..000000000
--- a/data/maps/LinkContestRoom3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-```````````````              $%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/maps/LinkContestRoom4/border.bin b/data/maps/LinkContestRoom4/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LinkContestRoom4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
index 774e55abc..ddc1b2741 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom4:: @ 8307AE4
- .4byte LinkContestRoom4_MapAttributes
+ .4byte LinkContestRoom4_Layout
.4byte LinkContestRoom4_MapEvents
.4byte LinkContestRoom4_MapScripts
.4byte 0x0
diff --git a/data/maps/LinkContestRoom4/map.bin b/data/maps/LinkContestRoom4/map.bin
deleted file mode 100644
index 4e2166c19..000000000
--- a/data/maps/LinkContestRoom4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-```````````````              $%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/maps/LinkContestRoom5/border.bin b/data/maps/LinkContestRoom5/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LinkContestRoom5/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
index 22b90f6c9..681662ee9 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom5:: @ 8307B00
- .4byte LinkContestRoom5_MapAttributes
+ .4byte LinkContestRoom5_Layout
.4byte LinkContestRoom5_MapEvents
.4byte LinkContestRoom5_MapScripts
.4byte 0x0
diff --git a/data/maps/LinkContestRoom5/map.bin b/data/maps/LinkContestRoom5/map.bin
deleted file mode 100644
index ad068fe7c..000000000
--- a/data/maps/LinkContestRoom5/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-```````````````              $%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/maps/LinkContestRoom6/border.bin b/data/maps/LinkContestRoom6/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LinkContestRoom6/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
index 773912080..55c417785 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom6:: @ 8307B1C
- .4byte LinkContestRoom6_MapAttributes
+ .4byte LinkContestRoom6_Layout
.4byte LinkContestRoom6_MapEvents
.4byte LinkContestRoom6_MapScripts
.4byte 0x0
diff --git a/data/maps/LinkContestRoom6/map.bin b/data/maps/LinkContestRoom6/map.bin
deleted file mode 100644
index 9fcec5a5e..000000000
--- a/data/maps/LinkContestRoom6/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-```````````````              $%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/maps/LittlerootTown/border.bin b/data/maps/LittlerootTown/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/LittlerootTown/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
index 5493f6005..73bbf71b5 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -1,5 +1,5 @@
LittlerootTown:: @ 8305544
- .4byte LittlerootTown_MapAttributes
+ .4byte LittlerootTown_Layout
.4byte LittlerootTown_MapEvents
.4byte LittlerootTown_MapScripts
.4byte LittlerootTown_MapConnections
diff --git a/data/maps/LittlerootTown/map.bin b/data/maps/LittlerootTown/map.bin
deleted file mode 100644
index 9af76f90e..000000000
--- a/data/maps/LittlerootTown/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-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/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/maps/LittlerootTown_BrendansHouse_1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index 122fdc82a..6f2c31c86 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_BrendansHouse_1F:: @ 8305A30
- .4byte LittlerootTown_BrendansHouse_1F_MapAttributes
+ .4byte LittlerootTown_BrendansHouse_1F_Layout
.4byte LittlerootTown_BrendansHouse_1F_MapEvents
.4byte LittlerootTown_BrendansHouse_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/maps/LittlerootTown_BrendansHouse_1F/map.bin
deleted file mode 100644
index 3ae8e69a6..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/maps/LittlerootTown_BrendansHouse_2F/border.bin
deleted file mode 100644
index c1b82435c..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
index 449a883cb..d23ea0b30 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_BrendansHouse_2F:: @ 8305A4C
- .4byte LittlerootTown_BrendansHouse_2F_MapAttributes
+ .4byte LittlerootTown_BrendansHouse_2F_Layout
.4byte LittlerootTown_BrendansHouse_2F_MapEvents
.4byte LittlerootTown_BrendansHouse_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
deleted file mode 100644
index 9de4bae2a..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-RTPTV'   Z[Ue/b2c2x2f2]2x2222{2|2}22222222222222BB222222222222222222222 \ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/maps/LittlerootTown_MaysHouse_1F/border.bin
deleted file mode 100644
index c1b82435c..000000000
--- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
index 6d6220086..961f411a2 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_MaysHouse_1F:: @ 8305A68
- .4byte LittlerootTown_MaysHouse_1F_MapAttributes
+ .4byte LittlerootTown_MaysHouse_1F_Layout
.4byte LittlerootTown_MaysHouse_1F_MapEvents
.4byte LittlerootTown_MaysHouse_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/maps/LittlerootTown_MaysHouse_1F/map.bin
deleted file mode 100644
index 12b4f86c2..000000000
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/maps/LittlerootTown_MaysHouse_2F/border.bin
deleted file mode 100644
index c1b82435c..000000000
--- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
index 44859dd4c..640230c00 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_MaysHouse_2F:: @ 8305A84
- .4byte LittlerootTown_MaysHouse_2F_MapAttributes
+ .4byte LittlerootTown_MaysHouse_2F_Layout
.4byte LittlerootTown_MaysHouse_2F_MapEvents
.4byte LittlerootTown_MaysHouse_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/maps/LittlerootTown_MaysHouse_2F/map.bin
deleted file mode 100644
index b51210332..000000000
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-'VTPTQ/eUXYE2222]2g22`2a2222222222222222222222BB2222222222222222 \ No newline at end of file
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
index 31fb03c64..44f415d9b 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_ProfessorBirchsLab:: @ 8305AA0
- .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
+ .4byte LittlerootTown_ProfessorBirchsLab_Layout
.4byte LittlerootTown_ProfessorBirchsLab_MapEvents
.4byte LittlerootTown_ProfessorBirchsLab_MapScripts
.4byte 0x0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
deleted file mode 100644
index 0b62afcdf..000000000
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
+++ /dev/null
@@ -1,4 +0,0 @@
-  <
-   
-
- !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/maps/MagmaHideout_1F/border.bin b/data/maps/MagmaHideout_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MagmaHideout_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index 3876e17ec..95e2ded37 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_1F:: @ 8307588
- .4byte MagmaHideout_1F_MapAttributes
+ .4byte MagmaHideout_1F_Layout
.4byte MagmaHideout_1F_MapEvents
.4byte MagmaHideout_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/maps/MagmaHideout_1F/map.bin
deleted file mode 100644
index 52c2d57eb..000000000
--- a/data/maps/MagmaHideout_1F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MagmaHideout_B1F/border.bin b/data/maps/MagmaHideout_B1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MagmaHideout_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc
index 16fe3f2ba..bafc9f112 100644
--- a/data/maps/MagmaHideout_B1F/header.inc
+++ b/data/maps/MagmaHideout_B1F/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_B1F:: @ 83075A4
- .4byte MagmaHideout_B1F_MapAttributes
+ .4byte MagmaHideout_B1F_Layout
.4byte MagmaHideout_B1F_MapEvents
.4byte MagmaHideout_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_B1F/map.bin b/data/maps/MagmaHideout_B1F/map.bin
deleted file mode 100644
index b423ca1a9..000000000
--- a/data/maps/MagmaHideout_B1F/map.bin
+++ /dev/null
@@ -1,95 +0,0 @@
- 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/maps/MagmaHideout_B2F/border.bin b/data/maps/MagmaHideout_B2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MagmaHideout_B2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc
index 3aee695b4..de9b39593 100644
--- a/data/maps/MagmaHideout_B2F/header.inc
+++ b/data/maps/MagmaHideout_B2F/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_B2F:: @ 83075C0
- .4byte MagmaHideout_B2F_MapAttributes
+ .4byte MagmaHideout_B2F_Layout
.4byte MagmaHideout_B2F_MapEvents
.4byte MagmaHideout_B2F_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_B2F/map.bin b/data/maps/MagmaHideout_B2F/map.bin
deleted file mode 100644
index 68afb0063..000000000
--- a/data/maps/MagmaHideout_B2F/map.bin
+++ /dev/null
@@ -1,49 +0,0 @@
-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/maps/MauvilleCity/border.bin b/data/maps/MauvilleCity/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/MauvilleCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
index e0e2c4f22..a5eb578c1 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -1,5 +1,5 @@
MauvilleCity:: @ 8305480
- .4byte MauvilleCity_MapAttributes
+ .4byte MauvilleCity_Layout
.4byte MauvilleCity_MapEvents
.4byte MauvilleCity_MapScripts
.4byte MauvilleCity_MapConnections
diff --git a/data/maps/MauvilleCity/map.bin b/data/maps/MauvilleCity/map.bin
deleted file mode 100644
index 80a38e902..000000000
--- a/data/maps/MauvilleCity/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/maps/MauvilleCity_BikeShop/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/MauvilleCity_BikeShop/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
index c99124794..4cf657936 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_BikeShop:: @ 8306168
- .4byte MauvilleCity_BikeShop_MapAttributes
+ .4byte MauvilleCity_BikeShop_Layout
.4byte MauvilleCity_BikeShop_MapEvents
.4byte MauvilleCity_BikeShop_MapScripts
.4byte 0x0
diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/maps/MauvilleCity_BikeShop/map.bin
deleted file mode 100644
index 9891b9fd5..000000000
--- a/data/maps/MauvilleCity_BikeShop/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-()*+,- 
-    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/maps/MauvilleCity_GameCorner/border.bin b/data/maps/MauvilleCity_GameCorner/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/MauvilleCity_GameCorner/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc
index 653a41544..dfb7bcd0a 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_GameCorner:: @ 83061A0
- .4byte MauvilleCity_GameCorner_MapAttributes
+ .4byte MauvilleCity_GameCorner_Layout
.4byte MauvilleCity_GameCorner_MapEvents
.4byte MauvilleCity_GameCorner_MapScripts
.4byte 0x0
diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/maps/MauvilleCity_GameCorner/map.bin
deleted file mode 100644
index ce3f9bf73..000000000
--- a/data/maps/MauvilleCity_GameCorner/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-<=>>>>? 
-
- ///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/maps/MauvilleCity_Gym/border.bin b/data/maps/MauvilleCity_Gym/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/MauvilleCity_Gym/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc
index efbd61fe0..7be94e661 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_Gym:: @ 830614C
- .4byte MauvilleCity_Gym_MapAttributes
+ .4byte MauvilleCity_Gym_Layout
.4byte MauvilleCity_Gym_MapEvents
.4byte MauvilleCity_Gym_MapScripts
.4byte 0x0
diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/maps/MauvilleCity_Gym/map.bin
deleted file mode 100644
index 73847264c..000000000
--- a/data/maps/MauvilleCity_Gym/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-&'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/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index e9acd83bd..b81f735fa 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_House1:: @ 8306184
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte MauvilleCity_House1_MapEvents
.4byte MauvilleCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc
index 37a434405..84180ce98 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_House2:: @ 83061BC
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte MauvilleCity_House2_MapEvents
.4byte MauvilleCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc
index 7712e16df..e8d2694d1 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_Mart:: @ 8306210
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte MauvilleCity_Mart_MapEvents
.4byte MauvilleCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
index b6e0a1628..e3cf14b52 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F:: @ 83061D8
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte MauvilleCity_PokemonCenter_1F_MapEvents
.4byte MauvilleCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
index 8787c975e..71c27de3b 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_2F:: @ 83061F4
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte MauvilleCity_PokemonCenter_2F_MapEvents
.4byte MauvilleCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/maps/MeteorFalls_1F_1R/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MeteorFalls_1F_1R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc
index dcb3fbbde..50e5a59cf 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_1F_1R:: @ 8306D70
- .4byte MeteorFalls_1F_1R_MapAttributes
+ .4byte MeteorFalls_1F_1R_Layout
.4byte MeteorFalls_1F_1R_MapEvents
.4byte MeteorFalls_1F_1R_MapScripts
.4byte 0x0
diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/maps/MeteorFalls_1F_1R/map.bin
deleted file mode 100644
index bcfb05fd2..000000000
--- a/data/maps/MeteorFalls_1F_1R/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/MeteorFalls_1F_2R/border.bin b/data/maps/MeteorFalls_1F_2R/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MeteorFalls_1F_2R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
index 0d9d797aa..9b07de17c 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_1F_2R:: @ 8306D8C
- .4byte MeteorFalls_1F_2R_MapAttributes
+ .4byte MeteorFalls_1F_2R_Layout
.4byte MeteorFalls_1F_2R_MapEvents
.4byte MeteorFalls_1F_2R_MapScripts
.4byte 0x0
diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/maps/MeteorFalls_1F_2R/map.bin
deleted file mode 100644
index cea93a39b..000000000
--- a/data/maps/MeteorFalls_1F_2R/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
->>>>>>>>>>>>>>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/maps/MeteorFalls_B1F_1R/border.bin b/data/maps/MeteorFalls_B1F_1R/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MeteorFalls_B1F_1R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
index f67ab9ea7..8b5b67256 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_B1F_1R:: @ 8306DA8
- .4byte MeteorFalls_B1F_1R_MapAttributes
+ .4byte MeteorFalls_B1F_1R_Layout
.4byte MeteorFalls_B1F_1R_MapEvents
.4byte MeteorFalls_B1F_1R_MapScripts
.4byte 0x0
diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/maps/MeteorFalls_B1F_1R/map.bin
deleted file mode 100644
index a37afdb17..000000000
--- a/data/maps/MeteorFalls_B1F_1R/map.bin
+++ /dev/null
@@ -1,6 +0,0 @@
->>>>>>>>>>>>>>>?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/maps/MeteorFalls_B1F_2R/border.bin b/data/maps/MeteorFalls_B1F_2R/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MeteorFalls_B1F_2R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
index 779e6d23a..f3ed76145 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_B1F_2R:: @ 8306DC4
- .4byte MeteorFalls_B1F_2R_MapAttributes
+ .4byte MeteorFalls_B1F_2R_Layout
.4byte MeteorFalls_B1F_2R_MapEvents
.4byte MeteorFalls_B1F_2R_MapScripts
.4byte 0x0
diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/maps/MeteorFalls_B1F_2R/map.bin
deleted file mode 100644
index 5f4497752..000000000
--- a/data/maps/MeteorFalls_B1F_2R/map.bin
+++ /dev/null
@@ -1 +0,0 @@
->>>>>>>>>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/maps/MossdeepCity/border.bin b/data/maps/MossdeepCity/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/MossdeepCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index 26b3e1db0..a108fc6d6 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -1,5 +1,5 @@
MossdeepCity:: @ 83054F0
- .4byte MossdeepCity_MapAttributes
+ .4byte MossdeepCity_Layout
.4byte MossdeepCity_MapEvents
.4byte MossdeepCity_MapScripts
.4byte MossdeepCity_MapConnections
diff --git a/data/maps/MossdeepCity/map.bin b/data/maps/MossdeepCity/map.bin
deleted file mode 100644
index 29b167286..000000000
--- a/data/maps/MossdeepCity/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/maps/MossdeepCity_GameCorner_1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/MossdeepCity_GameCorner_1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index d96d383ea..d7f6a2e16 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_GameCorner_1F:: @ 83068F4
- .4byte MossdeepCity_GameCorner_1F_MapAttributes
+ .4byte MossdeepCity_GameCorner_1F_Layout
.4byte MossdeepCity_GameCorner_1F_MapEvents
.4byte MossdeepCity_GameCorner_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/maps/MossdeepCity_GameCorner_1F/map.bin
deleted file mode 100644
index bad63f412..000000000
--- a/data/maps/MossdeepCity_GameCorner_1F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/maps/MossdeepCity_GameCorner_B1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/MossdeepCity_GameCorner_B1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 7692281f0..fc7a641eb 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_GameCorner_B1F:: @ 8306910
- .4byte MossdeepCity_GameCorner_B1F_MapAttributes
+ .4byte MossdeepCity_GameCorner_B1F_Layout
.4byte MossdeepCity_GameCorner_B1F_MapEvents
.4byte MossdeepCity_GameCorner_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/maps/MossdeepCity_GameCorner_B1F/map.bin
deleted file mode 100644
index 399d05705..000000000
--- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-        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/maps/MossdeepCity_Gym/border.bin b/data/maps/MossdeepCity_Gym/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/MossdeepCity_Gym/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc
index b72bdf62e..2546bc631 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_Gym:: @ 83067C0
- .4byte MossdeepCity_Gym_MapAttributes
+ .4byte MossdeepCity_Gym_Layout
.4byte MossdeepCity_Gym_MapEvents
.4byte MossdeepCity_Gym_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/maps/MossdeepCity_Gym/map.bin
deleted file mode 100644
index cd6eb09f9..000000000
--- a/data/maps/MossdeepCity_Gym/map.bin
+++ /dev/null
@@ -1,50 +0,0 @@
-@@@@@@@@@@@@@@@@@@@@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/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 5fd23c8ec..135ce0c71 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House1:: @ 83067DC
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte MossdeepCity_House1_MapEvents
.4byte MossdeepCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc
index 99140eaa7..f518be4e0 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House2:: @ 83067F8
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte MossdeepCity_House2_MapEvents
.4byte MossdeepCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc
index 382f165a4..7e3abf6cd 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House3:: @ 8306868
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte MossdeepCity_House3_MapEvents
.4byte MossdeepCity_House3_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc
index 1c0e433bb..90daccd22 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House4:: @ 83068A0
- .4byte MossdeepCity_House4_MapAttributes
+ .4byte HouseWithBed_Layout
.4byte MossdeepCity_House4_MapEvents
.4byte MossdeepCity_House4_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc
index c18fca0e3..eb808693c 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_Mart:: @ 830684C
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte MossdeepCity_Mart_MapEvents
.4byte MossdeepCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
index 036604eff..a2fff6ade 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_PokemonCenter_1F:: @ 8306814
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte MossdeepCity_PokemonCenter_1F_MapEvents
.4byte MossdeepCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
index cb42c5c80..9307396ae 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_PokemonCenter_2F:: @ 8306830
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte MossdeepCity_PokemonCenter_2F_MapEvents
.4byte MossdeepCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/maps/MossdeepCity_SpaceCenter_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
index 65ba897fb..6dd396fdd 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_SpaceCenter_1F:: @ 83068BC
- .4byte MossdeepCity_SpaceCenter_1F_MapAttributes
+ .4byte MossdeepCity_SpaceCenter_1F_Layout
.4byte MossdeepCity_SpaceCenter_1F_MapEvents
.4byte MossdeepCity_SpaceCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/maps/MossdeepCity_SpaceCenter_1F/map.bin
deleted file mode 100644
index 44f5081b9..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/maps/MossdeepCity_SpaceCenter_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index 2195ee8e2..53e692407 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_SpaceCenter_2F:: @ 83068D8
- .4byte MossdeepCity_SpaceCenter_2F_MapAttributes
+ .4byte MossdeepCity_SpaceCenter_2F_Layout
.4byte MossdeepCity_SpaceCenter_2F_MapEvents
.4byte MossdeepCity_SpaceCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/maps/MossdeepCity_SpaceCenter_2F/map.bin
deleted file mode 100644
index d2e52d780..000000000
--- a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/maps/MossdeepCity_StevensHouse/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/MossdeepCity_StevensHouse/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc
index 761ea9b73..ecdc32bd1 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_StevensHouse:: @ 8306884
- .4byte MossdeepCity_StevensHouse_MapAttributes
+ .4byte MossdeepCity_StevensHouse_Layout
.4byte MossdeepCity_StevensHouse_MapEvents
.4byte MossdeepCity_StevensHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/maps/MossdeepCity_StevensHouse/map.bin
deleted file mode 100644
index ade25497a..000000000
--- a/data/maps/MossdeepCity_StevensHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/MtChimney/border.bin b/data/maps/MtChimney/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MtChimney/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc
index cdc29ce7f..43995f016 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -1,5 +1,5 @@
MtChimney:: @ 8306EC0
- .4byte MtChimney_MapAttributes
+ .4byte MtChimney_Layout
.4byte MtChimney_MapEvents
.4byte MtChimney_MapScripts
.4byte 0x0
diff --git a/data/maps/MtChimney/map.bin b/data/maps/MtChimney/map.bin
deleted file mode 100644
index 09eb5a906..000000000
--- a/data/maps/MtChimney/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index f5207578b..493cc512e 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -1,5 +1,5 @@
MtChimney_CableCarStation:: @ 8306CAC
- .4byte MtChimney_CableCarStation_MapAttributes
+ .4byte CableCarStation_Layout
.4byte MtChimney_CableCarStation_MapEvents
.4byte MtChimney_CableCarStation_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_1F/border.bin b/data/maps/MtPyre_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MtPyre_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
index cfdff9591..0e2958753 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -1,5 +1,5 @@
MtPyre_1F:: @ 8306F14
- .4byte MtPyre_1F_MapAttributes
+ .4byte MtPyre_1F_Layout
.4byte MtPyre_1F_MapEvents
.4byte MtPyre_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_1F/map.bin b/data/maps/MtPyre_1F/map.bin
deleted file mode 100644
index 60b992a73..000000000
--- a/data/maps/MtPyre_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-22222&7&722222222222662666266'7222266266626622222222226622222222222222222222666266&7622222666266&762222222222222662222222222266222222222&7622662222266&7622662222266222222222222 \ No newline at end of file
diff --git a/data/maps/MtPyre_2F/border.bin b/data/maps/MtPyre_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MtPyre_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 914fdabd4..813fa5604 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,5 +1,5 @@
MtPyre_2F:: @ 8306F30
- .4byte MtPyre_2F_MapAttributes
+ .4byte MtPyre_2F_Layout
.4byte MtPyre_2F_MapEvents
.4byte MtPyre_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_2F/map.bin b/data/maps/MtPyre_2F/map.bin
deleted file mode 100644
index 628d2262e..000000000
--- a/data/maps/MtPyre_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-22222222&&2222&2222222222&2222222&222222222222222222222222222&222222&2222232222222222222&22222&22222 \ No newline at end of file
diff --git a/data/maps/MtPyre_3F/border.bin b/data/maps/MtPyre_3F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MtPyre_3F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index b4a59adbd..941fbbb20 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,5 +1,5 @@
MtPyre_3F:: @ 8306F4C
- .4byte MtPyre_3F_MapAttributes
+ .4byte MtPyre_3F_Layout
.4byte MtPyre_3F_MapEvents
.4byte MtPyre_3F_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_3F/map.bin b/data/maps/MtPyre_3F/map.bin
deleted file mode 100644
index fabbe8cb3..000000000
--- a/data/maps/MtPyre_3F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-22&2222&&&2222&&2222222222222222222&222222&222222222222222222222&222&2222222222222222222222222323 \ No newline at end of file
diff --git a/data/maps/MtPyre_4F/border.bin b/data/maps/MtPyre_4F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MtPyre_4F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index 8dcbd4e64..604d0fadc 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,5 +1,5 @@
MtPyre_4F:: @ 8306F68
- .4byte MtPyre_4F_MapAttributes
+ .4byte MtPyre_4F_Layout
.4byte MtPyre_4F_MapEvents
.4byte MtPyre_4F_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_4F/map.bin b/data/maps/MtPyre_4F/map.bin
deleted file mode 100644
index 98dc679ff..000000000
--- a/data/maps/MtPyre_4F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-2&&222&'&2222002200&222&&&&&222&&2222222222222222222222&226223222&22222&232222222222 \ No newline at end of file
diff --git a/data/maps/MtPyre_5F/border.bin b/data/maps/MtPyre_5F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MtPyre_5F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index 0eb7f7bba..f1dc8d7c1 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,5 +1,5 @@
MtPyre_5F:: @ 8306F84
- .4byte MtPyre_5F_MapAttributes
+ .4byte MtPyre_5F_Layout
.4byte MtPyre_5F_MapEvents
.4byte MtPyre_5F_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_5F/map.bin b/data/maps/MtPyre_5F/map.bin
deleted file mode 100644
index 12fbeeb7e..000000000
--- a/data/maps/MtPyre_5F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-2&222&2&2222222&222&&&&&222&&2222222222222222222222&2222222226223&222222222&222222222223 \ No newline at end of file
diff --git a/data/maps/MtPyre_6F/border.bin b/data/maps/MtPyre_6F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MtPyre_6F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index 3cab722cd..8d824b4b6 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,5 +1,5 @@
MtPyre_6F:: @ 8306FA0
- .4byte MtPyre_6F_MapAttributes
+ .4byte MtPyre_6F_Layout
.4byte MtPyre_6F_MapEvents
.4byte MtPyre_6F_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_6F/map.bin b/data/maps/MtPyre_6F/map.bin
deleted file mode 100644
index 54f599ec2..000000000
--- a/data/maps/MtPyre_6F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-2&222&&222222&22222226622222222262222&2222226622222&22&&272&&22&22222222222232222222222222222222222&2222222 \ No newline at end of file
diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/maps/MtPyre_Exterior/border.bin
deleted file mode 100644
index 1d7df4a00..000000000
--- a/data/maps/MtPyre_Exterior/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
index 543e090f0..4a1c86be9 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -1,5 +1,5 @@
MtPyre_Exterior:: @ 8306FBC
- .4byte MtPyre_Exterior_MapAttributes
+ .4byte MtPyre_Exterior_Layout
.4byte MtPyre_Exterior_MapEvents
.4byte MtPyre_Exterior_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/maps/MtPyre_Exterior/map.bin
deleted file mode 100644
index 7ab1e0461..000000000
--- a/data/maps/MtPyre_Exterior/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MtPyre_Summit/border.bin b/data/maps/MtPyre_Summit/border.bin
deleted file mode 100644
index 1d7df4a00..000000000
--- a/data/maps/MtPyre_Summit/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
index e07d849a6..74be5845e 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -1,5 +1,5 @@
MtPyre_Summit:: @ 8306FD8
- .4byte MtPyre_Summit_MapAttributes
+ .4byte MtPyre_Summit_Layout
.4byte MtPyre_Summit_MapEvents
.4byte MtPyre_Summit_MapScripts
.4byte 0x0
diff --git a/data/maps/MtPyre_Summit/map.bin b/data/maps/MtPyre_Summit/map.bin
deleted file mode 100644
index 1de8bd5ea..000000000
--- a/data/maps/MtPyre_Summit/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/maps/NewMauville_Entrance/border.bin
deleted file mode 100644
index 4531975c7..000000000
--- a/data/maps/NewMauville_Entrance/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
index 28ac26ccf..690e3d276 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -1,5 +1,5 @@
NewMauville_Entrance:: @ 8307320
- .4byte NewMauville_Entrance_MapAttributes
+ .4byte NewMauville_Entrance_Layout
.4byte NewMauville_Entrance_MapEvents
.4byte NewMauville_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/maps/NewMauville_Entrance/map.bin
deleted file mode 100644
index 1e3f471e8..000000000
--- a/data/maps/NewMauville_Entrance/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-t||||ut2suu33333suu33333suu33333suu33333suu33333suslllllll \ No newline at end of file
diff --git a/data/maps/NewMauville_Inside/border.bin b/data/maps/NewMauville_Inside/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/NewMauville_Inside/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc
index 9771d7ec7..dd252544f 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -1,5 +1,5 @@
NewMauville_Inside:: @ 830733C
- .4byte NewMauville_Inside_MapAttributes
+ .4byte NewMauville_Inside_Layout
.4byte NewMauville_Inside_MapEvents
.4byte NewMauville_Inside_MapScripts
.4byte 0x0
diff --git a/data/maps/NewMauville_Inside/map.bin b/data/maps/NewMauville_Inside/map.bin
deleted file mode 100644
index 78d1e39ce..000000000
--- a/data/maps/NewMauville_Inside/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/OldaleTown/border.bin b/data/maps/OldaleTown/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/OldaleTown/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
index 22965da3d..8403d61c6 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -1,5 +1,5 @@
OldaleTown:: @ 8305560
- .4byte OldaleTown_MapAttributes
+ .4byte OldaleTown_Layout
.4byte OldaleTown_MapEvents
.4byte OldaleTown_MapScripts
.4byte OldaleTown_MapConnections
diff --git a/data/maps/OldaleTown/map.bin b/data/maps/OldaleTown/map.bin
deleted file mode 100644
index e6ff2362e..000000000
--- a/data/maps/OldaleTown/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-01101110000011110000000011110(0)0)000l2m2m2n2111100123000tuuv1111189:;000|}~11111`ABC00011111111110001111000111111100111111001111111020111111100011111100211111111111111110110001111111111000000H0I02211111l2m2m2n2000PQRS11110tuuv110XYZ[11110|}~0`abc1111000011111000011000111110000111x211111111 \ No newline at end of file
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 530a0e763..4f0142667 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -1,5 +1,5 @@
OldaleTown_House1:: @ 8305ABC
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte OldaleTown_House1_MapEvents
.4byte OldaleTown_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
index 2214fbfaf..84f544145 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -1,5 +1,5 @@
OldaleTown_House2:: @ 8305AD8
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte OldaleTown_House2_MapEvents
.4byte OldaleTown_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/maps/OldaleTown_Mart/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/OldaleTown_Mart/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc
index a0e8a8851..c1efeb849 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -1,5 +1,5 @@
OldaleTown_Mart:: @ 8305B2C
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte OldaleTown_Mart_MapEvents
.4byte OldaleTown_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/maps/OldaleTown_Mart/map.bin
deleted file mode 100644
index 73d90bf31..000000000
--- a/data/maps/OldaleTown_Mart/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-"#$#$D*()() 222 2220212!212%28292:2222222-@AB222+,22+
-22222234223
-222222;<22;222222222 \ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/maps/OldaleTown_PokemonCenter_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
index 82ced7328..e0695fbaf 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
OldaleTown_PokemonCenter_1F:: @ 8305AF4
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte OldaleTown_PokemonCenter_1F_MapEvents
.4byte OldaleTown_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/maps/OldaleTown_PokemonCenter_1F/map.bin
deleted file mode 100644
index 5201dde15..000000000
--- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
- 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/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/maps/OldaleTown_PokemonCenter_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 79e6ca99d..cd42c15a7 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
OldaleTown_PokemonCenter_2F:: @ 8305B10
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte OldaleTown_PokemonCenter_2F_MapEvents
.4byte OldaleTown_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/maps/OldaleTown_PokemonCenter_2F/map.bin
deleted file mode 100644
index 40cf9afd7..000000000
--- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  ?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/maps/PacifidlogTown/border.bin b/data/maps/PacifidlogTown/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/PacifidlogTown/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc
index 057e83264..621ac206e 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown:: @ 83055EC
- .4byte PacifidlogTown_MapAttributes
+ .4byte PacifidlogTown_Layout
.4byte PacifidlogTown_MapEvents
.4byte PacifidlogTown_MapScripts
.4byte PacifidlogTown_MapConnections
diff --git a/data/maps/PacifidlogTown/map.bin b/data/maps/PacifidlogTown/map.bin
deleted file mode 100644
index 02c1454bb..000000000
--- a/data/maps/PacifidlogTown/map.bin
+++ /dev/null
@@ -1,6 +0,0 @@
-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/maps/PacifidlogTown_House1/border.bin b/data/maps/PacifidlogTown_House1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/PacifidlogTown_House1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
index 7842574f9..81b24d450 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House1:: @ 8305E90
- .4byte PacifidlogTown_House1_MapAttributes
+ .4byte PacifidlogTown_House1_Layout
.4byte PacifidlogTown_House1_MapEvents
.4byte PacifidlogTown_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/maps/PacifidlogTown_House1/map.bin
deleted file mode 100644
index 7865fdc7c..000000000
--- a/data/maps/PacifidlogTown_House1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333373333333333333333333333733333333333333333733333333373333337 \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/maps/PacifidlogTown_House2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/PacifidlogTown_House2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc
index 3fc2aba99..fe0626bf3 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House2:: @ 8305EAC
- .4byte PacifidlogTown_House2_MapAttributes
+ .4byte PacifidlogTown_House2_Layout
.4byte PacifidlogTown_House2_MapEvents
.4byte PacifidlogTown_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/maps/PacifidlogTown_House2/map.bin
deleted file mode 100644
index 617346322..000000000
--- a/data/maps/PacifidlogTown_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333333333733333333373333333333333333333333333333333333373333337 \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc
index 6bf1e6bd6..401c70d5b 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House3:: @ 8305EC8
- .4byte PacifidlogTown_House3_MapAttributes
+ .4byte PacifidlogTown_House1_Layout
.4byte PacifidlogTown_House3_MapEvents
.4byte PacifidlogTown_House3_MapScripts
.4byte 0x0
diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc
index df930a533..5e69f1f7e 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House4:: @ 8305EE4
- .4byte PacifidlogTown_House4_MapAttributes
+ .4byte PacifidlogTown_House2_Layout
.4byte PacifidlogTown_House4_MapEvents
.4byte PacifidlogTown_House4_MapScripts
.4byte 0x0
diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc
index d0fca156f..31bf4de65 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House5:: @ 8305F00
- .4byte PacifidlogTown_House5_MapAttributes
+ .4byte PacifidlogTown_House1_Layout
.4byte PacifidlogTown_House5_MapEvents
.4byte PacifidlogTown_House5_MapScripts
.4byte 0x0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
index ef2ddbf4c..872d1ac17 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_PokemonCenter_1F:: @ 8305E58
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte PacifidlogTown_PokemonCenter_1F_MapEvents
.4byte PacifidlogTown_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
index b985545a8..734d4225d 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_PokemonCenter_2F:: @ 8305E74
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte PacifidlogTown_PokemonCenter_2F_MapEvents
.4byte PacifidlogTown_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgCity/border.bin b/data/maps/PetalburgCity/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/PetalburgCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc
index c1706a55a..42136d835 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -1,5 +1,5 @@
PetalburgCity:: @ 8305448
- .4byte PetalburgCity_MapAttributes
+ .4byte PetalburgCity_Layout
.4byte PetalburgCity_MapEvents
.4byte PetalburgCity_MapScripts
.4byte PetalburgCity_MapConnections
diff --git a/data/maps/PetalburgCity/map.bin b/data/maps/PetalburgCity/map.bin
deleted file mode 100644
index 35f0172ca..000000000
--- a/data/maps/PetalburgCity/map.bin
+++ /dev/null
@@ -1,4 +0,0 @@
-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/maps/PetalburgCity_Gym/border.bin b/data/maps/PetalburgCity_Gym/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/PetalburgCity_Gym/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
index af00ed5f0..7799ed7df 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_Gym:: @ 8305F38
- .4byte PetalburgCity_Gym_MapAttributes
+ .4byte PetalburgCity_Gym_Layout
.4byte PetalburgCity_Gym_MapEvents
.4byte PetalburgCity_Gym_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/maps/PetalburgCity_Gym/map.bin
deleted file mode 100644
index 665783c7b..000000000
--- a/data/maps/PetalburgCity_Gym/map.bin
+++ /dev/null
@@ -1,10 +0,0 @@
-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/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index 4fe3dfdbc..66d92403b 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_House1:: @ 8305F54
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte PetalburgCity_House1_MapEvents
.4byte PetalburgCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/maps/PetalburgCity_House2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/PetalburgCity_House2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc
index fb76b1bfe..fdbf58c38 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_House2:: @ 8305F70
- .4byte PetalburgCity_House2_MapAttributes
+ .4byte HouseWithBed_Layout
.4byte PetalburgCity_House2_MapEvents
.4byte PetalburgCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/maps/PetalburgCity_House2/map.bin
deleted file mode 100644
index b91b7153b..000000000
--- a/data/maps/PetalburgCity_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc
index 56275cfaf..fc09d24a5 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_Mart:: @ 8305FC4
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte PetalburgCity_Mart_MapEvents
.4byte PetalburgCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
index 2596fb65d..3af2d5282 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_PokemonCenter_1F:: @ 8305F8C
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte PetalburgCity_PokemonCenter_1F_MapEvents
.4byte PetalburgCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
index ac6c77b6a..008c26bf6 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_PokemonCenter_2F:: @ 8305FA8
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte PetalburgCity_PokemonCenter_2F_MapEvents
.4byte PetalburgCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
index 47fb229ba..22ebc57a3 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_WallysHouse:: @ 8305F1C
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte PetalburgCity_WallysHouse_MapEvents
.4byte PetalburgCity_WallysHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgWoods/border.bin b/data/maps/PetalburgWoods/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/PetalburgWoods/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
index b3a981af9..a1eb5618c 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -1,5 +1,5 @@
PetalburgWoods:: @ 8306EA4
- .4byte PetalburgWoods_MapAttributes
+ .4byte PetalburgWoods_Layout
.4byte PetalburgWoods_MapEvents
.4byte PetalburgWoods_MapScripts
.4byte 0x0
diff --git a/data/maps/PetalburgWoods/map.bin b/data/maps/PetalburgWoods/map.bin
deleted file mode 100644
index a032b4c43..000000000
--- a/data/maps/PetalburgWoods/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/RecordCorner/border.bin b/data/maps/RecordCorner/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RecordCorner/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
index a8322ebee..976ede8cf 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -1,5 +1,5 @@
RecordCorner:: @ 83079B0
- .4byte RecordCorner_MapAttributes
+ .4byte RecordCorner_Layout
.4byte RecordCorner_MapEvents
.4byte RecordCorner_MapScripts
.4byte 0x0
diff --git a/data/maps/RecordCorner/map.bin b/data/maps/RecordCorner/map.bin
deleted file mode 100644
index 51dfb6e5a..000000000
--- a/data/maps/RecordCorner/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-22222222222222222222222222222222222222222222222222222222222222222222"2"2"2"2 \ No newline at end of file
diff --git a/data/maps/Route101/border.bin b/data/maps/Route101/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route101/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
index 1b4b6b1c4..c50d34519 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -1,5 +1,5 @@
Route101:: @ 8305608
- .4byte Route101_MapAttributes
+ .4byte Route101_Layout
.4byte Route101_MapEvents
.4byte Route101_MapScripts
.4byte Route101_MapConnections
diff --git a/data/maps/Route101/map.bin b/data/maps/Route101/map.bin
deleted file mode 100644
index fab3a1d69..000000000
--- a/data/maps/Route101/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route102/border.bin b/data/maps/Route102/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route102/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
index a4318e2d2..c23ac6567 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -1,5 +1,5 @@
Route102:: @ 8305624
- .4byte Route102_MapAttributes
+ .4byte Route102_Layout
.4byte Route102_MapEvents
.4byte Route102_MapScripts
.4byte Route102_MapConnections
diff --git a/data/maps/Route102/map.bin b/data/maps/Route102/map.bin
deleted file mode 100644
index 7378bb44b..000000000
--- a/data/maps/Route102/map.bin
+++ /dev/null
@@ -1 +0,0 @@
- 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/maps/Route103/border.bin b/data/maps/Route103/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route103/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index b23f9d523..cf7033922 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -1,5 +1,5 @@
Route103:: @ 8305640
- .4byte Route103_MapAttributes
+ .4byte Route103_Layout
.4byte Route103_MapEvents
.4byte Route103_MapScripts
.4byte Route103_MapConnections
diff --git a/data/maps/Route103/map.bin b/data/maps/Route103/map.bin
deleted file mode 100644
index 6c5205b4c..000000000
--- a/data/maps/Route103/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route104/border.bin b/data/maps/Route104/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route104/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
index 71e7059b5..084a2e602 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -1,5 +1,5 @@
Route104:: @ 830565C
- .4byte Route104_MapAttributes
+ .4byte Route104_Layout
.4byte Route104_MapEvents
.4byte Route104_MapScripts
.4byte Route104_MapConnections
diff --git a/data/maps/Route104/map.bin b/data/maps/Route104/map.bin
deleted file mode 100644
index 7731bc31c..000000000
--- a/data/maps/Route104/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/maps/Route104_MrBrineysHouse/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route104_MrBrineysHouse/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
index 3055a73d6..99d99bd8a 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -1,5 +1,5 @@
Route104_MrBrineysHouse:: @ 8306C20
- .4byte Route104_MrBrineysHouse_MapAttributes
+ .4byte Route104_MrBrineysHouse_Layout
.4byte Route104_MrBrineysHouse_MapEvents
.4byte Route104_MrBrineysHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/maps/Route104_MrBrineysHouse/map.bin
deleted file mode 100644
index 7660fd5d7..000000000
--- a/data/maps/Route104_MrBrineysHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/maps/Route104_PrettyPetalFlowerShop/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route104_PrettyPetalFlowerShop/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
index 3dae6a068..f98d930ab 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -1,5 +1,5 @@
Route104_PrettyPetalFlowerShop:: @ 8306C3C
- .4byte Route104_PrettyPetalFlowerShop_MapAttributes
+ .4byte Route104_PrettyPetalFlowerShop_Layout
.4byte Route104_PrettyPetalFlowerShop_MapEvents
.4byte Route104_PrettyPetalFlowerShop_MapScripts
.4byte 0x0
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/maps/Route104_PrettyPetalFlowerShop/map.bin
deleted file mode 100644
index d34ff5c1a..000000000
--- a/data/maps/Route104_PrettyPetalFlowerShop/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route104_Prototype/border.bin b/data/maps/Route104_Prototype/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route104_Prototype/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
index 7f5115386..87b11e3ba 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -1,5 +1,5 @@
Route104_Prototype:: @ 8307CF8
- .4byte Route104_Prototype_MapAttributes
+ .4byte Route104_Prototype_Layout
.4byte Route104_Prototype_MapEvents
.4byte Route104_Prototype_MapScripts
.4byte 0x0
diff --git a/data/maps/Route104_Prototype/map.bin b/data/maps/Route104_Prototype/map.bin
deleted file mode 100644
index 71bd63e62..000000000
--- a/data/maps/Route104_Prototype/map.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index 51b27eb0a..aecb3c549 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -1,5 +1,5 @@
Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14
- .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes
+ .4byte Route104_PrettyPetalFlowerShop_Layout
.4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents
.4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts
.4byte 0x0
diff --git a/data/maps/Route105/border.bin b/data/maps/Route105/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route105/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
index 344b8f634..a286003c9 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -1,5 +1,5 @@
Route105:: @ 8305678
- .4byte Route105_MapAttributes
+ .4byte Route105_Layout
.4byte Route105_MapEvents
.4byte Route105_MapScripts
.4byte Route105_MapConnections
diff --git a/data/maps/Route105/map.bin b/data/maps/Route105/map.bin
deleted file mode 100644
index 152aad670..000000000
--- a/data/maps/Route105/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route106/border.bin b/data/maps/Route106/border.bin
deleted file mode 100644
index 281762f5b..000000000
--- a/data/maps/Route106/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-CCCC \ No newline at end of file
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index 494690340..baeb22a8a 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,5 +1,5 @@
Route106:: @ 8305694
- .4byte Route106_MapAttributes
+ .4byte Route106_Layout
.4byte Route106_MapEvents
.4byte Route106_MapScripts
.4byte Route106_MapConnections
diff --git a/data/maps/Route106/map.bin b/data/maps/Route106/map.bin
deleted file mode 100644
index d65a278a4..000000000
--- a/data/maps/Route106/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route107/border.bin b/data/maps/Route107/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route107/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index 382b617ba..dc8a49a79 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,5 +1,5 @@
Route107:: @ 83056B0
- .4byte Route107_MapAttributes
+ .4byte Route107_Layout
.4byte Route107_MapEvents
.4byte Route107_MapScripts
.4byte Route107_MapConnections
diff --git a/data/maps/Route107/map.bin b/data/maps/Route107/map.bin
deleted file mode 100644
index 521997b0f..000000000
--- a/data/maps/Route107/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route108/border.bin b/data/maps/Route108/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route108/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
index 3214f7b89..d84d77d8e 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -1,5 +1,5 @@
Route108:: @ 83056CC
- .4byte Route108_MapAttributes
+ .4byte Route108_Layout
.4byte Route108_MapEvents
.4byte Route108_MapScripts
.4byte Route108_MapConnections
diff --git a/data/maps/Route108/map.bin b/data/maps/Route108/map.bin
deleted file mode 100644
index 0a82f9924..000000000
--- a/data/maps/Route108/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route109/border.bin b/data/maps/Route109/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route109/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
index db91d1368..67a9b09c0 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -1,5 +1,5 @@
Route109:: @ 83056E8
- .4byte Route109_MapAttributes
+ .4byte Route109_Layout
.4byte Route109_MapEvents
.4byte Route109_MapScripts
.4byte Route109_MapConnections
diff --git a/data/maps/Route109/map.bin b/data/maps/Route109/map.bin
deleted file mode 100644
index eb83de870..000000000
--- a/data/maps/Route109/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/maps/Route109_SeashoreHouse/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route109_SeashoreHouse/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
index 064d428bd..7ac57b934 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -1,5 +1,5 @@
Route109_SeashoreHouse:: @ 8307D30
- .4byte Route109_SeashoreHouse_MapAttributes
+ .4byte Route109_SeashoreHouse_Layout
.4byte Route109_SeashoreHouse_MapEvents
.4byte Route109_SeashoreHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/maps/Route109_SeashoreHouse/map.bin
deleted file mode 100644
index cb7853a17..000000000
--- a/data/maps/Route109_SeashoreHouse/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-./   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/maps/Route110/border.bin b/data/maps/Route110/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route110/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
index 442a02ccb..b2ea0c8bd 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -1,5 +1,5 @@
Route110:: @ 8305704
- .4byte Route110_MapAttributes
+ .4byte Route110_Layout
.4byte Route110_MapEvents
.4byte Route110_MapScripts
.4byte Route110_MapConnections
diff --git a/data/maps/Route110/map.bin b/data/maps/Route110/map.bin
deleted file mode 100644
index e10394048..000000000
--- a/data/maps/Route110/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
index 749ab18e9..523832792 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
@@ -1,5 +1,5 @@
Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C
- .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes
+ .4byte Route110_SeasideCyclingRoadEntrace_Layout
.4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents
.4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
index a4bd0cbd7..6c9a6413a 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
@@ -1,5 +1,5 @@
Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80
- .4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes
+ .4byte Route110_SeasideCyclingRoadEntrace_Layout
.4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents
.4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin
deleted file mode 100644
index e9fc770d4..000000000
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-x2p2p2p2p2622226x2p2p2p22h2h2h2h26666662h2h2h2\2h2h2h2h2p2Y2Z2Y2Z2p2y2h2h2l2d6h2h2h2a6b6a6b6h2h2t6 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/maps/Route110_TrickHouseCorridor/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route110_TrickHouseCorridor/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
index f2b2c691d..bde1d5b52 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHouseCorridor:: @ 8307D84
- .4byte Route110_TrickHouseCorridor_MapAttributes
+ .4byte Route110_TrickHouseCorridor_Layout
.4byte Route110_TrickHouseCorridor_MapEvents
.4byte Route110_TrickHouseCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/maps/Route110_TrickHouseCorridor/map.bin
deleted file mode 100644
index 8981d28bd..000000000
--- a/data/maps/Route110_TrickHouseCorridor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route110_TrickHouseEnd/border.bin b/data/maps/Route110_TrickHouseEnd/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route110_TrickHouseEnd/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
index d61808d7f..c0a61f038 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHouseEnd:: @ 8307D68
- .4byte Route110_TrickHouseEnd_MapAttributes
+ .4byte Route110_TrickHouseEnd_Layout
.4byte Route110_TrickHouseEnd_MapEvents
.4byte Route110_TrickHouseEnd_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/maps/Route110_TrickHouseEnd/map.bin
deleted file mode 100644
index 506fdb644..000000000
--- a/data/maps/Route110_TrickHouseEnd/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route110_TrickHouseEntrance/border.bin b/data/maps/Route110_TrickHouseEntrance/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route110_TrickHouseEntrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
index 80d6c597f..8ecc26186 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHouseEntrance:: @ 8307D4C
- .4byte Route110_TrickHouseEntrance_MapAttributes
+ .4byte Route110_TrickHouseEntrance_Layout
.4byte Route110_TrickHouseEntrance_MapEvents
.4byte Route110_TrickHouseEntrance_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/maps/Route110_TrickHouseEntrance/map.bin
deleted file mode 100644
index 1306bb9b5..000000000
--- a/data/maps/Route110_TrickHouseEntrance/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route110_TrickHousePuzzle1/border.bin b/data/maps/Route110_TrickHousePuzzle1/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle1/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
index c4c87877c..7b5bb82f5 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle1:: @ 8307DA0
- .4byte Route110_TrickHousePuzzle1_MapAttributes
+ .4byte Route110_TrickHousePuzzle1_Layout
.4byte Route110_TrickHousePuzzle1_MapEvents
.4byte Route110_TrickHousePuzzle1_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/maps/Route110_TrickHousePuzzle1/map.bin
deleted file mode 100644
index c809b7482..000000000
--- a/data/maps/Route110_TrickHousePuzzle1/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/Route110_TrickHousePuzzle2/border.bin b/data/maps/Route110_TrickHousePuzzle2/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle2/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
index d278ca3aa..a21c2f395 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle2:: @ 8307DBC
- .4byte Route110_TrickHousePuzzle2_MapAttributes
+ .4byte Route110_TrickHousePuzzle2_Layout
.4byte Route110_TrickHousePuzzle2_MapEvents
.4byte Route110_TrickHousePuzzle2_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/maps/Route110_TrickHousePuzzle2/map.bin
deleted file mode 100644
index 819080ced..000000000
--- a/data/maps/Route110_TrickHousePuzzle2/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o         
-w6 222X22222222222222222222222i2222222i222222222222222222222222222222222222222X22222222222222i22222222222i22222222222222222222222222222222X2222222222222222222222222222222222222222X2 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/maps/Route110_TrickHousePuzzle3/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle3/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 736a1dc19..974573410 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle3:: @ 8307DD8
- .4byte Route110_TrickHousePuzzle3_MapAttributes
+ .4byte Route110_TrickHousePuzzle3_Layout
.4byte Route110_TrickHousePuzzle3_MapEvents
.4byte Route110_TrickHousePuzzle3_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/maps/Route110_TrickHousePuzzle3/map.bin
deleted file mode 100644
index 4dc43a00d..000000000
--- a/data/maps/Route110_TrickHousePuzzle3/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/Route110_TrickHousePuzzle4/border.bin b/data/maps/Route110_TrickHousePuzzle4/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle4/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
index f4117a578..d400e5eb4 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle4:: @ 8307DF4
- .4byte Route110_TrickHousePuzzle4_MapAttributes
+ .4byte Route110_TrickHousePuzzle4_Layout
.4byte Route110_TrickHousePuzzle4_MapEvents
.4byte Route110_TrickHousePuzzle4_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/maps/Route110_TrickHousePuzzle4/map.bin
deleted file mode 100644
index e0b8cf33f..000000000
--- a/data/maps/Route110_TrickHousePuzzle4/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/maps/Route110_TrickHousePuzzle5/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle5/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
index 7216f556e..700aa68fe 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle5:: @ 8307E10
- .4byte Route110_TrickHousePuzzle5_MapAttributes
+ .4byte Route110_TrickHousePuzzle5_Layout
.4byte Route110_TrickHousePuzzle5_MapEvents
.4byte Route110_TrickHousePuzzle5_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/maps/Route110_TrickHousePuzzle5/map.bin
deleted file mode 100644
index a64ea34b6..000000000
--- a/data/maps/Route110_TrickHousePuzzle5/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 hhhhh22222hh222hhh2222222222hhhh22222222222hhh222222hh2222hhh2222hhhhh2222hh2222hhhhh2222hh222hhhhh22222hhhhhhhhh22222hhhhhhhh222222hhhhhhhh222222hhhhhhhh222222hhhhhhhhh2222hhhhhhhhhhh222hhhhhhhhhhhhh22hhhhhhhhhhhhhh2hhhhhhhhhhhhh222hhhhhhhhhhh22222hhhhh2222222222hhhhh22hhh22222hhhhh22hhhh222hhhhhh \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/maps/Route110_TrickHousePuzzle6/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle6/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
index 5ffc844bd..8bdef5c7b 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle6:: @ 8307E2C
- .4byte Route110_TrickHousePuzzle6_MapAttributes
+ .4byte Route110_TrickHousePuzzle6_Layout
.4byte Route110_TrickHousePuzzle6_MapEvents
.4byte Route110_TrickHousePuzzle6_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/maps/Route110_TrickHousePuzzle6/map.bin
deleted file mode 100644
index ec8447889..000000000
--- a/data/maps/Route110_TrickHousePuzzle6/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 222222222222222222222222222222222222222222222222222222222222222222222222622222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/maps/Route110_TrickHousePuzzle7/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle7/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
index cea170daa..2008208ce 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle7:: @ 8307E48
- .4byte Route110_TrickHousePuzzle7_MapAttributes
+ .4byte Route110_TrickHousePuzzle7_Layout
.4byte Route110_TrickHousePuzzle7_MapEvents
.4byte Route110_TrickHousePuzzle7_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/maps/Route110_TrickHousePuzzle7/map.bin
deleted file mode 100644
index 5859601f6..000000000
--- a/data/maps/Route110_TrickHousePuzzle7/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/Route110_TrickHousePuzzle8/border.bin b/data/maps/Route110_TrickHousePuzzle8/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_TrickHousePuzzle8/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc
index 6a4dc7051..ced373d13 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle8:: @ 8307E64
- .4byte Route110_TrickHousePuzzle8_MapAttributes
+ .4byte Route110_TrickHousePuzzle8_Layout
.4byte Route110_TrickHousePuzzle8_MapEvents
.4byte Route110_TrickHousePuzzle8_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/maps/Route110_TrickHousePuzzle8/map.bin
deleted file mode 100644
index d8c131da6..000000000
--- a/data/maps/Route110_TrickHousePuzzle8/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 666666666666226k2k2k2k2k2k2k2k2k2k2k2l6k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2l6l6k2k2k2k2k2l6l6l6l6l6k2l6l6l6l6l6l6l6l6222266266226222666266666626662k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2l6k2k2k2k2l6k2k2k2k2k2k2k2l6k2k2226666666666222222266666662222 \ No newline at end of file
diff --git a/data/maps/Route111/border.bin b/data/maps/Route111/border.bin
deleted file mode 100644
index 4531975c7..000000000
--- a/data/maps/Route111/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
index 5af1fb1c2..80fa09a0c 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -1,5 +1,5 @@
Route111:: @ 8305720
- .4byte Route111_MapAttributes
+ .4byte Route111_Layout
.4byte Route111_MapEvents
.4byte Route111_MapScripts
.4byte Route111_MapConnections
diff --git a/data/maps/Route111/map.bin b/data/maps/Route111/map.bin
deleted file mode 100644
index 50fc935bd..000000000
--- a/data/maps/Route111/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
index 23f4959a3..60383cf3d 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -1,5 +1,5 @@
Route111_OldLadysRestStop:: @ 8306C74
- .4byte Route111_OldLadysRestStop_MapAttributes
+ .4byte House3_Layout
.4byte Route111_OldLadysRestStop_MapEvents
.4byte Route111_OldLadysRestStop_MapScripts
.4byte 0x0
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index 32fbca9a0..985d6d62d 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -1,5 +1,5 @@
Route111_WinstrateFamilysHouse:: @ 8306C58
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte Route111_WinstrateFamilysHouse_MapEvents
.4byte Route111_WinstrateFamilysHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route112/border.bin b/data/maps/Route112/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/Route112/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
index f798451d6..9a59e413e 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -1,5 +1,5 @@
Route112:: @ 830573C
- .4byte Route112_MapAttributes
+ .4byte Route112_Layout
.4byte Route112_MapEvents
.4byte Route112_MapScripts
.4byte Route112_MapConnections
diff --git a/data/maps/Route112/map.bin b/data/maps/Route112/map.bin
deleted file mode 100644
index bc194cbc5..000000000
--- a/data/maps/Route112/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/maps/Route112_CableCarStation/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route112_CableCarStation/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
index 3d025fb7b..990e7a5bf 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -1,5 +1,5 @@
Route112_CableCarStation:: @ 8306C90
- .4byte Route112_CableCarStation_MapAttributes
+ .4byte CableCarStation_Layout
.4byte Route112_CableCarStation_MapEvents
.4byte Route112_CableCarStation_MapScripts
.4byte 0x0
diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/maps/Route112_CableCarStation/map.bin
deleted file mode 100644
index 93db9d5f0..000000000
--- a/data/maps/Route112_CableCarStation/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route113/border.bin b/data/maps/Route113/border.bin
deleted file mode 100644
index 73e1e3c60..000000000
--- a/data/maps/Route113/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-mnuv \ No newline at end of file
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
index 5792f97c3..c5dff2d5d 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -1,5 +1,5 @@
Route113:: @ 8305758
- .4byte Route113_MapAttributes
+ .4byte Route113_Layout
.4byte Route113_MapEvents
.4byte Route113_MapScripts
.4byte Route113_MapConnections
diff --git a/data/maps/Route113/map.bin b/data/maps/Route113/map.bin
deleted file mode 100644
index 1d6c6b283..000000000
--- a/data/maps/Route113/map.bin
+++ /dev/null
@@ -1,288 +0,0 @@
-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/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index a8bfdd35d..860db983c 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -1,5 +1,5 @@
Route113_GlassWorkshop:: @ 8307EB8
- .4byte Route113_GlassWorkshop_MapAttributes
+ .4byte House4_Layout
.4byte Route113_GlassWorkshop_MapEvents
.4byte Route113_GlassWorkshop_MapScripts
.4byte 0x0
diff --git a/data/maps/Route114/border.bin b/data/maps/Route114/border.bin
deleted file mode 100644
index 23e2a92e5..000000000
--- a/data/maps/Route114/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-klst \ No newline at end of file
diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc
index cfb5f4114..a845c579a 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -1,5 +1,5 @@
Route114:: @ 8305774
- .4byte Route114_MapAttributes
+ .4byte Route114_Layout
.4byte Route114_MapEvents
.4byte Route114_MapScripts
.4byte Route114_MapConnections
diff --git a/data/maps/Route114/map.bin b/data/maps/Route114/map.bin
deleted file mode 100644
index 0d92450f4..000000000
--- a/data/maps/Route114/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/maps/Route114_FossilManiacsHouse/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route114_FossilManiacsHouse/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
index 2da95c284..8939a6ebd 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -1,5 +1,5 @@
Route114_FossilManiacsHouse:: @ 8306CC8
- .4byte Route114_FossilManiacsHouse_MapAttributes
+ .4byte Route114_FossilManiacsHouse_Layout
.4byte Route114_FossilManiacsHouse_MapEvents
.4byte Route114_FossilManiacsHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/maps/Route114_FossilManiacsHouse/map.bin
deleted file mode 100644
index ea2d94fda..000000000
--- a/data/maps/Route114_FossilManiacsHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route114_FossilManiacsTunnel/border.bin b/data/maps/Route114_FossilManiacsTunnel/border.bin
deleted file mode 100644
index 580a207f4..000000000
--- a/data/maps/Route114_FossilManiacsTunnel/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-wwww \ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
index b410c822c..cdd7de9ff 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -1,5 +1,5 @@
Route114_FossilManiacsTunnel:: @ 8306CE4
- .4byte Route114_FossilManiacsTunnel_MapAttributes
+ .4byte Route114_FossilManiacsTunnel_Layout
.4byte Route114_FossilManiacsTunnel_MapEvents
.4byte Route114_FossilManiacsTunnel_MapScripts
.4byte 0x0
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/maps/Route114_FossilManiacsTunnel/map.bin
deleted file mode 100644
index 586216000..000000000
--- a/data/maps/Route114_FossilManiacsTunnel/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-w2whiiiiiijw2w2w2whxhiiiijrw2ww2wphxhiijrzjwww2pphx33rzjrw2wwppp332zjrrw6wwppp6y233rrrw6wwppp3y2y26rrrw6wwppp3y2y22rrrwwwpp7y2y22rrrw6wwp7p3y26rrrwwww6pp3y22rrrw6w6ww6ppp3y26rrw6w6ww6ppp62r6rzjw6ww6ppp32r3zjrw6ww6ppp32r3y6rrw6ww6ppp32r3y6rrw6whxp32r3y6rrw6wp2p2p 3r77rrw6wp6p2p 3zj3rzjwp2p6p 33r3r3rwp2p2p32r3r7rwp2p2p36r3zjrhx2p7p32r77rrpy62phx32zj3rrpy62pp3333r3rrpy62pp3222r3rr \ No newline at end of file
diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/maps/Route114_LanettesHouse/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route114_LanettesHouse/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc
index a5b7eea50..d40a42513 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -1,5 +1,5 @@
Route114_LanettesHouse:: @ 8306D00
- .4byte Route114_LanettesHouse_MapAttributes
+ .4byte Route114_LanettesHouse_Layout
.4byte Route114_LanettesHouse_MapEvents
.4byte Route114_LanettesHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/maps/Route114_LanettesHouse/map.bin
deleted file mode 100644
index de1858be4..000000000
--- a/data/maps/Route114_LanettesHouse/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-  
-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/maps/Route115/border.bin b/data/maps/Route115/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route115/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
index b11134e28..ee72fe0b2 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -1,5 +1,5 @@
Route115:: @ 8305790
- .4byte Route115_MapAttributes
+ .4byte Route115_Layout
.4byte Route115_MapEvents
.4byte Route115_MapScripts
.4byte Route115_MapConnections
diff --git a/data/maps/Route115/map.bin b/data/maps/Route115/map.bin
deleted file mode 100644
index d6e8e9f1c..000000000
--- a/data/maps/Route115/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route116/border.bin b/data/maps/Route116/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route116/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
index f4e145bf1..8fbf022a7 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -1,5 +1,5 @@
Route116:: @ 83057AC
- .4byte Route116_MapAttributes
+ .4byte Route116_Layout
.4byte Route116_MapEvents
.4byte Route116_MapScripts
.4byte Route116_MapConnections
diff --git a/data/maps/Route116/map.bin b/data/maps/Route116/map.bin
deleted file mode 100644
index 055562dbb..000000000
--- a/data/maps/Route116/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/maps/Route116_TunnelersRestHouse/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route116_TunnelersRestHouse/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
index a52c6cada..b245aa534 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -1,5 +1,5 @@
Route116_TunnelersRestHouse:: @ 8306D1C
- .4byte Route116_TunnelersRestHouse_MapAttributes
+ .4byte Route116_TunnelersRestHouse_Layout
.4byte Route116_TunnelersRestHouse_MapEvents
.4byte Route116_TunnelersRestHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/maps/Route116_TunnelersRestHouse/map.bin
deleted file mode 100644
index 91e2c2019..000000000
--- a/data/maps/Route116_TunnelersRestHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route117/border.bin b/data/maps/Route117/border.bin
deleted file mode 100644
index addb5d6ce..000000000
--- a/data/maps/Route117/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc
index 9649f4728..437e59bd6 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -1,5 +1,5 @@
Route117:: @ 83057C8
- .4byte Route117_MapAttributes
+ .4byte Route117_Layout
.4byte Route117_MapEvents
.4byte Route117_MapScripts
.4byte Route117_MapConnections
diff --git a/data/maps/Route117/map.bin b/data/maps/Route117/map.bin
deleted file mode 100644
index 9aaa06fef..000000000
--- a/data/maps/Route117/map.bin
+++ /dev/null
@@ -1,11 +0,0 @@
-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/maps/Route117_PokemonDayCare/border.bin b/data/maps/Route117_PokemonDayCare/border.bin
deleted file mode 100644
index 7f603e844..000000000
--- a/data/maps/Route117_PokemonDayCare/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
index 567819b48..3df8c8b16 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -1,5 +1,5 @@
Route117_PokemonDayCare:: @ 8306D38
- .4byte Route117_PokemonDayCare_MapAttributes
+ .4byte Route117_PokemonDayCare_Layout
.4byte Route117_PokemonDayCare_MapEvents
.4byte Route117_PokemonDayCare_MapScripts
.4byte 0x0
diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/maps/Route117_PokemonDayCare/map.bin
deleted file mode 100644
index bd4b64e13..000000000
--- a/data/maps/Route117_PokemonDayCare/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-567      
-=>?$2&22&244222 22 .!.#222222222(222322222-2022222222222)*%2222222820212222222C222922%2;<22@AAAAA \ No newline at end of file
diff --git a/data/maps/Route118/border.bin b/data/maps/Route118/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route118/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
index 5b1190621..d75021d0a 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -1,5 +1,5 @@
Route118:: @ 83057E4
- .4byte Route118_MapAttributes
+ .4byte Route118_Layout
.4byte Route118_MapEvents
.4byte Route118_MapScripts
.4byte Route118_MapConnections
diff --git a/data/maps/Route118/map.bin b/data/maps/Route118/map.bin
deleted file mode 100644
index c8b0865d0..000000000
--- a/data/maps/Route118/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route119/border.bin b/data/maps/Route119/border.bin
deleted file mode 100644
index 864ac15fa..000000000
--- a/data/maps/Route119/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
index ef5887676..fd2445e92 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -1,5 +1,5 @@
Route119:: @ 8305800
- .4byte Route119_MapAttributes
+ .4byte Route119_Layout
.4byte Route119_MapEvents
.4byte Route119_MapScripts
.4byte Route119_MapConnections
diff --git a/data/maps/Route119/map.bin b/data/maps/Route119/map.bin
deleted file mode 100644
index cd1c748d9..000000000
--- a/data/maps/Route119/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index 2a14f5292..245d6c559 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -1,5 +1,5 @@
Route119_House:: @ 8307F28
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte Route119_House_MapEvents
.4byte Route119_House_MapScripts
.4byte 0x0
diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/maps/Route119_WeatherInstitute_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route119_WeatherInstitute_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc
index b392fbc41..654ee2df0 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -1,5 +1,5 @@
Route119_WeatherInstitute_1F:: @ 8307EF0
- .4byte Route119_WeatherInstitute_1F_MapAttributes
+ .4byte Route119_WeatherInstitute_1F_Layout
.4byte Route119_WeatherInstitute_1F_MapEvents
.4byte Route119_WeatherInstitute_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/maps/Route119_WeatherInstitute_1F/map.bin
deleted file mode 100644
index 07a4e7ebb..000000000
--- a/data/maps/Route119_WeatherInstitute_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-__nk___k______|}~_ggkgggk,-,-gglmv2kj2z2z2k4545j222z2222tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R22w2R2R22w2R2R2R2R2R2R2U22fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z22R2R2R22z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]R2R2R2R2R2R2R2R2 \ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/maps/Route119_WeatherInstitute_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/Route119_WeatherInstitute_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index 9a5c3d9d8..803d3b75b 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,5 +1,5 @@
Route119_WeatherInstitute_2F:: @ 8307F0C
- .4byte Route119_WeatherInstitute_2F_MapAttributes
+ .4byte Route119_WeatherInstitute_2F_Layout
.4byte Route119_WeatherInstitute_2F_MapEvents
.4byte Route119_WeatherInstitute_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/maps/Route119_WeatherInstitute_2F/map.bin
deleted file mode 100644
index 97953f463..000000000
--- a/data/maps/Route119_WeatherInstitute_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-__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/maps/Route120/border.bin b/data/maps/Route120/border.bin
deleted file mode 100644
index 864ac15fa..000000000
--- a/data/maps/Route120/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
index 3f8be7e95..912234e0c 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -1,5 +1,5 @@
Route120:: @ 830581C
- .4byte Route120_MapAttributes
+ .4byte Route120_Layout
.4byte Route120_MapEvents
.4byte Route120_MapScripts
.4byte Route120_MapConnections
diff --git a/data/maps/Route120/map.bin b/data/maps/Route120/map.bin
deleted file mode 100644
index bb98e751c..000000000
--- a/data/maps/Route120/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route121/border.bin b/data/maps/Route121/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route121/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
index ba2c3d2da..90f1ed359 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -1,5 +1,5 @@
Route121:: @ 8305838
- .4byte Route121_MapAttributes
+ .4byte Route121_Layout
.4byte Route121_MapEvents
.4byte Route121_MapScripts
.4byte Route121_MapConnections
diff --git a/data/maps/Route121/map.bin b/data/maps/Route121/map.bin
deleted file mode 100644
index 5c5397c0b..000000000
--- a/data/maps/Route121/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route121_SafariZoneEntrance/border.bin b/data/maps/Route121_SafariZoneEntrance/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route121_SafariZoneEntrance/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
index 4a0bbe244..2c53111c8 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -1,5 +1,5 @@
Route121_SafariZoneEntrance:: @ 8306D54
- .4byte Route121_SafariZoneEntrance_MapAttributes
+ .4byte Route121_SafariZoneEntrance_Layout
.4byte Route121_SafariZoneEntrance_MapEvents
.4byte Route121_SafariZoneEntrance_MapScripts
.4byte 0x0
diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/maps/Route121_SafariZoneEntrance/map.bin
deleted file mode 100644
index 35c1badac..000000000
--- a/data/maps/Route121_SafariZoneEntrance/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-]x2p2p2p2p2p22222e2x2p2p2p2p22h2h2h2h2h22h22h2h22\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h22d6h2h2h2h2ababh2h2h2h2h2h2h22h2h2h222\2h2h2h2dh2h2h2x22h2h2h222h2h2h222h2h2h2\2h2h2h2q22d6h2h2t6 \ No newline at end of file
diff --git a/data/maps/Route122/border.bin b/data/maps/Route122/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route122/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
index 9889cc813..b6bd5943d 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -1,5 +1,5 @@
Route122:: @ 8305854
- .4byte Route122_MapAttributes
+ .4byte Route122_Layout
.4byte Route122_MapEvents
.4byte Route122_MapScripts
.4byte Route122_MapConnections
diff --git a/data/maps/Route122/map.bin b/data/maps/Route122/map.bin
deleted file mode 100644
index 1c76b0b0a..000000000
--- a/data/maps/Route122/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route123/border.bin b/data/maps/Route123/border.bin
deleted file mode 100644
index 864ac15fa..000000000
--- a/data/maps/Route123/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
index f33ab3e98..84bd53a9f 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -1,5 +1,5 @@
Route123:: @ 8305870
- .4byte Route123_MapAttributes
+ .4byte Route123_Layout
.4byte Route123_MapEvents
.4byte Route123_MapScripts
.4byte Route123_MapConnections
diff --git a/data/maps/Route123/map.bin b/data/maps/Route123/map.bin
deleted file mode 100644
index 9b5573cc5..000000000
--- a/data/maps/Route123/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index 11501e733..d170971fa 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -1,5 +1,5 @@
Route123_BerryMastersHouse:: @ 8307ED4
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte Route123_BerryMastersHouse_MapEvents
.4byte Route123_BerryMastersHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route124/border.bin b/data/maps/Route124/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route124/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
index 6e4466225..f1f361661 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -1,5 +1,5 @@
Route124:: @ 830588C
- .4byte Route124_MapAttributes
+ .4byte Route124_Layout
.4byte Route124_MapEvents
.4byte Route124_MapScripts
.4byte Route124_MapConnections
diff --git a/data/maps/Route124/map.bin b/data/maps/Route124/map.bin
deleted file mode 100644
index 212135178..000000000
--- a/data/maps/Route124/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/maps/Route124_DivingTreasureHuntersHouse/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index 472ebc45a..d4a0d938e 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -1,5 +1,5 @@
Route124_DivingTreasureHuntersHouse:: @ 8307F44
- .4byte Route124_DivingTreasureHuntersHouse_MapAttributes
+ .4byte Route124_DivingTreasureHuntersHouse_Layout
.4byte Route124_DivingTreasureHuntersHouse_MapEvents
.4byte Route124_DivingTreasureHuntersHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/maps/Route124_DivingTreasureHuntersHouse/map.bin
deleted file mode 100644
index 8f1f6cbef..000000000
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route125/border.bin b/data/maps/Route125/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route125/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
index e7a43a64d..2e07545dc 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -1,5 +1,5 @@
Route125:: @ 83058A8
- .4byte Route125_MapAttributes
+ .4byte Route125_Layout
.4byte Route125_MapEvents
.4byte Route125_MapScripts
.4byte Route125_MapConnections
diff --git a/data/maps/Route125/map.bin b/data/maps/Route125/map.bin
deleted file mode 100644
index 12dab2a0b..000000000
--- a/data/maps/Route125/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route126/border.bin b/data/maps/Route126/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route126/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
index a973af531..ec593c1cb 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -1,5 +1,5 @@
Route126:: @ 83058C4
- .4byte Route126_MapAttributes
+ .4byte Route126_Layout
.4byte Route126_MapEvents
.4byte Route126_MapScripts
.4byte Route126_MapConnections
diff --git a/data/maps/Route126/map.bin b/data/maps/Route126/map.bin
deleted file mode 100644
index 2d684cf64..000000000
--- a/data/maps/Route126/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route127/border.bin b/data/maps/Route127/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route127/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
index a9f887a2b..484ef4e48 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -1,5 +1,5 @@
Route127:: @ 83058E0
- .4byte Route127_MapAttributes
+ .4byte Route127_Layout
.4byte Route127_MapEvents
.4byte Route127_MapScripts
.4byte Route127_MapConnections
diff --git a/data/maps/Route127/map.bin b/data/maps/Route127/map.bin
deleted file mode 100644
index 3d4690c18..000000000
--- a/data/maps/Route127/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route128/border.bin b/data/maps/Route128/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route128/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
index 9ecc76fb7..7461f5796 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -1,5 +1,5 @@
Route128:: @ 83058FC
- .4byte Route128_MapAttributes
+ .4byte Route128_Layout
.4byte Route128_MapEvents
.4byte Route128_MapScripts
.4byte Route128_MapConnections
diff --git a/data/maps/Route128/map.bin b/data/maps/Route128/map.bin
deleted file mode 100644
index fae8a373e..000000000
--- a/data/maps/Route128/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route129/border.bin b/data/maps/Route129/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route129/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
index 580d69fc7..8cdd83703 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -1,5 +1,5 @@
Route129:: @ 8305918
- .4byte Route129_MapAttributes
+ .4byte Route129_Layout
.4byte Route129_MapEvents
.4byte Route129_MapScripts
.4byte Route129_MapConnections
diff --git a/data/maps/Route129/map.bin b/data/maps/Route129/map.bin
deleted file mode 100644
index 8d09787fd..000000000
--- a/data/maps/Route129/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route130/border.bin b/data/maps/Route130/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route130/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index a788bf9b5..ade5554f1 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,5 +1,5 @@
Route130:: @ 8305934
- .4byte Route130_MapAttributes
+ .4byte Route130_Layout
.4byte Route130_MapEvents
.4byte Route130_MapScripts
.4byte Route130_MapConnections
diff --git a/data/maps/Route130/map.bin b/data/maps/Route130/map.bin
deleted file mode 100644
index b06fa74dc..000000000
--- a/data/maps/Route130/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route131/border.bin b/data/maps/Route131/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route131/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
index e7d9ea231..5dfa4e94c 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -1,5 +1,5 @@
Route131:: @ 8305950
- .4byte Route131_MapAttributes
+ .4byte Route131_Layout
.4byte Route131_MapEvents
.4byte Route131_MapScripts
.4byte Route131_MapConnections
diff --git a/data/maps/Route131/map.bin b/data/maps/Route131/map.bin
deleted file mode 100644
index ca8079e0f..000000000
--- a/data/maps/Route131/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route132/border.bin b/data/maps/Route132/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route132/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
index d7ad0b2a4..5d797099e 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -1,5 +1,5 @@
Route132:: @ 830596C
- .4byte Route132_MapAttributes
+ .4byte Route132_Layout
.4byte Route132_MapEvents
.4byte Route132_MapScripts
.4byte Route132_MapConnections
diff --git a/data/maps/Route132/map.bin b/data/maps/Route132/map.bin
deleted file mode 100644
index f122b2865..000000000
--- a/data/maps/Route132/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route133/border.bin b/data/maps/Route133/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route133/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
index 4c0f718ec..1c0f9f16f 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -1,5 +1,5 @@
Route133:: @ 8305988
- .4byte Route133_MapAttributes
+ .4byte Route133_Layout
.4byte Route133_MapEvents
.4byte Route133_MapScripts
.4byte Route133_MapConnections
diff --git a/data/maps/Route133/map.bin b/data/maps/Route133/map.bin
deleted file mode 100644
index dfb44fe81..000000000
--- a/data/maps/Route133/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Route134/border.bin b/data/maps/Route134/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route134/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
index 2ca22c40e..8280c31aa 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -1,5 +1,5 @@
Route134:: @ 83059A4
- .4byte Route134_MapAttributes
+ .4byte Route134_Layout
.4byte Route134_MapEvents
.4byte Route134_MapScripts
.4byte Route134_MapConnections
diff --git a/data/maps/Route134/map.bin b/data/maps/Route134/map.bin
deleted file mode 100644
index fbb491539..000000000
--- a/data/maps/Route134/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/RustboroCity/border.bin b/data/maps/RustboroCity/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/RustboroCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
index d1352ea3e..3b36e6c68 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -1,5 +1,5 @@
RustboroCity:: @ 830549C
- .4byte RustboroCity_MapAttributes
+ .4byte RustboroCity_Layout
.4byte RustboroCity_MapEvents
.4byte RustboroCity_MapScripts
.4byte RustboroCity_MapConnections
diff --git a/data/maps/RustboroCity/map.bin b/data/maps/RustboroCity/map.bin
deleted file mode 100644
index d8921ec3f..000000000
--- a/data/maps/RustboroCity/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/maps/RustboroCity_CuttersHouse/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_CuttersHouse/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
index c3b5a6d7c..b547804b4 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -1,5 +1,5 @@
RustboroCity_CuttersHouse:: @ 8306360
- .4byte RustboroCity_CuttersHouse_MapAttributes
+ .4byte RustboroCity_CuttersHouse_Layout
.4byte RustboroCity_CuttersHouse_MapEvents
.4byte RustboroCity_CuttersHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/maps/RustboroCity_CuttersHouse/map.bin
deleted file mode 100644
index 5515d00cf..000000000
--- a/data/maps/RustboroCity_CuttersHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/RustboroCity_DevonCorp_1F/border.bin b/data/maps/RustboroCity_DevonCorp_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_DevonCorp_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
index 5539006ff..d5c56227f 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_DevonCorp_1F:: @ 830622C
- .4byte RustboroCity_DevonCorp_1F_MapAttributes
+ .4byte RustboroCity_DevonCorp_1F_Layout
.4byte RustboroCity_DevonCorp_1F_MapEvents
.4byte RustboroCity_DevonCorp_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/maps/RustboroCity_DevonCorp_1F/map.bin
deleted file mode 100644
index 78cc0c199..000000000
--- a/data/maps/RustboroCity_DevonCorp_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-333333333333333333333333333333333333333333333333333333333333333333333333333333333333322333333333333 \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/maps/RustboroCity_DevonCorp_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_DevonCorp_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
index 76bbea60b..930a8e915 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_DevonCorp_2F:: @ 8306248
- .4byte RustboroCity_DevonCorp_2F_MapAttributes
+ .4byte RustboroCity_DevonCorp_2F_Layout
.4byte RustboroCity_DevonCorp_2F_MapEvents
.4byte RustboroCity_DevonCorp_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/maps/RustboroCity_DevonCorp_2F/map.bin
deleted file mode 100644
index 03985c572..000000000
--- a/data/maps/RustboroCity_DevonCorp_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-33333333333333333333333333333333333337773377337733773333377333733333333333333333333333333333333333377337733773333333333333333333333 \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/maps/RustboroCity_DevonCorp_3F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_DevonCorp_3F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc
index c3d4549de..335fbd66c 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_DevonCorp_3F:: @ 8306264
- .4byte RustboroCity_DevonCorp_3F_MapAttributes
+ .4byte RustboroCity_DevonCorp_3F_Layout
.4byte RustboroCity_DevonCorp_3F_MapEvents
.4byte RustboroCity_DevonCorp_3F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/maps/RustboroCity_DevonCorp_3F/map.bin
deleted file mode 100644
index 8333a8bc3..000000000
--- a/data/maps/RustboroCity_DevonCorp_3F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-IJK33333333Q3R3S333333333333333333333333333332333H33333233333P33333333233333333333333333333333333333333333333333333333 \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/maps/RustboroCity_Flat1_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_Flat1_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc
index 68a5697be..1577abe5c 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat1_1F:: @ 830630C
- .4byte RustboroCity_Flat1_1F_MapAttributes
+ .4byte RustboroCity_Flat1_1F_Layout
.4byte RustboroCity_Flat1_1F_MapEvents
.4byte RustboroCity_Flat1_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/maps/RustboroCity_Flat1_1F/map.bin
deleted file mode 100644
index 017298e71..000000000
--- a/data/maps/RustboroCity_Flat1_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/RustboroCity_Flat1_2F/border.bin b/data/maps/RustboroCity_Flat1_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_Flat1_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
index f0b29ae0d..18d9323a4 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat1_2F:: @ 8306328
- .4byte RustboroCity_Flat1_2F_MapAttributes
+ .4byte RustboroCity_Flat1_2F_Layout
.4byte RustboroCity_Flat1_2F_MapEvents
.4byte RustboroCity_Flat1_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/maps/RustboroCity_Flat1_2F/map.bin
deleted file mode 100644
index 17a611343..000000000
--- a/data/maps/RustboroCity_Flat1_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/RustboroCity_Flat2_1F/border.bin b/data/maps/RustboroCity_Flat2_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_Flat2_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc
index 5f54f2624..dbfc104eb 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat2_1F:: @ 8306398
- .4byte RustboroCity_Flat2_1F_MapAttributes
+ .4byte RustboroCity_Flat2_1F_Layout
.4byte RustboroCity_Flat2_1F_MapEvents
.4byte RustboroCity_Flat2_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/maps/RustboroCity_Flat2_1F/map.bin
deleted file mode 100644
index 0f6829f9c..000000000
--- a/data/maps/RustboroCity_Flat2_1F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/maps/RustboroCity_Flat2_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_Flat2_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
index 086947abf..dbdca8d1a 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat2_2F:: @ 83063B4
- .4byte RustboroCity_Flat2_2F_MapAttributes
+ .4byte RustboroCity_Flat2_2F_Layout
.4byte RustboroCity_Flat2_2F_MapEvents
.4byte RustboroCity_Flat2_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/maps/RustboroCity_Flat2_2F/map.bin
deleted file mode 100644
index 9f3750fb4..000000000
--- a/data/maps/RustboroCity_Flat2_2F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/maps/RustboroCity_Flat2_3F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_Flat2_3F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
index 42866ebf2..9bac24e13 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat2_3F:: @ 83063D0
- .4byte RustboroCity_Flat2_3F_MapAttributes
+ .4byte RustboroCity_Flat2_3F_Layout
.4byte RustboroCity_Flat2_3F_MapEvents
.4byte RustboroCity_Flat2_3F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/maps/RustboroCity_Flat2_3F/map.bin
deleted file mode 100644
index 2112fe799..000000000
--- a/data/maps/RustboroCity_Flat2_3F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/maps/RustboroCity_Gym/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/RustboroCity_Gym/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc
index 5d18e933b..58b1d7674 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Gym:: @ 8306280
- .4byte RustboroCity_Gym_MapAttributes
+ .4byte RustboroCity_Gym_Layout
.4byte RustboroCity_Gym_MapEvents
.4byte RustboroCity_Gym_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/maps/RustboroCity_Gym/map.bin
deleted file mode 100644
index bc69d8879..000000000
--- a/data/maps/RustboroCity_Gym/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-         
-%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/maps/RustboroCity_House1/border.bin b/data/maps/RustboroCity_House1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_House1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc
index 9ee09b4e3..ec04f80ac 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -1,5 +1,5 @@
RustboroCity_House1:: @ 8306344
- .4byte RustboroCity_House1_MapAttributes
+ .4byte RustboroCity_House1_Layout
.4byte RustboroCity_House1_MapEvents
.4byte RustboroCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_House1/map.bin b/data/maps/RustboroCity_House1/map.bin
deleted file mode 100644
index a14fc0405..000000000
--- a/data/maps/RustboroCity_House1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/RustboroCity_House2/border.bin b/data/maps/RustboroCity_House2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/RustboroCity_House2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc
index 0122c6a92..cb9052e3c 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -1,5 +1,5 @@
RustboroCity_House2:: @ 830637C
- .4byte RustboroCity_House2_MapAttributes
+ .4byte RustboroCity_House_Layout
.4byte RustboroCity_House2_MapEvents
.4byte RustboroCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_House2/map.bin b/data/maps/RustboroCity_House2/map.bin
deleted file mode 100644
index 5a53bbc77..000000000
--- a/data/maps/RustboroCity_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc
index 8876f8499..c4fdd2d3c 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -1,5 +1,5 @@
RustboroCity_House3:: @ 83063EC
- .4byte RustboroCity_House3_MapAttributes
+ .4byte RustboroCity_House_Layout
.4byte RustboroCity_House3_MapEvents
.4byte RustboroCity_House3_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc
index 535c3e2fc..fe87573b4 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Mart:: @ 83062F0
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte RustboroCity_Mart_MapEvents
.4byte RustboroCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index 57cb84729..5caf1e5fd 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_PokemonCenter_1F:: @ 83062B8
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte RustboroCity_PokemonCenter_1F_MapEvents
.4byte RustboroCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
index 838a5e5a9..c25b9338f 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_PokemonCenter_2F:: @ 83062D4
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte RustboroCity_PokemonCenter_2F_MapEvents
.4byte RustboroCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/maps/RustboroCity_PokemonSchool/border.bin
deleted file mode 100644
index 8f857616b..000000000
--- a/data/maps/RustboroCity_PokemonSchool/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc
index dfb46b6f1..525731410 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -1,5 +1,5 @@
RustboroCity_PokemonSchool:: @ 830629C
- .4byte RustboroCity_PokemonSchool_MapAttributes
+ .4byte RustboroCity_PokemonSchool_Layout
.4byte RustboroCity_PokemonSchool_MapEvents
.4byte RustboroCity_PokemonSchool_MapScripts
.4byte 0x0
diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/maps/RustboroCity_PokemonSchool/map.bin
deleted file mode 100644
index 3f3b183d3..000000000
--- a/data/maps/RustboroCity_PokemonSchool/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/RusturfTunnel/border.bin b/data/maps/RusturfTunnel/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/RusturfTunnel/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
index 3e497a1e5..a25ada853 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -1,5 +1,5 @@
RusturfTunnel:: @ 8306DE0
- .4byte RusturfTunnel_MapAttributes
+ .4byte RusturfTunnel_Layout
.4byte RusturfTunnel_MapEvents
.4byte RusturfTunnel_MapScripts
.4byte 0x0
diff --git a/data/maps/RusturfTunnel/map.bin b/data/maps/RusturfTunnel/map.bin
deleted file mode 100644
index 87ce9bc73..000000000
--- a/data/maps/RusturfTunnel/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/SSTidalCorridor/border.bin b/data/maps/SSTidalCorridor/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SSTidalCorridor/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
index 6370e81ca..716b957f2 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -1,5 +1,5 @@
SSTidalCorridor:: @ 8307B54
- .4byte SSTidalCorridor_MapAttributes
+ .4byte SSTidalCorridor_Layout
.4byte SSTidalCorridor_MapEvents
.4byte SSTidalCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/SSTidalCorridor/map.bin b/data/maps/SSTidalCorridor/map.bin
deleted file mode 100644
index f8cf1725d..000000000
--- a/data/maps/SSTidalCorridor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-2222222222222222 6222222222222222222201111111111222222011111111112222220111111111122222201111111111222222%#$"#$"#$"#&22222-+6{*+6{*+6{*+622222222222222222222 22222222222222222 \ No newline at end of file
diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/maps/SSTidalLowerDeck/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SSTidalLowerDeck/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index 5b6bec321..f41665a91 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,5 +1,5 @@
SSTidalLowerDeck:: @ 8307B70
- .4byte SSTidalLowerDeck_MapAttributes
+ .4byte SSTidalLowerDeck_Layout
.4byte SSTidalLowerDeck_MapEvents
.4byte SSTidalLowerDeck_MapScripts
.4byte 0x0
diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/maps/SSTidalLowerDeck/map.bin
deleted file mode 100644
index 059ce30fe..000000000
--- a/data/maps/SSTidalLowerDeck/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/SSTidalRooms/border.bin b/data/maps/SSTidalRooms/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SSTidalRooms/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc
index 36bcab75e..c307f86c7 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -1,5 +1,5 @@
SSTidalRooms:: @ 8307B8C
- .4byte SSTidalRooms_MapAttributes
+ .4byte SSTidalRooms_Layout
.4byte SSTidalRooms_MapEvents
.4byte SSTidalRooms_MapScripts
.4byte 0x0
diff --git a/data/maps/SSTidalRooms/map.bin b/data/maps/SSTidalRooms/map.bin
deleted file mode 100644
index 6103ad0c2..000000000
--- a/data/maps/SSTidalRooms/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/SafariZone_Northeast/border.bin b/data/maps/SafariZone_Northeast/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/SafariZone_Northeast/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
index 55bef875f..71a878230 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -1,5 +1,5 @@
SafariZone_Northeast:: @ 8307BC4
- .4byte SafariZone_Northeast_MapAttributes
+ .4byte SafariZone_Northeast_Layout
.4byte SafariZone_Northeast_MapEvents
.4byte SafariZone_Northeast_MapScripts
.4byte SafariZone_Northeast_MapConnections
diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/maps/SafariZone_Northeast/map.bin
deleted file mode 100644
index d5e7fd825..000000000
--- a/data/maps/SafariZone_Northeast/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/maps/SafariZone_Northwest/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/SafariZone_Northwest/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
index a3c85c6ed..5a85342cb 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -1,5 +1,5 @@
SafariZone_Northwest:: @ 8307BA8
- .4byte SafariZone_Northwest_MapAttributes
+ .4byte SafariZone_Northwest_Layout
.4byte SafariZone_Northwest_MapEvents
.4byte SafariZone_Northwest_MapScripts
.4byte SafariZone_Northwest_MapConnections
diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/maps/SafariZone_Northwest/map.bin
deleted file mode 100644
index 1825a1c92..000000000
--- a/data/maps/SafariZone_Northwest/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/maps/SafariZone_RestHouse/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SafariZone_RestHouse/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
index 3db84b0b7..fd39571cd 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -1,5 +1,5 @@
SafariZone_RestHouse:: @ 8307CDC
- .4byte SafariZone_RestHouse_MapAttributes
+ .4byte SafariZone_RestHouse_Layout
.4byte SafariZone_RestHouse_MapEvents
.4byte SafariZone_RestHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/maps/SafariZone_RestHouse/map.bin
deleted file mode 100644
index c57c99c7b..000000000
--- a/data/maps/SafariZone_RestHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-        $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/maps/SafariZone_Southeast/border.bin b/data/maps/SafariZone_Southeast/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/SafariZone_Southeast/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
index 1307c9700..e076dd12b 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -1,5 +1,5 @@
SafariZone_Southeast:: @ 8307BFC
- .4byte SafariZone_Southeast_MapAttributes
+ .4byte SafariZone_Southeast_Layout
.4byte SafariZone_Southeast_MapEvents
.4byte SafariZone_Southeast_MapScripts
.4byte SafariZone_Southeast_MapConnections
diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/maps/SafariZone_Southeast/map.bin
deleted file mode 100644
index 540798144..000000000
--- a/data/maps/SafariZone_Southeast/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/maps/SafariZone_Southwest/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/SafariZone_Southwest/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc
index 548dc24b7..b1effab36 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -1,5 +1,5 @@
SafariZone_Southwest:: @ 8307BE0
- .4byte SafariZone_Southwest_MapAttributes
+ .4byte SafariZone_Southwest_Layout
.4byte SafariZone_Southwest_MapEvents
.4byte SafariZone_Southwest_MapScripts
.4byte SafariZone_Southwest_MapConnections
diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/maps/SafariZone_Southwest/map.bin
deleted file mode 100644
index 0074b6e55..000000000
--- a/data/maps/SafariZone_Southwest/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/ScorchedSlab/border.bin b/data/maps/ScorchedSlab/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ScorchedSlab/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index 16e45546e..ef420a191 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,5 +1,5 @@
ScorchedSlab:: @ 830756C
- .4byte ScorchedSlab_MapAttributes
+ .4byte ScorchedSlab_Layout
.4byte ScorchedSlab_MapEvents
.4byte ScorchedSlab_MapScripts
.4byte 0x0
diff --git a/data/maps/ScorchedSlab/map.bin b/data/maps/ScorchedSlab/map.bin
deleted file mode 100644
index edbd982ee..000000000
--- a/data/maps/ScorchedSlab/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-222222222222222222222222222222222ppppppppppppppppppppppppppppppppppppppppppppppppppppGG^^^^GGG          $G \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/maps/SeafloorCavern_Entrance/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
index d768c1099..ebb78622b 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Entrance:: @ 8307064
- .4byte SeafloorCavern_Entrance_MapAttributes
+ .4byte SeafloorCavern_Entrance_Layout
.4byte SeafloorCavern_Entrance_MapEvents
.4byte SeafloorCavern_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/maps/SeafloorCavern_Entrance/map.bin
deleted file mode 100644
index 3861044dd..000000000
--- a/data/maps/SeafloorCavern_Entrance/map.bin
+++ /dev/null
@@ -1,11 +0,0 @@
-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/maps/SeafloorCavern_Room1/border.bin b/data/maps/SeafloorCavern_Room1/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
index affbaf21c..81914c09a 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room1:: @ 8307080
- .4byte SeafloorCavern_Room1_MapAttributes
+ .4byte SeafloorCavern_Room1_Layout
.4byte SeafloorCavern_Room1_MapEvents
.4byte SeafloorCavern_Room1_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/maps/SeafloorCavern_Room1/map.bin
deleted file mode 100644
index 57cd82f78..000000000
--- a/data/maps/SeafloorCavern_Room1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-222322222222222222222222222222222222222622222226222222222222222222222222222222222222226666222222266662222<22266666222662222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/maps/SeafloorCavern_Room2/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
index 6e0e7455d..b1ce34ce8 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room2:: @ 830709C
- .4byte SeafloorCavern_Room2_MapAttributes
+ .4byte SeafloorCavern_Room2_Layout
.4byte SeafloorCavern_Room2_MapEvents
.4byte SeafloorCavern_Room2_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/maps/SeafloorCavern_Room2/map.bin
deleted file mode 100644
index 01b66f2f3..000000000
--- a/data/maps/SeafloorCavern_Room2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-33222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/maps/SeafloorCavern_Room3/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
index e2a432cd9..e152c8819 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room3:: @ 83070B8
- .4byte SeafloorCavern_Room3_MapAttributes
+ .4byte SeafloorCavern_Room3_Layout
.4byte SeafloorCavern_Room3_MapEvents
.4byte SeafloorCavern_Room3_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/maps/SeafloorCavern_Room3/map.bin
deleted file mode 100644
index b5e92ca20..000000000
--- a/data/maps/SeafloorCavern_Room3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-666666663666662226666622266666222666662226662226662226662222222222222222222222222222222222222QQQM2222222222222222226666666 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/maps/SeafloorCavern_Room4/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
index 0416091d4..de65dd9d8 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room4:: @ 83070D4
- .4byte SeafloorCavern_Room4_MapAttributes
+ .4byte SeafloorCavern_Room4_Layout
.4byte SeafloorCavern_Room4_MapEvents
.4byte SeafloorCavern_Room4_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/maps/SeafloorCavern_Room4/map.bin
deleted file mode 100644
index 928749c95..000000000
--- a/data/maps/SeafloorCavern_Room4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-3362222222622222226LQQM22262222222292222222222229222222222222222222666222222222222223222222229222222222229222222LQQQM2222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/maps/SeafloorCavern_Room5/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room5/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index 3272c7021..316f0d3c9 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room5:: @ 83070F0
- .4byte SeafloorCavern_Room5_MapAttributes
+ .4byte SeafloorCavern_Room5_Layout
.4byte SeafloorCavern_Room5_MapEvents
.4byte SeafloorCavern_Room5_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/maps/SeafloorCavern_Room5/map.bin
deleted file mode 100644
index 386430fe4..000000000
--- a/data/maps/SeafloorCavern_Room5/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-32222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/maps/SeafloorCavern_Room6/border.bin
deleted file mode 100644
index a00c39057..000000000
--- a/data/maps/SeafloorCavern_Room6/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-~~~~ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
index 18fab912d..28bbdf424 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room6:: @ 830710C
- .4byte SeafloorCavern_Room6_MapAttributes
+ .4byte SeafloorCavern_Room6_Layout
.4byte SeafloorCavern_Room6_MapEvents
.4byte SeafloorCavern_Room6_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/maps/SeafloorCavern_Room6/map.bin
deleted file mode 100644
index 3776cc4c7..000000000
--- a/data/maps/SeafloorCavern_Room6/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-z2xzzy2y2y2y2xxzzy2y2y2y2pxxzzy2y2y2y2ppppppppppppxxzzy2y2y2y2ppppuvvvwpppxxzzpppu~~~wppxxzzppppppp}ppxxzzppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppppxxzzppppppxxzzpppppppppppppxxzzppppppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppxxzzppppppppppxxzzpppppppppppuvzzpppppuo2o2o2vwpuv~~~~vvvvvz~22~2x~v~~~~~~~~~~~~~~~~~~~~~~~~~ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/maps/SeafloorCavern_Room7/border.bin
deleted file mode 100644
index a00c39057..000000000
--- a/data/maps/SeafloorCavern_Room7/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-~~~~ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index ff7579206..8c79c7ae9 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room7:: @ 8307128
- .4byte SeafloorCavern_Room7_MapAttributes
+ .4byte SeafloorCavern_Room7_Layout
.4byte SeafloorCavern_Room7_MapEvents
.4byte SeafloorCavern_Room7_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/maps/SeafloorCavern_Room7/map.bin
deleted file mode 100644
index c1afaebcf..000000000
--- a/data/maps/SeafloorCavern_Room7/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/SeafloorCavern_Room8/border.bin b/data/maps/SeafloorCavern_Room8/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room8/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
index f443c8530..8650c2849 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room8:: @ 8307144
- .4byte SeafloorCavern_Room8_MapAttributes
+ .4byte SeafloorCavern_Room8_Layout
.4byte SeafloorCavern_Room8_MapEvents
.4byte SeafloorCavern_Room8_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/maps/SeafloorCavern_Room8/map.bin
deleted file mode 100644
index e70e95b47..000000000
--- a/data/maps/SeafloorCavern_Room8/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-632222222222222222222222222222222222LQM22222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/maps/SeafloorCavern_Room9/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/SeafloorCavern_Room9/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
index 10303ec46..f6625c0a0 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room9:: @ 8307160
- .4byte SeafloorCavern_Room9_MapAttributes
+ .4byte SeafloorCavern_Room9_Layout
.4byte SeafloorCavern_Room9_MapEvents
.4byte SeafloorCavern_Room9_MapScripts
.4byte 0x0
diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/maps/SeafloorCavern_Room9/map.bin
deleted file mode 100644
index 252112ac2..000000000
--- a/data/maps/SeafloorCavern_Room9/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/SealedChamber_InnerRoom/border.bin b/data/maps/SealedChamber_InnerRoom/border.bin
deleted file mode 100644
index 9afd13cdc..000000000
--- a/data/maps/SealedChamber_InnerRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
index 6ae714a1f..b80aadc9e 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -1,5 +1,5 @@
SealedChamber_InnerRoom:: @ 8307550
- .4byte SealedChamber_InnerRoom_MapAttributes
+ .4byte SealedChamber_InnerRoom_Layout
.4byte SealedChamber_InnerRoom_MapEvents
.4byte SealedChamber_InnerRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/maps/SealedChamber_InnerRoom/map.bin
deleted file mode 100644
index 823fa5fab..000000000
--- a/data/maps/SealedChamber_InnerRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-222222222222777222222222222222222222222222222222222222722222722222222222222222222222222222222222222222222222222722222222272222222222222222222222222222222222222222222222222722222722222222222222 \ No newline at end of file
diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/maps/SealedChamber_OuterRoom/border.bin
deleted file mode 100644
index 9afd13cdc..000000000
--- a/data/maps/SealedChamber_OuterRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
index fe35a8210..7acb97fe9 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -1,5 +1,5 @@
SealedChamber_OuterRoom:: @ 8307534
- .4byte SealedChamber_OuterRoom_MapAttributes
+ .4byte SealedChamber_OuterRoom_Layout
.4byte SealedChamber_OuterRoom_MapEvents
.4byte SealedChamber_OuterRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/maps/SealedChamber_OuterRoom/map.bin
deleted file mode 100644
index bf1482f97..000000000
--- a/data/maps/SealedChamber_OuterRoom/map.bin
+++ /dev/null
@@ -1,11 +0,0 @@
-`*+,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/maps/SecretBase_BlueCave1/border.bin b/data/maps/SecretBase_BlueCave1/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BlueCave1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
index 24641e4e6..8ed7552b6 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave1:: @ 8307710
- .4byte SecretBase_BlueCave1_MapAttributes
+ .4byte SecretBase_BlueCave1_Layout
.4byte SecretBase_BlueCave1_MapEvents
.4byte SecretBase_BlueCave1_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/maps/SecretBase_BlueCave1/map.bin
deleted file mode 100644
index 371b2a8d5..000000000
--- a/data/maps/SecretBase_BlueCave1/map.bin
+++ /dev/null
@@ -1,50 +0,0 @@
-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/maps/SecretBase_BlueCave2/border.bin b/data/maps/SecretBase_BlueCave2/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BlueCave2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
index 599abd34a..ce44afd3b 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave2:: @ 83077B8
- .4byte SecretBase_BlueCave2_MapAttributes
+ .4byte SecretBase_BlueCave2_Layout
.4byte SecretBase_BlueCave2_MapEvents
.4byte SecretBase_BlueCave2_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/maps/SecretBase_BlueCave2/map.bin
deleted file mode 100644
index 4993e5b65..000000000
--- a/data/maps/SecretBase_BlueCave2/map.bin
+++ /dev/null
@@ -1,57 +0,0 @@
-  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/maps/SecretBase_BlueCave3/border.bin b/data/maps/SecretBase_BlueCave3/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BlueCave3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
index 2adbdb4e5..361d5dff1 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave3:: @ 8307860
- .4byte SecretBase_BlueCave3_MapAttributes
+ .4byte SecretBase_BlueCave3_Layout
.4byte SecretBase_BlueCave3_MapEvents
.4byte SecretBase_BlueCave3_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/maps/SecretBase_BlueCave3/map.bin
deleted file mode 100644
index 968aade07..000000000
--- a/data/maps/SecretBase_BlueCave3/map.bin
+++ /dev/null
@@ -1,51 +0,0 @@
- 
-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/maps/SecretBase_BlueCave4/border.bin b/data/maps/SecretBase_BlueCave4/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BlueCave4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
index 269a276ef..f76cbfce1 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave4:: @ 8307908
- .4byte SecretBase_BlueCave4_MapAttributes
+ .4byte SecretBase_BlueCave4_Layout
.4byte SecretBase_BlueCave4_MapEvents
.4byte SecretBase_BlueCave4_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/maps/SecretBase_BlueCave4/map.bin
deleted file mode 100644
index 631ac0f81..000000000
--- a/data/maps/SecretBase_BlueCave4/map.bin
+++ /dev/null
@@ -1,57 +0,0 @@
- 
-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/maps/SecretBase_BrownCave1/border.bin b/data/maps/SecretBase_BrownCave1/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BrownCave1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
index b54737d93..0001efcea 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave1:: @ 83076F4
- .4byte SecretBase_BrownCave1_MapAttributes
+ .4byte SecretBase_BrownCave1_Layout
.4byte SecretBase_BrownCave1_MapEvents
.4byte SecretBase_BrownCave1_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/maps/SecretBase_BrownCave1/map.bin
deleted file mode 100644
index 56d3436ca..000000000
--- a/data/maps/SecretBase_BrownCave1/map.bin
+++ /dev/null
@@ -1,54 +0,0 @@
-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/maps/SecretBase_BrownCave2/border.bin b/data/maps/SecretBase_BrownCave2/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BrownCave2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
index e84bfd2eb..ebe1e2ac6 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave2:: @ 830779C
- .4byte SecretBase_BrownCave2_MapAttributes
+ .4byte SecretBase_BrownCave2_Layout
.4byte SecretBase_BrownCave2_MapEvents
.4byte SecretBase_BrownCave2_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/maps/SecretBase_BrownCave2/map.bin
deleted file mode 100644
index 184896975..000000000
--- a/data/maps/SecretBase_BrownCave2/map.bin
+++ /dev/null
@@ -1,56 +0,0 @@
- 
-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/maps/SecretBase_BrownCave3/border.bin b/data/maps/SecretBase_BrownCave3/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BrownCave3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
index 9e0dc78e0..161c19360 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave3:: @ 8307844
- .4byte SecretBase_BrownCave3_MapAttributes
+ .4byte SecretBase_BrownCave3_Layout
.4byte SecretBase_BrownCave3_MapEvents
.4byte SecretBase_BrownCave3_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/maps/SecretBase_BrownCave3/map.bin
deleted file mode 100644
index d9967522a..000000000
--- a/data/maps/SecretBase_BrownCave3/map.bin
+++ /dev/null
@@ -1,69 +0,0 @@
- 
-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/maps/SecretBase_BrownCave4/border.bin b/data/maps/SecretBase_BrownCave4/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_BrownCave4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
index d21c844da..9a3fc9269 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave4:: @ 83078EC
- .4byte SecretBase_BrownCave4_MapAttributes
+ .4byte SecretBase_BrownCave4_Layout
.4byte SecretBase_BrownCave4_MapEvents
.4byte SecretBase_BrownCave4_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/maps/SecretBase_BrownCave4/map.bin
deleted file mode 100644
index 8b5a763c4..000000000
--- a/data/maps/SecretBase_BrownCave4/map.bin
+++ /dev/null
@@ -1,70 +0,0 @@
-  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/maps/SecretBase_RedCave1/border.bin b/data/maps/SecretBase_RedCave1/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_RedCave1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
index 60df36c7e..3a470fa40 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave1:: @ 83076D8
- .4byte SecretBase_RedCave1_MapAttributes
+ .4byte SecretBase_RedCave1_Layout
.4byte SecretBase_RedCave1_MapEvents
.4byte SecretBase_RedCave1_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/maps/SecretBase_RedCave1/map.bin
deleted file mode 100644
index ce666b57d..000000000
--- a/data/maps/SecretBase_RedCave1/map.bin
+++ /dev/null
@@ -1,51 +0,0 @@
-
-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/maps/SecretBase_RedCave2/border.bin b/data/maps/SecretBase_RedCave2/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_RedCave2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
index 5325c424e..fa4f38a53 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave2:: @ 8307780
- .4byte SecretBase_RedCave2_MapAttributes
+ .4byte SecretBase_RedCave2_Layout
.4byte SecretBase_RedCave2_MapEvents
.4byte SecretBase_RedCave2_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/maps/SecretBase_RedCave2/map.bin
deleted file mode 100644
index 4fa03acfe..000000000
--- a/data/maps/SecretBase_RedCave2/map.bin
+++ /dev/null
@@ -1,42 +0,0 @@
- 
-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/maps/SecretBase_RedCave3/border.bin b/data/maps/SecretBase_RedCave3/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_RedCave3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
index a86997805..be46df6b6 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave3:: @ 8307828
- .4byte SecretBase_RedCave3_MapAttributes
+ .4byte SecretBase_RedCave3_Layout
.4byte SecretBase_RedCave3_MapEvents
.4byte SecretBase_RedCave3_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/maps/SecretBase_RedCave3/map.bin
deleted file mode 100644
index 0528e565d..000000000
--- a/data/maps/SecretBase_RedCave3/map.bin
+++ /dev/null
@@ -1,47 +0,0 @@
- 
-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/maps/SecretBase_RedCave4/border.bin b/data/maps/SecretBase_RedCave4/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_RedCave4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index 40e830726..8e1d2e2c4 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave4:: @ 83078D0
- .4byte SecretBase_RedCave4_MapAttributes
+ .4byte SecretBase_RedCave4_Layout
.4byte SecretBase_RedCave4_MapEvents
.4byte SecretBase_RedCave4_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/maps/SecretBase_RedCave4/map.bin
deleted file mode 100644
index 526763290..000000000
--- a/data/maps/SecretBase_RedCave4/map.bin
+++ /dev/null
@@ -1,56 +0,0 @@
- 
-2
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2
-2 "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/maps/SecretBase_Shrub1/border.bin b/data/maps/SecretBase_Shrub1/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Shrub1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 3b634c729..ca0f3861c 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub1:: @ 8307764
- .4byte SecretBase_Shrub1_MapAttributes
+ .4byte SecretBase_Shrub1_Layout
.4byte SecretBase_Shrub1_MapEvents
.4byte SecretBase_Shrub1_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/maps/SecretBase_Shrub1/map.bin
deleted file mode 100644
index 4b566cc1b..000000000
--- a/data/maps/SecretBase_Shrub1/map.bin
+++ /dev/null
@@ -1,53 +0,0 @@
- 
-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/maps/SecretBase_Shrub2/border.bin b/data/maps/SecretBase_Shrub2/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Shrub2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index 1c27f8945..89f1b2ed0 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub2:: @ 830780C
- .4byte SecretBase_Shrub2_MapAttributes
+ .4byte SecretBase_Shrub2_Layout
.4byte SecretBase_Shrub2_MapEvents
.4byte SecretBase_Shrub2_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/maps/SecretBase_Shrub2/map.bin
deleted file mode 100644
index 8cb88cc44..000000000
--- a/data/maps/SecretBase_Shrub2/map.bin
+++ /dev/null
@@ -1,57 +0,0 @@
-  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/maps/SecretBase_Shrub3/border.bin b/data/maps/SecretBase_Shrub3/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Shrub3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
index e6e85c9ed..5bc0e51d6 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub3:: @ 83078B4
- .4byte SecretBase_Shrub3_MapAttributes
+ .4byte SecretBase_Shrub3_Layout
.4byte SecretBase_Shrub3_MapEvents
.4byte SecretBase_Shrub3_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/maps/SecretBase_Shrub3/map.bin
deleted file mode 100644
index d51aeea21..000000000
--- a/data/maps/SecretBase_Shrub3/map.bin
+++ /dev/null
@@ -1,65 +0,0 @@
- 
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2 
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2 
-2 
-2 
-2  
-2
-2
-2
-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/maps/SecretBase_Shrub4/border.bin b/data/maps/SecretBase_Shrub4/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Shrub4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 1e610463f..e6cbf1428 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub4:: @ 830795C
- .4byte SecretBase_Shrub4_MapAttributes
+ .4byte SecretBase_Shrub4_Layout
.4byte SecretBase_Shrub4_MapEvents
.4byte SecretBase_Shrub4_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/maps/SecretBase_Shrub4/map.bin
deleted file mode 100644
index 8a4cf836d..000000000
--- a/data/maps/SecretBase_Shrub4/map.bin
+++ /dev/null
@@ -1,69 +0,0 @@
- 
-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/maps/SecretBase_Tree1/border.bin b/data/maps/SecretBase_Tree1/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Tree1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
index 64722268c..f887c00e7 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree1:: @ 8307748
- .4byte SecretBase_Tree1_MapAttributes
+ .4byte SecretBase_Tree1_Layout
.4byte SecretBase_Tree1_MapEvents
.4byte SecretBase_Tree1_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/maps/SecretBase_Tree1/map.bin
deleted file mode 100644
index 907f1486a..000000000
--- a/data/maps/SecretBase_Tree1/map.bin
+++ /dev/null
@@ -1,56 +0,0 @@
-
-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/maps/SecretBase_Tree2/border.bin b/data/maps/SecretBase_Tree2/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Tree2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index fefd54e68..c36f1ada0 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree2:: @ 83077F0
- .4byte SecretBase_Tree2_MapAttributes
+ .4byte SecretBase_Tree2_Layout
.4byte SecretBase_Tree2_MapEvents
.4byte SecretBase_Tree2_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/maps/SecretBase_Tree2/map.bin
deleted file mode 100644
index c2e5698b0..000000000
--- a/data/maps/SecretBase_Tree2/map.bin
+++ /dev/null
@@ -1,48 +0,0 @@
- 
-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/maps/SecretBase_Tree3/border.bin b/data/maps/SecretBase_Tree3/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Tree3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
index 09e55e66d..13890aefb 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree3:: @ 8307898
- .4byte SecretBase_Tree3_MapAttributes
+ .4byte SecretBase_Tree3_Layout
.4byte SecretBase_Tree3_MapEvents
.4byte SecretBase_Tree3_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/maps/SecretBase_Tree3/map.bin
deleted file mode 100644
index b6ae04b00..000000000
--- a/data/maps/SecretBase_Tree3/map.bin
+++ /dev/null
@@ -1,63 +0,0 @@
- 
-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/maps/SecretBase_Tree4/border.bin b/data/maps/SecretBase_Tree4/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/SecretBase_Tree4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
index cfb58242e..f91c43add 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree4:: @ 8307940
- .4byte SecretBase_Tree4_MapAttributes
+ .4byte SecretBase_Tree4_Layout
.4byte SecretBase_Tree4_MapEvents
.4byte SecretBase_Tree4_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/maps/SecretBase_Tree4/map.bin
deleted file mode 100644
index b3b381d9e..000000000
--- a/data/maps/SecretBase_Tree4/map.bin
+++ /dev/null
@@ -1,77 +0,0 @@
- 
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2  
-2
-2
-2
-2
-2 
-2
-2 
-2
-2
-2
-2
-2 "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/maps/SecretBase_YellowCave1/border.bin b/data/maps/SecretBase_YellowCave1/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_YellowCave1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
index 42a63256f..f275c84c4 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave1:: @ 830772C
- .4byte SecretBase_YellowCave1_MapAttributes
+ .4byte SecretBase_YellowCave1_Layout
.4byte SecretBase_YellowCave1_MapEvents
.4byte SecretBase_YellowCave1_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/maps/SecretBase_YellowCave1/map.bin
deleted file mode 100644
index 1301e7317..000000000
--- a/data/maps/SecretBase_YellowCave1/map.bin
+++ /dev/null
@@ -1,57 +0,0 @@
- 
-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/maps/SecretBase_YellowCave2/border.bin b/data/maps/SecretBase_YellowCave2/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_YellowCave2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
index d57acde5c..4ea3e3fa5 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave2:: @ 83077D4
- .4byte SecretBase_YellowCave2_MapAttributes
+ .4byte SecretBase_YellowCave2_Layout
.4byte SecretBase_YellowCave2_MapEvents
.4byte SecretBase_YellowCave2_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/maps/SecretBase_YellowCave2/map.bin
deleted file mode 100644
index e18cb47c6..000000000
--- a/data/maps/SecretBase_YellowCave2/map.bin
+++ /dev/null
@@ -1,56 +0,0 @@
- 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/maps/SecretBase_YellowCave3/border.bin b/data/maps/SecretBase_YellowCave3/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_YellowCave3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
index ecb6b7086..a3a6ce97f 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave3:: @ 830787C
- .4byte SecretBase_YellowCave3_MapAttributes
+ .4byte SecretBase_YellowCave3_Layout
.4byte SecretBase_YellowCave3_MapEvents
.4byte SecretBase_YellowCave3_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/maps/SecretBase_YellowCave3/map.bin
deleted file mode 100644
index b7d80a0ab..000000000
--- a/data/maps/SecretBase_YellowCave3/map.bin
+++ /dev/null
@@ -1,63 +0,0 @@
- 
-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/maps/SecretBase_YellowCave4/border.bin b/data/maps/SecretBase_YellowCave4/border.bin
deleted file mode 100644
index 5c0908a6a..000000000
--- a/data/maps/SecretBase_YellowCave4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 97de9362b..721ecefb3 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave4:: @ 8307924
- .4byte SecretBase_YellowCave4_MapAttributes
+ .4byte SecretBase_YellowCave4_Layout
.4byte SecretBase_YellowCave4_MapEvents
.4byte SecretBase_YellowCave4_MapScripts
.4byte 0x0
diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/maps/SecretBase_YellowCave4/map.bin
deleted file mode 100644
index d3c3e0204..000000000
--- a/data/maps/SecretBase_YellowCave4/map.bin
+++ /dev/null
@@ -1,80 +0,0 @@
- 
-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/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/maps/ShoalCave_HighTideEntranceRoom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index e012b1a69..9eacbdc7e 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_HighTideEntranceRoom:: @ 83072E8
- .4byte ShoalCave_HighTideEntranceRoom_MapAttributes
+ .4byte ShoalCave_HighTideEntranceRoom_Layout
.4byte ShoalCave_HighTideEntranceRoom_MapEvents
.4byte ShoalCave_HighTideEntranceRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/maps/ShoalCave_HighTideEntranceRoom/map.bin
deleted file mode 100644
index 0e4b88c8f..000000000
--- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-      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/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/maps/ShoalCave_HighTideInnerRoom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index c3f16869b..ab8156fcd 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_HighTideInnerRoom:: @ 8307304
- .4byte ShoalCave_HighTideInnerRoom_MapAttributes
+ .4byte ShoalCave_HighTideInnerRoom_Layout
.4byte ShoalCave_HighTideInnerRoom_MapEvents
.4byte ShoalCave_HighTideInnerRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/maps/ShoalCave_HighTideInnerRoom/map.bin
deleted file mode 100644
index c540a4008..000000000
--- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/maps/ShoalCave_LowTideEntranceRoom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index db63a0f9d..0a9b5ee49 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideEntranceRoom:: @ 8307278
- .4byte ShoalCave_LowTideEntranceRoom_MapAttributes
+ .4byte ShoalCave_LowTideEntranceRoom_Layout
.4byte ShoalCave_LowTideEntranceRoom_MapEvents
.4byte ShoalCave_LowTideEntranceRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/maps/ShoalCave_LowTideEntranceRoom/map.bin
deleted file mode 100644
index 1cf7c87f2..000000000
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-      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/maps/ShoalCave_LowTideIceRoom/border.bin b/data/maps/ShoalCave_LowTideIceRoom/border.bin
deleted file mode 100644
index 206bd63f8..000000000
--- a/data/maps/ShoalCave_LowTideIceRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index ba36a090d..59374d231 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideIceRoom:: @ 8307684
- .4byte ShoalCave_LowTideIceRoom_MapAttributes
+ .4byte ShoalCave_LowTideIceRoom_Layout
.4byte ShoalCave_LowTideIceRoom_MapEvents
.4byte ShoalCave_LowTideIceRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/maps/ShoalCave_LowTideIceRoom/map.bin
deleted file mode 100644
index 222f1f26c..000000000
--- a/data/maps/ShoalCave_LowTideIceRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-{|{|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/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/maps/ShoalCave_LowTideInnerRoom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ShoalCave_LowTideInnerRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index c038dafcd..785230fc8 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideInnerRoom:: @ 8307294
- .4byte ShoalCave_LowTideInnerRoom_MapAttributes
+ .4byte ShoalCave_LowTideInnerRoom_Layout
.4byte ShoalCave_LowTideInnerRoom_MapEvents
.4byte ShoalCave_LowTideInnerRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/maps/ShoalCave_LowTideInnerRoom/map.bin
deleted file mode 100644
index 87df28cf4..000000000
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/maps/ShoalCave_LowTideLowerRoom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ShoalCave_LowTideLowerRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index 6fe4efb01..8d1375a5d 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideLowerRoom:: @ 83072CC
- .4byte ShoalCave_LowTideLowerRoom_MapAttributes
+ .4byte ShoalCave_LowTideLowerRoom_Layout
.4byte ShoalCave_LowTideLowerRoom_MapEvents
.4byte ShoalCave_LowTideLowerRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/maps/ShoalCave_LowTideLowerRoom/map.bin
deleted file mode 100644
index 04bf2baf3..000000000
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.bin
+++ /dev/null
@@ -1,4 +0,0 @@
-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/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/maps/ShoalCave_LowTideStairsRoom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ShoalCave_LowTideStairsRoom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index d3d904731..f47ce07e0 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideStairsRoom:: @ 83072B0
- .4byte ShoalCave_LowTideStairsRoom_MapAttributes
+ .4byte ShoalCave_LowTideStairsRoom_Layout
.4byte ShoalCave_LowTideStairsRoom_MapEvents
.4byte ShoalCave_LowTideStairsRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/maps/ShoalCave_LowTideStairsRoom/map.bin
deleted file mode 100644
index f2b56644d..000000000
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-             1     22222262 2626222222622222622262222222Z322222222222222266222222222222#                     \ No newline at end of file
diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/maps/SingleBattleColosseum/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SingleBattleColosseum/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
index f62205a55..eee3d307d 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -1,5 +1,5 @@
SingleBattleColosseum:: @ 8307978
- .4byte SingleBattleColosseum_MapAttributes
+ .4byte SingleBattleColosseum_Layout
.4byte SingleBattleColosseum_MapEvents
.4byte SingleBattleColosseum_MapScripts
.4byte 0x0
diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/maps/SingleBattleColosseum/map.bin
deleted file mode 100644
index 1f66ab707..000000000
--- a/data/maps/SingleBattleColosseum/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_22L2M22222M2N2222U2T2U2U2b2c2U2U2V2U222U2`2U2U2d2e2U2U2a2U222U2T2U2U2f2g2U2U2V2U222U2\2]2]2]2]2]2]2^2U22!2!2 \ No newline at end of file
diff --git a/data/maps/SkyPillar_1F/border.bin b/data/maps/SkyPillar_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SkyPillar_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
index 4ccc410da..2afe52190 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_1F:: @ 8307614
- .4byte SkyPillar_1F_MapAttributes
+ .4byte SkyPillar_1F_Layout
.4byte SkyPillar_1F_MapEvents
.4byte SkyPillar_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_1F/map.bin b/data/maps/SkyPillar_1F/map.bin
deleted file mode 100644
index 1eb299c49..000000000
--- a/data/maps/SkyPillar_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-''''''''';<=''/////////CD2E//222222222222222222222222222222222222222289999:2222222@AAAAB222222AAAAAA22222AAAAAA222222AAAAAA222222IMMMMJ2222222222222222222222222222222222"2#222222 \ No newline at end of file
diff --git a/data/maps/SkyPillar_2F/border.bin b/data/maps/SkyPillar_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SkyPillar_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
index 1e3b0393d..307e73e95 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_2F:: @ 8307630
- .4byte SkyPillar_2F_MapAttributes
+ .4byte SkyPillar_2F_Layout
.4byte SkyPillar_2F_MapEvents
.4byte SkyPillar_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_2F/map.bin b/data/maps/SkyPillar_2F/map.bin
deleted file mode 100644
index 8ec9bf213..000000000
--- a/data/maps/SkyPillar_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<='''';<=''//CD2E////CL2E//5252525252525252525252525242424242424242424242424242424242424242424242424242424289999:626262624242@AAAAB6262626242426262AAAAAA42424262626262AAAAAA4242424262626262AAAAAA4242424262624242IMMMMJ626242426242426262424242626262624242426262424242426262626242424262626242424242424242 \ No newline at end of file
diff --git a/data/maps/SkyPillar_3F/border.bin b/data/maps/SkyPillar_3F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SkyPillar_3F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
index bd6d9cb86..f98f5edbc 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_3F:: @ 830764C
- .4byte SkyPillar_3F_MapAttributes
+ .4byte SkyPillar_3F_Layout
.4byte SkyPillar_3F_MapEvents
.4byte SkyPillar_3F_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_3F/map.bin b/data/maps/SkyPillar_3F/map.bin
deleted file mode 100644
index d6c76d48c..000000000
--- a/data/maps/SkyPillar_3F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<=';<=';<='//CL2E/CD2E/CD2E/2222222222222222222222222222222222222289999:2222222@AAAAB222222AAAAAA2222222AAAAAA2222222AAAAAA2222222IMMMMJ222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SkyPillar_4F/border.bin b/data/maps/SkyPillar_4F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SkyPillar_4F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
index 50869e629..c6482dba6 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_4F:: @ 8307668
- .4byte SkyPillar_4F_MapAttributes
+ .4byte SkyPillar_4F_Layout
.4byte SkyPillar_4F_MapEvents
.4byte SkyPillar_4F_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_4F/map.bin b/data/maps/SkyPillar_4F/map.bin
deleted file mode 100644
index 02e82bb4f..000000000
--- a/data/maps/SkyPillar_4F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<=';<=';<='//CD2E/CL2E/CL2E/5252525252525252652525252526262666424242642426242626242626424242426424289999:4262626242424242@AAAAB42626262426262AAAAAA42626424262662AAAAAA424242662662AAAAAA42424242624242IMMMMJ4242424242424262426426242662624242424264262426242624262624242424242624262426426262624242 \ No newline at end of file
diff --git a/data/maps/SkyPillar_5F/border.bin b/data/maps/SkyPillar_5F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SkyPillar_5F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
index 16da8bcf4..ce4aacaef 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_5F:: @ 83076A0
- .4byte SkyPillar_5F_MapAttributes
+ .4byte SkyPillar_5F_Layout
.4byte SkyPillar_5F_MapEvents
.4byte SkyPillar_5F_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_5F/map.bin b/data/maps/SkyPillar_5F/map.bin
deleted file mode 100644
index b8cd541d5..000000000
--- a/data/maps/SkyPillar_5F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<='''';<=''//CL2E////CD2E//22222622262222226222226222222228999999:622622@AAAAAAB622262AAAAAAAA226222AAAAAAAA222222AAAAAAAA22222AAAAAAAA262222AAAAAAAA62222IMMMMMMJ22222222222222622622222222222 \ No newline at end of file
diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/maps/SkyPillar_Entrance/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/SkyPillar_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
index 89d9becd9..c00189089 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -1,5 +1,5 @@
SkyPillar_Entrance:: @ 83075DC
- .4byte SkyPillar_Entrance_MapAttributes
+ .4byte SkyPillar_Entrance_Layout
.4byte SkyPillar_Entrance_MapEvents
.4byte SkyPillar_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/maps/SkyPillar_Entrance/map.bin
deleted file mode 100644
index b215b86ef..000000000
--- a/data/maps/SkyPillar_Entrance/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-222222222222222222226222222222222222222 ##22   #2226   #2222222222222222222222222222######## \ No newline at end of file
diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/maps/SkyPillar_Outside/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/SkyPillar_Outside/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
index 44e9a5991..71c9e9968 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -1,5 +1,5 @@
SkyPillar_Outside:: @ 83075F8
- .4byte SkyPillar_Outside_MapAttributes
+ .4byte SkyPillar_Outside_Layout
.4byte SkyPillar_Outside_MapEvents
.4byte SkyPillar_Outside_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/maps/SkyPillar_Outside/map.bin
deleted file mode 100644
index 4517589d0..000000000
--- a/data/maps/SkyPillar_Outside/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/SkyPillar_Top/border.bin b/data/maps/SkyPillar_Top/border.bin
deleted file mode 100644
index e0241fa60..000000000
--- a/data/maps/SkyPillar_Top/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index 0c241fe27..eb158417d 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -1,5 +1,5 @@
SkyPillar_Top:: @ 83076BC
- .4byte SkyPillar_Top_MapAttributes
+ .4byte SkyPillar_Top_Layout
.4byte SkyPillar_Top_MapEvents
.4byte SkyPillar_Top_MapScripts
.4byte 0x0
diff --git a/data/maps/SkyPillar_Top/map.bin b/data/maps/SkyPillar_Top/map.bin
deleted file mode 100644
index fe6c2ad43..000000000
--- a/data/maps/SkyPillar_Top/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-d2d2d2d2d2d2d2d2d2d2d26d2d2d2d2d26d26d2d2d2d2d2d2d2424242424242427642424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242764242424242424242424242424242424242424242424242424242424242424242427642424242424242424242424242424242424242424242424242424242424242424276424242424242424242424242427642424242424242427642424242424242''''''''''m22n';<='''''''''//////////j22k/CL2E/////////525252525252525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[ \ No newline at end of file
diff --git a/data/maps/SlateportCity/border.bin b/data/maps/SlateportCity/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/SlateportCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
index 6575e0de5..75d71276c 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -1,5 +1,5 @@
SlateportCity:: @ 8305464
- .4byte SlateportCity_MapAttributes
+ .4byte SlateportCity_Layout
.4byte SlateportCity_MapEvents
.4byte SlateportCity_MapScripts
.4byte SlateportCity_MapConnections
diff --git a/data/maps/SlateportCity/map.bin b/data/maps/SlateportCity/map.bin
deleted file mode 100644
index 97046ab59..000000000
--- a/data/maps/SlateportCity/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc
index 64cc06565..5dd0f7be9 100644
--- a/data/maps/SlateportCity_ContestHall/header.inc
+++ b/data/maps/SlateportCity_ContestHall/header.inc
@@ -1,5 +1,5 @@
SlateportCity_ContestHall:: @ 8306034
- .4byte SlateportCity_ContestHall_MapAttributes
+ .4byte ContestHall_Layout
.4byte SlateportCity_ContestHall_MapEvents
.4byte SlateportCity_ContestHall_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc
index 440139e64..e758d8bd8 100644
--- a/data/maps/SlateportCity_ContestLobby/header.inc
+++ b/data/maps/SlateportCity_ContestLobby/header.inc
@@ -1,5 +1,5 @@
SlateportCity_ContestLobby:: @ 8306018
- .4byte SlateportCity_ContestLobby_MapAttributes
+ .4byte ContestLobby_Layout
.4byte SlateportCity_ContestLobby_MapEvents
.4byte SlateportCity_ContestLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/maps/SlateportCity_Harbor/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SlateportCity_Harbor/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc
index d7da07b49..479da8d1f 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -1,5 +1,5 @@
SlateportCity_Harbor:: @ 83060C0
- .4byte SlateportCity_Harbor_MapAttributes
+ .4byte Harbor_Layout
.4byte SlateportCity_Harbor_MapEvents
.4byte SlateportCity_Harbor_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/maps/SlateportCity_Harbor/map.bin
deleted file mode 100644
index c77c1edfb..000000000
--- a/data/maps/SlateportCity_Harbor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-!!!!!!!!!!!!!!!!!!!!!!!!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/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc
index 75a5cdb72..9d0a92cf0 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -1,5 +1,5 @@
SlateportCity_House1:: @ 8306050
- .4byte SlateportCity_House1_MapAttributes
+ .4byte HouseWithBed_Layout
.4byte SlateportCity_House1_MapEvents
.4byte SlateportCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
index a5df54962..34b7c99a5 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,5 +1,5 @@
SlateportCity_House2:: @ 83060DC
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte SlateportCity_House2_MapEvents
.4byte SlateportCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc
index 12f2172be..f591efb9c 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -1,5 +1,5 @@
SlateportCity_Mart:: @ 8306130
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte SlateportCity_Mart_MapEvents
.4byte SlateportCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/maps/SlateportCity_OceanicMuseum_1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
index 7aaa2ff91..02821ae8d 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_OceanicMuseum_1F:: @ 8306088
- .4byte SlateportCity_OceanicMuseum_1F_MapAttributes
+ .4byte SlateportCity_OceanicMuseum_1F_Layout
.4byte SlateportCity_OceanicMuseum_1F_MapEvents
.4byte SlateportCity_OceanicMuseum_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/maps/SlateportCity_OceanicMuseum_1F/map.bin
deleted file mode 100644
index f18b01e49..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-]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/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/maps/SlateportCity_OceanicMuseum_2F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
index 3d9153f56..a8811c29e 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_OceanicMuseum_2F:: @ 83060A4
- .4byte SlateportCity_OceanicMuseum_2F_MapAttributes
+ .4byte SlateportCity_OceanicMuseum_2F_Layout
.4byte SlateportCity_OceanicMuseum_2F_MapEvents
.4byte SlateportCity_OceanicMuseum_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/maps/SlateportCity_OceanicMuseum_2F/map.bin
deleted file mode 100644
index 1fa2cdc18..000000000
--- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ac %       bd%   22M2N2N2O22222-222222222C2289@,C22225C2S2T22S2T22 22C222334C22222K2[\2[\2(C2C22E2F2F2G2K2222222222222K2C22*01,C2222222Q2R2222 22C222334C2222222YZC222(C2C222222K222222222K2222K2 \ No newline at end of file
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
index d668f0efc..90e3b2c09 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_PokemonCenter_1F:: @ 83060F8
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte SlateportCity_PokemonCenter_1F_MapEvents
.4byte SlateportCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
index 36c726d7f..a59bb27c6 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_PokemonCenter_2F:: @ 8306114
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte SlateportCity_PokemonCenter_2F_MapEvents
.4byte SlateportCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/maps/SlateportCity_PokemonFanClub/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SlateportCity_PokemonFanClub/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc
index 1672d21b1..14ff57a26 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -1,5 +1,5 @@
SlateportCity_PokemonFanClub:: @ 830606C
- .4byte SlateportCity_PokemonFanClub_MapAttributes
+ .4byte SlateportCity_PokemonFanClub_Layout
.4byte SlateportCity_PokemonFanClub_MapEvents
.4byte SlateportCity_PokemonFanClub_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/maps/SlateportCity_PokemonFanClub/map.bin
deleted file mode 100644
index 71ae8c7c9..000000000
--- a/data/maps/SlateportCity_PokemonFanClub/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/maps/SlateportCity_SternsShipyard_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
index c3516151e..c5e7058f8 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_SternsShipyard_1F:: @ 8305FE0
- .4byte SlateportCity_SternsShipyard_1F_MapAttributes
+ .4byte SlateportCity_SternsShipyard_1F_Layout
.4byte SlateportCity_SternsShipyard_1F_MapEvents
.4byte SlateportCity_SternsShipyard_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/maps/SlateportCity_SternsShipyard_1F/map.bin
deleted file mode 100644
index 036f5ce26..000000000
--- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin
+++ /dev/null
@@ -1,7 +0,0 @@
-!
-!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/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/maps/SlateportCity_SternsShipyard_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
index 242e061aa..25958807e 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_SternsShipyard_2F:: @ 8305FFC
- .4byte SlateportCity_SternsShipyard_2F_MapAttributes
+ .4byte SlateportCity_SternsShipyard_2F_Layout
.4byte SlateportCity_SternsShipyard_2F_MapEvents
.4byte SlateportCity_SternsShipyard_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/maps/SlateportCity_SternsShipyard_2F/map.bin
deleted file mode 100644
index d10ed2ac2..000000000
--- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-!!!$#! !!$! !!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/maps/SootopolisCity/border.bin b/data/maps/SootopolisCity/border.bin
deleted file mode 100644
index c07869a9f..000000000
--- a/data/maps/SootopolisCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc
index d5cbae0be..32ea11228 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -1,5 +1,5 @@
SootopolisCity:: @ 830550C
- .4byte SootopolisCity_MapAttributes
+ .4byte SootopolisCity_Layout
.4byte SootopolisCity_MapEvents
.4byte SootopolisCity_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity/map.bin b/data/maps/SootopolisCity/map.bin
deleted file mode 100644
index 4269e22a6..000000000
--- a/data/maps/SootopolisCity/map.bin
+++ /dev/null
@@ -1,12 +0,0 @@
-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/maps/SootopolisCity_Gym_1F/border.bin b/data/maps/SootopolisCity_Gym_1F/border.bin
deleted file mode 100644
index 12819766e..000000000
--- a/data/maps/SootopolisCity_Gym_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index 185bdc970..cc84c036b 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_Gym_1F:: @ 830692C
- .4byte SootopolisCity_Gym_1F_MapAttributes
+ .4byte SootopolisCity_Gym_1F_Layout
.4byte SootopolisCity_Gym_1F_MapEvents
.4byte SootopolisCity_Gym_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/maps/SootopolisCity_Gym_1F/map.bin
deleted file mode 100644
index a4a20d477..000000000
--- a/data/maps/SootopolisCity_Gym_1F/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/maps/SootopolisCity_Gym_B1F/border.bin b/data/maps/SootopolisCity_Gym_B1F/border.bin
deleted file mode 100644
index 12819766e..000000000
--- a/data/maps/SootopolisCity_Gym_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 104ee8215..725a2b07e 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_Gym_B1F:: @ 8306948
- .4byte SootopolisCity_Gym_B1F_MapAttributes
+ .4byte SootopolisCity_Gym_B1F_Layout
.4byte SootopolisCity_Gym_B1F_MapEvents
.4byte SootopolisCity_Gym_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/maps/SootopolisCity_Gym_B1F/map.bin
deleted file mode 100644
index eb73a4d2f..000000000
--- a/data/maps/SootopolisCity_Gym_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-%&&&&&&&&&&&&&'-%           '/--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/maps/SootopolisCity_House1/border.bin b/data/maps/SootopolisCity_House1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SootopolisCity_House1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc
index 5ff1eb351..ed43835d4 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House1:: @ 83069B8
- .4byte SootopolisCity_House1_MapAttributes
+ .4byte SootopolisCity_House1_Layout
.4byte SootopolisCity_House1_MapEvents
.4byte SootopolisCity_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/maps/SootopolisCity_House1/map.bin
deleted file mode 100644
index 43f11b194..000000000
--- a/data/maps/SootopolisCity_House1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-023333332332772333327723333333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/maps/SootopolisCity_House2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SootopolisCity_House2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc
index 1ff5a7df1..eb7d36a34 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House2:: @ 83069D4
- .4byte SootopolisCity_House2_MapAttributes
+ .4byte SootopolisCity_House2_Layout
.4byte SootopolisCity_House2_MapEvents
.4byte SootopolisCity_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/maps/SootopolisCity_House2/map.bin
deleted file mode 100644
index 632e1e36a..000000000
--- a/data/maps/SootopolisCity_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-vw62223336333277233333772333333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/maps/SootopolisCity_House3/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/SootopolisCity_House3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc
index 3c6075fe7..7afa0cc43 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House3:: @ 83069F0
- .4byte SootopolisCity_House3_MapAttributes
+ .4byte SootopolisCity_House3_Layout
.4byte SootopolisCity_House3_MapEvents
.4byte SootopolisCity_House3_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/maps/SootopolisCity_House3/map.bin
deleted file mode 100644
index 8bbd6c517..000000000
--- a/data/maps/SootopolisCity_House3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-62233322333333337723333377333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc
index f155d1980..d9d34652f 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House4:: @ 8306A0C
- .4byte SootopolisCity_House4_MapAttributes
+ .4byte SootopolisCity_House1_Layout
.4byte SootopolisCity_House4_MapEvents
.4byte SootopolisCity_House4_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc
index 7cfe101ac..ce3ed3456 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House5:: @ 8306A28
- .4byte SootopolisCity_House5_MapAttributes
+ .4byte SootopolisCity_House2_Layout
.4byte SootopolisCity_House5_MapEvents
.4byte SootopolisCity_House5_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc
index 536872e88..ab1c28f9a 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House6:: @ 8306A44
- .4byte SootopolisCity_House6_MapAttributes
+ .4byte SootopolisCity_House3_Layout
.4byte SootopolisCity_House6_MapEvents
.4byte SootopolisCity_House6_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc
index 598a84316..b025f33ec 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House7:: @ 8306A60
- .4byte SootopolisCity_House7_MapAttributes
+ .4byte SootopolisCity_House1_Layout
.4byte SootopolisCity_House7_MapEvents
.4byte SootopolisCity_House7_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House8/border.bin b/data/maps/SootopolisCity_House8/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SootopolisCity_House8/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc
index 4d6619797..da39efd62 100644
--- a/data/maps/SootopolisCity_House8/header.inc
+++ b/data/maps/SootopolisCity_House8/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House8:: @ 8306A7C
- .4byte SootopolisCity_House8_MapAttributes
+ .4byte SootopolisCity_House8_Layout
.4byte SootopolisCity_House8_MapEvents
.4byte SootopolisCity_House8_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_House8/map.bin b/data/maps/SootopolisCity_House8/map.bin
deleted file mode 100644
index ffeea7269..000000000
--- a/data/maps/SootopolisCity_House8/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-XX``22333366333773333327723333333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc
index 47505e04d..fbf68127f 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_Mart:: @ 830699C
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte SootopolisCity_Mart_MapEvents
.4byte SootopolisCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index d0cef1039..5a6ce3973 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_PokemonCenter_1F:: @ 8306964
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte SootopolisCity_PokemonCenter_1F_MapEvents
.4byte SootopolisCity_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
index 4bdb48a7d..ed64f1f51 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_PokemonCenter_2F:: @ 8306980
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte SootopolisCity_PokemonCenter_2F_MapEvents
.4byte SootopolisCity_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/maps/SouthernIsland_Exterior/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/SouthernIsland_Exterior/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc
index 0579c81bc..6918c9c37 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -1,5 +1,5 @@
SouthernIsland_Exterior:: @ 8307CA4
- .4byte SouthernIsland_Exterior_MapAttributes
+ .4byte SouthernIsland_Exterior_Layout
.4byte SouthernIsland_Exterior_MapEvents
.4byte SouthernIsland_Exterior_MapScripts
.4byte 0x0
diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/maps/SouthernIsland_Exterior/map.bin
deleted file mode 100644
index 8c2c2df4a..000000000
--- a/data/maps/SouthernIsland_Exterior/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/SouthernIsland_Interior/border.bin b/data/maps/SouthernIsland_Interior/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/SouthernIsland_Interior/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
index 42cf6db66..afa589d28 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -1,5 +1,5 @@
SouthernIsland_Interior:: @ 8307CC0
- .4byte SouthernIsland_Interior_MapAttributes
+ .4byte SouthernIsland_Interior_Layout
.4byte SouthernIsland_Interior_MapEvents
.4byte SouthernIsland_Interior_MapScripts
.4byte 0x0
diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/maps/SouthernIsland_Interior/map.bin
deleted file mode 100644
index db1e4b153..000000000
--- a/data/maps/SouthernIsland_Interior/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000011000000000000001111001112211 \ No newline at end of file
diff --git a/data/maps/TradeCenter/border.bin b/data/maps/TradeCenter/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/TradeCenter/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
index 62bac5400..e29e2135d 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -1,5 +1,5 @@
TradeCenter:: @ 8307994
- .4byte TradeCenter_MapAttributes
+ .4byte TradeCenter_Layout
.4byte TradeCenter_MapEvents
.4byte TradeCenter_MapScripts
.4byte 0x0
diff --git a/data/maps/TradeCenter/map.bin b/data/maps/TradeCenter/map.bin
deleted file mode 100644
index 7e592dbe6..000000000
--- a/data/maps/TradeCenter/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/Underwater1/border.bin b/data/maps/Underwater1/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index cfd06e4ce..52555165b 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -1,5 +1,5 @@
Underwater1:: @ 83059C0
- .4byte Underwater1_MapAttributes
+ .4byte Underwater1_Layout
.4byte Underwater1_MapEvents
.4byte Underwater1_MapScripts
.4byte Underwater1_MapConnections
diff --git a/data/maps/Underwater1/map.bin b/data/maps/Underwater1/map.bin
deleted file mode 100644
index 230e3dcd2..000000000
--- a/data/maps/Underwater1/map.bin
+++ /dev/null
@@ -1,17 +0,0 @@
-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/maps/Underwater2/border.bin b/data/maps/Underwater2/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
index 38446fecc..0c19c9066 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -1,5 +1,5 @@
Underwater2:: @ 83059DC
- .4byte Underwater2_MapAttributes
+ .4byte Underwater2_Layout
.4byte Underwater2_MapEvents
.4byte Underwater2_MapScripts
.4byte Underwater2_MapConnections
diff --git a/data/maps/Underwater2/map.bin b/data/maps/Underwater2/map.bin
deleted file mode 100644
index 0c6377c30..000000000
--- a/data/maps/Underwater2/map.bin
+++ /dev/null
@@ -1,35 +0,0 @@
-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/maps/Underwater3/border.bin b/data/maps/Underwater3/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
index 3cc773730..e952239e2 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -1,5 +1,5 @@
Underwater3:: @ 83059F8
- .4byte Underwater3_MapAttributes
+ .4byte Underwater3_Layout
.4byte Underwater3_MapEvents
.4byte Underwater3_MapScripts
.4byte Underwater3_MapConnections
diff --git a/data/maps/Underwater3/map.bin b/data/maps/Underwater3/map.bin
deleted file mode 100644
index 1f7addb2d..000000000
--- a/data/maps/Underwater3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Underwater4/border.bin b/data/maps/Underwater4/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
index 8fb1e6faa..fb040d771 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -1,5 +1,5 @@
Underwater4:: @ 8305A14
- .4byte Underwater4_MapAttributes
+ .4byte Underwater4_Layout
.4byte Underwater4_MapEvents
.4byte Underwater4_MapScripts
.4byte Underwater4_MapConnections
diff --git a/data/maps/Underwater4/map.bin b/data/maps/Underwater4/map.bin
deleted file mode 100644
index 23f987681..000000000
--- a/data/maps/Underwater4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/Underwater_Route134/border.bin b/data/maps/Underwater_Route134/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater_Route134/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
index fbc90290c..f27cb2fa7 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -1,5 +1,5 @@
Underwater_Route134:: @ 83074FC
- .4byte Underwater_Route134_MapAttributes
+ .4byte Underwater_Route134_Layout
.4byte Underwater_Route134_MapEvents
.4byte Underwater_Route134_MapScripts
.4byte 0x0
diff --git a/data/maps/Underwater_Route134/map.bin b/data/maps/Underwater_Route134/map.bin
deleted file mode 100644
index 77bdd37aa..000000000
--- a/data/maps/Underwater_Route134/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-(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/maps/Underwater_SeafloorCavern/border.bin b/data/maps/Underwater_SeafloorCavern/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater_SeafloorCavern/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
index 09f36c16f..13c740fed 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -1,5 +1,5 @@
Underwater_SeafloorCavern:: @ 8307048
- .4byte Underwater_SeafloorCavern_MapAttributes
+ .4byte Underwater_SeafloorCavern_Layout
.4byte Underwater_SeafloorCavern_MapEvents
.4byte Underwater_SeafloorCavern_MapScripts
.4byte 0x0
diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/maps/Underwater_SeafloorCavern/map.bin
deleted file mode 100644
index 4cacc495e..000000000
--- a/data/maps/Underwater_SeafloorCavern/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-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/maps/Underwater_SealedChamber/border.bin b/data/maps/Underwater_SealedChamber/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater_SealedChamber/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
index 86ff3384d..0eec2d22e 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -1,5 +1,5 @@
Underwater_SealedChamber:: @ 8307518
- .4byte Underwater_SealedChamber_MapAttributes
+ .4byte Underwater_SealedChamber_Layout
.4byte Underwater_SealedChamber_MapEvents
.4byte Underwater_SealedChamber_MapScripts
.4byte 0x0
diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/maps/Underwater_SealedChamber/map.bin
deleted file mode 100644
index 5ac0b4a73..000000000
--- a/data/maps/Underwater_SealedChamber/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-efgmno22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  2222222#222222222222222222222  222222222222#2222222  222222222222#2222222  222222222222222222222222#222222  22222222222222222222222222222222222222222222     2222222222222222222222222222222p2222222222C2C2C2222222222222S2S2S2222222# 22222S2S2S22222 "#            " \ No newline at end of file
diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/maps/Underwater_SootopolisCity/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater_SootopolisCity/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
index 8aa8bb316..3a672844f 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -1,5 +1,5 @@
Underwater_SootopolisCity:: @ 8306DFC
- .4byte Underwater_SootopolisCity_MapAttributes
+ .4byte Underwater_SootopolisCity_Layout
.4byte Underwater_SootopolisCity_MapEvents
.4byte Underwater_SootopolisCity_MapScripts
.4byte 0x0
diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/maps/Underwater_SootopolisCity/map.bin
deleted file mode 100644
index 71346ab72..000000000
--- a/data/maps/Underwater_SootopolisCity/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2### # (2(2(2$(2(2(2(2(2
-""""#  +,-    " \ No newline at end of file
diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/maps/UnknownMap_082CF564/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_082CF564/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/maps/UnknownMap_082CF564/map.bin
deleted file mode 100644
index ca93fa0e2..000000000
--- a/data/maps/UnknownMap_082CF564/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/maps/UnknownMap_082D05D8/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_082D05D8/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/maps/UnknownMap_082D05D8/map.bin
deleted file mode 100644
index 37f05b971..000000000
--- a/data/maps/UnknownMap_082D05D8/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/maps/UnknownMap_082D05FC/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_082D05FC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/maps/UnknownMap_082D05FC/map.bin
deleted file mode 100644
index ca93fa0e2..000000000
--- a/data/maps/UnknownMap_082D05FC/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/maps/UnknownMap_082E55C8/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E55C8/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/maps/UnknownMap_082E55C8/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E55C8/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/maps/UnknownMap_082E55EC/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E55EC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/maps/UnknownMap_082E55EC/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E55EC/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/maps/UnknownMap_082E5610/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E5610/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/maps/UnknownMap_082E5610/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E5610/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/maps/UnknownMap_082E5634/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E5634/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/maps/UnknownMap_082E5634/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E5634/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/maps/UnknownMap_082E5658/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E5658/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/maps/UnknownMap_082E5658/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E5658/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/maps/UnknownMap_082E567C/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E567C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/maps/UnknownMap_082E567C/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E567C/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/maps/UnknownMap_082E56A0/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E56A0/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/maps/UnknownMap_082E56A0/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E56A0/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/maps/UnknownMap_082E56C4/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E56C4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/maps/UnknownMap_082E56C4/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E56C4/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/maps/UnknownMap_082E56E8/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E56E8/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/maps/UnknownMap_082E56E8/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E56E8/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/maps/UnknownMap_082E570C/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E570C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/maps/UnknownMap_082E570C/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E570C/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/maps/UnknownMap_082E5730/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E5730/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/maps/UnknownMap_082E5730/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E5730/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/maps/UnknownMap_082E5754/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E5754/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/maps/UnknownMap_082E5754/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E5754/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/maps/UnknownMap_082E5778/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E5778/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/maps/UnknownMap_082E5778/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E5778/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/maps/UnknownMap_082E579C/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_082E579C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/maps/UnknownMap_082E579C/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_082E579C/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/maps/UnknownMap_082EDF30/border.bin
deleted file mode 100644
index 9e4b3fb7a..000000000
--- a/data/maps/UnknownMap_082EDF30/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/maps/UnknownMap_082EDF30/map.bin
deleted file mode 100644
index 028da0526..000000000
--- a/data/maps/UnknownMap_082EDF30/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-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/maps/UnknownMap_082FF894/border.bin b/data/maps/UnknownMap_082FF894/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/UnknownMap_082FF894/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/maps/UnknownMap_082FF894/map.bin
deleted file mode 100644
index fd294d9b6..000000000
--- a/data/maps/UnknownMap_082FF894/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/maps/UnknownMap_08302970/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/UnknownMap_08302970/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/maps/UnknownMap_08302970/map.bin
deleted file mode 100644
index dd82c58d3..000000000
--- a/data/maps/UnknownMap_08302970/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/UnknownMap_083041B4/border.bin b/data/maps/UnknownMap_083041B4/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/UnknownMap_083041B4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/maps/UnknownMap_083041B4/map.bin
deleted file mode 100644
index ec344933f..000000000
--- a/data/maps/UnknownMap_083041B4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/UnknownMap_25_29/border.bin b/data/maps/UnknownMap_25_29/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_25_29/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index 93d3ab03f..dafb7d083 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_29:: @ 8307A04
- .4byte UnknownMap_25_29_MapAttributes
+ .4byte UnknownMap_25_29_Layout
.4byte UnknownMap_25_29_MapEvents
.4byte UnknownMap_25_29_MapScripts
.4byte 0x0
diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/maps/UnknownMap_25_29/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/maps/UnknownMap_25_29/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/maps/UnknownMap_25_30/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_25_30/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
index 96f2e3de2..005b7b40e 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_30:: @ 8307A20
- .4byte UnknownMap_25_30_MapAttributes
+ .4byte UnknownMap_25_30_Layout
.4byte UnknownMap_25_30_MapEvents
.4byte UnknownMap_25_30_MapScripts
.4byte 0x0
diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/maps/UnknownMap_25_30/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/maps/UnknownMap_25_30/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/maps/UnknownMap_25_31/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_25_31/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
index 135e1c4b1..5dae310ff 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_31:: @ 8307A3C
- .4byte UnknownMap_25_31_MapAttributes
+ .4byte UnknownMap_25_31_Layout
.4byte UnknownMap_25_31_MapEvents
.4byte UnknownMap_25_31_MapScripts
.4byte 0x0
diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/maps/UnknownMap_25_31/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/maps/UnknownMap_25_31/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/maps/UnknownMap_25_32/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_25_32/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
index 4aaae9710..2dbc00c06 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_32:: @ 8307A58
- .4byte UnknownMap_25_32_MapAttributes
+ .4byte UnknownMap_25_32_Layout
.4byte UnknownMap_25_32_MapEvents
.4byte UnknownMap_25_32_MapScripts
.4byte 0x0
diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/maps/UnknownMap_25_32/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/maps/UnknownMap_25_32/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/maps/UnknownMap_25_33/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_25_33/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
index e0bebe753..dc57d796b 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_33:: @ 8307A74
- .4byte UnknownMap_25_33_MapAttributes
+ .4byte UnknownMap_25_33_Layout
.4byte UnknownMap_25_33_MapEvents
.4byte UnknownMap_25_33_MapScripts
.4byte 0x0
diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/maps/UnknownMap_25_33/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/maps/UnknownMap_25_33/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/maps/UnknownMap_25_34/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_25_34/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
index b2c174c06..ccb77b687 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_34:: @ 8307A90
- .4byte UnknownMap_25_34_MapAttributes
+ .4byte UnknownMap_25_34_Layout
.4byte UnknownMap_25_34_MapEvents
.4byte UnknownMap_25_34_MapScripts
.4byte 0x0
diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/maps/UnknownMap_25_34/map.bin
deleted file mode 100644
index 5fc1e81ec..000000000
--- a/data/maps/UnknownMap_25_34/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  \ No newline at end of file
diff --git a/data/maps/UnreferencedMap/border.bin b/data/maps/UnreferencedMap/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/UnreferencedMap/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/UnreferencedMap/map.bin b/data/maps/UnreferencedMap/map.bin
deleted file mode 100644
index 17a14a8d5..000000000
--- a/data/maps/UnreferencedMap/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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/maps/VerdanturfTown/border.bin b/data/maps/VerdanturfTown/border.bin
deleted file mode 100644
index 864ac15fa..000000000
--- a/data/maps/VerdanturfTown/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
index ee41c767f..5d78f42e1 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown:: @ 83055D0
- .4byte VerdanturfTown_MapAttributes
+ .4byte VerdanturfTown_Layout
.4byte VerdanturfTown_MapEvents
.4byte VerdanturfTown_MapScripts
.4byte VerdanturfTown_MapConnections
diff --git a/data/maps/VerdanturfTown/map.bin b/data/maps/VerdanturfTown/map.bin
deleted file mode 100644
index 0dbece956..000000000
--- a/data/maps/VerdanturfTown/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc
index 1c0179afb..7f6b1d434 100644
--- a/data/maps/VerdanturfTown_ContestHall/header.inc
+++ b/data/maps/VerdanturfTown_ContestHall/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_ContestHall:: @ 8305D94
- .4byte VerdanturfTown_ContestHall_MapAttributes
+ .4byte ContestHall_Layout
.4byte VerdanturfTown_ContestHall_MapEvents
.4byte VerdanturfTown_ContestHall_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc
index 31274e19f..c2f763927 100644
--- a/data/maps/VerdanturfTown_ContestLobby/header.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_ContestLobby:: @ 8305D78
- .4byte VerdanturfTown_ContestLobby_MapAttributes
+ .4byte ContestLobby_Layout
.4byte VerdanturfTown_ContestLobby_MapEvents
.4byte VerdanturfTown_ContestLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index 7b0ab4ad0..117166d92 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_FriendshipRatersHouse:: @ 8305E20
- .4byte House12_MapAttributes
+ .4byte House2_Layout
.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc
index 0e29f4ea6..0bf8c3e2e 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_House:: @ 8305E3C
- .4byte House11_MapAttributes
+ .4byte House1_Layout
.4byte VerdanturfTown_House_MapEvents
.4byte VerdanturfTown_House_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc
index db037960c..f2950cc8d 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_Mart:: @ 8305DB0
- .4byte PokeMart_MapAttributes
+ .4byte PokeMart_Layout
.4byte VerdanturfTown_Mart_MapEvents
.4byte VerdanturfTown_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
index 384c8719e..4e4e67840 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_PokemonCenter_1F:: @ 8305DCC
- .4byte PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte VerdanturfTown_PokemonCenter_1F_MapEvents
.4byte VerdanturfTown_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
index 518c11352..3122a827f 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_PokemonCenter_2F:: @ 8305DE8
- .4byte PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte VerdanturfTown_PokemonCenter_2F_MapEvents
.4byte VerdanturfTown_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/maps/VerdanturfTown_WandasHouse/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/VerdanturfTown_WandasHouse/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc
index bc31f5457..993693239 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_WandasHouse:: @ 8305E04
- .4byte VerdanturfTown_WandasHouse_MapAttributes
+ .4byte VerdanturfTown_WandasHouse_Layout
.4byte VerdanturfTown_WandasHouse_MapEvents
.4byte VerdanturfTown_WandasHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/maps/VerdanturfTown_WandasHouse/map.bin
deleted file mode 100644
index 95d14d3c4..000000000
--- a/data/maps/VerdanturfTown_WandasHouse/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/maps/VictoryRoad_1F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/VictoryRoad_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc
index 21937891e..78b6e3939 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -1,5 +1,5 @@
VictoryRoad_1F:: @ 8307224
- .4byte VictoryRoad_1F_MapAttributes
+ .4byte VictoryRoad_1F_Layout
.4byte VictoryRoad_1F_MapEvents
.4byte VictoryRoad_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/maps/VictoryRoad_1F/map.bin
deleted file mode 100644
index a78316ef9..000000000
--- a/data/maps/VictoryRoad_1F/map.bin
+++ /dev/null
@@ -1,10 +0,0 @@
-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/maps/VictoryRoad_B1F/border.bin b/data/maps/VictoryRoad_B1F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/VictoryRoad_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc
index ebaa67358..ac2b2eeff 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -1,5 +1,5 @@
VictoryRoad_B1F:: @ 8307240
- .4byte VictoryRoad_B1F_MapAttributes
+ .4byte VictoryRoad_B1F_Layout
.4byte VictoryRoad_B1F_MapEvents
.4byte VictoryRoad_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/maps/VictoryRoad_B1F/map.bin
deleted file mode 100644
index 706c96974..000000000
--- a/data/maps/VictoryRoad_B1F/map.bin
+++ /dev/null
@@ -1,25 +0,0 @@
-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/maps/VictoryRoad_B2F/border.bin b/data/maps/VictoryRoad_B2F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/VictoryRoad_B2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc
index 4690acbb7..f38f649a9 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -1,5 +1,5 @@
VictoryRoad_B2F:: @ 830725C
- .4byte VictoryRoad_B2F_MapAttributes
+ .4byte VictoryRoad_B2F_Layout
.4byte VictoryRoad_B2F_MapEvents
.4byte VictoryRoad_B2F_MapScripts
.4byte 0x0
diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/maps/VictoryRoad_B2F/map.bin
deleted file mode 100644
index 682c31764..000000000
--- a/data/maps/VictoryRoad_B2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-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
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
index af4092f99..aec54aaab 100644
--- a/data/maps/_assets.inc
+++ b/data/maps/_assets.inc
@@ -1,5006 +1,332 @@
-PetalburgCity_MapBorder:: @ 8287264
- .incbin "data/maps/PetalburgCity/border.bin"
-
-PetalburgCity_MapBlockdata:: @ 828726C
- .incbin "data/maps/PetalburgCity/map.bin"
-
- .align 2
-PetalburgCity_MapAttributes:: @ 8287974
- .4byte 0x1e
- .4byte 0x1e
- .4byte PetalburgCity_MapBorder
- .4byte PetalburgCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
-SlateportCity_MapBorder:: @ 828798C
- .incbin "data/maps/SlateportCity/border.bin"
-
-SlateportCity_MapBlockdata:: @ 8287994
- .incbin "data/maps/SlateportCity/map.bin"
-
- .align 2
-SlateportCity_MapAttributes:: @ 8288C54
- .4byte 0x28
- .4byte 0x3c
- .4byte SlateportCity_MapBorder
- .4byte SlateportCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Slateport
-
-MauvilleCity_MapBorder:: @ 8288C6C
- .incbin "data/maps/MauvilleCity/border.bin"
-
-MauvilleCity_MapBlockdata:: @ 8288C74
- .incbin "data/maps/MauvilleCity/map.bin"
-
- .align 2
-MauvilleCity_MapAttributes:: @ 82892B4
- .4byte 0x28
- .4byte 0x14
- .4byte MauvilleCity_MapBorder
- .4byte MauvilleCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
-RustboroCity_MapBorder:: @ 82892CC
- .incbin "data/maps/RustboroCity/border.bin"
-
-RustboroCity_MapBlockdata:: @ 82892D4
- .incbin "data/maps/RustboroCity/map.bin"
-
- .align 2
-RustboroCity_MapAttributes:: @ 828A594
- .4byte 0x28
- .4byte 0x3c
- .4byte RustboroCity_MapBorder
- .4byte RustboroCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
-FortreeCity_MapBorder:: @ 828A5AC
- .incbin "data/maps/FortreeCity/border.bin"
-
-FortreeCity_MapBlockdata:: @ 828A5B4
- .incbin "data/maps/FortreeCity/map.bin"
-
- .align 2
-FortreeCity_MapAttributes:: @ 828ABF4
- .4byte 0x28
- .4byte 0x14
- .4byte FortreeCity_MapBorder
- .4byte FortreeCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fortree
-
-LilycoveCity_MapBorder:: @ 828AC0C
- .incbin "data/maps/LilycoveCity/border.bin"
-
-LilycoveCity_MapBlockdata:: @ 828AC14
- .incbin "data/maps/LilycoveCity/map.bin"
-
- .align 2
-LilycoveCity_MapAttributes:: @ 828C514
- .4byte 0x50
- .4byte 0x28
- .4byte LilycoveCity_MapBorder
- .4byte LilycoveCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-MossdeepCity_MapBorder:: @ 828C52C
- .incbin "data/maps/MossdeepCity/border.bin"
-
-MossdeepCity_MapBlockdata:: @ 828C534
- .incbin "data/maps/MossdeepCity/map.bin"
-
- .align 2
-MossdeepCity_MapAttributes:: @ 828DE34
- .4byte 0x50
- .4byte 0x28
- .4byte MossdeepCity_MapBorder
- .4byte MossdeepCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
-SootopolisCity_MapBorder:: @ 828DE4C
- .incbin "data/maps/SootopolisCity/border.bin"
-
-SootopolisCity_MapBlockdata:: @ 828DE54
- .incbin "data/maps/SootopolisCity/map.bin"
-
- .align 2
-SootopolisCity_MapAttributes:: @ 828FA74
- .4byte 0x3c
- .4byte 0x3c
- .4byte SootopolisCity_MapBorder
- .4byte SootopolisCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Sootopolis
-
-EverGrandeCity_MapBorder:: @ 828FA8C
- .incbin "data/maps/EverGrandeCity/border.bin"
-
-EverGrandeCity_MapBlockdata:: @ 828FA94
- .incbin "data/maps/EverGrandeCity/map.bin"
-
- .align 2
-EverGrandeCity_MapAttributes:: @ 8291394
- .4byte 0x28
- .4byte 0x50
- .4byte EverGrandeCity_MapBorder
- .4byte EverGrandeCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_EverGrande
-
-LittlerootTown_MapBorder:: @ 82913AC
- .incbin "data/maps/LittlerootTown/border.bin"
-
-LittlerootTown_MapBlockdata:: @ 82913B4
- .incbin "data/maps/LittlerootTown/map.bin"
-
- .align 2
-LittlerootTown_MapAttributes:: @ 82916D4
- .4byte 0x14
- .4byte 0x14
- .4byte LittlerootTown_MapBorder
- .4byte LittlerootTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
-OldaleTown_MapBorder:: @ 82916EC
- .incbin "data/maps/OldaleTown/border.bin"
-
-OldaleTown_MapBlockdata:: @ 82916F4
- .incbin "data/maps/OldaleTown/map.bin"
-
- .align 2
-OldaleTown_MapAttributes:: @ 8291A14
- .4byte 0x14
- .4byte 0x14
- .4byte OldaleTown_MapBorder
- .4byte OldaleTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
-DewfordTown_MapBorder:: @ 8291A2C
- .incbin "data/maps/DewfordTown/border.bin"
-
-DewfordTown_MapBlockdata:: @ 8291A34
- .incbin "data/maps/DewfordTown/map.bin"
-
- .align 2
-DewfordTown_MapAttributes:: @ 8291D54
- .4byte 0x14
- .4byte 0x14
- .4byte DewfordTown_MapBorder
- .4byte DewfordTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
-LavaridgeTown_MapBorder:: @ 8291D6C
- .incbin "data/maps/LavaridgeTown/border.bin"
-
-LavaridgeTown_MapBlockdata:: @ 8291D74
- .incbin "data/maps/LavaridgeTown/map.bin"
-
- .align 2
-LavaridgeTown_MapAttributes:: @ 8292094
- .4byte 0x14
- .4byte 0x14
- .4byte LavaridgeTown_MapBorder
- .4byte LavaridgeTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
-FallarborTown_MapBorder:: @ 82920AC
- .incbin "data/maps/FallarborTown/border.bin"
-
-FallarborTown_MapBlockdata:: @ 82920B4
- .incbin "data/maps/FallarborTown/map.bin"
-
- .align 2
-FallarborTown_MapAttributes:: @ 82923D4
- .4byte 0x14
- .4byte 0x14
- .4byte FallarborTown_MapBorder
- .4byte FallarborTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
-VerdanturfTown_MapBorder:: @ 82923EC
- .incbin "data/maps/VerdanturfTown/border.bin"
-
-VerdanturfTown_MapBlockdata:: @ 82923F4
- .incbin "data/maps/VerdanturfTown/map.bin"
-
- .align 2
-VerdanturfTown_MapAttributes:: @ 8292714
- .4byte 0x14
- .4byte 0x14
- .4byte VerdanturfTown_MapBorder
- .4byte VerdanturfTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
-PacifidlogTown_MapBorder:: @ 829272C
- .incbin "data/maps/PacifidlogTown/border.bin"
-
-PacifidlogTown_MapBlockdata:: @ 8292734
- .incbin "data/maps/PacifidlogTown/map.bin"
-
- .align 2
-PacifidlogTown_MapAttributes:: @ 8292D74
- .4byte 0x14
- .4byte 0x28
- .4byte PacifidlogTown_MapBorder
- .4byte PacifidlogTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-Route101_MapBorder:: @ 8292D8C
- .incbin "data/maps/Route101/border.bin"
-
-Route101_MapBlockdata:: @ 8292D94
- .incbin "data/maps/Route101/map.bin"
-
- .align 2
-Route101_MapAttributes:: @ 82930B4
- .4byte 0x14
- .4byte 0x14
- .4byte Route101_MapBorder
- .4byte Route101_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
-Route102_MapBorder:: @ 82930CC
- .incbin "data/maps/Route102/border.bin"
-
-Route102_MapBlockdata:: @ 82930D4
- .incbin "data/maps/Route102/map.bin"
-
- .align 2
-Route102_MapAttributes:: @ 82938A4
- .4byte 0x32
- .4byte 0x14
- .4byte Route102_MapBorder
- .4byte Route102_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
-Route103_MapBorder:: @ 82938BC
- .incbin "data/maps/Route103/border.bin"
-
-Route103_MapBlockdata:: @ 82938C4
- .incbin "data/maps/Route103/map.bin"
-
- .align 2
-Route103_MapAttributes:: @ 8294544
- .4byte 0x50
- .4byte 0x14
- .4byte Route103_MapBorder
- .4byte Route103_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
-Route104_MapBorder:: @ 829455C
- .incbin "data/maps/Route104/border.bin"
-
-Route104_MapBlockdata:: @ 8294564
- .incbin "data/maps/Route104/map.bin"
-
- .align 2
-Route104_MapAttributes:: @ 8295E64
- .4byte 0x28
- .4byte 0x50
- .4byte Route104_MapBorder
- .4byte Route104_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
-Route105_MapBorder:: @ 8295E7C
- .incbin "data/maps/Route105/border.bin"
-
-Route105_MapBlockdata:: @ 8295E84
- .incbin "data/maps/Route105/map.bin"
-
- .align 2
-Route105_MapAttributes:: @ 8297784
- .4byte 0x28
- .4byte 0x50
- .4byte Route105_MapBorder
- .4byte Route105_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
-Route106_MapBorder:: @ 829779C
- .incbin "data/maps/Route106/border.bin"
-
-Route106_MapBlockdata:: @ 82977A4
- .incbin "data/maps/Route106/map.bin"
-
- .align 2
-Route106_MapAttributes:: @ 8298424
- .4byte 0x50
- .4byte 0x14
- .4byte Route106_MapBorder
- .4byte Route106_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
-Route107_MapBorder:: @ 829843C
- .incbin "data/maps/Route107/border.bin"
-
-Route107_MapBlockdata:: @ 8298444
- .incbin "data/maps/Route107/map.bin"
-
- .align 2
-Route107_MapAttributes:: @ 8298DA4
- .4byte 0x3c
- .4byte 0x14
- .4byte Route107_MapBorder
- .4byte Route107_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
-Route108_MapBorder:: @ 8298DBC
- .incbin "data/maps/Route108/border.bin"
-
-Route108_MapBlockdata:: @ 8298DC4
- .incbin "data/maps/Route108/map.bin"
-
- .align 2
-Route108_MapAttributes:: @ 8299724
- .4byte 0x3c
- .4byte 0x14
- .4byte Route108_MapBorder
- .4byte Route108_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Slateport
-
-Route109_MapBorder:: @ 829973C
- .incbin "data/maps/Route109/border.bin"
-
-Route109_MapBlockdata:: @ 8299744
- .incbin "data/maps/Route109/map.bin"
-
- .align 2
-Route109_MapAttributes:: @ 829AA04
- .4byte 0x28
- .4byte 0x3c
- .4byte Route109_MapBorder
- .4byte Route109_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Slateport
-
-Route110_MapBorder:: @ 829AA1C
- .incbin "data/maps/Route110/border.bin"
-
-Route110_MapBlockdata:: @ 829AA24
- .incbin "data/maps/Route110/map.bin"
-
- .align 2
-Route110_MapAttributes:: @ 829C964
- .4byte 0x28
- .4byte 0x64
- .4byte Route110_MapBorder
- .4byte Route110_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
-Route111_MapBorder:: @ 829C97C
- .incbin "data/maps/Route111/border.bin"
-
-Route111_MapBlockdata:: @ 829C984
- .incbin "data/maps/Route111/map.bin"
-
- .align 2
-Route111_MapAttributes:: @ 829F544
- .4byte 0x28
- .4byte 0x8c
- .4byte Route111_MapBorder
- .4byte Route111_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
-Route112_MapBorder:: @ 829F55C
- .incbin "data/maps/Route112/border.bin"
-
-Route112_MapBlockdata:: @ 829F564
- .incbin "data/maps/Route112/map.bin"
-
- .align 2
-Route112_MapAttributes:: @ 82A0824
- .4byte 0x28
- .4byte 0x3c
- .4byte Route112_MapBorder
- .4byte Route112_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
-Route113_MapBorder:: @ 82A083C
- .incbin "data/maps/Route113/border.bin"
-
-Route113_MapBlockdata:: @ 82A0844
- .incbin "data/maps/Route113/map.bin"
-
- .align 2
-Route113_MapAttributes:: @ 82A17E4
- .4byte 0x64
- .4byte 0x14
- .4byte Route113_MapBorder
- .4byte Route113_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
-Route114_MapBorder:: @ 82A17FC
- .incbin "data/maps/Route114/border.bin"
-
-Route114_MapBlockdata:: @ 82A1804
- .incbin "data/maps/Route114/map.bin"
-
- .align 2
-Route114_MapAttributes:: @ 82A3104
- .4byte 0x28
- .4byte 0x50
- .4byte Route114_MapBorder
- .4byte Route114_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
-Route115_MapBorder:: @ 82A311C
- .incbin "data/maps/Route115/border.bin"
-
-Route115_MapBlockdata:: @ 82A3124
- .incbin "data/maps/Route115/map.bin"
-
- .align 2
-Route115_MapAttributes:: @ 82A4A24
- .4byte 0x28
- .4byte 0x50
- .4byte Route115_MapBorder
- .4byte Route115_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
-Route116_MapBorder:: @ 82A4A3C
- .incbin "data/maps/Route116/border.bin"
-
-Route116_MapBlockdata:: @ 82A4A44
- .incbin "data/maps/Route116/map.bin"
-
- .align 2
-Route116_MapAttributes:: @ 82A59E4
- .4byte 0x64
- .4byte 0x14
- .4byte Route116_MapBorder
- .4byte Route116_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
-Route117_MapBorder:: @ 82A59FC
- .incbin "data/maps/Route117/border.bin"
-
-Route117_MapBlockdata:: @ 82A5A04
- .incbin "data/maps/Route117/map.bin"
-
- .align 2
-Route117_MapAttributes:: @ 82A6364
- .4byte 0x3c
- .4byte 0x14
- .4byte Route117_MapBorder
- .4byte Route117_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
-Route118_MapBorder:: @ 82A637C
- .incbin "data/maps/Route118/border.bin"
-
-Route118_MapBlockdata:: @ 82A6384
- .incbin "data/maps/Route118/map.bin"
-
- .align 2
-Route118_MapAttributes:: @ 82A7004
- .4byte 0x50
- .4byte 0x14
- .4byte Route118_MapBorder
- .4byte Route118_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
-Route119_MapBorder:: @ 82A701C
- .incbin "data/maps/Route119/border.bin"
-
-Route119_MapBlockdata:: @ 82A7024
- .incbin "data/maps/Route119/map.bin"
-
- .align 2
-Route119_MapAttributes:: @ 82A9BE4
- .4byte 0x28
- .4byte 0x8c
- .4byte Route119_MapBorder
- .4byte Route119_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fortree
-
-Route120_MapBorder:: @ 82A9BFC
- .incbin "data/maps/Route120/border.bin"
-
-Route120_MapBlockdata:: @ 82A9C04
- .incbin "data/maps/Route120/map.bin"
-
- .align 2
-Route120_MapAttributes:: @ 82ABB44
- .4byte 0x28
- .4byte 0x64
- .4byte Route120_MapBorder
- .4byte Route120_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fortree
-
-Route121_MapBorder:: @ 82ABB5C
- .incbin "data/maps/Route121/border.bin"
-
-Route121_MapBlockdata:: @ 82ABB64
- .incbin "data/maps/Route121/map.bin"
-
- .align 2
-Route121_MapAttributes:: @ 82AC7E4
- .4byte 0x50
- .4byte 0x14
- .4byte Route121_MapBorder
- .4byte Route121_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-Route122_MapBorder:: @ 82AC7FC
- .incbin "data/maps/Route122/border.bin"
-
-Route122_MapBlockdata:: @ 82AC804
- .incbin "data/maps/Route122/map.bin"
-
- .align 2
-Route122_MapAttributes:: @ 82AD484
- .4byte 0x28
- .4byte 0x28
- .4byte Route122_MapBorder
- .4byte Route122_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-Route123_MapBorder:: @ 82AD49C
- .incbin "data/maps/Route123/border.bin"
-
-Route123_MapBlockdata:: @ 82AD4A4
- .incbin "data/maps/Route123/map.bin"
-
- .align 2
-Route123_MapAttributes:: @ 82AEA84
- .4byte 0x8c
- .4byte 0x14
- .4byte Route123_MapBorder
- .4byte Route123_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-Route124_MapBorder:: @ 82AEA9C
- .incbin "data/maps/Route124/border.bin"
-
-Route124_MapBlockdata:: @ 82AEAA4
- .incbin "data/maps/Route124/map.bin"
-
- .align 2
-Route124_MapAttributes:: @ 82B1CA4
- .4byte 0x50
- .4byte 0x50
- .4byte Route124_MapBorder
- .4byte Route124_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
-Route125_MapBorder:: @ 82B1CBC
- .incbin "data/maps/Route125/border.bin"
-
-Route125_MapBlockdata:: @ 82B1CC4
- .incbin "data/maps/Route125/map.bin"
-
- .align 2
-Route125_MapAttributes:: @ 82B35C4
- .4byte 0x50
- .4byte 0x28
- .4byte Route125_MapBorder
- .4byte Route125_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
-Route126_MapBorder:: @ 82B35DC
- .incbin "data/maps/Route126/border.bin"
-
-Route126_MapBlockdata:: @ 82B35E4
- .incbin "data/maps/Route126/map.bin"
-
- .align 2
-Route126_MapAttributes:: @ 82B67E4
- .4byte 0x50
- .4byte 0x50
- .4byte Route126_MapBorder
- .4byte Route126_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
-Route127_MapBorder:: @ 82B67FC
- .incbin "data/maps/Route127/border.bin"
-
-Route127_MapBlockdata:: @ 82B6804
- .incbin "data/maps/Route127/map.bin"
-
- .align 2
-Route127_MapAttributes:: @ 82B9A04
- .4byte 0x50
- .4byte 0x50
- .4byte Route127_MapBorder
- .4byte Route127_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
-Route128_MapBorder:: @ 82B9A1C
- .incbin "data/maps/Route128/border.bin"
-
-Route128_MapBlockdata:: @ 82B9A24
- .incbin "data/maps/Route128/map.bin"
-
- .align 2
-Route128_MapAttributes:: @ 82BBFA4
- .4byte 0x78
- .4byte 0x28
- .4byte Route128_MapBorder
- .4byte Route128_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
-Route129_MapBorder:: @ 82BBFBC
- .incbin "data/maps/Route129/border.bin"
-
-Route129_MapBlockdata:: @ 82BBFC4
- .incbin "data/maps/Route129/map.bin"
-
- .align 2
-Route129_MapAttributes:: @ 82BD8C4
- .4byte 0x50
- .4byte 0x28
- .4byte Route129_MapBorder
- .4byte Route129_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
-UnreferencedMap_MapBorder: @ 82BD8DC
- .incbin "data/maps/UnreferencedMap/border.bin"
-
-UnreferencedMap_MapBlockdata: @ 82BD8E4
- .incbin "data/maps/UnreferencedMap/map.bin"
-
- .align 2
-UnreferencedMap_MapAttributes:: @ 82BF1E4
- .4byte 0x50
- .4byte 0x28
- .4byte UnreferencedMap_MapBorder
- .4byte UnreferencedMap_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-Route131_MapBorder:: @ 82BF1FC
- .incbin "data/maps/Route131/border.bin"
-
-Route131_MapBlockdata:: @ 82BF204
- .incbin "data/maps/Route131/map.bin"
-
- .align 2
-Route131_MapAttributes:: @ 82C04C4
- .4byte 0x3c
- .4byte 0x28
- .4byte Route131_MapBorder
- .4byte Route131_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-Route132_MapBorder:: @ 82C04DC
- .incbin "data/maps/Route132/border.bin"
-
-Route132_MapBlockdata:: @ 82C04E4
- .incbin "data/maps/Route132/map.bin"
-
- .align 2
-Route132_MapAttributes:: @ 82C1DE4
- .4byte 0x50
- .4byte 0x28
- .4byte Route132_MapBorder
- .4byte Route132_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-Route133_MapBorder:: @ 82C1DFC
- .incbin "data/maps/Route133/border.bin"
-
-Route133_MapBlockdata:: @ 82C1E04
- .incbin "data/maps/Route133/map.bin"
-
- .align 2
-Route133_MapAttributes:: @ 82C3704
- .4byte 0x50
- .4byte 0x28
- .4byte Route133_MapBorder
- .4byte Route133_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-Route134_MapBorder:: @ 82C371C
- .incbin "data/maps/Route134/border.bin"
-
-Route134_MapBlockdata:: @ 82C3724
- .incbin "data/maps/Route134/map.bin"
-
- .align 2
-Route134_MapAttributes:: @ 82C5024
- .4byte 0x50
- .4byte 0x28
- .4byte Route134_MapBorder
- .4byte Route134_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-Underwater2_MapBorder:: @ 82C503C
- .incbin "data/maps/Underwater2/border.bin"
-
-Underwater2_MapBlockdata:: @ 82C5044
- .incbin "data/maps/Underwater2/map.bin"
-
- .align 2
-Underwater2_MapAttributes:: @ 82C8244
- .4byte 0x50
- .4byte 0x50
- .4byte Underwater2_MapBorder
- .4byte Underwater2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-Underwater3_MapBorder:: @ 82C825C
- .incbin "data/maps/Underwater3/border.bin"
-
-Underwater3_MapBlockdata:: @ 82C8264
- .incbin "data/maps/Underwater3/map.bin"
-
- .align 2
-Underwater3_MapAttributes:: @ 82CB464
- .4byte 0x50
- .4byte 0x50
- .4byte Underwater3_MapBorder
- .4byte Underwater3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-Underwater4_MapBorder:: @ 82CB47C
- .incbin "data/maps/Underwater4/border.bin"
-
-Underwater4_MapBlockdata:: @ 82CB484
- .incbin "data/maps/Underwater4/map.bin"
-
- .align 2
-Underwater4_MapAttributes:: @ 82CDA04
- .4byte 0x78
- .4byte 0x28
- .4byte Underwater4_MapBorder
- .4byte Underwater4_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
- .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin"
-
-LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24
- .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin"
-
- .align 2
-LittlerootTown_BrendansHouse_1F_MapAttributes:: @ 82CDAEC
- .4byte 0xb
- .4byte 0x9
- .4byte LittlerootTown_BrendansHouse_1F_MapBorder
- .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
- .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin"
-
-LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C
- .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin"
-
- .align 2
-LittlerootTown_BrendansHouse_2F_MapAttributes:: @ 82CDB9C
- .4byte 0x9
- .4byte 0x8
- .4byte LittlerootTown_BrendansHouse_2F_MapBorder
- .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
- .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin"
-
-LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC
- .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin"
-
- .align 2
-LittlerootTown_MaysHouse_1F_MapAttributes:: @ 82CDC84
- .4byte 0xb
- .4byte 0x9
- .4byte LittlerootTown_MaysHouse_1F_MapBorder
- .4byte LittlerootTown_MaysHouse_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
- .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin"
-
-LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4
- .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin"
-
- .align 2
-LittlerootTown_MaysHouse_2F_MapAttributes:: @ 82CDD34
- .4byte 0x9
- .4byte 0x8
- .4byte LittlerootTown_MaysHouse_2F_MapBorder
- .4byte LittlerootTown_MaysHouse_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
- .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin"
-
-LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54
- .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin"
-
- .align 2
-LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8
- .4byte 0xd
- .4byte 0xd
- .4byte LittlerootTown_ProfessorBirchsLab_MapBorder
- .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
-House11_MapBorder:: @ 82CDEC0
- .incbin "data/maps/House11/border.bin"
-
-House11_MapBlockdata:: @ 82CDEC8
- .incbin "data/maps/House11/map.bin"
-
- .align 2
-House11_MapAttributes:: @ 82CDF7C
- .4byte 0xa
- .4byte 0x9
- .4byte House11_MapBorder
- .4byte House11_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-House12_MapBorder:: @ 82CDF94
- .incbin "data/maps/House12/border.bin"
-
-House12_MapBlockdata:: @ 82CDF9C
- .incbin "data/maps/House12/map.bin"
-
- .align 2
-House12_MapAttributes:: @ 82CE04C
- .4byte 0xb
- .4byte 0x8
- .4byte House12_MapBorder
- .4byte House12_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-PokemonCenter_1F_MapBorder:: @ 82CE064
- .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin"
-
-PokemonCenter_1F_MapBlockdata:: @ 82CE06C
- .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin"
-
- .align 2
-PokemonCenter_1F_MapAttributes:: @ 82CE168
- .4byte 0xe
- .4byte 0x9
- .4byte PokemonCenter_1F_MapBorder
- .4byte PokemonCenter_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
-PokemonCenter_2F_MapBorder:: @ 82CE180
- .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin"
-
-PokemonCenter_2F_MapBlockdata:: @ 82CE188
- .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin"
-
- .align 2
-PokemonCenter_2F_MapAttributes:: @ 82CE284
- .4byte 0xe
- .4byte 0x9
- .4byte PokemonCenter_2F_MapBorder
- .4byte PokemonCenter_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
-PokeMart_MapBorder:: @ 82CE29C
- .incbin "data/maps/OldaleTown_Mart/border.bin"
-
-PokeMart_MapBlockdata:: @ 82CE2A4
- .incbin "data/maps/OldaleTown_Mart/map.bin"
-
- .align 2
-PokeMart_MapAttributes:: @ 82CE354
- .4byte 0xb
- .4byte 0x8
- .4byte PokeMart_MapBorder
- .4byte PokeMart_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-DewfordTown_House1_MapBorder:: @ 82CE36C
- .incbin "data/maps/DewfordTown_House1/border.bin"
-
-DewfordTown_House1_MapBlockdata:: @ 82CE374
- .incbin "data/maps/DewfordTown_House1/map.bin"
-
- .align 2
-DewfordTown_House1_MapAttributes:: @ 82CE414
-LavaridgeTown_House_MapAttributes:: @ 82CE414
-Route111_OldLadysRestStop_MapAttributes:: @ 82CE414
- .4byte 0xa
- .4byte 0x8
- .4byte DewfordTown_House1_MapBorder
- .4byte DewfordTown_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-DewfordTown_Gym_MapBorder:: @ 82CE42C
- .incbin "data/maps/DewfordTown_Gym/border.bin"
-
-DewfordTown_Gym_MapBlockdata:: @ 82CE434
- .incbin "data/maps/DewfordTown_Gym/map.bin"
-
- .align 2
-DewfordTown_Gym_MapAttributes:: @ 82CE824
- .4byte 0x12
- .4byte 0x1c
- .4byte DewfordTown_Gym_MapBorder
- .4byte DewfordTown_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_DewfordGym
-
-DewfordTown_Hall_MapBorder:: @ 82CE83C
- .incbin "data/maps/DewfordTown_Hall/border.bin"
-
-DewfordTown_Hall_MapBlockdata:: @ 82CE844
- .incbin "data/maps/DewfordTown_Hall/map.bin"
-
- .align 2
-DewfordTown_Hall_MapAttributes:: @ 82CE978
- .4byte 0x11
- .4byte 0x9
- .4byte DewfordTown_Hall_MapBorder
- .4byte DewfordTown_Hall_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-DewfordTown_House2_MapBorder:: @ 82CE990
- .incbin "data/maps/DewfordTown_House2/border.bin"
-
-DewfordTown_House2_MapBlockdata:: @ 82CE998
- .incbin "data/maps/DewfordTown_House2/map.bin"
-
- .align 2
-DewfordTown_House2_MapAttributes:: @ 82CEA4C
-Route113_GlassWorkshop_MapAttributes:: @ 82CEA4C
- .4byte 0xa
- .4byte 0x9
- .4byte DewfordTown_House2_MapBorder
- .4byte DewfordTown_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
- .incbin "data/maps/LavaridgeTown_HerbShop/border.bin"
-
-LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C
- .incbin "data/maps/LavaridgeTown_HerbShop/map.bin"
-
- .align 2
-LavaridgeTown_HerbShop_MapAttributes:: @ 82CEB1C
- .4byte 0xb
- .4byte 0x8
- .4byte LavaridgeTown_HerbShop_MapBorder
- .4byte LavaridgeTown_HerbShop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
- .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin"
-
-LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C
- .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin"
-
- .align 2
-LavaridgeTown_Gym_1F_MapAttributes:: @ 82CED4C
- .4byte 0xb
- .4byte 0x18
- .4byte LavaridgeTown_Gym_1F_MapBorder
- .4byte LavaridgeTown_Gym_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LavaridgeGym
-
-LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
- .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin"
-
-LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C
- .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin"
-
- .align 2
-LavaridgeTown_Gym_B1F_MapAttributes:: @ 82CEF7C
- .4byte 0xb
- .4byte 0x18
- .4byte LavaridgeTown_Gym_B1F_MapBorder
- .4byte LavaridgeTown_Gym_B1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LavaridgeGym
-
-LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
- .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin"
-
-LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C
- .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin"
-
- .align 2
-LavaridgeTown_PokemonCenter_1F_MapAttributes:: @ 82CF098
- .4byte 0xe
- .4byte 0x9
- .4byte LavaridgeTown_PokemonCenter_1F_MapBorder
- .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
-FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0
- .incbin "data/maps/FallarborTown_ContestLobby/border.bin"
-
-FallarborTown_ContestLobby_MapBlockdata:: @ 82CF0B8
- .incbin "data/maps/FallarborTown_ContestLobby/map.bin"
-
- .align 2
-FallarborTown_ContestLobby_MapAttributes:: @ 82CF18C
-SlateportCity_ContestLobby_MapAttributes:: @ 82CF18C
-VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C
- .4byte 0xf
- .4byte 0x7
- .4byte FallarborTown_ContestLobby_MapBorder
- .4byte FallarborTown_ContestLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-FallarborTown_ContestHall_MapBorder:: @ 82CF1A4
- .incbin "data/maps/FallarborTown_ContestHall/border.bin"
-
-FallarborTown_ContestHall_MapBlockdata:: @ 82CF1AC
- .incbin "data/maps/FallarborTown_ContestHall/map.bin"
-
- .align 2
-FallarborTown_ContestHall_MapAttributes:: @ 82CF4A0
-SlateportCity_ContestHall_MapAttributes:: @ 82CF4A0
-VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0
- .4byte 0x15
- .4byte 0x12
- .4byte FallarborTown_ContestHall_MapBorder
- .4byte FallarborTown_ContestHall_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-LilycoveCity_House2_MapBorder:: @ 82CF4B8
- .incbin "data/maps/LilycoveCity_House2/border.bin"
-
-LilycoveCity_House2_MapBlockdata:: @ 82CF4C0
- .incbin "data/maps/LilycoveCity_House2/map.bin"
-
- .align 2
-LilycoveCity_House2_MapAttributes:: @ 82CF540
- .4byte 0x8
- .4byte 0x8
- .4byte LilycoveCity_House2_MapBorder
- .4byte LilycoveCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-UnknownMapBorder_082CF564:
- .incbin "data/maps/UnknownMap_082CF564/border.bin"
-
-UnknownMapBlockdata_082CF564:
- .incbin "data/maps/UnknownMap_082CF564/map.bin"
-
- .align 2
-UnknownMapAttributes_082CF564::
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082CF564
- .4byte UnknownMapBlockdata_082CF564
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
- .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin"
-
-VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584
- .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin"
-
- .align 2
-VerdanturfTown_WandasHouse_MapAttributes:: @ 82CF694
- .4byte 0x11
- .4byte 0x8
- .4byte VerdanturfTown_WandasHouse_MapBorder
- .4byte VerdanturfTown_WandasHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-PacifidlogTown_House1_MapBorder:: @ 82CF6AC
- .incbin "data/maps/PacifidlogTown_House1/border.bin"
-
-PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4
- .incbin "data/maps/PacifidlogTown_House1/map.bin"
-
- .align 2
-PacifidlogTown_House1_MapAttributes:: @ 82CF768
-PacifidlogTown_House3_MapAttributes:: @ 82CF768
-PacifidlogTown_House5_MapAttributes:: @ 82CF768
- .4byte 0xa
- .4byte 0x9
- .4byte PacifidlogTown_House1_MapBorder
- .4byte PacifidlogTown_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-PacifidlogTown_House2_MapBorder:: @ 82CF780
- .incbin "data/maps/PacifidlogTown_House2/border.bin"
-
-PacifidlogTown_House2_MapBlockdata:: @ 82CF788
- .incbin "data/maps/PacifidlogTown_House2/map.bin"
-
- .align 2
-PacifidlogTown_House2_MapAttributes:: @ 82CF83C
-PacifidlogTown_House4_MapAttributes:: @ 82CF83C
- .4byte 0xa
- .4byte 0x9
- .4byte PacifidlogTown_House2_MapBorder
- .4byte PacifidlogTown_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-PetalburgCity_Gym_MapBorder:: @ 82CF854
- .incbin "data/maps/PetalburgCity_Gym/border.bin"
-
-PetalburgCity_Gym_MapBlockdata:: @ 82CF85C
- .incbin "data/maps/PetalburgCity_Gym/map.bin"
-
- .align 2
-PetalburgCity_Gym_MapAttributes:: @ 82D003C
- .4byte 0x9
- .4byte 0x70
- .4byte PetalburgCity_Gym_MapBorder
- .4byte PetalburgCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PetalburgGym
-
-PetalburgCity_House2_MapBorder:: @ 82D0054
- .incbin "data/maps/PetalburgCity_House2/border.bin"
-
-PetalburgCity_House2_MapBlockdata:: @ 82D005C
- .incbin "data/maps/PetalburgCity_House2/map.bin"
-
- .align 2
-MossdeepCity_House4_MapAttributes:: @ 82D00FC
-PetalburgCity_House2_MapAttributes:: @ 82D00FC
-SlateportCity_House1_MapAttributes:: @ 82D00FC
- .4byte 0xa
- .4byte 0x8
- .4byte PetalburgCity_House2_MapBorder
- .4byte PetalburgCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
- .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin"
-
-SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C
- .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin"
-
- .align 2
-SlateportCity_SternsShipyard_1F_MapAttributes:: @ 82D0394
- .4byte 0x15
- .4byte 0xf
- .4byte SlateportCity_SternsShipyard_1F_MapBorder
- .4byte SlateportCity_SternsShipyard_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
- .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin"
-
-SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4
- .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin"
-
- .align 2
-SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4
- .4byte 0x11
- .4byte 0xf
- .4byte SlateportCity_SternsShipyard_2F_MapBorder
- .4byte SlateportCity_SternsShipyard_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-UnknownMapBorder_082D05D8::
- .incbin "data/maps/UnknownMap_082D05D8/border.bin"
-
-UnknownMapBlockdata_082D05D8::
- .incbin "data/maps/UnknownMap_082D05D8/map.bin"
-
- .align 2
-UnknownMapAttributes_082D05D8::
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082D05D8
- .4byte UnknownMapBlockdata_082D05D8
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-UnknownMapBorder_082D05FC::
- .incbin "data/maps/UnknownMap_082D05FC/border.bin"
-
-UnknownMapBlockdata_082D05FC::
- .incbin "data/maps/UnknownMap_082D05FC/map.bin"
-
- .align 2
-UnknownMapAttributes_082D05FC::
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082D05FC
- .4byte UnknownMapBlockdata_082D05FC
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
- .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin"
-
-SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C
- .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin"
-
- .align 2
-SlateportCity_PokemonFanClub_MapAttributes:: @ 82D0750
- .4byte 0xe
- .4byte 0xb
- .4byte SlateportCity_PokemonFanClub_MapBorder
- .4byte SlateportCity_PokemonFanClub_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonFanClub
-
-SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
- .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin"
-
-SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770
- .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin"
-
- .align 2
-SlateportCity_OceanicMuseum_1F_MapAttributes:: @ 82D08D8
- .4byte 0x14
- .4byte 0x9
- .4byte SlateportCity_OceanicMuseum_1F_MapBorder
- .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_OceanicMuseum
-
-SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
- .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin"
-
-SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8
- .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin"
-
- .align 2
-SlateportCity_OceanicMuseum_2F_MapAttributes:: @ 82D0A60
- .4byte 0x14
- .4byte 0x9
- .4byte SlateportCity_OceanicMuseum_2F_MapBorder
- .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_OceanicMuseum
-
-SlateportCity_Harbor_MapBorder:: @ 82D0A78
- .incbin "data/maps/SlateportCity_Harbor/border.bin"
-
-SlateportCity_Harbor_MapBlockdata:: @ 82D0A80
- .incbin "data/maps/SlateportCity_Harbor/map.bin"
-
- .align 2
-LilycoveCity_Harbor_MapAttributes:: @ 82D0D50
-SlateportCity_Harbor_MapAttributes:: @ 82D0D50
- .4byte 0x18
- .4byte 0xf
- .4byte SlateportCity_Harbor_MapBorder
- .4byte SlateportCity_Harbor_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MauvilleCity_Gym_MapBorder:: @ 82D0D68
- .incbin "data/maps/MauvilleCity_Gym/border.bin"
-
-MauvilleCity_Gym_MapBlockdata:: @ 82D0D70
- .incbin "data/maps/MauvilleCity_Gym/map.bin"
-
- .align 2
-MauvilleCity_Gym_MapAttributes:: @ 82D0F14
- .4byte 0xa
- .4byte 0x15
- .4byte MauvilleCity_Gym_MapBorder
- .4byte MauvilleCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MauvilleGym
-
-MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
- .incbin "data/maps/MauvilleCity_BikeShop/border.bin"
-
-MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34
- .incbin "data/maps/MauvilleCity_BikeShop/map.bin"
-
- .align 2
-MauvilleCity_BikeShop_MapAttributes:: @ 82D100C
- .4byte 0xc
- .4byte 0x9
- .4byte MauvilleCity_BikeShop_MapBorder
- .4byte MauvilleCity_BikeShop_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BikeShop
-
-MauvilleCity_GameCorner_MapBorder:: @ 82D1024
- .incbin "data/maps/MauvilleCity_GameCorner/border.bin"
-
-MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C
- .incbin "data/maps/MauvilleCity_GameCorner/map.bin"
-
- .align 2
-MauvilleCity_GameCorner_MapAttributes:: @ 82D1210
- .4byte 0x16
- .4byte 0xb
- .4byte MauvilleCity_GameCorner_MapBorder
- .4byte MauvilleCity_GameCorner_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MauvilleGameCorner
-
-RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
- .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin"
-
-RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230
- .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin"
-
- .align 2
-RustboroCity_DevonCorp_1F_MapAttributes:: @ 82D1388
- .4byte 0x13
- .4byte 0x9
- .4byte RustboroCity_DevonCorp_1F_MapBorder
- .4byte RustboroCity_DevonCorp_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
- .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin"
-
-RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8
- .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin"
-
- .align 2
-RustboroCity_DevonCorp_2F_MapAttributes:: @ 82D1500
- .4byte 0x13
- .4byte 0x9
- .4byte RustboroCity_DevonCorp_2F_MapBorder
- .4byte RustboroCity_DevonCorp_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-RustboroCity_Gym_MapBorder:: @ 82D1518
- .incbin "data/maps/RustboroCity_Gym/border.bin"
-
-RustboroCity_Gym_MapBlockdata:: @ 82D1520
- .incbin "data/maps/RustboroCity_Gym/map.bin"
-
- .align 2
-RustboroCity_Gym_MapAttributes:: @ 82D16C4
- .4byte 0xb
- .4byte 0x13
- .4byte RustboroCity_Gym_MapBorder
- .4byte RustboroCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_RustboroGym
-
-RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
- .incbin "data/maps/RustboroCity_PokemonSchool/border.bin"
-
-RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4
- .incbin "data/maps/RustboroCity_PokemonSchool/map.bin"
-
- .align 2
-RustboroCity_PokemonSchool_MapAttributes:: @ 82D17EC
- .4byte 0xc
- .4byte 0xb
- .4byte RustboroCity_PokemonSchool_MapBorder
- .4byte RustboroCity_PokemonSchool_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonSchool
-
-RustboroCity_House2_MapBorder:: @ 82D1804
- .incbin "data/maps/RustboroCity_House2/border.bin"
-
-RustboroCity_House2_MapBlockdata:: @ 82D180C
- .incbin "data/maps/RustboroCity_House2/map.bin"
-
- .align 2
-RustboroCity_House2_MapAttributes:: @ 82D18E4
-RustboroCity_House3_MapAttributes:: @ 82D18E4
- .4byte 0xc
- .4byte 0x9
- .4byte RustboroCity_House2_MapBorder
- .4byte RustboroCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-RustboroCity_House1_MapBorder:: @ 82D18FC
- .incbin "data/maps/RustboroCity_House1/border.bin"
-
-RustboroCity_House1_MapBlockdata:: @ 82D1904
- .incbin "data/maps/RustboroCity_House1/map.bin"
-
- .align 2
-RustboroCity_House1_MapAttributes:: @ 82D19D4
- .4byte 0xd
- .4byte 0x8
- .4byte RustboroCity_House1_MapBorder
- .4byte RustboroCity_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
- .incbin "data/maps/RustboroCity_CuttersHouse/border.bin"
-
-RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4
- .incbin "data/maps/RustboroCity_CuttersHouse/map.bin"
-
- .align 2
-RustboroCity_CuttersHouse_MapAttributes:: @ 82D1ABC
- .4byte 0xb
- .4byte 0x9
- .4byte RustboroCity_CuttersHouse_MapBorder
- .4byte RustboroCity_CuttersHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-FortreeCity_House1_MapBorder:: @ 82D1AD4
- .incbin "data/maps/FortreeCity_House1/border.bin"
-
-FortreeCity_House1_MapBlockdata:: @ 82D1ADC
- .incbin "data/maps/FortreeCity_House1/map.bin"
-
- .align 2
-FortreeCity_House1_MapAttributes:: @ 82D1B3C
-FortreeCity_House3_MapAttributes:: @ 82D1B3C
-FortreeCity_House5_MapAttributes:: @ 82D1B3C
- .4byte 0x8
- .4byte 0x6
- .4byte FortreeCity_House1_MapBorder
- .4byte FortreeCity_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-FortreeCity_Gym_MapBorder:: @ 82D1B54
- .incbin "data/maps/FortreeCity_Gym/border.bin"
-
-FortreeCity_Gym_MapBlockdata:: @ 82D1B5C
- .incbin "data/maps/FortreeCity_Gym/map.bin"
-
- .align 2
-FortreeCity_Gym_MapAttributes:: @ 82D1F44
- .4byte 0x14
- .4byte 0x19
- .4byte FortreeCity_Gym_MapBorder
- .4byte FortreeCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_FortreeGym
-
-FortreeCity_House2_MapBorder:: @ 82D1F5C
- .incbin "data/maps/FortreeCity_House2/border.bin"
-
-FortreeCity_House2_MapBlockdata:: @ 82D1F64
- .incbin "data/maps/FortreeCity_House2/map.bin"
-
- .align 2
-FortreeCity_House2_MapAttributes:: @ 82D1FC4
-FortreeCity_House4_MapAttributes:: @ 82D1FC4
- .4byte 0x8
- .4byte 0x6
- .4byte FortreeCity_House2_MapBorder
- .4byte FortreeCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
- .incbin "data/maps/Route104_MrBrineysHouse/border.bin"
-
-Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4
- .incbin "data/maps/Route104_MrBrineysHouse/map.bin"
-
- .align 2
-Route104_MrBrineysHouse_MapAttributes:: @ 82D20BC
- .4byte 0xc
- .4byte 0x9
- .4byte Route104_MrBrineysHouse_MapBorder
- .4byte Route104_MrBrineysHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin"
-
-LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin"
-
- .align 2
-LilycoveCity_LilycoveMuseum_1F_MapAttributes:: @ 82D2328
- .4byte 0x15
- .4byte 0xe
- .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
- .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LilycoveMuseum
-
-LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin"
-
-LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin"
-
- .align 2
-LilycoveCity_LilycoveMuseum_2F_MapAttributes:: @ 82D2584
- .4byte 0x16
- .4byte 0xd
- .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
- .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LilycoveMuseum
-
-LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
- .incbin "data/maps/LilycoveCity_ContestLobby/border.bin"
-
-LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4
- .incbin "data/maps/LilycoveCity_ContestLobby/map.bin"
-
- .align 2
-LilycoveCity_ContestLobby_MapAttributes:: @ 82D27CC
- .4byte 0x17
- .4byte 0xc
- .4byte LilycoveCity_ContestLobby_MapBorder
- .4byte LilycoveCity_ContestLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
- .incbin "data/maps/LilycoveCity_ContestHall/border.bin"
-
-LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC
- .incbin "data/maps/LilycoveCity_ContestHall/map.bin"
-
- .align 2
-LilycoveCity_ContestHall_MapAttributes:: @ 82D3514
- .4byte 0x33
- .4byte 0x21
- .4byte LilycoveCity_ContestHall_MapBorder
- .4byte LilycoveCity_ContestHall_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
- .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin"
-
-LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534
- .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin"
-
- .align 2
-LilycoveCity_PokemonTrainerFanClub_MapAttributes:: @ 82D3684
- .4byte 0xc
- .4byte 0xe
- .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
- .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
- .incbin "data/maps/LilycoveCity_EmptyMap/border.bin"
-
-LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4
- .incbin "data/maps/LilycoveCity_EmptyMap/map.bin"
-
- .align 2
-LilycoveCity_EmptyMap_MapAttributes:: @ 82D36A8
- .4byte 0x1
- .4byte 0x1
- .4byte LilycoveCity_EmptyMap_MapBorder
- .4byte LilycoveCity_EmptyMap_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MossdeepCity_Gym_MapBorder:: @ 82D36C0
- .incbin "data/maps/MossdeepCity_Gym/border.bin"
-
-MossdeepCity_Gym_MapBlockdata:: @ 82D36C8
- .incbin "data/maps/MossdeepCity_Gym/map.bin"
-
- .align 2
-MossdeepCity_Gym_MapAttributes:: @ 82D3B78
- .4byte 0x14
- .4byte 0x1e
- .4byte MossdeepCity_Gym_MapBorder
- .4byte MossdeepCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MossdeepGym
-
-SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
- .incbin "data/maps/SootopolisCity_Gym_1F/border.bin"
-
-SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98
- .incbin "data/maps/SootopolisCity_Gym_1F/map.bin"
-
- .align 2
-SootopolisCity_Gym_1F_MapAttributes:: @ 82D3F0C
- .4byte 0x11
- .4byte 0x1a
- .4byte SootopolisCity_Gym_1F_MapBorder
- .4byte SootopolisCity_Gym_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_SootopolisGym
-
-SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
- .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin"
-
-SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C
- .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin"
-
- .align 2
-SootopolisCity_Gym_B1F_MapAttributes:: @ 82D42A0
- .4byte 0x11
- .4byte 0x1a
- .4byte SootopolisCity_Gym_B1F_MapBorder
- .4byte SootopolisCity_Gym_B1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_SootopolisGym
-
-EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
- .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin"
-
-EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0
- .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin"
-
- .align 2
-EverGrandeCity_SidneysRoom_MapAttributes:: @ 82D442C
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_SidneysRoom_MapBorder
- .4byte EverGrandeCity_SidneysRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
-EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
- .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin"
-
-EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C
- .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin"
-
- .align 2
-EverGrandeCity_PhoebesRoom_MapAttributes:: @ 82D45B8
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_PhoebesRoom_MapBorder
- .4byte EverGrandeCity_PhoebesRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
-EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
- .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin"
-
-EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8
- .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin"
-
- .align 2
-EverGrandeCity_GlaciasRoom_MapAttributes:: @ 82D4744
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_GlaciasRoom_MapBorder
- .4byte EverGrandeCity_GlaciasRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
-EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
- .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin"
-
-EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764
- .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin"
-
- .align 2
-EverGrandeCity_DrakesRoom_MapAttributes:: @ 82D48D0
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_DrakesRoom_MapBorder
- .4byte EverGrandeCity_DrakesRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
-EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
- .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin"
-
-EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0
- .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin"
-
- .align 2
-EverGrandeCity_ChampionsRoom_MapAttributes:: @ 82D4A44
- .4byte 0xd
- .4byte 0xd
- .4byte EverGrandeCity_ChampionsRoom_MapBorder
- .4byte EverGrandeCity_ChampionsRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
-EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C
- .incbin "data/maps/EverGrandeCity_Corridor1/border.bin"
-
-EverGrandeCity_Corridor1_MapBlockdata:: @ 82D4A64
- .incbin "data/maps/EverGrandeCity_Corridor1/map.bin"
-
- .align 2
-EverGrandeCity_Corridor1_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor2_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor3_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor5_MapAttributes:: @ 82D4B84
- .4byte 0xb
- .4byte 0xd
- .4byte EverGrandeCity_Corridor1_MapBorder
- .4byte EverGrandeCity_Corridor1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
-Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
- .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin"
-
-Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4
- .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin"
-
- .align 2
-Route104_PrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
-Route104_PrototypePrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
- .4byte 0xf
- .4byte 0x9
- .4byte Route104_PrettyPetalFlowerShop_MapBorder
- .4byte Route104_PrettyPetalFlowerShop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PrettyPetalFlowerShop
-
-Route112_CableCarStation_MapBorder:: @ 82D4CCC
- .incbin "data/maps/Route112_CableCarStation/border.bin"
-
-Route112_CableCarStation_MapBlockdata:: @ 82D4CD4
- .incbin "data/maps/Route112_CableCarStation/map.bin"
-
- .align 2
-MtChimney_CableCarStation_MapAttributes:: @ 82D4E0C
-Route112_CableCarStation_MapAttributes:: @ 82D4E0C
- .4byte 0xd
- .4byte 0xc
- .4byte Route112_CableCarStation_MapBorder
- .4byte Route112_CableCarStation_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
- .incbin "data/maps/Route114_FossilManiacsHouse/border.bin"
-
-Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C
- .incbin "data/maps/Route114_FossilManiacsHouse/map.bin"
-
- .align 2
-Route114_FossilManiacsHouse_MapAttributes:: @ 82D4ECC
- .4byte 0xa
- .4byte 0x8
- .4byte Route114_FossilManiacsHouse_MapBorder
- .4byte Route114_FossilManiacsHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
- .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin"
-
-Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC
- .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin"
-
- .align 2
-Route114_FossilManiacsTunnel_MapAttributes:: @ 82D5190
- .4byte 0xd
- .4byte 0x1a
- .4byte Route114_FossilManiacsTunnel_MapBorder
- .4byte Route114_FossilManiacsTunnel_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
-Route114_LanettesHouse_MapBorder:: @ 82D51A8
- .incbin "data/maps/Route114_LanettesHouse/border.bin"
-
-Route114_LanettesHouse_MapBlockdata:: @ 82D51B0
- .incbin "data/maps/Route114_LanettesHouse/map.bin"
-
- .align 2
-Route114_LanettesHouse_MapAttributes:: @ 82D5260
- .4byte 0xb
- .4byte 0x8
- .4byte Route114_LanettesHouse_MapBorder
- .4byte Route114_LanettesHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
-Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
- .incbin "data/maps/Route116_TunnelersRestHouse/border.bin"
-
-Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280
- .incbin "data/maps/Route116_TunnelersRestHouse/map.bin"
-
- .align 2
-Route116_TunnelersRestHouse_MapAttributes:: @ 82D5334
- .4byte 0xa
- .4byte 0x9
- .4byte Route116_TunnelersRestHouse_MapBorder
- .4byte Route116_TunnelersRestHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route117_PokemonDayCare_MapBorder:: @ 82D534C
- .incbin "data/maps/Route117_PokemonDayCare/border.bin"
-
-Route117_PokemonDayCare_MapBlockdata:: @ 82D5354
- .incbin "data/maps/Route117_PokemonDayCare/map.bin"
-
- .align 2
-Route117_PokemonDayCare_MapAttributes:: @ 82D542C
- .4byte 0xc
- .4byte 0x9
- .4byte Route117_PokemonDayCare_MapBorder
- .4byte Route117_PokemonDayCare_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonDayCare
-
-Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
- .incbin "data/maps/Route121_SafariZoneEntrance/border.bin"
-
-Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C
- .incbin "data/maps/Route121_SafariZoneEntrance/map.bin"
-
- .align 2
-Route121_SafariZoneEntrance_MapAttributes:: @ 82D5644
- .4byte 0x12
- .4byte 0xe
- .4byte Route121_SafariZoneEntrance_MapBorder
- .4byte Route121_SafariZoneEntrance_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-MeteorFalls_1F_1R_MapBorder:: @ 82D565C
- .incbin "data/maps/MeteorFalls_1F_1R/border.bin"
-
-MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664
- .incbin "data/maps/MeteorFalls_1F_1R/map.bin"
-
- .align 2
-MeteorFalls_1F_1R_MapAttributes:: @ 82D603C
- .4byte 0x1e
- .4byte 0x2a
- .4byte MeteorFalls_1F_1R_MapBorder
- .4byte MeteorFalls_1F_1R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
-MeteorFalls_1F_2R_MapBorder:: @ 82D6054
- .incbin "data/maps/MeteorFalls_1F_2R/border.bin"
-
-MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C
- .incbin "data/maps/MeteorFalls_1F_2R/map.bin"
-
- .align 2
-MeteorFalls_1F_2R_MapAttributes:: @ 82D67DC
- .4byte 0x1e
- .4byte 0x20
- .4byte MeteorFalls_1F_2R_MapBorder
- .4byte MeteorFalls_1F_2R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
-MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
- .incbin "data/maps/MeteorFalls_B1F_1R/border.bin"
-
-MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC
- .incbin "data/maps/MeteorFalls_B1F_1R/map.bin"
-
- .align 2
-MeteorFalls_B1F_1R_MapAttributes:: @ 82D7098
- .4byte 0x1d
- .4byte 0x26
- .4byte MeteorFalls_B1F_1R_MapBorder
- .4byte MeteorFalls_B1F_1R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
-MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
- .incbin "data/maps/MeteorFalls_B1F_2R/border.bin"
-
-MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8
- .incbin "data/maps/MeteorFalls_B1F_2R/map.bin"
-
- .align 2
-MeteorFalls_B1F_2R_MapAttributes:: @ 82D7244
- .4byte 0xb
- .4byte 0x12
- .4byte MeteorFalls_B1F_2R_MapBorder
- .4byte MeteorFalls_B1F_2R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
-RusturfTunnel_MapBorder:: @ 82D725C
- .incbin "data/maps/RusturfTunnel/border.bin"
-
-RusturfTunnel_MapBlockdata:: @ 82D7264
- .incbin "data/maps/RusturfTunnel/map.bin"
-
- .align 2
-RusturfTunnel_MapAttributes:: @ 82D7924
- .4byte 0x24
- .4byte 0x18
- .4byte RusturfTunnel_MapBorder
- .4byte RusturfTunnel_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_RusturfTunnel
-
-Underwater_SootopolisCity_MapBorder:: @ 82D793C
- .incbin "data/maps/Underwater_SootopolisCity/border.bin"
-
-Underwater_SootopolisCity_MapBlockdata:: @ 82D7944
- .incbin "data/maps/Underwater_SootopolisCity/map.bin"
-
- .align 2
-Underwater_SootopolisCity_MapAttributes:: @ 82D7AD4
- .4byte 0x14
- .4byte 0xa
- .4byte Underwater_SootopolisCity_MapBorder
- .4byte Underwater_SootopolisCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-DesertRuins_MapBorder:: @ 82D7AEC
- .incbin "data/maps/DesertRuins/border.bin"
-
-DesertRuins_MapBlockdata:: @ 82D7AF4
- .incbin "data/maps/DesertRuins/map.bin"
-
- .align 2
-DesertRuins_MapAttributes:: @ 82D7F58
- .4byte 0x11
- .4byte 0x21
- .4byte DesertRuins_MapBorder
- .4byte DesertRuins_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-GraniteCave_1F_MapBorder:: @ 82D7F70
- .incbin "data/maps/GraniteCave_1F/border.bin"
-
-GraniteCave_1F_MapBlockdata:: @ 82D7F78
- .incbin "data/maps/GraniteCave_1F/map.bin"
-
- .align 2
-GraniteCave_1F_MapAttributes:: @ 82D8464
- .4byte 0x2a
- .4byte 0xf
- .4byte GraniteCave_1F_MapBorder
- .4byte GraniteCave_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-GraniteCave_B1F_MapBorder:: @ 82D847C
- .incbin "data/maps/GraniteCave_B1F/border.bin"
-
-GraniteCave_B1F_MapBlockdata:: @ 82D8484
- .incbin "data/maps/GraniteCave_B1F/map.bin"
-
- .align 2
-GraniteCave_B1F_MapAttributes:: @ 82D8B04
- .4byte 0x20
- .4byte 0x1a
- .4byte GraniteCave_B1F_MapBorder
- .4byte GraniteCave_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-GraniteCave_B2F_MapBorder:: @ 82D8B1C
- .incbin "data/maps/GraniteCave_B2F/border.bin"
-
-GraniteCave_B2F_MapBlockdata:: @ 82D8B24
- .incbin "data/maps/GraniteCave_B2F/map.bin"
-
- .align 2
-GraniteCave_B2F_MapAttributes:: @ 82D91A4
- .4byte 0x20
- .4byte 0x1a
- .4byte GraniteCave_B2F_MapBorder
- .4byte GraniteCave_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-PetalburgWoods_MapBorder:: @ 82D91BC
- .incbin "data/maps/PetalburgWoods/border.bin"
-
-PetalburgWoods_MapBlockdata:: @ 82D91C4
- .incbin "data/maps/PetalburgWoods/map.bin"
-
- .align 2
-PetalburgWoods_MapAttributes:: @ 82DA244
- .4byte 0x30
- .4byte 0x2c
- .4byte PetalburgWoods_MapBorder
- .4byte PetalburgWoods_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
-MtChimney_MapBorder:: @ 82DA25C
- .incbin "data/maps/MtChimney/border.bin"
-
-MtChimney_MapBlockdata:: @ 82DA264
- .incbin "data/maps/MtChimney/map.bin"
-
- .align 2
-MtChimney_MapAttributes:: @ 82DB114
- .4byte 0x28
- .4byte 0x2f
- .4byte MtChimney_MapBorder
- .4byte MtChimney_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
-MtPyre_1F_MapBorder:: @ 82DB12C
- .incbin "data/maps/MtPyre_1F/border.bin"
-
-MtPyre_1F_MapBlockdata:: @ 82DB134
- .incbin "data/maps/MtPyre_1F/map.bin"
-
- .align 2
-MtPyre_1F_MapAttributes:: @ 82DB478
- .4byte 0x16
- .4byte 0x13
- .4byte MtPyre_1F_MapBorder
- .4byte MtPyre_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MtPyre_2F_MapBorder:: @ 82DB490
- .incbin "data/maps/MtPyre_2F/border.bin"
-
-MtPyre_2F_MapBlockdata:: @ 82DB498
- .incbin "data/maps/MtPyre_2F/map.bin"
-
- .align 2
-MtPyre_2F_MapAttributes:: @ 82DB5EC
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_2F_MapBorder
- .4byte MtPyre_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MtPyre_3F_MapBorder:: @ 82DB604
- .incbin "data/maps/MtPyre_3F/border.bin"
-
-MtPyre_3F_MapBlockdata:: @ 82DB60C
- .incbin "data/maps/MtPyre_3F/map.bin"
-
- .align 2
-MtPyre_3F_MapAttributes:: @ 82DB760
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_3F_MapBorder
- .4byte MtPyre_3F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MtPyre_4F_MapBorder:: @ 82DB778
- .incbin "data/maps/MtPyre_4F/border.bin"
-
-MtPyre_4F_MapBlockdata:: @ 82DB780
- .incbin "data/maps/MtPyre_4F/map.bin"
-
- .align 2
-MtPyre_4F_MapAttributes:: @ 82DB8D4
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_4F_MapBorder
- .4byte MtPyre_4F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MtPyre_5F_MapBorder:: @ 82DB8EC
- .incbin "data/maps/MtPyre_5F/border.bin"
-
-MtPyre_5F_MapBlockdata:: @ 82DB8F4
- .incbin "data/maps/MtPyre_5F/map.bin"
-
- .align 2
-MtPyre_5F_MapAttributes:: @ 82DBA48
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_5F_MapBorder
- .4byte MtPyre_5F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MtPyre_6F_MapBorder:: @ 82DBA60
- .incbin "data/maps/MtPyre_6F/border.bin"
-
-MtPyre_6F_MapBlockdata:: @ 82DBA68
- .incbin "data/maps/MtPyre_6F/map.bin"
-
- .align 2
-MtPyre_6F_MapAttributes:: @ 82DBBBC
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_6F_MapBorder
- .4byte MtPyre_6F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-AquaHideout_1F_MapBorder:: @ 82DBBD4
- .incbin "data/maps/AquaHideout_1F/border.bin"
-
-AquaHideout_1F_MapBlockdata:: @ 82DBBDC
- .incbin "data/maps/AquaHideout_1F/map.bin"
-
- .align 2
-AquaHideout_1F_MapAttributes:: @ 82DC26C
- .4byte 0x1c
- .4byte 0x1e
- .4byte AquaHideout_1F_MapBorder
- .4byte AquaHideout_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-AquaHideout_B1F_MapBorder:: @ 82DC284
- .incbin "data/maps/AquaHideout_B1F/border.bin"
-
-AquaHideout_B1F_MapBlockdata:: @ 82DC28C
- .incbin "data/maps/AquaHideout_B1F/map.bin"
-
- .align 2
-AquaHideout_B1F_MapAttributes:: @ 82DCC1C
- .4byte 0x33
- .4byte 0x18
- .4byte AquaHideout_B1F_MapBorder
- .4byte AquaHideout_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-AquaHideout_B2F_MapBorder:: @ 82DCC34
- .incbin "data/maps/AquaHideout_B2F/border.bin"
-
-AquaHideout_B2F_MapBlockdata:: @ 82DCC3C
- .incbin "data/maps/AquaHideout_B2F/map.bin"
-
- .align 2
-AquaHideout_B2F_MapAttributes:: @ 82DD29C
- .4byte 0x22
- .4byte 0x18
- .4byte AquaHideout_B2F_MapBorder
- .4byte AquaHideout_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
- .incbin "data/maps/Underwater_SeafloorCavern/border.bin"
-
-Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC
- .incbin "data/maps/Underwater_SeafloorCavern/map.bin"
-
- .align 2
-Underwater_SeafloorCavern_MapAttributes:: @ 82DD3B8
- .4byte 0xe
- .4byte 0x9
- .4byte Underwater_SeafloorCavern_MapBorder
- .4byte Underwater_SeafloorCavern_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
- .incbin "data/maps/SeafloorCavern_Entrance/border.bin"
-
-SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8
- .incbin "data/maps/SeafloorCavern_Entrance/map.bin"
-
- .align 2
-SeafloorCavern_Entrance_MapAttributes:: @ 82DD6F8
- .4byte 0x14
- .4byte 0x14
- .4byte SeafloorCavern_Entrance_MapBorder
- .4byte SeafloorCavern_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SeafloorCavern_Room1_MapBorder:: @ 82DD710
- .incbin "data/maps/SeafloorCavern_Room1/border.bin"
-
-SeafloorCavern_Room1_MapBlockdata:: @ 82DD718
- .incbin "data/maps/SeafloorCavern_Room1/map.bin"
-
- .align 2
-SeafloorCavern_Room1_MapAttributes:: @ 82DDA60
- .4byte 0x14
- .4byte 0x15
- .4byte SeafloorCavern_Room1_MapBorder
- .4byte SeafloorCavern_Room1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SeafloorCavern_Room2_MapBorder:: @ 82DDA78
- .incbin "data/maps/SeafloorCavern_Room2/border.bin"
-
-SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80
- .incbin "data/maps/SeafloorCavern_Room2/map.bin"
-
- .align 2
-SeafloorCavern_Room2_MapAttributes:: @ 82DDD74
- .4byte 0x12
- .4byte 0x15
- .4byte SeafloorCavern_Room2_MapBorder
- .4byte SeafloorCavern_Room2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
- .incbin "data/maps/SeafloorCavern_Room3/border.bin"
-
-SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94
- .incbin "data/maps/SeafloorCavern_Room3/map.bin"
-
- .align 2
-SeafloorCavern_Room3_MapAttributes:: @ 82DDFB4
- .4byte 0x10
- .4byte 0x11
- .4byte SeafloorCavern_Room3_MapBorder
- .4byte SeafloorCavern_Room3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
- .incbin "data/maps/SeafloorCavern_Room4/border.bin"
-
-SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4
- .incbin "data/maps/SeafloorCavern_Room4/map.bin"
-
- .align 2
-SeafloorCavern_Room4_MapAttributes:: @ 82DE280
- .4byte 0x12
- .4byte 0x13
- .4byte SeafloorCavern_Room4_MapBorder
- .4byte SeafloorCavern_Room4_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SeafloorCavern_Room5_MapBorder:: @ 82DE298
- .incbin "data/maps/SeafloorCavern_Room5/border.bin"
-
-SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0
- .incbin "data/maps/SeafloorCavern_Room5/map.bin"
-
- .align 2
-SeafloorCavern_Room5_MapAttributes:: @ 82DE5C0
- .4byte 0x14
- .4byte 0x14
- .4byte SeafloorCavern_Room5_MapBorder
- .4byte SeafloorCavern_Room5_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
- .incbin "data/maps/SeafloorCavern_Room6/border.bin"
-
-SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0
- .incbin "data/maps/SeafloorCavern_Room6/map.bin"
-
- .align 2
-SeafloorCavern_Room6_MapAttributes:: @ 82DEA30
- .4byte 0x18
- .4byte 0x17
- .4byte SeafloorCavern_Room6_MapBorder
- .4byte SeafloorCavern_Room6_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SeafloorCavern_Room7_MapBorder:: @ 82DEA48
- .incbin "data/maps/SeafloorCavern_Room7/border.bin"
-
-SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50
- .incbin "data/maps/SeafloorCavern_Room7/map.bin"
-
- .align 2
-SeafloorCavern_Room7_MapAttributes:: @ 82DEED0
- .4byte 0x17
- .4byte 0x19
- .4byte SeafloorCavern_Room7_MapBorder
- .4byte SeafloorCavern_Room7_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
- .incbin "data/maps/SeafloorCavern_Room8/border.bin"
-
-SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0
- .incbin "data/maps/SeafloorCavern_Room8/map.bin"
-
- .align 2
-SeafloorCavern_Room8_MapAttributes:: @ 82DF024
- .4byte 0xb
- .4byte 0xe
- .4byte SeafloorCavern_Room8_MapBorder
- .4byte SeafloorCavern_Room8_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SeafloorCavern_Room9_MapBorder:: @ 82DF03C
- .incbin "data/maps/SeafloorCavern_Room9/border.bin"
-
-SeafloorCavern_Room9_MapBlockdata:: @ 82DF044
- .incbin "data/maps/SeafloorCavern_Room9/map.bin"
-
- .align 2
-SeafloorCavern_Room9_MapAttributes:: @ 82DF9F8
- .4byte 0x1b
- .4byte 0x2e
- .4byte SeafloorCavern_Room9_MapBorder
- .4byte SeafloorCavern_Room9_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
- .incbin "data/maps/CaveOfOrigin_Entrance/border.bin"
-
-CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18
- .incbin "data/maps/CaveOfOrigin_Entrance/map.bin"
-
- .align 2
-CaveOfOrigin_Entrance_MapAttributes:: @ 82DFDF4
- .4byte 0x13
- .4byte 0x1a
- .4byte CaveOfOrigin_Entrance_MapBorder
- .4byte CaveOfOrigin_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
- .incbin "data/maps/CaveOfOrigin_1F/border.bin"
-
-CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14
- .incbin "data/maps/CaveOfOrigin_1F/map.bin"
-
- .align 2
-CaveOfOrigin_1F_MapAttributes:: @ 82E0238
- .4byte 0x17
- .4byte 0x17
- .4byte CaveOfOrigin_1F_MapBorder
- .4byte CaveOfOrigin_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-CaveOfOrigin_B1F_MapBorder:: @ 82E0250
- .incbin "data/maps/CaveOfOrigin_B1F/border.bin"
-
-CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258
- .incbin "data/maps/CaveOfOrigin_B1F/map.bin"
-
- .align 2
-CaveOfOrigin_B1F_MapAttributes:: @ 82E067C
- .4byte 0x17
- .4byte 0x17
- .4byte CaveOfOrigin_B1F_MapBorder
- .4byte CaveOfOrigin_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-CaveOfOrigin_B2F_MapBorder:: @ 82E0694
- .incbin "data/maps/CaveOfOrigin_B2F/border.bin"
-
-CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C
- .incbin "data/maps/CaveOfOrigin_B2F/map.bin"
-
- .align 2
-CaveOfOrigin_B2F_MapAttributes:: @ 82E0A10
- .4byte 0x15
- .4byte 0x15
- .4byte CaveOfOrigin_B2F_MapBorder
- .4byte CaveOfOrigin_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
- .incbin "data/maps/CaveOfOrigin_B3F/border.bin"
-
-CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30
- .incbin "data/maps/CaveOfOrigin_B3F/map.bin"
-
- .align 2
-CaveOfOrigin_B3F_MapAttributes:: @ 82E0D50
- .4byte 0x13
- .4byte 0x15
- .4byte CaveOfOrigin_B3F_MapBorder
- .4byte CaveOfOrigin_B3F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
- .incbin "data/maps/CaveOfOrigin_B4F/border.bin"
-
-CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70
- .incbin "data/maps/CaveOfOrigin_B4F/map.bin"
-
- .align 2
-CaveOfOrigin_B4F_MapAttributes:: @ 82E1044
- .4byte 0x13
- .4byte 0x13
- .4byte CaveOfOrigin_B4F_MapBorder
- .4byte CaveOfOrigin_B4F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-VictoryRoad_1F_MapBorder:: @ 82E105C
- .incbin "data/maps/VictoryRoad_1F/border.bin"
-
-VictoryRoad_1F_MapBlockdata:: @ 82E1064
- .incbin "data/maps/VictoryRoad_1F/map.bin"
-
- .align 2
-VictoryRoad_1F_MapAttributes:: @ 82E2090
- .4byte 0x2e
- .4byte 0x2d
- .4byte VictoryRoad_1F_MapBorder
- .4byte VictoryRoad_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
- .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin"
-
-ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0
- .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideEntranceRoom_MapAttributes:: @ 82E2A44
- .4byte 0x23
- .4byte 0x23
- .4byte ShoalCave_LowTideEntranceRoom_MapBorder
- .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
- .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin"
-
-ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64
- .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideInnerRoom_MapAttributes:: @ 82E380C
- .4byte 0x2e
- .4byte 0x26
- .4byte ShoalCave_LowTideInnerRoom_MapBorder
- .4byte ShoalCave_LowTideInnerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
- .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin"
-
-ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C
- .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideStairsRoom_MapAttributes:: @ 82E3AA4
- .4byte 0x15
- .4byte 0xf
- .4byte ShoalCave_LowTideStairsRoom_MapBorder
- .4byte ShoalCave_LowTideStairsRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
- .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin"
-
-ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4
- .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideLowerRoom_MapAttributes:: @ 82E3E28
- .4byte 0x1f
- .4byte 0xe
- .4byte ShoalCave_LowTideLowerRoom_MapBorder
- .4byte ShoalCave_LowTideLowerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
- .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin"
-
-ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48
- .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin"
-
- .align 2
-ShoalCave_HighTideEntranceRoom_MapAttributes:: @ 82E47DC
- .4byte 0x23
- .4byte 0x23
- .4byte ShoalCave_HighTideEntranceRoom_MapBorder
- .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
- .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin"
-
-ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC
- .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin"
-
- .align 2
-ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4
- .4byte 0x2e
- .4byte 0x26
- .4byte ShoalCave_HighTideInnerRoom_MapBorder
- .4byte ShoalCave_HighTideInnerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E55C8:
- .incbin "data/maps/UnknownMap_082E55C8/border.bin"
-
-UnknownMapBlockdata_082E55C8:
- .incbin "data/maps/UnknownMap_082E55C8/map.bin"
-
- .align 2
-UnknownMapAttributes_082E55C8:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E55C8
- .4byte UnknownMapBlockdata_082E55C8
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E55EC:
- .incbin "data/maps/UnknownMap_082E55EC/border.bin"
-
-UnknownMapBlockdata_082E55EC:
- .incbin "data/maps/UnknownMap_082E55EC/map.bin"
-
- .align 2
-UnknownMapAttributes_082E55EC:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E55EC
- .4byte UnknownMapBlockdata_082E55EC
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E5610:
- .incbin "data/maps/UnknownMap_082E5610/border.bin"
-
-UnknownMapBlockdata_082E5610:
- .incbin "data/maps/UnknownMap_082E5610/map.bin"
-
- .align 2
-UnknownMapAttributes_082E5610:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E5610
- .4byte UnknownMapBlockdata_082E5610
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E5634:
- .incbin "data/maps/UnknownMap_082E5634/border.bin"
-
-UnknownMapBlockdata_082E5634:
- .incbin "data/maps/UnknownMap_082E5634/map.bin"
-
- .align 2
-UnknownMapAttributes_082E5634:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E5634
- .4byte UnknownMapBlockdata_082E5634
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E5658:
- .incbin "data/maps/UnknownMap_082E5658/border.bin"
-
-UnknownMapBlockdata_082E5658:
- .incbin "data/maps/UnknownMap_082E5658/map.bin"
-
- .align 2
-UnknownMapAttributes_082E5658:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E5658
- .4byte UnknownMapBlockdata_082E5658
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E567C:
- .incbin "data/maps/UnknownMap_082E567C/border.bin"
-
-UnknownMapBlockdata_082E567C:
- .incbin "data/maps/UnknownMap_082E567C/map.bin"
-
- .align 2
-UnknownMapAttributes_082E567C:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E567C
- .4byte UnknownMapBlockdata_082E567C
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E56A0:
- .incbin "data/maps/UnknownMap_082E56A0/border.bin"
-
-UnknownMapBlockdata_082E56A0:
- .incbin "data/maps/UnknownMap_082E56A0/map.bin"
-
- .align 2
-UnknownMapAttributes_082E56A0:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E56A0
- .4byte UnknownMapBlockdata_082E56A0
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E56C4:
- .incbin "data/maps/UnknownMap_082E56C4/border.bin"
-
-UnknownMapBlockdata_082E56C4:
- .incbin "data/maps/UnknownMap_082E56C4/map.bin"
-
- .align 2
-UnknownMapAttributes_082E56C4:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E56C4
- .4byte UnknownMapBlockdata_082E56C4
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E56E8:
- .incbin "data/maps/UnknownMap_082E56E8/border.bin"
-
-UnknownMapBlockdata_082E56E8:
- .incbin "data/maps/UnknownMap_082E56E8/map.bin"
-
- .align 2
-UnknownMapAttributes_082E56E8:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E56E8
- .4byte UnknownMapBlockdata_082E56E8
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E570C:
- .incbin "data/maps/UnknownMap_082E570C/border.bin"
-
-UnknownMapBlockdata_082E570C:
- .incbin "data/maps/UnknownMap_082E570C/map.bin"
-
- .align 2
-UnknownMapAttributes_082E570C:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E570C
- .4byte UnknownMapBlockdata_082E570C
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E5730:
- .incbin "data/maps/UnknownMap_082E5730/border.bin"
-
-UnknownMapBlockdata_082E5730:
- .incbin "data/maps/UnknownMap_082E5730/map.bin"
-
- .align 2
-UnknownMapAttributes_082E5730:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E5730
- .4byte UnknownMapBlockdata_082E5730
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E5754:
- .incbin "data/maps/UnknownMap_082E5754/border.bin"
-
-UnknownMapBlockdata_082E5754:
- .incbin "data/maps/UnknownMap_082E5754/map.bin"
-
- .align 2
-UnknownMapAttributes_082E5754:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E5754
- .4byte UnknownMapBlockdata_082E5754
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E5778:
- .incbin "data/maps/UnknownMap_082E5778/border.bin"
-
-UnknownMapBlockdata_082E5778:
- .incbin "data/maps/UnknownMap_082E5778/map.bin"
-
- .align 2
-UnknownMapAttributes_082E5778:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E5778
- .4byte UnknownMapBlockdata_082E5778
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082E579C:
- .incbin "data/maps/UnknownMap_082E579C/border.bin"
-
-UnknownMapBlockdata_082E579C:
- .incbin "data/maps/UnknownMap_082E579C/map.bin"
-
- .align 2
-UnknownMapAttributes_082E579C:
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_082E579C
- .4byte UnknownMapBlockdata_082E579C
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-NewMauville_Entrance_MapBorder:: @ 82E57B4
- .incbin "data/maps/NewMauville_Entrance/border.bin"
-
-NewMauville_Entrance_MapBlockdata:: @ 82E57BC
- .incbin "data/maps/NewMauville_Entrance/map.bin"
-
- .align 2
-NewMauville_Entrance_MapAttributes:: @ 82E5860
- .4byte 0x9
- .4byte 0x9
- .4byte NewMauville_Entrance_MapBorder
- .4byte NewMauville_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-NewMauville_Inside_MapBorder:: @ 82E5878
- .incbin "data/maps/NewMauville_Inside/border.bin"
-
-NewMauville_Inside_MapBlockdata:: @ 82E5880
- .incbin "data/maps/NewMauville_Inside/map.bin"
-
- .align 2
-NewMauville_Inside_MapAttributes:: @ 82E65A4
- .4byte 0x29
- .4byte 0x29
- .4byte NewMauville_Inside_MapBorder
- .4byte NewMauville_Inside_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BikeShop
-
-AbandonedShip_Deck_MapBorder:: @ 82E65BC
- .incbin "data/maps/AbandonedShip_Deck/border.bin"
-
-AbandonedShip_Deck_MapBlockdata:: @ 82E65C4
- .incbin "data/maps/AbandonedShip_Deck/map.bin"
-
- .align 2
-AbandonedShip_Deck_MapAttributes:: @ 82E698C
- .4byte 0x17
- .4byte 0x15
- .4byte AbandonedShip_Deck_MapBorder
- .4byte AbandonedShip_Deck_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
- .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin"
-
-AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC
- .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin"
-
- .align 2
-AbandonedShip_Corridors_1F_MapAttributes:: @ 82E6B5C
- .4byte 0x12
- .4byte 0xc
- .4byte AbandonedShip_Corridors_1F_MapBorder
- .4byte AbandonedShip_Corridors_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
- .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin"
-
-AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C
- .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms_1F_MapAttributes:: @ 82E6DE0
- .4byte 0x12
- .4byte 0x11
- .4byte AbandonedShip_Rooms_1F_MapBorder
- .4byte AbandonedShip_Rooms_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
- .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin"
-
-AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00
- .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin"
-
- .align 2
-AbandonedShip_Corridors_B1F_MapAttributes:: @ 82E6F04
- .4byte 0xd
- .4byte 0xa
- .4byte AbandonedShip_Corridors_B1F_MapBorder
- .4byte AbandonedShip_Corridors_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
- .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin"
-
-AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24
- .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms_B1F_MapAttributes:: @ 82E70D4
- .4byte 0x1b
- .4byte 0x8
- .4byte AbandonedShip_Rooms_B1F_MapBorder
- .4byte AbandonedShip_Rooms_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
- .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin"
-
-AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4
- .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms2_B1F_MapAttributes:: @ 82E7214
- .4byte 0x12
- .4byte 0x8
- .4byte AbandonedShip_Rooms2_B1F_MapBorder
- .4byte AbandonedShip_Rooms2_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_Underwater1_MapBorder:: @ 82E722C
- .incbin "data/maps/AbandonedShip_Underwater1/border.bin"
-
-AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234
- .incbin "data/maps/AbandonedShip_Underwater1/map.bin"
-
- .align 2
-AbandonedShip_Underwater1_MapAttributes:: @ 82E72B4
- .4byte 0x8
- .4byte 0x8
- .4byte AbandonedShip_Underwater1_MapBorder
- .4byte AbandonedShip_Underwater1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
- .incbin "data/maps/AbandonedShip_Room_B1F/border.bin"
-
-AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4
- .incbin "data/maps/AbandonedShip_Room_B1F/map.bin"
-
- .align 2
-AbandonedShip_Room_B1F_MapAttributes:: @ 82E7364
- .4byte 0x9
- .4byte 0x8
- .4byte AbandonedShip_Room_B1F_MapBorder
- .4byte AbandonedShip_Room_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
- .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin"
-
-AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384
- .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms2_1F_MapAttributes:: @ 82E74B8
- .4byte 0x9
- .4byte 0x11
- .4byte AbandonedShip_Rooms2_1F_MapBorder
- .4byte AbandonedShip_Rooms2_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
- .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin"
-
-AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8
- .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin"
-
- .align 2
-AbandonedShip_CaptainsOffice_MapAttributes:: @ 82E7558
- .4byte 0x9
- .4byte 0x7
- .4byte AbandonedShip_CaptainsOffice_MapBorder
- .4byte AbandonedShip_CaptainsOffice_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-AbandonedShip_Underwater2_MapBorder:: @ 82E7570
- .incbin "data/maps/AbandonedShip_Underwater2/border.bin"
-
-AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578
- .incbin "data/maps/AbandonedShip_Underwater2/map.bin"
-
- .align 2
-AbandonedShip_Underwater2_MapAttributes:: @ 82E76A0
- .4byte 0x15
- .4byte 0x7
- .4byte AbandonedShip_Underwater2_MapBorder
- .4byte AbandonedShip_Underwater2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-SecretBase_RedCave1_MapBorder:: @ 82E76B8
- .incbin "data/maps/SecretBase_RedCave1/border.bin"
-
-SecretBase_RedCave1_MapBlockdata:: @ 82E76C0
- .incbin "data/maps/SecretBase_RedCave1/map.bin"
-
- .align 2
-SecretBase_RedCave1_MapAttributes:: @ 82E7788
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_RedCave1_MapBorder
- .4byte SecretBase_RedCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave1_MapBorder:: @ 82E77A0
- .incbin "data/maps/SecretBase_BrownCave1/border.bin"
-
-SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8
- .incbin "data/maps/SecretBase_BrownCave1/map.bin"
-
- .align 2
-SecretBase_BrownCave1_MapAttributes:: @ 82E7870
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_BrownCave1_MapBorder
- .4byte SecretBase_BrownCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave1_MapBorder:: @ 82E7888
- .incbin "data/maps/SecretBase_BlueCave1/border.bin"
-
-SecretBase_BlueCave1_MapBlockdata:: @ 82E7890
- .incbin "data/maps/SecretBase_BlueCave1/map.bin"
-
- .align 2
-SecretBase_BlueCave1_MapAttributes:: @ 82E7958
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_BlueCave1_MapBorder
- .4byte SecretBase_BlueCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave1_MapBorder:: @ 82E7970
- .incbin "data/maps/SecretBase_YellowCave1/border.bin"
-
-SecretBase_YellowCave1_MapBlockdata:: @ 82E7978
- .incbin "data/maps/SecretBase_YellowCave1/map.bin"
-
- .align 2
-SecretBase_YellowCave1_MapAttributes:: @ 82E7A40
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_YellowCave1_MapBorder
- .4byte SecretBase_YellowCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree1_MapBorder:: @ 82E7A58
- .incbin "data/maps/SecretBase_Tree1/border.bin"
-
-SecretBase_Tree1_MapBlockdata:: @ 82E7A60
- .incbin "data/maps/SecretBase_Tree1/map.bin"
-
- .align 2
-SecretBase_Tree1_MapAttributes:: @ 82E7B28
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_Tree1_MapBorder
- .4byte SecretBase_Tree1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub1_MapBorder:: @ 82E7B40
- .incbin "data/maps/SecretBase_Shrub1/border.bin"
-
-SecretBase_Shrub1_MapBlockdata:: @ 82E7B48
- .incbin "data/maps/SecretBase_Shrub1/map.bin"
-
- .align 2
-SecretBase_Shrub1_MapAttributes:: @ 82E7C10
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_Shrub1_MapBorder
- .4byte SecretBase_Shrub1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave2_MapBorder:: @ 82E7C28
- .incbin "data/maps/SecretBase_RedCave2/border.bin"
-
-SecretBase_RedCave2_MapBlockdata:: @ 82E7C30
- .incbin "data/maps/SecretBase_RedCave2/map.bin"
-
- .align 2
-SecretBase_RedCave2_MapAttributes:: @ 82E7D10
- .4byte 0x7
- .4byte 0x10
- .4byte SecretBase_RedCave2_MapBorder
- .4byte SecretBase_RedCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave2_MapBorder:: @ 82E7D28
- .incbin "data/maps/SecretBase_BrownCave2/border.bin"
-
-SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30
- .incbin "data/maps/SecretBase_BrownCave2/map.bin"
-
- .align 2
-SecretBase_BrownCave2_MapAttributes:: @ 82E7E2C
- .4byte 0xe
- .4byte 0x9
- .4byte SecretBase_BrownCave2_MapBorder
- .4byte SecretBase_BrownCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave2_MapBorder:: @ 82E7E44
- .incbin "data/maps/SecretBase_BlueCave2/border.bin"
-
-SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C
- .incbin "data/maps/SecretBase_BlueCave2/map.bin"
-
- .align 2
-SecretBase_BlueCave2_MapAttributes:: @ 82E7F20
- .4byte 0xf
- .4byte 0x7
- .4byte SecretBase_BlueCave2_MapBorder
- .4byte SecretBase_BlueCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave2_MapBorder:: @ 82E7F38
- .incbin "data/maps/SecretBase_YellowCave2/border.bin"
-
-SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40
- .incbin "data/maps/SecretBase_YellowCave2/map.bin"
-
- .align 2
-SecretBase_YellowCave2_MapAttributes:: @ 82E803C
- .4byte 0xe
- .4byte 0x9
- .4byte SecretBase_YellowCave2_MapBorder
- .4byte SecretBase_YellowCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree2_MapBorder:: @ 82E8054
- .incbin "data/maps/SecretBase_Tree2/border.bin"
-
-SecretBase_Tree2_MapBlockdata:: @ 82E805C
- .incbin "data/maps/SecretBase_Tree2/map.bin"
-
- .align 2
-SecretBase_Tree2_MapAttributes:: @ 82E813C
- .4byte 0x7
- .4byte 0x10
- .4byte SecretBase_Tree2_MapBorder
- .4byte SecretBase_Tree2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub2_MapBorder:: @ 82E8154
- .incbin "data/maps/SecretBase_Shrub2/border.bin"
-
-SecretBase_Shrub2_MapBlockdata:: @ 82E815C
- .incbin "data/maps/SecretBase_Shrub2/map.bin"
-
- .align 2
-SecretBase_Shrub2_MapAttributes:: @ 82E8230
- .4byte 0xf
- .4byte 0x7
- .4byte SecretBase_Shrub2_MapBorder
- .4byte SecretBase_Shrub2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave3_MapBorder:: @ 82E8248
- .incbin "data/maps/SecretBase_RedCave3/border.bin"
-
-SecretBase_RedCave3_MapBlockdata:: @ 82E8250
- .incbin "data/maps/SecretBase_RedCave3/map.bin"
-
- .align 2
-SecretBase_RedCave3_MapAttributes:: @ 82E8340
- .4byte 0xf
- .4byte 0x8
- .4byte SecretBase_RedCave3_MapBorder
- .4byte SecretBase_RedCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave3_MapBorder:: @ 82E8358
- .incbin "data/maps/SecretBase_BrownCave3/border.bin"
-
-SecretBase_BrownCave3_MapBlockdata:: @ 82E8360
- .incbin "data/maps/SecretBase_BrownCave3/map.bin"
-
- .align 2
-SecretBase_BrownCave3_MapAttributes:: @ 82E84AC
- .4byte 0xf
- .4byte 0xb
- .4byte SecretBase_BrownCave3_MapBorder
- .4byte SecretBase_BrownCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave3_MapBorder:: @ 82E84C4
- .incbin "data/maps/SecretBase_BlueCave3/border.bin"
-
-SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC
- .incbin "data/maps/SecretBase_BlueCave3/map.bin"
-
- .align 2
-SecretBase_BlueCave3_MapAttributes:: @ 82E8620
- .4byte 0xa
- .4byte 0x11
- .4byte SecretBase_BlueCave3_MapBorder
- .4byte SecretBase_BlueCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave3_MapBorder:: @ 82E8638
- .incbin "data/maps/SecretBase_YellowCave3/border.bin"
-
-SecretBase_YellowCave3_MapBlockdata:: @ 82E8640
- .incbin "data/maps/SecretBase_YellowCave3/map.bin"
-
- .align 2
-SecretBase_YellowCave3_MapAttributes:: @ 82E8748
- .4byte 0xc
- .4byte 0xb
- .4byte SecretBase_YellowCave3_MapBorder
- .4byte SecretBase_YellowCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree3_MapBorder:: @ 82E8760
- .incbin "data/maps/SecretBase_Tree3/border.bin"
-
-SecretBase_Tree3_MapBlockdata:: @ 82E8768
- .incbin "data/maps/SecretBase_Tree3/map.bin"
-
- .align 2
-SecretBase_Tree3_MapAttributes:: @ 82E8878
- .4byte 0x11
- .4byte 0x8
- .4byte SecretBase_Tree3_MapBorder
- .4byte SecretBase_Tree3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub3_MapBorder:: @ 82E8890
- .incbin "data/maps/SecretBase_Shrub3/border.bin"
-
-SecretBase_Shrub3_MapBlockdata:: @ 82E8898
- .incbin "data/maps/SecretBase_Shrub3/map.bin"
-
- .align 2
-SecretBase_Shrub3_MapAttributes:: @ 82E89B8
- .4byte 0xd
- .4byte 0xb
- .4byte SecretBase_Shrub3_MapBorder
- .4byte SecretBase_Shrub3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave4_MapBorder:: @ 82E89D0
- .incbin "data/maps/SecretBase_RedCave4/border.bin"
-
-SecretBase_RedCave4_MapBlockdata:: @ 82E89D8
- .incbin "data/maps/SecretBase_RedCave4/map.bin"
-
- .align 2
-SecretBase_RedCave4_MapAttributes:: @ 82E8AE8
- .4byte 0x9
- .4byte 0xf
- .4byte SecretBase_RedCave4_MapBorder
- .4byte SecretBase_RedCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave4_MapBorder:: @ 82E8B00
- .incbin "data/maps/SecretBase_BrownCave4/border.bin"
-
-SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08
- .incbin "data/maps/SecretBase_BrownCave4/map.bin"
-
- .align 2
-SecretBase_BrownCave4_MapAttributes:: @ 82E8C58
- .4byte 0xe
- .4byte 0xc
- .4byte SecretBase_BrownCave4_MapBorder
- .4byte SecretBase_BrownCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave4_MapBorder:: @ 82E8C70
- .incbin "data/maps/SecretBase_BlueCave4/border.bin"
-
-SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78
- .incbin "data/maps/SecretBase_BlueCave4/map.bin"
-
- .align 2
-SecretBase_BlueCave4_MapAttributes:: @ 82E8DAC
- .4byte 0x9
- .4byte 0x11
- .4byte SecretBase_BlueCave4_MapBorder
- .4byte SecretBase_BlueCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
- .incbin "data/maps/SecretBase_YellowCave4/border.bin"
-
-SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC
- .incbin "data/maps/SecretBase_YellowCave4/map.bin"
-
- .align 2
-SecretBase_YellowCave4_MapAttributes:: @ 82E8F38
- .4byte 0xd
- .4byte 0xe
- .4byte SecretBase_YellowCave4_MapBorder
- .4byte SecretBase_YellowCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree4_MapBorder:: @ 82E8F50
- .incbin "data/maps/SecretBase_Tree4/border.bin"
-
-SecretBase_Tree4_MapBlockdata:: @ 82E8F58
- .incbin "data/maps/SecretBase_Tree4/map.bin"
-
- .align 2
-SecretBase_Tree4_MapAttributes:: @ 82E90E0
- .4byte 0xe
- .4byte 0xe
- .4byte SecretBase_Tree4_MapBorder
- .4byte SecretBase_Tree4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub4_MapBorder:: @ 82E90F8
- .incbin "data/maps/SecretBase_Shrub4/border.bin"
-
-SecretBase_Shrub4_MapBlockdata:: @ 82E9100
- .incbin "data/maps/SecretBase_Shrub4/map.bin"
-
- .align 2
-SecretBase_Shrub4_MapAttributes:: @ 82E9234
- .4byte 0xe
- .4byte 0xb
- .4byte SecretBase_Shrub4_MapBorder
- .4byte SecretBase_Shrub4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
-SingleBattleColosseum_MapBorder:: @ 82E924C
- .incbin "data/maps/SingleBattleColosseum/border.bin"
-
-SingleBattleColosseum_MapBlockdata:: @ 82E9254
- .incbin "data/maps/SingleBattleColosseum/map.bin"
-
- .align 2
-SingleBattleColosseum_MapAttributes:: @ 82E9350
- .4byte 0xe
- .4byte 0x9
- .4byte SingleBattleColosseum_MapBorder
- .4byte SingleBattleColosseum_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
-TradeCenter_MapBorder:: @ 82E9368
- .incbin "data/maps/TradeCenter/border.bin"
-
-TradeCenter_MapBlockdata:: @ 82E9370
- .incbin "data/maps/TradeCenter/map.bin"
-
- .align 2
-TradeCenter_MapAttributes:: @ 82E9448
- .4byte 0xc
- .4byte 0x9
- .4byte TradeCenter_MapBorder
- .4byte TradeCenter_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
-RecordCorner_MapBorder:: @ 82E9460
- .incbin "data/maps/RecordCorner/border.bin"
-
-RecordCorner_MapBlockdata:: @ 82E9468
- .incbin "data/maps/RecordCorner/map.bin"
-
- .align 2
-RecordCorner_MapAttributes:: @ 82E95F8
- .4byte 0x14
- .4byte 0xa
- .4byte RecordCorner_MapBorder
- .4byte RecordCorner_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
-DoubleBattleColosseum_MapBorder:: @ 82E9610
- .incbin "data/maps/DoubleBattleColosseum/border.bin"
-
-DoubleBattleColosseum_MapBlockdata:: @ 82E9618
- .incbin "data/maps/DoubleBattleColosseum/map.bin"
-
- .align 2
-DoubleBattleColosseum_MapAttributes:: @ 82E9714
- .4byte 0xe
- .4byte 0x9
- .4byte DoubleBattleColosseum_MapBorder
- .4byte DoubleBattleColosseum_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
-LinkContestRoom1_MapBorder:: @ 82E972C
- .incbin "data/maps/LinkContestRoom1/border.bin"
-
-LinkContestRoom1_MapBlockdata:: @ 82E9734
- .incbin "data/maps/LinkContestRoom1/map.bin"
-
- .align 2
-LinkContestRoom1_MapAttributes:: @ 82E9880
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom1_MapBorder
- .4byte LinkContestRoom1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
-UnknownMap_25_29_MapBorder:: @ 82E9898
- .incbin "data/maps/UnknownMap_25_29/border.bin"
-
-UnknownMap_25_29_MapBlockdata:: @ 82E98A0
- .incbin "data/maps/UnknownMap_25_29/map.bin"
-
- .align 2
-UnknownMap_25_29_MapAttributes:: @ 82E98A4
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_29_MapBorder
- .4byte UnknownMap_25_29_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-UnknownMap_25_30_MapBorder:: @ 82E98BC
- .incbin "data/maps/UnknownMap_25_30/border.bin"
-
-UnknownMap_25_30_MapBlockdata:: @ 82E98C4
- .incbin "data/maps/UnknownMap_25_30/map.bin"
-
- .align 2
-UnknownMap_25_30_MapAttributes:: @ 82E98C8
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_30_MapBorder
- .4byte UnknownMap_25_30_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-UnknownMap_25_31_MapBorder:: @ 82E98E0
- .incbin "data/maps/UnknownMap_25_31/border.bin"
-
-UnknownMap_25_31_MapBlockdata:: @ 82E98E8
- .incbin "data/maps/UnknownMap_25_31/map.bin"
-
- .align 2
-UnknownMap_25_31_MapAttributes:: @ 82E98EC
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_31_MapBorder
- .4byte UnknownMap_25_31_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-UnknownMap_25_32_MapBorder:: @ 82E9904
- .incbin "data/maps/UnknownMap_25_32/border.bin"
-
-UnknownMap_25_32_MapBlockdata:: @ 82E990C
- .incbin "data/maps/UnknownMap_25_32/map.bin"
-
- .align 2
-UnknownMap_25_32_MapAttributes:: @ 82E9910
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_32_MapBorder
- .4byte UnknownMap_25_32_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-UnknownMap_25_33_MapBorder:: @ 82E9928
- .incbin "data/maps/UnknownMap_25_33/border.bin"
-
-UnknownMap_25_33_MapBlockdata:: @ 82E9930
- .incbin "data/maps/UnknownMap_25_33/map.bin"
-
- .align 2
-UnknownMap_25_33_MapAttributes:: @ 82E9934
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_33_MapBorder
- .4byte UnknownMap_25_33_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-UnknownMap_25_34_MapBorder:: @ 82E994C
- .incbin "data/maps/UnknownMap_25_34/border.bin"
-
-UnknownMap_25_34_MapBlockdata:: @ 82E9954
- .incbin "data/maps/UnknownMap_25_34/map.bin"
-
- .align 2
-UnknownMap_25_34_MapAttributes:: @ 82E9958
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_34_MapBorder
- .4byte UnknownMap_25_34_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
-LinkContestRoom2_MapBorder:: @ 82E9970
- .incbin "data/maps/LinkContestRoom2/border.bin"
-
-LinkContestRoom2_MapBlockdata:: @ 82E9978
- .incbin "data/maps/LinkContestRoom2/map.bin"
-
- .align 2
-LinkContestRoom2_MapAttributes:: @ 82E9AC4
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom2_MapBorder
- .4byte LinkContestRoom2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
-LinkContestRoom3_MapBorder:: @ 82E9ADC
- .incbin "data/maps/LinkContestRoom3/border.bin"
-
-LinkContestRoom3_MapBlockdata:: @ 82E9AE4
- .incbin "data/maps/LinkContestRoom3/map.bin"
-
- .align 2
-LinkContestRoom3_MapAttributes:: @ 82E9C30
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom3_MapBorder
- .4byte LinkContestRoom3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
-LinkContestRoom4_MapBorder:: @ 82E9C48
- .incbin "data/maps/LinkContestRoom4/border.bin"
-
-LinkContestRoom4_MapBlockdata:: @ 82E9C50
- .incbin "data/maps/LinkContestRoom4/map.bin"
-
- .align 2
-LinkContestRoom4_MapAttributes:: @ 82E9D9C
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom4_MapBorder
- .4byte LinkContestRoom4_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
-LinkContestRoom5_MapBorder:: @ 82E9DB4
- .incbin "data/maps/LinkContestRoom5/border.bin"
-
-LinkContestRoom5_MapBlockdata:: @ 82E9DBC
- .incbin "data/maps/LinkContestRoom5/map.bin"
-
- .align 2
-LinkContestRoom5_MapAttributes:: @ 82E9F08
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom5_MapBorder
- .4byte LinkContestRoom5_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
-LinkContestRoom6_MapBorder:: @ 82E9F20
- .incbin "data/maps/LinkContestRoom6/border.bin"
-
-LinkContestRoom6_MapBlockdata:: @ 82E9F28
- .incbin "data/maps/LinkContestRoom6/map.bin"
-
- .align 2
-LinkContestRoom6_MapAttributes:: @ 82EA074
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom6_MapBorder
- .4byte LinkContestRoom6_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
-InsideOfTruck_MapBorder:: @ 82EA08C
- .incbin "data/maps/InsideOfTruck/border.bin"
-
-InsideOfTruck_MapBlockdata:: @ 82EA094
- .incbin "data/maps/InsideOfTruck/map.bin"
-
- .align 2
-InsideOfTruck_MapAttributes:: @ 82EA0C8
- .4byte 0x5
- .4byte 0x5
- .4byte InsideOfTruck_MapBorder
- .4byte InsideOfTruck_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideOfTruck
-
-SafariZone_Northwest_MapBorder:: @ 82EA0E0
- .incbin "data/maps/SafariZone_Northwest/border.bin"
-
-SafariZone_Northwest_MapBlockdata:: @ 82EA0E8
- .incbin "data/maps/SafariZone_Northwest/map.bin"
-
- .align 2
-SafariZone_Northwest_MapAttributes:: @ 82EAD68
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Northwest_MapBorder
- .4byte SafariZone_Northwest_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-SafariZone_Northeast_MapBorder:: @ 82EAD80
- .incbin "data/maps/SafariZone_Northeast/border.bin"
-
-SafariZone_Northeast_MapBlockdata:: @ 82EAD88
- .incbin "data/maps/SafariZone_Northeast/map.bin"
-
- .align 2
-SafariZone_Northeast_MapAttributes:: @ 82EBA08
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Northeast_MapBorder
- .4byte SafariZone_Northeast_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-SafariZone_Southwest_MapBorder:: @ 82EBA20
- .incbin "data/maps/SafariZone_Southwest/border.bin"
-
-SafariZone_Southwest_MapBlockdata:: @ 82EBA28
- .incbin "data/maps/SafariZone_Southwest/map.bin"
-
- .align 2
-SafariZone_Southwest_MapAttributes:: @ 82EC6A8
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Southwest_MapBorder
- .4byte SafariZone_Southwest_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-SafariZone_Southeast_MapBorder:: @ 82EC6C0
- .incbin "data/maps/SafariZone_Southeast/border.bin"
-
-SafariZone_Southeast_MapBlockdata:: @ 82EC6C8
- .incbin "data/maps/SafariZone_Southeast/map.bin"
-
- .align 2
-SafariZone_Southeast_MapAttributes:: @ 82ED348
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Southeast_MapBorder
- .4byte SafariZone_Southeast_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
-UnknownMapBorder_082EDF30:
- .incbin "data/maps/UnknownMap_082EDF30/border.bin"
-
-UnknownMapBlockdata_082EDF30:
- .incbin "data/maps/UnknownMap_082EDF30/map.bin"
-
- .align 2
-UnknownMapAttributes_082EDF30:
- .4byte 0x3A
- .4byte 0x1A
- .4byte UnknownMapBorder_082EDF30
- .4byte UnknownMapBlockdata_082EDF30
- .4byte gTileset_General
- .4byte 0
-
-Route109_SeashoreHouse_MapBorder:: @ 82EDF48
- .incbin "data/maps/Route109_SeashoreHouse/border.bin"
-
-Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50
- .incbin "data/maps/Route109_SeashoreHouse/map.bin"
-
- .align 2
-Route109_SeashoreHouse_MapAttributes:: @ 82EE07C
- .4byte 0xf
- .4byte 0xa
- .4byte Route109_SeashoreHouse_MapBorder
- .4byte Route109_SeashoreHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_SeashoreHouse
-
-Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
- .incbin "data/maps/Route110_TrickHouseEntrance/border.bin"
-
-Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C
- .incbin "data/maps/Route110_TrickHouseEntrance/map.bin"
-
- .align 2
-Route110_TrickHouseEntrance_MapAttributes:: @ 82EE15C
- .4byte 0xc
- .4byte 0x8
- .4byte Route110_TrickHouseEntrance_MapBorder
- .4byte Route110_TrickHouseEntrance_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route110_TrickHouseEnd_MapBorder:: @ 82EE174
- .incbin "data/maps/Route110_TrickHouseEnd/border.bin"
-
-Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C
- .incbin "data/maps/Route110_TrickHouseEnd/map.bin"
-
- .align 2
-Route110_TrickHouseEnd_MapAttributes:: @ 82EE23C
- .4byte 0xc
- .4byte 0x8
- .4byte Route110_TrickHouseEnd_MapBorder
- .4byte Route110_TrickHouseEnd_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
- .incbin "data/maps/Route110_TrickHouseCorridor/border.bin"
-
-Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C
- .incbin "data/maps/Route110_TrickHouseCorridor/map.bin"
-
- .align 2
-Route110_TrickHouseCorridor_MapAttributes:: @ 82EE52C
- .4byte 0xf
- .4byte 0x18
- .4byte Route110_TrickHouseCorridor_MapBorder
- .4byte Route110_TrickHouseCorridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
- .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin"
-
-Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C
- .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle1_MapAttributes:: @ 82EE7E0
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle1_MapBorder
- .4byte Route110_TrickHousePuzzle1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
- .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin"
-
-Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800
- .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle2_MapAttributes:: @ 82EEA94
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle2_MapBorder
- .4byte Route110_TrickHousePuzzle2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
- .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin"
-
-Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4
- .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle3_MapAttributes:: @ 82EED48
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle3_MapBorder
- .4byte Route110_TrickHousePuzzle3_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
- .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin"
-
-Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68
- .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle4_MapAttributes:: @ 82EEFFC
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle4_MapBorder
- .4byte Route110_TrickHousePuzzle4_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
- .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin"
-
-Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C
- .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle5_MapAttributes:: @ 82EF2B0
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle5_MapBorder
- .4byte Route110_TrickHousePuzzle5_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
- .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin"
-
-Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0
- .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle6_MapAttributes:: @ 82EF564
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle6_MapBorder
- .4byte Route110_TrickHousePuzzle6_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
- .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin"
-
-Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584
- .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle7_MapAttributes:: @ 82EF818
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle7_MapBorder
- .4byte Route110_TrickHousePuzzle7_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
- .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin"
-
-Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838
- .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle8_MapAttributes:: @ 82EFACC
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle8_MapBorder
- .4byte Route110_TrickHousePuzzle8_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
-FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
- .incbin "data/maps/FortreeCity_DecorationShop/border.bin"
-
-FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC
- .incbin "data/maps/FortreeCity_DecorationShop/map.bin"
-
- .align 2
-FortreeCity_DecorationShop_MapAttributes:: @ 82EFB4C
- .4byte 0x8
- .4byte 0x6
- .4byte FortreeCity_DecorationShop_MapBorder
- .4byte FortreeCity_DecorationShop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64
- .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin"
-
-Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata:: @ 82EFB6C
- .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin"
-
- .align 2
-Route110_SeasideCyclingRoadNorthEntrance_MapAttributes:: @ 82EFC20
-Route110_SeasideCyclingRoadSouthEntrance_MapAttributes:: @ 82EFC20
- .4byte 0xf
- .4byte 0x6
- .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBorder
- .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
- .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin"
-
-LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40
- .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_1F_MapAttributes:: @ 82EFD60
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_1F_MapBorder
- .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
- .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin"
-
-LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80
- .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_2F_MapAttributes:: @ 82EFEA0
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_2F_MapBorder
- .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
- .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin"
-
-LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0
- .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_3F_MapAttributes:: @ 82EFFE0
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_3F_MapBorder
- .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
- .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin"
-
-LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000
- .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_4F_MapAttributes:: @ 82F0120
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_4F_MapBorder
- .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
- .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin"
-
-LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140
- .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_5F_MapAttributes:: @ 82F0260
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_5F_MapBorder
- .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
- .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin"
-
-LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280
- .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStoreRooftop_MapAttributes:: @ 82F0430
- .4byte 0x12
- .4byte 0xc
- .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
- .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
-Route130_MapBorder:: @ 82F0448
- .incbin "data/maps/Route130/border.bin"
-
-Route130_MapBlockdata:: @ 82F0450
- .incbin "data/maps/Route130/map.bin"
-
- .align 2
-Route130_MapAttributes:: @ 82F1D50
- .4byte 0x50
- .4byte 0x28
- .4byte Route130_MapBorder
- .4byte Route130_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-BattleTower_Lobby_MapBorder:: @ 82F1D68
- .incbin "data/maps/BattleTower_Lobby/border.bin"
-
-BattleTower_Lobby_MapBlockdata:: @ 82F1D70
- .incbin "data/maps/BattleTower_Lobby/map.bin"
-
- .align 2
-BattleTower_Lobby_MapAttributes:: @ 82F1E6C
- .4byte 0xe
- .4byte 0x9
- .4byte BattleTower_Lobby_MapBorder
- .4byte BattleTower_Lobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTower
-
-BattleTower_Outside_MapBorder:: @ 82F1E84
- .incbin "data/maps/BattleTower_Outside/border.bin"
-
-BattleTower_Outside_MapBlockdata:: @ 82F1E8C
- .incbin "data/maps/BattleTower_Outside/map.bin"
-
- .align 2
-BattleTower_Outside_MapAttributes:: @ 82F2558
- .4byte 0x1d
- .4byte 0x1e
- .4byte BattleTower_Outside_MapBorder
- .4byte BattleTower_Outside_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
-BattleTower_Elevator_MapBorder:: @ 82F2570
- .incbin "data/maps/BattleTower_Elevator/border.bin"
-
-BattleTower_Elevator_MapBlockdata:: @ 82F2578
- .incbin "data/maps/BattleTower_Elevator/map.bin"
-
- .align 2
-BattleTower_Elevator_MapAttributes:: @ 82F25B0
- .4byte 0x4
- .4byte 0x7
- .4byte BattleTower_Elevator_MapBorder
- .4byte BattleTower_Elevator_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTower
-
-BattleTower_Corridor_MapBorder:: @ 82F25C8
- .incbin "data/maps/BattleTower_Corridor/border.bin"
-
-BattleTower_Corridor_MapBlockdata:: @ 82F25D0
- .incbin "data/maps/BattleTower_Corridor/map.bin"
-
- .align 2
-BattleTower_Corridor_MapAttributes:: @ 82F267C
- .4byte 0x11
- .4byte 0x5
- .4byte BattleTower_Corridor_MapBorder
- .4byte BattleTower_Corridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTower
-
-BattleTower_BattleRoom_MapBorder:: @ 82F2694
- .incbin "data/maps/BattleTower_BattleRoom/border.bin"
-
-BattleTower_BattleRoom_MapBlockdata:: @ 82F269C
- .incbin "data/maps/BattleTower_BattleRoom/map.bin"
-
- .align 2
-BattleTower_BattleRoom_MapAttributes:: @ 82F2750
- .4byte 0xa
- .4byte 0x9
- .4byte BattleTower_BattleRoom_MapBorder
- .4byte BattleTower_BattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTower
-
-RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
- .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin"
-
-RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770
- .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin"
-
- .align 2
-RustboroCity_DevonCorp_3F_MapAttributes:: @ 82F28C8
- .4byte 0x13
- .4byte 0x9
- .4byte RustboroCity_DevonCorp_3F_MapBorder
- .4byte RustboroCity_DevonCorp_3F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
- .incbin "data/maps/EverGrandeCity_PokemonLeague/border.bin"
-
-EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8
- .incbin "data/maps/EverGrandeCity_PokemonLeague/map.bin"
-
- .align 2
-EverGrandeCity_PokemonLeague_MapAttributes:: @ 82F2AB0
- .4byte 0x13
- .4byte 0xc
- .4byte EverGrandeCity_PokemonLeague_MapBorder
- .4byte EverGrandeCity_PokemonLeague_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
-Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
- .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin"
-
-Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0
- .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin"
-
- .align 2
-Route119_WeatherInstitute_1F_MapAttributes:: @ 82F2CD8
- .4byte 0x14
- .4byte 0xd
- .4byte Route119_WeatherInstitute_1F_MapBorder
- .4byte Route119_WeatherInstitute_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
-Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
- .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin"
-
-Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8
- .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin"
-
- .align 2
-Route119_WeatherInstitute_2F_MapAttributes:: @ 82F2EB0
- .4byte 0x14
- .4byte 0xb
- .4byte Route119_WeatherInstitute_2F_MapBorder
- .4byte Route119_WeatherInstitute_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
-LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
- .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin"
-
-LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0
- .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStoreElevator_MapAttributes:: @ 82F2F00
- .4byte 0x4
- .4byte 0x6
- .4byte LilycoveCity_DepartmentStoreElevator_MapBorder
- .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTower
-
-Underwater1_MapBorder:: @ 82F2F18
- .incbin "data/maps/Underwater1/border.bin"
-
-Underwater1_MapBlockdata:: @ 82F2F20
- .incbin "data/maps/Underwater1/map.bin"
-
- .align 2
-Underwater1_MapAttributes:: @ 82F6120
- .4byte 0x50
- .4byte 0x50
- .4byte Underwater1_MapBorder
- .4byte Underwater1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
- .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin"
-
-MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140
- .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin"
-
- .align 2
-MossdeepCity_SpaceCenter_1F_MapAttributes:: @ 82F6280
- .4byte 0x10
- .4byte 0xa
- .4byte MossdeepCity_SpaceCenter_1F_MapBorder
- .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
- .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin"
-
-MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0
- .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin"
-
- .align 2
-MossdeepCity_SpaceCenter_2F_MapAttributes:: @ 82F63E0
- .4byte 0x10
- .4byte 0xa
- .4byte MossdeepCity_SpaceCenter_2F_MapBorder
- .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-SSTidalCorridor_MapBorder:: @ 82F63F8
- .incbin "data/maps/SSTidalCorridor/border.bin"
-
-SSTidalCorridor_MapBlockdata:: @ 82F6400
- .incbin "data/maps/SSTidalCorridor/map.bin"
-
- .align 2
-SSTidalCorridor_MapAttributes:: @ 82F65D4
- .4byte 0x12
- .4byte 0xd
- .4byte SSTidalCorridor_MapBorder
- .4byte SSTidalCorridor_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-SSTidalLowerDeck_MapBorder:: @ 82F65EC
- .incbin "data/maps/SSTidalLowerDeck/border.bin"
-
-SSTidalLowerDeck_MapBlockdata:: @ 82F65F4
- .incbin "data/maps/SSTidalLowerDeck/map.bin"
-
- .align 2
-SSTidalLowerDeck_MapAttributes:: @ 82F67B0
- .4byte 0x11
- .4byte 0xd
- .4byte SSTidalLowerDeck_MapBorder
- .4byte SSTidalLowerDeck_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-SSTidalRooms_MapBorder:: @ 82F67C8
- .incbin "data/maps/SSTidalRooms/border.bin"
-
-SSTidalRooms_MapBlockdata:: @ 82F67D0
- .incbin "data/maps/SSTidalRooms/map.bin"
-
- .align 2
-SSTidalRooms_MapAttributes:: @ 82F6CE0
- .4byte 0x24
- .4byte 0x12
- .4byte SSTidalRooms_MapBorder
- .4byte SSTidalRooms_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-IslandCave_MapBorder:: @ 82F6CF8
- .incbin "data/maps/IslandCave/border.bin"
-
-IslandCave_MapBlockdata:: @ 82F6D00
- .incbin "data/maps/IslandCave/map.bin"
-
- .align 2
-IslandCave_MapAttributes:: @ 82F7164
- .4byte 0x11
- .4byte 0x21
- .4byte IslandCave_MapBorder
- .4byte IslandCave_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-AncientTomb_MapBorder:: @ 82F717C
- .incbin "data/maps/AncientTomb/border.bin"
-
-AncientTomb_MapBlockdata:: @ 82F7184
- .incbin "data/maps/AncientTomb/map.bin"
-
- .align 2
-AncientTomb_MapAttributes:: @ 82F75E8
- .4byte 0x11
- .4byte 0x21
- .4byte AncientTomb_MapBorder
- .4byte AncientTomb_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-Underwater_Route134_MapBorder:: @ 82F7600
- .incbin "data/maps/Underwater_Route134/border.bin"
-
-Underwater_Route134_MapBlockdata:: @ 82F7608
- .incbin "data/maps/Underwater_Route134/map.bin"
-
- .align 2
-Underwater_Route134_MapAttributes:: @ 82F7770
- .4byte 0x12
- .4byte 0xa
- .4byte Underwater_Route134_MapBorder
- .4byte Underwater_Route134_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-Underwater_SealedChamber_MapBorder:: @ 82F7788
- .incbin "data/maps/Underwater_SealedChamber/border.bin"
-
-Underwater_SealedChamber_MapBlockdata:: @ 82F7790
- .incbin "data/maps/Underwater_SealedChamber/map.bin"
-
- .align 2
-Underwater_SealedChamber_MapAttributes:: @ 82F7FD0
- .4byte 0x16
- .4byte 0x30
- .4byte Underwater_SealedChamber_MapBorder
- .4byte Underwater_SealedChamber_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
-SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
- .incbin "data/maps/SealedChamber_OuterRoom/border.bin"
-
-SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0
- .incbin "data/maps/SealedChamber_OuterRoom/map.bin"
-
- .align 2
-SealedChamber_OuterRoom_MapAttributes:: @ 82F83B8
- .4byte 0x15
- .4byte 0x17
- .4byte SealedChamber_OuterRoom_MapBorder
- .4byte SealedChamber_OuterRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-VictoryRoad_B1F_MapBorder:: @ 82F83D0
- .incbin "data/maps/VictoryRoad_B1F/border.bin"
-
-VictoryRoad_B1F_MapBlockdata:: @ 82F83D8
- .incbin "data/maps/VictoryRoad_B1F/map.bin"
-
- .align 2
-VictoryRoad_B1F_MapAttributes:: @ 82F8EFC
- .4byte 0x2e
- .4byte 0x1f
- .4byte VictoryRoad_B1F_MapBorder
- .4byte VictoryRoad_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-VictoryRoad_B2F_MapBorder:: @ 82F8F14
- .incbin "data/maps/VictoryRoad_B2F/border.bin"
-
-VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C
- .incbin "data/maps/VictoryRoad_B2F/map.bin"
-
- .align 2
-VictoryRoad_B2F_MapAttributes:: @ 82F9A40
- .4byte 0x2e
- .4byte 0x1f
- .4byte VictoryRoad_B2F_MapBorder
- .4byte VictoryRoad_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-Route104_Prototype_MapBorder:: @ 82F9A58
- .incbin "data/maps/Route104_Prototype/border.bin"
-
-Route104_Prototype_MapBlockdata:: @ 82F9A60
- .incbin "data/maps/Route104_Prototype/map.bin"
-
- .align 2
-Route104_Prototype_MapAttributes:: @ 82F9A64
- .4byte 0x1
- .4byte 0x1
- .4byte Route104_Prototype_MapBorder
- .4byte Route104_Prototype_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
-GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
- .incbin "data/maps/GraniteCave_StevensRoom/border.bin"
-
-GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84
- .incbin "data/maps/GraniteCave_StevensRoom/map.bin"
-
- .align 2
-GraniteCave_StevensRoom_MapAttributes:: @ 82F9C28
- .4byte 0xf
- .4byte 0xe
- .4byte GraniteCave_StevensRoom_MapBorder
- .4byte GraniteCave_StevensRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
- .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin"
-
-AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48
- .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin"
-
- .align 2
-AbandonedShip_HiddenFloorCorridors_MapAttributes:: @ 82F9D68
- .4byte 0xd
- .4byte 0xb
- .4byte AbandonedShip_HiddenFloorCorridors_MapBorder
- .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-SouthernIsland_Exterior_MapBorder:: @ 82F9D80
- .incbin "data/maps/SouthernIsland_Exterior/border.bin"
-
-SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88
- .incbin "data/maps/SouthernIsland_Exterior/map.bin"
-
- .align 2
-SouthernIsland_Exterior_MapAttributes:: @ 82FA544
- .4byte 0x21
- .4byte 0x1e
- .4byte SouthernIsland_Exterior_MapBorder
- .4byte SouthernIsland_Exterior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
-SouthernIsland_Interior_MapBorder:: @ 82FA55C
- .incbin "data/maps/SouthernIsland_Interior/border.bin"
-
-SouthernIsland_Interior_MapBlockdata:: @ 82FA564
- .incbin "data/maps/SouthernIsland_Interior/map.bin"
-
- .align 2
-SouthernIsland_Interior_MapAttributes:: @ 82FAA74
- .4byte 0x1b
- .4byte 0x18
- .4byte SouthernIsland_Interior_MapBorder
- .4byte SouthernIsland_Interior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
-JaggedPass_MapBorder:: @ 82FAA8C
- .incbin "data/maps/JaggedPass/border.bin"
-
-JaggedPass_MapBlockdata:: @ 82FAA94
- .incbin "data/maps/JaggedPass/map.bin"
-
- .align 2
-JaggedPass_MapAttributes:: @ 82FB55C
- .4byte 0x1e
- .4byte 0x2e
- .4byte JaggedPass_MapBorder
- .4byte JaggedPass_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
-FieryPath_MapBorder:: @ 82FB574
- .incbin "data/maps/FieryPath/border.bin"
-
-FieryPath_MapBlockdata:: @ 82FB57C
- .incbin "data/maps/FieryPath/map.bin"
-
- .align 2
-FieryPath_MapAttributes:: @ 82FBFE0
- .4byte 0x23
- .4byte 0x26
- .4byte FieryPath_MapBorder
- .4byte FieryPath_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
-RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
- .incbin "data/maps/RustboroCity_Flat2_1F/border.bin"
-
-RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000
- .incbin "data/maps/RustboroCity_Flat2_1F/map.bin"
-
- .align 2
-RustboroCity_Flat2_1F_MapAttributes:: @ 82FC0FC
- .4byte 0xe
- .4byte 0x9
- .4byte RustboroCity_Flat2_1F_MapBorder
- .4byte RustboroCity_Flat2_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
- .incbin "data/maps/RustboroCity_Flat2_2F/border.bin"
-
-RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C
- .incbin "data/maps/RustboroCity_Flat2_2F/map.bin"
-
- .align 2
-RustboroCity_Flat2_2F_MapAttributes:: @ 82FC218
- .4byte 0xe
- .4byte 0x9
- .4byte RustboroCity_Flat2_2F_MapBorder
- .4byte RustboroCity_Flat2_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
- .incbin "data/maps/RustboroCity_Flat2_3F/border.bin"
-
-RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238
- .incbin "data/maps/RustboroCity_Flat2_3F/map.bin"
-
- .align 2
-RustboroCity_Flat2_3F_MapAttributes:: @ 82FC334
- .4byte 0xe
- .4byte 0x9
- .4byte RustboroCity_Flat2_3F_MapBorder
- .4byte RustboroCity_Flat2_3F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-SootopolisCity_House8_MapBorder:: @ 82FC34C
- .incbin "data/maps/SootopolisCity_House8/border.bin"
-
-SootopolisCity_House8_MapBlockdata:: @ 82FC354
- .incbin "data/maps/SootopolisCity_House8/map.bin"
-
- .align 2
-SootopolisCity_House8_MapAttributes:: @ 82FC3C4
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_House8_MapBorder
- .4byte SootopolisCity_House8_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
- .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin"
-
-EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4
- .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin"
-
- .align 2
-EverGrandeCity_HallOfFame_MapAttributes:: @ 82FC5E4
- .4byte 0xf
- .4byte 0x11
- .4byte EverGrandeCity_HallOfFame_MapBorder
- .4byte EverGrandeCity_HallOfFame_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
-LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin"
-
-LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin"
-
- .align 2
-LilycoveCity_CoveLilyMotel_1F_MapAttributes:: @ 82FC6DC
- .4byte 0xc
- .4byte 0x9
- .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
- .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin"
-
-LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin"
-
- .align 2
-LilycoveCity_CoveLilyMotel_2F_MapAttributes:: @ 82FC7D4
- .4byte 0xc
- .4byte 0x9
- .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
- .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
- .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin"
-
-Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4
- .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin"
-
- .align 2
-Route124_DivingTreasureHuntersHouse_MapAttributes:: @ 82FC8A8
- .4byte 0xa
- .4byte 0x9
- .4byte Route124_DivingTreasureHuntersHouse_MapBorder
- .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-MtPyre_Exterior_MapBorder:: @ 82FC8C0
- .incbin "data/maps/MtPyre_Exterior/border.bin"
-
-MtPyre_Exterior_MapBlockdata:: @ 82FC8C8
- .incbin "data/maps/MtPyre_Exterior/map.bin"
-
- .align 2
-MtPyre_Exterior_MapAttributes:: @ 82FD7EC
- .4byte 0x26
- .4byte 0x33
- .4byte MtPyre_Exterior_MapBorder
- .4byte MtPyre_Exterior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MtPyre_Summit_MapBorder:: @ 82FD804
- .incbin "data/maps/MtPyre_Summit/border.bin"
-
-MtPyre_Summit_MapBlockdata:: @ 82FD80C
- .incbin "data/maps/MtPyre_Summit/map.bin"
-
- .align 2
-MtPyre_Summit_MapAttributes:: @ 82FE680
- .4byte 0x32
- .4byte 0x25
- .4byte MtPyre_Summit_MapBorder
- .4byte MtPyre_Summit_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-SealedChamber_InnerRoom_MapBorder:: @ 82FE698
- .incbin "data/maps/SealedChamber_InnerRoom/border.bin"
-
-SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0
- .incbin "data/maps/SealedChamber_InnerRoom/map.bin"
-
- .align 2
-SealedChamber_InnerRoom_MapAttributes:: @ 82FEA68
- .4byte 0x15
- .4byte 0x17
- .4byte SealedChamber_InnerRoom_MapBorder
- .4byte SealedChamber_InnerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
- .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin"
-
-MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88
- .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin"
-
- .align 2
-MossdeepCity_GameCorner_1F_MapAttributes:: @ 82FEB38
- .4byte 0xb
- .4byte 0x8
- .4byte MossdeepCity_GameCorner_1F_MapBorder
- .4byte MossdeepCity_GameCorner_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
- .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin"
-
-MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58
- .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin"
-
- .align 2
-MossdeepCity_GameCorner_B1F_MapAttributes:: @ 82FEC30
- .4byte 0xc
- .4byte 0x9
- .4byte MossdeepCity_GameCorner_B1F_MapBorder
- .4byte MossdeepCity_GameCorner_B1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-SootopolisCity_House1_MapBorder:: @ 82FEC48
- .incbin "data/maps/SootopolisCity_House1/border.bin"
-
-SootopolisCity_House1_MapBlockdata:: @ 82FEC50
- .incbin "data/maps/SootopolisCity_House1/map.bin"
-
- .align 2
-SootopolisCity_House1_MapAttributes:: @ 82FECC0
-SootopolisCity_House4_MapAttributes:: @ 82FECC0
-SootopolisCity_House7_MapAttributes:: @ 82FECC0
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_House1_MapBorder
- .4byte SootopolisCity_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-SootopolisCity_House2_MapBorder:: @ 82FECD8
- .incbin "data/maps/SootopolisCity_House2/border.bin"
-
-SootopolisCity_House2_MapBlockdata:: @ 82FECE0
- .incbin "data/maps/SootopolisCity_House2/map.bin"
-
- .align 2
-SootopolisCity_House2_MapAttributes:: @ 82FED50
-SootopolisCity_House5_MapAttributes:: @ 82FED50
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_House2_MapBorder
- .4byte SootopolisCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-SootopolisCity_House3_MapBorder:: @ 82FED68
- .incbin "data/maps/SootopolisCity_House3/border.bin"
-
-SootopolisCity_House3_MapBlockdata:: @ 82FED70
- .incbin "data/maps/SootopolisCity_House3/map.bin"
-
- .align 2
-SootopolisCity_House3_MapAttributes:: @ 82FEDE0
-SootopolisCity_House6_MapAttributes:: @ 82FEDE0
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_House3_MapBorder
- .4byte SootopolisCity_House3_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
- .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin"
-
-AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00
- .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin"
-
- .align 2
-AbandonedShip_HiddenFloorRooms_MapAttributes:: @ 82FF328
- .4byte 0x2c
- .4byte 0xf
- .4byte AbandonedShip_HiddenFloorRooms_MapBorder
- .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Ship
-
-ScorchedSlab_MapBorder:: @ 82FF340
- .incbin "data/maps/ScorchedSlab/border.bin"
-
-ScorchedSlab_MapBlockdata:: @ 82FF348
- .incbin "data/maps/ScorchedSlab/map.bin"
-
- .align 2
-ScorchedSlab_MapAttributes:: @ 82FF5A0
- .4byte 0xf
- .4byte 0x14
- .4byte ScorchedSlab_MapBorder
- .4byte ScorchedSlab_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_082FF894:
- .incbin "data/maps/UnknownMap_082FF894/border.bin"
-
-UnknownMapBlockdata_082FF894:
- .incbin "data/maps/UnknownMap_082FF894/map.bin"
-
- .align 2
-UnknownMapAttributes_082FF894:
- .4byte 0x13
- .4byte 0x13
- .4byte UnknownMapBorder_082FF894
- .4byte UnknownMapBlockdata_082FF894
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
- .incbin "data/maps/RustboroCity_Flat1_1F/border.bin"
-
-RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4
- .incbin "data/maps/RustboroCity_Flat1_1F/map.bin"
-
- .align 2
-RustboroCity_Flat1_1F_MapAttributes:: @ 82FF994
- .4byte 0xe
- .4byte 0x8
- .4byte RustboroCity_Flat1_1F_MapBorder
- .4byte RustboroCity_Flat1_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
- .incbin "data/maps/RustboroCity_Flat1_2F/border.bin"
-
-RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4
- .incbin "data/maps/RustboroCity_Flat1_2F/map.bin"
-
- .align 2
-RustboroCity_Flat1_2F_MapAttributes:: @ 82FFA94
- .4byte 0xe
- .4byte 0x8
- .4byte RustboroCity_Flat1_2F_MapBorder
- .4byte RustboroCity_Flat1_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
- .incbin "data/maps/EverGrandeCity_Corridor4/border.bin"
-
-EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4
- .incbin "data/maps/EverGrandeCity_Corridor4/map.bin"
-
- .align 2
-EverGrandeCity_Corridor4_MapAttributes:: @ 82FFDA0
- .4byte 0xb
- .4byte 0x22
- .4byte EverGrandeCity_Corridor4_MapBorder
- .4byte EverGrandeCity_Corridor4_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
-MagmaHideout_1F_MapBorder:: @ 82FFDB8
- .incbin "data/maps/MagmaHideout_1F/border.bin"
-
-MagmaHideout_1F_MapBlockdata:: @ 82FFDC0
- .incbin "data/maps/MagmaHideout_1F/map.bin"
-
- .align 2
-MagmaHideout_1F_MapAttributes:: @ 8300450
- .4byte 0x1c
- .4byte 0x1e
- .4byte MagmaHideout_1F_MapBorder
- .4byte MagmaHideout_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MagmaHideout_B1F_MapBorder:: @ 8300468
- .incbin "data/maps/MagmaHideout_B1F/border.bin"
-
-MagmaHideout_B1F_MapBlockdata:: @ 8300470
- .incbin "data/maps/MagmaHideout_B1F/map.bin"
-
- .align 2
-MagmaHideout_B1F_MapAttributes:: @ 8301010
- .4byte 0x3e
- .4byte 0x18
- .4byte MagmaHideout_B1F_MapBorder
- .4byte MagmaHideout_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-MagmaHideout_B2F_MapBorder:: @ 8301028
- .incbin "data/maps/MagmaHideout_B2F/border.bin"
-
-MagmaHideout_B2F_MapBlockdata:: @ 8301030
- .incbin "data/maps/MagmaHideout_B2F/map.bin"
-
- .align 2
-MagmaHideout_B2F_MapAttributes:: @ 8301690
- .4byte 0x22
- .4byte 0x18
- .4byte MagmaHideout_B2F_MapBorder
- .4byte MagmaHideout_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
-UnknownMapBorder_08302970:
- .incbin "data/maps/UnknownMap_08302970/border.bin"
-
-UnknownMapBlockdata_08302970:
- .incbin "data/maps/UnknownMap_08302970/map.bin"
-
- .align 2
-UnknownMapAttributes_08302970:
- .4byte 0x3C
- .4byte 0x28
- .4byte UnknownMapBorder_08302970
- .4byte UnknownMapBlockdata_08302970
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SkyPillar_Entrance_MapBorder:: @ 8302988
- .incbin "data/maps/SkyPillar_Entrance/border.bin"
-
-SkyPillar_Entrance_MapBlockdata:: @ 8302990
- .incbin "data/maps/SkyPillar_Entrance/map.bin"
-
- .align 2
-SkyPillar_Entrance_MapAttributes:: @ 8302C18
- .4byte 0x12
- .4byte 0x12
- .4byte SkyPillar_Entrance_MapBorder
- .4byte SkyPillar_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SkyPillar_Outside_MapBorder:: @ 8302C30
- .incbin "data/maps/SkyPillar_Outside/border.bin"
-
-SkyPillar_Outside_MapBlockdata:: @ 8302C38
- .incbin "data/maps/SkyPillar_Outside/map.bin"
-
- .align 2
-SkyPillar_Outside_MapAttributes:: @ 8303140
- .4byte 0x1c
- .4byte 0x17
- .4byte SkyPillar_Outside_MapBorder
- .4byte SkyPillar_Outside_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SkyPillar_1F_MapBorder:: @ 8303158
- .incbin "data/maps/SkyPillar_1F/border.bin"
-
-SkyPillar_1F_MapBlockdata:: @ 8303160
- .incbin "data/maps/SkyPillar_1F/map.bin"
-
- .align 2
-SkyPillar_1F_MapAttributes:: @ 83032E8
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_1F_MapBorder
- .4byte SkyPillar_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SkyPillar_2F_MapBorder:: @ 8303300
- .incbin "data/maps/SkyPillar_2F/border.bin"
-
-SkyPillar_2F_MapBlockdata:: @ 8303308
- .incbin "data/maps/SkyPillar_2F/map.bin"
-
- .align 2
-SkyPillar_2F_MapAttributes:: @ 8303490
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_2F_MapBorder
- .4byte SkyPillar_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SkyPillar_3F_MapBorder:: @ 83034A8
- .incbin "data/maps/SkyPillar_3F/border.bin"
-
-SkyPillar_3F_MapBlockdata:: @ 83034B0
- .incbin "data/maps/SkyPillar_3F/map.bin"
-
- .align 2
-SkyPillar_3F_MapAttributes:: @ 8303638
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_3F_MapBorder
- .4byte SkyPillar_3F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SkyPillar_4F_MapBorder:: @ 8303650
- .incbin "data/maps/SkyPillar_4F/border.bin"
-
-SkyPillar_4F_MapBlockdata:: @ 8303658
- .incbin "data/maps/SkyPillar_4F/map.bin"
-
- .align 2
-SkyPillar_4F_MapAttributes:: @ 83037E0
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_4F_MapBorder
- .4byte SkyPillar_4F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-UnknownMapBorder_083041B4:
- .incbin "data/maps/UnknownMap_083041B4/border.bin"
-
-UnknownMapBlockdata_083041B4:
- .incbin "data/maps/UnknownMap_083041B4/map.bin"
-
- .align 2
-UnknownMapAttributes_083041B4:
- .4byte 0x1B
- .4byte 0x2E
- .4byte UnknownMapBorder_083041B4
- .4byte UnknownMapBlockdata_083041B4
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
- .incbin "data/maps/MossdeepCity_StevensHouse/border.bin"
-
-MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4
- .incbin "data/maps/MossdeepCity_StevensHouse/map.bin"
-
- .align 2
-MossdeepCity_StevensHouse_MapAttributes:: @ 8304284
- .4byte 0xb
- .4byte 0x8
- .4byte MossdeepCity_StevensHouse_MapBorder
- .4byte MossdeepCity_StevensHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
- .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin"
-
-ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4
- .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideIceRoom_MapAttributes:: @ 8304754
- .4byte 0x14
- .4byte 0x1e
- .4byte ShoalCave_LowTideIceRoom_MapBorder
- .4byte ShoalCave_LowTideIceRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-SafariZone_RestHouse_MapBorder:: @ 830476C
- .incbin "data/maps/SafariZone_RestHouse/border.bin"
-
-SafariZone_RestHouse_MapBlockdata:: @ 8304774
- .incbin "data/maps/SafariZone_RestHouse/map.bin"
-
- .align 2
-SafariZone_RestHouse_MapAttributes:: @ 8304828
- .4byte 0xa
- .4byte 0x9
- .4byte SafariZone_RestHouse_MapBorder
- .4byte SafariZone_RestHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
-SkyPillar_5F_MapBorder:: @ 8304840
- .incbin "data/maps/SkyPillar_5F/border.bin"
-
-SkyPillar_5F_MapBlockdata:: @ 8304848
- .incbin "data/maps/SkyPillar_5F/map.bin"
-
- .align 2
-SkyPillar_5F_MapAttributes:: @ 83049D0
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_5F_MapBorder
- .4byte SkyPillar_5F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
-SkyPillar_Top_MapBorder:: @ 83049E8
- .incbin "data/maps/SkyPillar_Top/border.bin"
-
-SkyPillar_Top_MapBlockdata:: @ 83049F0
- .incbin "data/maps/SkyPillar_Top/map.bin"
-
- .align 2
-SkyPillar_Top_MapAttributes:: @ 8304F00
- .4byte 0x1b
- .4byte 0x18
- .4byte SkyPillar_Top_MapBorder
- .4byte SkyPillar_Top_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
+ .include "data/layouts/PetalburgCity/layout.inc"
+ .include "data/layouts/SlateportCity/layout.inc"
+ .include "data/layouts/MauvilleCity/layout.inc"
+ .include "data/layouts/RustboroCity/layout.inc"
+ .include "data/layouts/FortreeCity/layout.inc"
+ .include "data/layouts/LilycoveCity/layout.inc"
+ .include "data/layouts/MossdeepCity/layout.inc"
+ .include "data/layouts/SootopolisCity/layout.inc"
+ .include "data/layouts/EverGrandeCity/layout.inc"
+ .include "data/layouts/LittlerootTown/layout.inc"
+ .include "data/layouts/OldaleTown/layout.inc"
+ .include "data/layouts/DewfordTown/layout.inc"
+ .include "data/layouts/LavaridgeTown/layout.inc"
+ .include "data/layouts/FallarborTown/layout.inc"
+ .include "data/layouts/VerdanturfTown/layout.inc"
+ .include "data/layouts/PacifidlogTown/layout.inc"
+ .include "data/layouts/Route101/layout.inc"
+ .include "data/layouts/Route102/layout.inc"
+ .include "data/layouts/Route103/layout.inc"
+ .include "data/layouts/Route104/layout.inc"
+ .include "data/layouts/Route105/layout.inc"
+ .include "data/layouts/Route106/layout.inc"
+ .include "data/layouts/Route107/layout.inc"
+ .include "data/layouts/Route108/layout.inc"
+ .include "data/layouts/Route109/layout.inc"
+ .include "data/layouts/Route110/layout.inc"
+ .include "data/layouts/Route111/layout.inc"
+ .include "data/layouts/Route112/layout.inc"
+ .include "data/layouts/Route113/layout.inc"
+ .include "data/layouts/Route114/layout.inc"
+ .include "data/layouts/Route115/layout.inc"
+ .include "data/layouts/Route116/layout.inc"
+ .include "data/layouts/Route117/layout.inc"
+ .include "data/layouts/Route118/layout.inc"
+ .include "data/layouts/Route119/layout.inc"
+ .include "data/layouts/Route120/layout.inc"
+ .include "data/layouts/Route121/layout.inc"
+ .include "data/layouts/Route122/layout.inc"
+ .include "data/layouts/Route123/layout.inc"
+ .include "data/layouts/Route124/layout.inc"
+ .include "data/layouts/Route125/layout.inc"
+ .include "data/layouts/Route126/layout.inc"
+ .include "data/layouts/Route127/layout.inc"
+ .include "data/layouts/Route128/layout.inc"
+ .include "data/layouts/Route129/layout.inc"
+ .include "data/layouts/UnreferencedMap/layout.inc"
+ .include "data/layouts/Route131/layout.inc"
+ .include "data/layouts/Route132/layout.inc"
+ .include "data/layouts/Route133/layout.inc"
+ .include "data/layouts/Route134/layout.inc"
+ .include "data/layouts/Underwater2/layout.inc"
+ .include "data/layouts/Underwater3/layout.inc"
+ .include "data/layouts/Underwater4/layout.inc"
+ .include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc"
+ .include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc"
+ .include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc"
+ .include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc"
+ .include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc"
+ .include "data/layouts/House1/layout.inc"
+ .include "data/layouts/House2/layout.inc"
+ .include "data/layouts/PokemonCenter_1F/layout.inc"
+ .include "data/layouts/PokemonCenter_2F/layout.inc"
+ .include "data/layouts/PokeMart/layout.inc"
+ .include "data/layouts/House3/layout.inc"
+ .include "data/layouts/DewfordTown_Gym/layout.inc"
+ .include "data/layouts/DewfordTown_Hall/layout.inc"
+ .include "data/layouts/House4/layout.inc"
+ .include "data/layouts/LavaridgeTown_HerbShop/layout.inc"
+ .include "data/layouts/LavaridgeTown_Gym_1F/layout.inc"
+ .include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc"
+ .include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc"
+ .include "data/layouts/ContestLobby/layout.inc"
+ .include "data/layouts/ContestHall/layout.inc"
+ .include "data/layouts/LilycoveCity_House2/layout.inc"
+ .include "data/layouts/UnknownMap_082CF564/layout.inc"
+ .include "data/layouts/VerdanturfTown_WandasHouse/layout.inc"
+ .include "data/layouts/PacifidlogTown_House1/layout.inc"
+ .include "data/layouts/PacifidlogTown_House2/layout.inc"
+ .include "data/layouts/PetalburgCity_Gym/layout.inc"
+ .include "data/layouts/HouseWithBed/layout.inc"
+ .include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc"
+ .include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc"
+ .include "data/layouts/UnknownMap_082D05D8/layout.inc"
+ .include "data/layouts/UnknownMap_082D05FC/layout.inc"
+ .include "data/layouts/SlateportCity_PokemonFanClub/layout.inc"
+ .include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc"
+ .include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc"
+ .include "data/layouts/Harbor/layout.inc"
+ .include "data/layouts/MauvilleCity_Gym/layout.inc"
+ .include "data/layouts/MauvilleCity_BikeShop/layout.inc"
+ .include "data/layouts/MauvilleCity_GameCorner/layout.inc"
+ .include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc"
+ .include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc"
+ .include "data/layouts/RustboroCity_Gym/layout.inc"
+ .include "data/layouts/RustboroCity_PokemonSchool/layout.inc"
+ .include "data/layouts/RustboroCity_House/layout.inc"
+ .include "data/layouts/RustboroCity_House1/layout.inc"
+ .include "data/layouts/RustboroCity_CuttersHouse/layout.inc"
+ .include "data/layouts/FortreeCity_House1/layout.inc"
+ .include "data/layouts/FortreeCity_Gym/layout.inc"
+ .include "data/layouts/FortreeCity_House2/layout.inc"
+ .include "data/layouts/Route104_MrBrineysHouse/layout.inc"
+ .include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc"
+ .include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc"
+ .include "data/layouts/LilycoveCity_ContestLobby/layout.inc"
+ .include "data/layouts/LilycoveCity_ContestHall/layout.inc"
+ .include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc"
+ .include "data/layouts/LilycoveCity_EmptyMap/layout.inc"
+ .include "data/layouts/MossdeepCity_Gym/layout.inc"
+ .include "data/layouts/SootopolisCity_Gym_1F/layout.inc"
+ .include "data/layouts/SootopolisCity_Gym_B1F/layout.inc"
+ .include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc"
+ .include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc"
+ .include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc"
+ .include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc"
+ .include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc"
+ .include "data/layouts/EverGrandeCity_ShortCorridor/layout.inc"
+ .include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc"
+ .include "data/layouts/CableCarStation/layout.inc"
+ .include "data/layouts/Route114_FossilManiacsHouse/layout.inc"
+ .include "data/layouts/Route114_FossilManiacsTunnel/layout.inc"
+ .include "data/layouts/Route114_LanettesHouse/layout.inc"
+ .include "data/layouts/Route116_TunnelersRestHouse/layout.inc"
+ .include "data/layouts/Route117_PokemonDayCare/layout.inc"
+ .include "data/layouts/Route121_SafariZoneEntrance/layout.inc"
+ .include "data/layouts/MeteorFalls_1F_1R/layout.inc"
+ .include "data/layouts/MeteorFalls_1F_2R/layout.inc"
+ .include "data/layouts/MeteorFalls_B1F_1R/layout.inc"
+ .include "data/layouts/MeteorFalls_B1F_2R/layout.inc"
+ .include "data/layouts/RusturfTunnel/layout.inc"
+ .include "data/layouts/Underwater_SootopolisCity/layout.inc"
+ .include "data/layouts/DesertRuins/layout.inc"
+ .include "data/layouts/GraniteCave_1F/layout.inc"
+ .include "data/layouts/GraniteCave_B1F/layout.inc"
+ .include "data/layouts/GraniteCave_B2F/layout.inc"
+ .include "data/layouts/PetalburgWoods/layout.inc"
+ .include "data/layouts/MtChimney/layout.inc"
+ .include "data/layouts/MtPyre_1F/layout.inc"
+ .include "data/layouts/MtPyre_2F/layout.inc"
+ .include "data/layouts/MtPyre_3F/layout.inc"
+ .include "data/layouts/MtPyre_4F/layout.inc"
+ .include "data/layouts/MtPyre_5F/layout.inc"
+ .include "data/layouts/MtPyre_6F/layout.inc"
+ .include "data/layouts/AquaHideout_1F/layout.inc"
+ .include "data/layouts/AquaHideout_B1F/layout.inc"
+ .include "data/layouts/AquaHideout_B2F/layout.inc"
+ .include "data/layouts/Underwater_SeafloorCavern/layout.inc"
+ .include "data/layouts/SeafloorCavern_Entrance/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room1/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room2/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room3/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room4/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room5/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room6/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room7/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room8/layout.inc"
+ .include "data/layouts/SeafloorCavern_Room9/layout.inc"
+ .include "data/layouts/CaveOfOrigin_Entrance/layout.inc"
+ .include "data/layouts/CaveOfOrigin_1F/layout.inc"
+ .include "data/layouts/CaveOfOrigin_B1F/layout.inc"
+ .include "data/layouts/CaveOfOrigin_B2F/layout.inc"
+ .include "data/layouts/CaveOfOrigin_B3F/layout.inc"
+ .include "data/layouts/CaveOfOrigin_B4F/layout.inc"
+ .include "data/layouts/VictoryRoad_1F/layout.inc"
+ .include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc"
+ .include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc"
+ .include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc"
+ .include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc"
+ .include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc"
+ .include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc"
+ .include "data/layouts/UnknownMap_082E55C8/layout.inc"
+ .include "data/layouts/UnknownMap_082E55EC/layout.inc"
+ .include "data/layouts/UnknownMap_082E5610/layout.inc"
+ .include "data/layouts/UnknownMap_082E5634/layout.inc"
+ .include "data/layouts/UnknownMap_082E5658/layout.inc"
+ .include "data/layouts/UnknownMap_082E567C/layout.inc"
+ .include "data/layouts/UnknownMap_082E56A0/layout.inc"
+ .include "data/layouts/UnknownMap_082E56C4/layout.inc"
+ .include "data/layouts/UnknownMap_082E56E8/layout.inc"
+ .include "data/layouts/UnknownMap_082E570C/layout.inc"
+ .include "data/layouts/UnknownMap_082E5730/layout.inc"
+ .include "data/layouts/UnknownMap_082E5754/layout.inc"
+ .include "data/layouts/UnknownMap_082E5778/layout.inc"
+ .include "data/layouts/UnknownMap_082E579C/layout.inc"
+ .include "data/layouts/NewMauville_Entrance/layout.inc"
+ .include "data/layouts/NewMauville_Inside/layout.inc"
+ .include "data/layouts/AbandonedShip_Deck/layout.inc"
+ .include "data/layouts/AbandonedShip_Corridors_1F/layout.inc"
+ .include "data/layouts/AbandonedShip_Rooms_1F/layout.inc"
+ .include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc"
+ .include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc"
+ .include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc"
+ .include "data/layouts/AbandonedShip_Underwater1/layout.inc"
+ .include "data/layouts/AbandonedShip_Room_B1F/layout.inc"
+ .include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc"
+ .include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc"
+ .include "data/layouts/AbandonedShip_Underwater2/layout.inc"
+ .include "data/layouts/SecretBase_RedCave1/layout.inc"
+ .include "data/layouts/SecretBase_BrownCave1/layout.inc"
+ .include "data/layouts/SecretBase_BlueCave1/layout.inc"
+ .include "data/layouts/SecretBase_YellowCave1/layout.inc"
+ .include "data/layouts/SecretBase_Tree1/layout.inc"
+ .include "data/layouts/SecretBase_Shrub1/layout.inc"
+ .include "data/layouts/SecretBase_RedCave2/layout.inc"
+ .include "data/layouts/SecretBase_BrownCave2/layout.inc"
+ .include "data/layouts/SecretBase_BlueCave2/layout.inc"
+ .include "data/layouts/SecretBase_YellowCave2/layout.inc"
+ .include "data/layouts/SecretBase_Tree2/layout.inc"
+ .include "data/layouts/SecretBase_Shrub2/layout.inc"
+ .include "data/layouts/SecretBase_RedCave3/layout.inc"
+ .include "data/layouts/SecretBase_BrownCave3/layout.inc"
+ .include "data/layouts/SecretBase_BlueCave3/layout.inc"
+ .include "data/layouts/SecretBase_YellowCave3/layout.inc"
+ .include "data/layouts/SecretBase_Tree3/layout.inc"
+ .include "data/layouts/SecretBase_Shrub3/layout.inc"
+ .include "data/layouts/SecretBase_RedCave4/layout.inc"
+ .include "data/layouts/SecretBase_BrownCave4/layout.inc"
+ .include "data/layouts/SecretBase_BlueCave4/layout.inc"
+ .include "data/layouts/SecretBase_YellowCave4/layout.inc"
+ .include "data/layouts/SecretBase_Tree4/layout.inc"
+ .include "data/layouts/SecretBase_Shrub4/layout.inc"
+ .include "data/layouts/SingleBattleColosseum/layout.inc"
+ .include "data/layouts/TradeCenter/layout.inc"
+ .include "data/layouts/RecordCorner/layout.inc"
+ .include "data/layouts/DoubleBattleColosseum/layout.inc"
+ .include "data/layouts/LinkContestRoom1/layout.inc"
+ .include "data/layouts/UnknownMap_25_29/layout.inc"
+ .include "data/layouts/UnknownMap_25_30/layout.inc"
+ .include "data/layouts/UnknownMap_25_31/layout.inc"
+ .include "data/layouts/UnknownMap_25_32/layout.inc"
+ .include "data/layouts/UnknownMap_25_33/layout.inc"
+ .include "data/layouts/UnknownMap_25_34/layout.inc"
+ .include "data/layouts/LinkContestRoom2/layout.inc"
+ .include "data/layouts/LinkContestRoom3/layout.inc"
+ .include "data/layouts/LinkContestRoom4/layout.inc"
+ .include "data/layouts/LinkContestRoom5/layout.inc"
+ .include "data/layouts/LinkContestRoom6/layout.inc"
+ .include "data/layouts/InsideOfTruck/layout.inc"
+ .include "data/layouts/SafariZone_Northwest/layout.inc"
+ .include "data/layouts/SafariZone_Northeast/layout.inc"
+ .include "data/layouts/SafariZone_Southwest/layout.inc"
+ .include "data/layouts/SafariZone_Southeast/layout.inc"
+ .include "data/layouts/UnknownMap_082EDF30/layout.inc"
+ .include "data/layouts/Route109_SeashoreHouse/layout.inc"
+ .include "data/layouts/Route110_TrickHouseEntrance/layout.inc"
+ .include "data/layouts/Route110_TrickHouseEnd/layout.inc"
+ .include "data/layouts/Route110_TrickHouseCorridor/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle1/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle2/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle3/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle4/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle5/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle6/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle7/layout.inc"
+ .include "data/layouts/Route110_TrickHousePuzzle8/layout.inc"
+ .include "data/layouts/FortreeCity_DecorationShop/layout.inc"
+ .include "data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc"
+ .include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc"
+ .include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc"
+ .include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc"
+ .include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc"
+ .include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc"
+ .include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc"
+ .include "data/layouts/Route130/layout.inc"
+ .include "data/layouts/BattleTower_Lobby/layout.inc"
+ .include "data/layouts/BattleTower_Outside/layout.inc"
+ .include "data/layouts/BattleTower_Elevator/layout.inc"
+ .include "data/layouts/BattleTower_Corridor/layout.inc"
+ .include "data/layouts/BattleTower_BattleRoom/layout.inc"
+ .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc"
+ .include "data/layouts/EverGrandeCity_PokemonLeague/layout.inc"
+ .include "data/layouts/Route119_WeatherInstitute_1F/layout.inc"
+ .include "data/layouts/Route119_WeatherInstitute_2F/layout.inc"
+ .include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc"
+ .include "data/layouts/Underwater1/layout.inc"
+ .include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc"
+ .include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc"
+ .include "data/layouts/SSTidalCorridor/layout.inc"
+ .include "data/layouts/SSTidalLowerDeck/layout.inc"
+ .include "data/layouts/SSTidalRooms/layout.inc"
+ .include "data/layouts/IslandCave/layout.inc"
+ .include "data/layouts/AncientTomb/layout.inc"
+ .include "data/layouts/Underwater_Route134/layout.inc"
+ .include "data/layouts/Underwater_SealedChamber/layout.inc"
+ .include "data/layouts/SealedChamber_OuterRoom/layout.inc"
+ .include "data/layouts/VictoryRoad_B1F/layout.inc"
+ .include "data/layouts/VictoryRoad_B2F/layout.inc"
+ .include "data/layouts/Route104_Prototype/layout.inc"
+ .include "data/layouts/GraniteCave_StevensRoom/layout.inc"
+ .include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc"
+ .include "data/layouts/SouthernIsland_Exterior/layout.inc"
+ .include "data/layouts/SouthernIsland_Interior/layout.inc"
+ .include "data/layouts/JaggedPass/layout.inc"
+ .include "data/layouts/FieryPath/layout.inc"
+ .include "data/layouts/RustboroCity_Flat2_1F/layout.inc"
+ .include "data/layouts/RustboroCity_Flat2_2F/layout.inc"
+ .include "data/layouts/RustboroCity_Flat2_3F/layout.inc"
+ .include "data/layouts/SootopolisCity_House8/layout.inc"
+ .include "data/layouts/EverGrandeCity_HallOfFame/layout.inc"
+ .include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc"
+ .include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc"
+ .include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc"
+ .include "data/layouts/MtPyre_Exterior/layout.inc"
+ .include "data/layouts/MtPyre_Summit/layout.inc"
+ .include "data/layouts/SealedChamber_InnerRoom/layout.inc"
+ .include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc"
+ .include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc"
+ .include "data/layouts/SootopolisCity_House1/layout.inc"
+ .include "data/layouts/SootopolisCity_House2/layout.inc"
+ .include "data/layouts/SootopolisCity_House3/layout.inc"
+ .include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc"
+ .include "data/layouts/ScorchedSlab/layout.inc"
+ .include "data/layouts/UnknownMap_082FF894/layout.inc"
+ .include "data/layouts/RustboroCity_Flat1_1F/layout.inc"
+ .include "data/layouts/RustboroCity_Flat1_2F/layout.inc"
+ .include "data/layouts/EverGrandeCity_Corridor4/layout.inc"
+ .include "data/layouts/MagmaHideout_1F/layout.inc"
+ .include "data/layouts/MagmaHideout_B1F/layout.inc"
+ .include "data/layouts/MagmaHideout_B2F/layout.inc"
+ .include "data/layouts/UnknownMap_08302970/layout.inc"
+ .include "data/layouts/SkyPillar_Entrance/layout.inc"
+ .include "data/layouts/SkyPillar_Outside/layout.inc"
+ .include "data/layouts/SkyPillar_1F/layout.inc"
+ .include "data/layouts/SkyPillar_2F/layout.inc"
+ .include "data/layouts/SkyPillar_3F/layout.inc"
+ .include "data/layouts/SkyPillar_4F/layout.inc"
+ .include "data/layouts/UnknownMap_083041B4/layout.inc"
+ .include "data/layouts/MossdeepCity_StevensHouse/layout.inc"
+ .include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc"
+ .include "data/layouts/SafariZone_RestHouse/layout.inc"
+ .include "data/layouts/SkyPillar_5F/layout.inc"
+ .include "data/layouts/SkyPillar_Top/layout.inc"
diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc
index 241efb9a6..b1a15d7ef 100644
--- a/data/maps/attributes_table.inc
+++ b/data/maps/attributes_table.inc
@@ -1,334 +1,334 @@
.align 2
gMapAttributes:: @ 8304F18
- .4byte PetalburgCity_MapAttributes
- .4byte SlateportCity_MapAttributes
- .4byte MauvilleCity_MapAttributes
- .4byte RustboroCity_MapAttributes
- .4byte FortreeCity_MapAttributes
- .4byte LilycoveCity_MapAttributes
- .4byte MossdeepCity_MapAttributes
- .4byte SootopolisCity_MapAttributes
- .4byte EverGrandeCity_MapAttributes
- .4byte LittlerootTown_MapAttributes
- .4byte OldaleTown_MapAttributes
- .4byte DewfordTown_MapAttributes
- .4byte LavaridgeTown_MapAttributes
- .4byte FallarborTown_MapAttributes
- .4byte VerdanturfTown_MapAttributes
- .4byte PacifidlogTown_MapAttributes
- .4byte Route101_MapAttributes
- .4byte Route102_MapAttributes
- .4byte Route103_MapAttributes
- .4byte Route104_MapAttributes
- .4byte Route105_MapAttributes
- .4byte Route106_MapAttributes
- .4byte Route107_MapAttributes
- .4byte Route108_MapAttributes
- .4byte Route109_MapAttributes
- .4byte Route110_MapAttributes
- .4byte Route111_MapAttributes
- .4byte Route112_MapAttributes
- .4byte Route113_MapAttributes
- .4byte Route114_MapAttributes
- .4byte Route115_MapAttributes
- .4byte Route116_MapAttributes
- .4byte Route117_MapAttributes
- .4byte Route118_MapAttributes
- .4byte Route119_MapAttributes
- .4byte Route120_MapAttributes
- .4byte Route121_MapAttributes
- .4byte Route122_MapAttributes
- .4byte Route123_MapAttributes
- .4byte Route124_MapAttributes
- .4byte Route125_MapAttributes
- .4byte Route126_MapAttributes
- .4byte Route127_MapAttributes
- .4byte Route128_MapAttributes
- .4byte Route129_MapAttributes
- .4byte UnreferencedMap_MapAttributes
- .4byte Route131_MapAttributes
- .4byte Route132_MapAttributes
- .4byte Route133_MapAttributes
- .4byte Route134_MapAttributes
- .4byte Underwater2_MapAttributes
- .4byte Underwater3_MapAttributes
- .4byte Underwater4_MapAttributes
- .4byte LittlerootTown_BrendansHouse_1F_MapAttributes
- .4byte LittlerootTown_BrendansHouse_2F_MapAttributes
- .4byte LittlerootTown_MaysHouse_1F_MapAttributes
- .4byte LittlerootTown_MaysHouse_2F_MapAttributes
- .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
- .4byte House11_MapAttributes
- .4byte House12_MapAttributes
- .4byte PokemonCenter_1F_MapAttributes
- .4byte PokemonCenter_2F_MapAttributes
- .4byte PokeMart_MapAttributes
- .4byte DewfordTown_House1_MapAttributes
- .4byte DewfordTown_Gym_MapAttributes
- .4byte DewfordTown_Hall_MapAttributes
- .4byte DewfordTown_House2_MapAttributes
- .4byte LavaridgeTown_HerbShop_MapAttributes
- .4byte LavaridgeTown_Gym_1F_MapAttributes
- .4byte LavaridgeTown_Gym_B1F_MapAttributes
- .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
- .4byte FallarborTown_ContestLobby_MapAttributes
- .4byte FallarborTown_ContestHall_MapAttributes
- .4byte LilycoveCity_House2_MapAttributes
- .4byte UnknownMapAttributes_082CF564
- .4byte VerdanturfTown_WandasHouse_MapAttributes
- .4byte PacifidlogTown_House1_MapAttributes
- .4byte PacifidlogTown_House2_MapAttributes
- .4byte PetalburgCity_Gym_MapAttributes
- .4byte MossdeepCity_House4_MapAttributes
- .4byte SlateportCity_SternsShipyard_1F_MapAttributes
- .4byte SlateportCity_SternsShipyard_2F_MapAttributes
- .4byte UnknownMapAttributes_082D05D8
- .4byte UnknownMapAttributes_082D05FC
- .4byte SlateportCity_PokemonFanClub_MapAttributes
- .4byte SlateportCity_OceanicMuseum_1F_MapAttributes
- .4byte SlateportCity_OceanicMuseum_2F_MapAttributes
- .4byte LilycoveCity_Harbor_MapAttributes
- .4byte MauvilleCity_Gym_MapAttributes
- .4byte MauvilleCity_BikeShop_MapAttributes
- .4byte MauvilleCity_GameCorner_MapAttributes
- .4byte RustboroCity_DevonCorp_1F_MapAttributes
- .4byte RustboroCity_DevonCorp_2F_MapAttributes
- .4byte RustboroCity_Gym_MapAttributes
- .4byte RustboroCity_PokemonSchool_MapAttributes
- .4byte RustboroCity_House2_MapAttributes
- .4byte RustboroCity_House1_MapAttributes
- .4byte RustboroCity_CuttersHouse_MapAttributes
- .4byte FortreeCity_House1_MapAttributes
- .4byte FortreeCity_Gym_MapAttributes
- .4byte FortreeCity_House2_MapAttributes
- .4byte Route104_MrBrineysHouse_MapAttributes
- .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
- .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
- .4byte LilycoveCity_ContestLobby_MapAttributes
- .4byte LilycoveCity_ContestHall_MapAttributes
- .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
- .4byte LilycoveCity_EmptyMap_MapAttributes
- .4byte MossdeepCity_Gym_MapAttributes
- .4byte SootopolisCity_Gym_1F_MapAttributes
- .4byte SootopolisCity_Gym_B1F_MapAttributes
- .4byte EverGrandeCity_SidneysRoom_MapAttributes
- .4byte EverGrandeCity_PhoebesRoom_MapAttributes
- .4byte EverGrandeCity_GlaciasRoom_MapAttributes
- .4byte EverGrandeCity_DrakesRoom_MapAttributes
- .4byte EverGrandeCity_ChampionsRoom_MapAttributes
- .4byte EverGrandeCity_Corridor1_MapAttributes
- .4byte Route104_PrettyPetalFlowerShop_MapAttributes
- .4byte Route112_CableCarStation_MapAttributes
- .4byte Route114_FossilManiacsHouse_MapAttributes
- .4byte Route114_FossilManiacsTunnel_MapAttributes
- .4byte Route114_LanettesHouse_MapAttributes
- .4byte Route116_TunnelersRestHouse_MapAttributes
- .4byte Route117_PokemonDayCare_MapAttributes
- .4byte Route121_SafariZoneEntrance_MapAttributes
- .4byte MeteorFalls_1F_1R_MapAttributes
- .4byte MeteorFalls_1F_2R_MapAttributes
- .4byte MeteorFalls_B1F_1R_MapAttributes
- .4byte MeteorFalls_B1F_2R_MapAttributes
- .4byte RusturfTunnel_MapAttributes
- .4byte Underwater_SootopolisCity_MapAttributes
- .4byte DesertRuins_MapAttributes
- .4byte GraniteCave_1F_MapAttributes
- .4byte GraniteCave_B1F_MapAttributes
- .4byte GraniteCave_B2F_MapAttributes
- .4byte PetalburgWoods_MapAttributes
- .4byte MtChimney_MapAttributes
- .4byte MtPyre_1F_MapAttributes
- .4byte MtPyre_2F_MapAttributes
- .4byte MtPyre_3F_MapAttributes
- .4byte MtPyre_4F_MapAttributes
- .4byte MtPyre_5F_MapAttributes
- .4byte MtPyre_6F_MapAttributes
- .4byte AquaHideout_1F_MapAttributes
- .4byte AquaHideout_B1F_MapAttributes
- .4byte AquaHideout_B2F_MapAttributes
- .4byte Underwater_SeafloorCavern_MapAttributes
- .4byte SeafloorCavern_Entrance_MapAttributes
- .4byte SeafloorCavern_Room1_MapAttributes
- .4byte SeafloorCavern_Room2_MapAttributes
- .4byte SeafloorCavern_Room3_MapAttributes
- .4byte SeafloorCavern_Room4_MapAttributes
- .4byte SeafloorCavern_Room5_MapAttributes
- .4byte SeafloorCavern_Room6_MapAttributes
- .4byte SeafloorCavern_Room7_MapAttributes
- .4byte SeafloorCavern_Room8_MapAttributes
- .4byte SeafloorCavern_Room9_MapAttributes
- .4byte CaveOfOrigin_Entrance_MapAttributes
- .4byte CaveOfOrigin_1F_MapAttributes
- .4byte CaveOfOrigin_B1F_MapAttributes
- .4byte CaveOfOrigin_B2F_MapAttributes
- .4byte CaveOfOrigin_B3F_MapAttributes
- .4byte CaveOfOrigin_B4F_MapAttributes
- .4byte VictoryRoad_1F_MapAttributes
- .4byte ShoalCave_LowTideEntranceRoom_MapAttributes
- .4byte ShoalCave_LowTideInnerRoom_MapAttributes
- .4byte ShoalCave_LowTideStairsRoom_MapAttributes
- .4byte ShoalCave_LowTideLowerRoom_MapAttributes
- .4byte ShoalCave_HighTideEntranceRoom_MapAttributes
- .4byte ShoalCave_HighTideInnerRoom_MapAttributes
- .4byte UnknownMapAttributes_082E55C8 @ unused maps
- .4byte UnknownMapAttributes_082E55EC
- .4byte UnknownMapAttributes_082E5610
- .4byte UnknownMapAttributes_082E5634
- .4byte UnknownMapAttributes_082E5658
- .4byte UnknownMapAttributes_082E567C
- .4byte UnknownMapAttributes_082E56A0
- .4byte UnknownMapAttributes_082E56C4
- .4byte UnknownMapAttributes_082E56E8
- .4byte UnknownMapAttributes_082E570C
- .4byte UnknownMapAttributes_082E5730
- .4byte UnknownMapAttributes_082E5754
- .4byte UnknownMapAttributes_082E5778
- .4byte UnknownMapAttributes_082E579C
- .4byte NewMauville_Entrance_MapAttributes
- .4byte NewMauville_Inside_MapAttributes
- .4byte AbandonedShip_Deck_MapAttributes
- .4byte AbandonedShip_Corridors_1F_MapAttributes
- .4byte AbandonedShip_Rooms_1F_MapAttributes
- .4byte AbandonedShip_Corridors_B1F_MapAttributes
- .4byte AbandonedShip_Rooms_B1F_MapAttributes
- .4byte AbandonedShip_Rooms2_B1F_MapAttributes
- .4byte AbandonedShip_Underwater1_MapAttributes
- .4byte AbandonedShip_Room_B1F_MapAttributes
- .4byte AbandonedShip_Rooms2_1F_MapAttributes
- .4byte AbandonedShip_CaptainsOffice_MapAttributes
- .4byte AbandonedShip_Underwater2_MapAttributes
- .4byte SecretBase_RedCave1_MapAttributes
- .4byte SecretBase_BrownCave1_MapAttributes
- .4byte SecretBase_BlueCave1_MapAttributes
- .4byte SecretBase_YellowCave1_MapAttributes
- .4byte SecretBase_Tree1_MapAttributes
- .4byte SecretBase_Shrub1_MapAttributes
- .4byte SecretBase_RedCave2_MapAttributes
- .4byte SecretBase_BrownCave2_MapAttributes
- .4byte SecretBase_BlueCave2_MapAttributes
- .4byte SecretBase_YellowCave2_MapAttributes
- .4byte SecretBase_Tree2_MapAttributes
- .4byte SecretBase_Shrub2_MapAttributes
- .4byte SecretBase_RedCave3_MapAttributes
- .4byte SecretBase_BrownCave3_MapAttributes
- .4byte SecretBase_BlueCave3_MapAttributes
- .4byte SecretBase_YellowCave3_MapAttributes
- .4byte SecretBase_Tree3_MapAttributes
- .4byte SecretBase_Shrub3_MapAttributes
- .4byte SecretBase_RedCave4_MapAttributes
- .4byte SecretBase_BrownCave4_MapAttributes
- .4byte SecretBase_BlueCave4_MapAttributes
- .4byte SecretBase_YellowCave4_MapAttributes
- .4byte SecretBase_Tree4_MapAttributes
- .4byte SecretBase_Shrub4_MapAttributes
- .4byte SingleBattleColosseum_MapAttributes
- .4byte TradeCenter_MapAttributes
- .4byte RecordCorner_MapAttributes
- .4byte DoubleBattleColosseum_MapAttributes
- .4byte LinkContestRoom1_MapAttributes
- .4byte UnknownMap_25_29_MapAttributes
- .4byte UnknownMap_25_30_MapAttributes
- .4byte UnknownMap_25_31_MapAttributes
- .4byte UnknownMap_25_32_MapAttributes
- .4byte UnknownMap_25_33_MapAttributes
- .4byte UnknownMap_25_34_MapAttributes
- .4byte LinkContestRoom2_MapAttributes
- .4byte LinkContestRoom3_MapAttributes
- .4byte LinkContestRoom4_MapAttributes
- .4byte LinkContestRoom5_MapAttributes
- .4byte LinkContestRoom6_MapAttributes
- .4byte InsideOfTruck_MapAttributes
- .4byte SafariZone_Northwest_MapAttributes
- .4byte SafariZone_Northeast_MapAttributes
- .4byte SafariZone_Southwest_MapAttributes
- .4byte SafariZone_Southeast_MapAttributes
- .4byte UnknownMapAttributes_082EDF30
- .4byte Route109_SeashoreHouse_MapAttributes
- .4byte Route110_TrickHouseEntrance_MapAttributes
- .4byte Route110_TrickHouseEnd_MapAttributes
- .4byte Route110_TrickHouseCorridor_MapAttributes
- .4byte Route110_TrickHousePuzzle1_MapAttributes
- .4byte Route110_TrickHousePuzzle2_MapAttributes
- .4byte Route110_TrickHousePuzzle3_MapAttributes
- .4byte Route110_TrickHousePuzzle4_MapAttributes
- .4byte Route110_TrickHousePuzzle5_MapAttributes
- .4byte Route110_TrickHousePuzzle6_MapAttributes
- .4byte Route110_TrickHousePuzzle7_MapAttributes
- .4byte Route110_TrickHousePuzzle8_MapAttributes
- .4byte FortreeCity_DecorationShop_MapAttributes
- .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes
- .4byte LilycoveCity_DepartmentStore_1F_MapAttributes
- .4byte LilycoveCity_DepartmentStore_2F_MapAttributes
- .4byte LilycoveCity_DepartmentStore_3F_MapAttributes
- .4byte LilycoveCity_DepartmentStore_4F_MapAttributes
- .4byte LilycoveCity_DepartmentStore_5F_MapAttributes
- .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
- .4byte Route130_MapAttributes
- .4byte BattleTower_Lobby_MapAttributes
- .4byte BattleTower_Outside_MapAttributes
- .4byte BattleTower_Elevator_MapAttributes
- .4byte BattleTower_Corridor_MapAttributes
- .4byte BattleTower_BattleRoom_MapAttributes
- .4byte RustboroCity_DevonCorp_3F_MapAttributes
- .4byte EverGrandeCity_PokemonLeague_MapAttributes
- .4byte Route119_WeatherInstitute_1F_MapAttributes
- .4byte Route119_WeatherInstitute_2F_MapAttributes
- .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
- .4byte Underwater1_MapAttributes
- .4byte MossdeepCity_SpaceCenter_1F_MapAttributes
- .4byte MossdeepCity_SpaceCenter_2F_MapAttributes
- .4byte SSTidalCorridor_MapAttributes
- .4byte SSTidalLowerDeck_MapAttributes
- .4byte SSTidalRooms_MapAttributes
- .4byte IslandCave_MapAttributes
- .4byte AncientTomb_MapAttributes
- .4byte Underwater_Route134_MapAttributes
- .4byte Underwater_SealedChamber_MapAttributes
- .4byte SealedChamber_OuterRoom_MapAttributes
- .4byte VictoryRoad_B1F_MapAttributes
- .4byte VictoryRoad_B2F_MapAttributes
- .4byte Route104_Prototype_MapAttributes
- .4byte GraniteCave_StevensRoom_MapAttributes
- .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
- .4byte SouthernIsland_Exterior_MapAttributes
- .4byte SouthernIsland_Interior_MapAttributes
- .4byte JaggedPass_MapAttributes
- .4byte FieryPath_MapAttributes
- .4byte RustboroCity_Flat2_1F_MapAttributes
- .4byte RustboroCity_Flat2_2F_MapAttributes
- .4byte RustboroCity_Flat2_3F_MapAttributes
- .4byte SootopolisCity_House8_MapAttributes
- .4byte EverGrandeCity_HallOfFame_MapAttributes
- .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
- .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
- .4byte Route124_DivingTreasureHuntersHouse_MapAttributes
- .4byte MtPyre_Exterior_MapAttributes
- .4byte MtPyre_Summit_MapAttributes
- .4byte SealedChamber_InnerRoom_MapAttributes
- .4byte MossdeepCity_GameCorner_1F_MapAttributes
- .4byte MossdeepCity_GameCorner_B1F_MapAttributes
- .4byte SootopolisCity_House1_MapAttributes
- .4byte SootopolisCity_House2_MapAttributes
- .4byte SootopolisCity_House3_MapAttributes
- .4byte AbandonedShip_HiddenFloorRooms_MapAttributes
- .4byte ScorchedSlab_MapAttributes
- .4byte UnknownMapAttributes_082FF894
- .4byte RustboroCity_Flat1_1F_MapAttributes
- .4byte RustboroCity_Flat1_2F_MapAttributes
- .4byte EverGrandeCity_Corridor4_MapAttributes
- .4byte MagmaHideout_1F_MapAttributes
- .4byte MagmaHideout_B1F_MapAttributes
- .4byte MagmaHideout_B2F_MapAttributes
- .4byte UnknownMapAttributes_08302970
- .4byte SkyPillar_Entrance_MapAttributes
- .4byte SkyPillar_Outside_MapAttributes
- .4byte SkyPillar_1F_MapAttributes
- .4byte SkyPillar_2F_MapAttributes
- .4byte SkyPillar_3F_MapAttributes
- .4byte SkyPillar_4F_MapAttributes
- .4byte UnknownMapAttributes_083041B4
- .4byte MossdeepCity_StevensHouse_MapAttributes
- .4byte ShoalCave_LowTideIceRoom_MapAttributes
- .4byte SafariZone_RestHouse_MapAttributes
- .4byte SkyPillar_5F_MapAttributes
- .4byte SkyPillar_Top_MapAttributes
+ .4byte PetalburgCity_Layout
+ .4byte SlateportCity_Layout
+ .4byte MauvilleCity_Layout
+ .4byte RustboroCity_Layout
+ .4byte FortreeCity_Layout
+ .4byte LilycoveCity_Layout
+ .4byte MossdeepCity_Layout
+ .4byte SootopolisCity_Layout
+ .4byte EverGrandeCity_Layout
+ .4byte LittlerootTown_Layout
+ .4byte OldaleTown_Layout
+ .4byte DewfordTown_Layout
+ .4byte LavaridgeTown_Layout
+ .4byte FallarborTown_Layout
+ .4byte VerdanturfTown_Layout
+ .4byte PacifidlogTown_Layout
+ .4byte Route101_Layout
+ .4byte Route102_Layout
+ .4byte Route103_Layout
+ .4byte Route104_Layout
+ .4byte Route105_Layout
+ .4byte Route106_Layout
+ .4byte Route107_Layout
+ .4byte Route108_Layout
+ .4byte Route109_Layout
+ .4byte Route110_Layout
+ .4byte Route111_Layout
+ .4byte Route112_Layout
+ .4byte Route113_Layout
+ .4byte Route114_Layout
+ .4byte Route115_Layout
+ .4byte Route116_Layout
+ .4byte Route117_Layout
+ .4byte Route118_Layout
+ .4byte Route119_Layout
+ .4byte Route120_Layout
+ .4byte Route121_Layout
+ .4byte Route122_Layout
+ .4byte Route123_Layout
+ .4byte Route124_Layout
+ .4byte Route125_Layout
+ .4byte Route126_Layout
+ .4byte Route127_Layout
+ .4byte Route128_Layout
+ .4byte Route129_Layout
+ .4byte UnreferencedMap_Layout
+ .4byte Route131_Layout
+ .4byte Route132_Layout
+ .4byte Route133_Layout
+ .4byte Route134_Layout
+ .4byte Underwater2_Layout
+ .4byte Underwater3_Layout
+ .4byte Underwater4_Layout
+ .4byte LittlerootTown_BrendansHouse_1F_Layout
+ .4byte LittlerootTown_BrendansHouse_2F_Layout
+ .4byte LittlerootTown_MaysHouse_1F_Layout
+ .4byte LittlerootTown_MaysHouse_2F_Layout
+ .4byte LittlerootTown_ProfessorBirchsLab_Layout
+ .4byte House1_Layout
+ .4byte House2_Layout
+ .4byte PokemonCenter_1F_Layout
+ .4byte PokemonCenter_2F_Layout
+ .4byte PokeMart_Layout
+ .4byte House3_Layout
+ .4byte DewfordTown_Gym_Layout
+ .4byte DewfordTown_Hall_Layout
+ .4byte House4_Layout
+ .4byte LavaridgeTown_HerbShop_Layout
+ .4byte LavaridgeTown_Gym_1F_Layout
+ .4byte LavaridgeTown_Gym_B1F_Layout
+ .4byte LavaridgeTown_PokemonCenter_1F_Layout
+ .4byte ContestLobby_Layout
+ .4byte ContestHall_Layout
+ .4byte LilycoveCity_House2_Layout
+ .4byte UnknownMap_082CF564_Layout
+ .4byte VerdanturfTown_WandasHouse_Layout
+ .4byte PacifidlogTown_House1_Layout
+ .4byte PacifidlogTown_House2_Layout
+ .4byte PetalburgCity_Gym_Layout
+ .4byte HouseWithBed_Layout
+ .4byte SlateportCity_SternsShipyard_1F_Layout
+ .4byte SlateportCity_SternsShipyard_2F_Layout
+ .4byte UnknownMap_082D05D8_Layout
+ .4byte UnknownMap_082D05FC_Layout
+ .4byte SlateportCity_PokemonFanClub_Layout
+ .4byte SlateportCity_OceanicMuseum_1F_Layout
+ .4byte SlateportCity_OceanicMuseum_2F_Layout
+ .4byte Harbor_Layout
+ .4byte MauvilleCity_Gym_Layout
+ .4byte MauvilleCity_BikeShop_Layout
+ .4byte MauvilleCity_GameCorner_Layout
+ .4byte RustboroCity_DevonCorp_1F_Layout
+ .4byte RustboroCity_DevonCorp_2F_Layout
+ .4byte RustboroCity_Gym_Layout
+ .4byte RustboroCity_PokemonSchool_Layout
+ .4byte RustboroCity_House_Layout
+ .4byte RustboroCity_House1_Layout
+ .4byte RustboroCity_CuttersHouse_Layout
+ .4byte FortreeCity_House1_Layout
+ .4byte FortreeCity_Gym_Layout
+ .4byte FortreeCity_House2_Layout
+ .4byte Route104_MrBrineysHouse_Layout
+ .4byte LilycoveCity_LilycoveMuseum_1F_Layout
+ .4byte LilycoveCity_LilycoveMuseum_2F_Layout
+ .4byte LilycoveCity_ContestLobby_Layout
+ .4byte LilycoveCity_ContestHall_Layout
+ .4byte LilycoveCity_PokemonTrainerFanClub_Layout
+ .4byte LilycoveCity_EmptyMap_Layout
+ .4byte MossdeepCity_Gym_Layout
+ .4byte SootopolisCity_Gym_1F_Layout
+ .4byte SootopolisCity_Gym_B1F_Layout
+ .4byte EverGrandeCity_SidneysRoom_Layout
+ .4byte EverGrandeCity_PhoebesRoom_Layout
+ .4byte EverGrandeCity_GlaciasRoom_Layout
+ .4byte EverGrandeCity_DrakesRoom_Layout
+ .4byte EverGrandeCity_ChampionsRoom_Layout
+ .4byte EverGrandeCity_ShortCorridor_Layout
+ .4byte Route104_PrettyPetalFlowerShop_Layout
+ .4byte CableCarStation_Layout
+ .4byte Route114_FossilManiacsHouse_Layout
+ .4byte Route114_FossilManiacsTunnel_Layout
+ .4byte Route114_LanettesHouse_Layout
+ .4byte Route116_TunnelersRestHouse_Layout
+ .4byte Route117_PokemonDayCare_Layout
+ .4byte Route121_SafariZoneEntrance_Layout
+ .4byte MeteorFalls_1F_1R_Layout
+ .4byte MeteorFalls_1F_2R_Layout
+ .4byte MeteorFalls_B1F_1R_Layout
+ .4byte MeteorFalls_B1F_2R_Layout
+ .4byte RusturfTunnel_Layout
+ .4byte Underwater_SootopolisCity_Layout
+ .4byte DesertRuins_Layout
+ .4byte GraniteCave_1F_Layout
+ .4byte GraniteCave_B1F_Layout
+ .4byte GraniteCave_B2F_Layout
+ .4byte PetalburgWoods_Layout
+ .4byte MtChimney_Layout
+ .4byte MtPyre_1F_Layout
+ .4byte MtPyre_2F_Layout
+ .4byte MtPyre_3F_Layout
+ .4byte MtPyre_4F_Layout
+ .4byte MtPyre_5F_Layout
+ .4byte MtPyre_6F_Layout
+ .4byte AquaHideout_1F_Layout
+ .4byte AquaHideout_B1F_Layout
+ .4byte AquaHideout_B2F_Layout
+ .4byte Underwater_SeafloorCavern_Layout
+ .4byte SeafloorCavern_Entrance_Layout
+ .4byte SeafloorCavern_Room1_Layout
+ .4byte SeafloorCavern_Room2_Layout
+ .4byte SeafloorCavern_Room3_Layout
+ .4byte SeafloorCavern_Room4_Layout
+ .4byte SeafloorCavern_Room5_Layout
+ .4byte SeafloorCavern_Room6_Layout
+ .4byte SeafloorCavern_Room7_Layout
+ .4byte SeafloorCavern_Room8_Layout
+ .4byte SeafloorCavern_Room9_Layout
+ .4byte CaveOfOrigin_Entrance_Layout
+ .4byte CaveOfOrigin_1F_Layout
+ .4byte CaveOfOrigin_B1F_Layout
+ .4byte CaveOfOrigin_B2F_Layout
+ .4byte CaveOfOrigin_B3F_Layout
+ .4byte CaveOfOrigin_B4F_Layout
+ .4byte VictoryRoad_1F_Layout
+ .4byte ShoalCave_LowTideEntranceRoom_Layout
+ .4byte ShoalCave_LowTideInnerRoom_Layout
+ .4byte ShoalCave_LowTideStairsRoom_Layout
+ .4byte ShoalCave_LowTideLowerRoom_Layout
+ .4byte ShoalCave_HighTideEntranceRoom_Layout
+ .4byte ShoalCave_HighTideInnerRoom_Layout
+ .4byte UnknownMap_082E55C8_Layout @ unused maps
+ .4byte UnknownMap_082E55EC_Layout
+ .4byte UnknownMap_082E5610_Layout
+ .4byte UnknownMap_082E5634_Layout
+ .4byte UnknownMap_082E5658_Layout
+ .4byte UnknownMap_082E567C_Layout
+ .4byte UnknownMap_082E56A0_Layout
+ .4byte UnknownMap_082E56C4_Layout
+ .4byte UnknownMap_082E56E8_Layout
+ .4byte UnknownMap_082E570C_Layout
+ .4byte UnknownMap_082E5730_Layout
+ .4byte UnknownMap_082E5754_Layout
+ .4byte UnknownMap_082E5778_Layout
+ .4byte UnknownMap_082E579C_Layout
+ .4byte NewMauville_Entrance_Layout
+ .4byte NewMauville_Inside_Layout
+ .4byte AbandonedShip_Deck_Layout
+ .4byte AbandonedShip_Corridors_1F_Layout
+ .4byte AbandonedShip_Rooms_1F_Layout
+ .4byte AbandonedShip_Corridors_B1F_Layout
+ .4byte AbandonedShip_Rooms_B1F_Layout
+ .4byte AbandonedShip_Rooms2_B1F_Layout
+ .4byte AbandonedShip_Underwater1_Layout
+ .4byte AbandonedShip_Room_B1F_Layout
+ .4byte AbandonedShip_Rooms2_1F_Layout
+ .4byte AbandonedShip_CaptainsOffice_Layout
+ .4byte AbandonedShip_Underwater2_Layout
+ .4byte SecretBase_RedCave1_Layout
+ .4byte SecretBase_BrownCave1_Layout
+ .4byte SecretBase_BlueCave1_Layout
+ .4byte SecretBase_YellowCave1_Layout
+ .4byte SecretBase_Tree1_Layout
+ .4byte SecretBase_Shrub1_Layout
+ .4byte SecretBase_RedCave2_Layout
+ .4byte SecretBase_BrownCave2_Layout
+ .4byte SecretBase_BlueCave2_Layout
+ .4byte SecretBase_YellowCave2_Layout
+ .4byte SecretBase_Tree2_Layout
+ .4byte SecretBase_Shrub2_Layout
+ .4byte SecretBase_RedCave3_Layout
+ .4byte SecretBase_BrownCave3_Layout
+ .4byte SecretBase_BlueCave3_Layout
+ .4byte SecretBase_YellowCave3_Layout
+ .4byte SecretBase_Tree3_Layout
+ .4byte SecretBase_Shrub3_Layout
+ .4byte SecretBase_RedCave4_Layout
+ .4byte SecretBase_BrownCave4_Layout
+ .4byte SecretBase_BlueCave4_Layout
+ .4byte SecretBase_YellowCave4_Layout
+ .4byte SecretBase_Tree4_Layout
+ .4byte SecretBase_Shrub4_Layout
+ .4byte SingleBattleColosseum_Layout
+ .4byte TradeCenter_Layout
+ .4byte RecordCorner_Layout
+ .4byte DoubleBattleColosseum_Layout
+ .4byte LinkContestRoom1_Layout
+ .4byte UnknownMap_25_29_Layout
+ .4byte UnknownMap_25_30_Layout
+ .4byte UnknownMap_25_31_Layout
+ .4byte UnknownMap_25_32_Layout
+ .4byte UnknownMap_25_33_Layout
+ .4byte UnknownMap_25_34_Layout
+ .4byte LinkContestRoom2_Layout
+ .4byte LinkContestRoom3_Layout
+ .4byte LinkContestRoom4_Layout
+ .4byte LinkContestRoom5_Layout
+ .4byte LinkContestRoom6_Layout
+ .4byte InsideOfTruck_Layout
+ .4byte SafariZone_Northwest_Layout
+ .4byte SafariZone_Northeast_Layout
+ .4byte SafariZone_Southwest_Layout
+ .4byte SafariZone_Southeast_Layout
+ .4byte UnknownMap_082EDF30_Layout
+ .4byte Route109_SeashoreHouse_Layout
+ .4byte Route110_TrickHouseEntrance_Layout
+ .4byte Route110_TrickHouseEnd_Layout
+ .4byte Route110_TrickHouseCorridor_Layout
+ .4byte Route110_TrickHousePuzzle1_Layout
+ .4byte Route110_TrickHousePuzzle2_Layout
+ .4byte Route110_TrickHousePuzzle3_Layout
+ .4byte Route110_TrickHousePuzzle4_Layout
+ .4byte Route110_TrickHousePuzzle5_Layout
+ .4byte Route110_TrickHousePuzzle6_Layout
+ .4byte Route110_TrickHousePuzzle7_Layout
+ .4byte Route110_TrickHousePuzzle8_Layout
+ .4byte FortreeCity_DecorationShop_Layout
+ .4byte Route110_SeasideCyclingRoadEntrace_Layout
+ .4byte LilycoveCity_DepartmentStore_1F_Layout
+ .4byte LilycoveCity_DepartmentStore_2F_Layout
+ .4byte LilycoveCity_DepartmentStore_3F_Layout
+ .4byte LilycoveCity_DepartmentStore_4F_Layout
+ .4byte LilycoveCity_DepartmentStore_5F_Layout
+ .4byte LilycoveCity_DepartmentStoreRooftop_Layout
+ .4byte Route130_Layout
+ .4byte BattleTower_Lobby_Layout
+ .4byte BattleTower_Outside_Layout
+ .4byte BattleTower_Elevator_Layout
+ .4byte BattleTower_Corridor_Layout
+ .4byte BattleTower_BattleRoom_Layout
+ .4byte RustboroCity_DevonCorp_3F_Layout
+ .4byte EverGrandeCity_PokemonLeague_Layout
+ .4byte Route119_WeatherInstitute_1F_Layout
+ .4byte Route119_WeatherInstitute_2F_Layout
+ .4byte LilycoveCity_DepartmentStoreElevator_Layout
+ .4byte Underwater1_Layout
+ .4byte MossdeepCity_SpaceCenter_1F_Layout
+ .4byte MossdeepCity_SpaceCenter_2F_Layout
+ .4byte SSTidalCorridor_Layout
+ .4byte SSTidalLowerDeck_Layout
+ .4byte SSTidalRooms_Layout
+ .4byte IslandCave_Layout
+ .4byte AncientTomb_Layout
+ .4byte Underwater_Route134_Layout
+ .4byte Underwater_SealedChamber_Layout
+ .4byte SealedChamber_OuterRoom_Layout
+ .4byte VictoryRoad_B1F_Layout
+ .4byte VictoryRoad_B2F_Layout
+ .4byte Route104_Prototype_Layout
+ .4byte GraniteCave_StevensRoom_Layout
+ .4byte AbandonedShip_HiddenFloorCorridors_Layout
+ .4byte SouthernIsland_Exterior_Layout
+ .4byte SouthernIsland_Interior_Layout
+ .4byte JaggedPass_Layout
+ .4byte FieryPath_Layout
+ .4byte RustboroCity_Flat2_1F_Layout
+ .4byte RustboroCity_Flat2_2F_Layout
+ .4byte RustboroCity_Flat2_3F_Layout
+ .4byte SootopolisCity_House8_Layout
+ .4byte EverGrandeCity_HallOfFame_Layout
+ .4byte LilycoveCity_CoveLilyMotel_1F_Layout
+ .4byte LilycoveCity_CoveLilyMotel_2F_Layout
+ .4byte Route124_DivingTreasureHuntersHouse_Layout
+ .4byte MtPyre_Exterior_Layout
+ .4byte MtPyre_Summit_Layout
+ .4byte SealedChamber_InnerRoom_Layout
+ .4byte MossdeepCity_GameCorner_1F_Layout
+ .4byte MossdeepCity_GameCorner_B1F_Layout
+ .4byte SootopolisCity_House1_Layout
+ .4byte SootopolisCity_House2_Layout
+ .4byte SootopolisCity_House3_Layout
+ .4byte AbandonedShip_HiddenFloorRooms_Layout
+ .4byte ScorchedSlab_Layout
+ .4byte UnknownMap_082FF894_Layout
+ .4byte RustboroCity_Flat1_1F_Layout
+ .4byte RustboroCity_Flat1_2F_Layout
+ .4byte EverGrandeCity_Corridor4_Layout
+ .4byte MagmaHideout_1F_Layout
+ .4byte MagmaHideout_B1F_Layout
+ .4byte MagmaHideout_B2F_Layout
+ .4byte UnknownMap_08302970_Layout
+ .4byte SkyPillar_Entrance_Layout
+ .4byte SkyPillar_Outside_Layout
+ .4byte SkyPillar_1F_Layout
+ .4byte SkyPillar_2F_Layout
+ .4byte SkyPillar_3F_Layout
+ .4byte SkyPillar_4F_Layout
+ .4byte UnknownMap_083041B4_Layout
+ .4byte MossdeepCity_StevensHouse_Layout
+ .4byte ShoalCave_LowTideIceRoom_Layout
+ .4byte SafariZone_RestHouse_Layout
+ .4byte SkyPillar_5F_Layout
+ .4byte SkyPillar_Top_Layout