summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-20 17:41:17 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-20 19:54:21 -0500
commit89d35e82a27c7328bf5987b4993b3456bb78f440 (patch)
treee98a7ba6af471ac0b6e7237eb2ca159ddb4d2f6f /data/maps
parent4ab87bf8f3fd527d0b5120344f84b73d309693db (diff)
Move 'map attributes' into 'layouts'
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/AlteringCave/border.bin1
-rw-r--r--data/maps/AlteringCave/header.inc2
-rw-r--r--data/maps/AlteringCave/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/AquaHideout_UnusedRubyMap1/border.bin1
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap1/header.inc2
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap1/map.binbin1680 -> 0 bytes
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap2/border.bin1
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap2/header.inc2
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap2/map.bin95
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap3/border.bin1
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap3/header.inc2
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap3/map.bin49
-rw-r--r--data/maps/ArtisanCave_1F/border.bin1
-rw-r--r--data/maps/ArtisanCave_1F/header.inc2
-rw-r--r--data/maps/ArtisanCave_1F/map.bin1
-rw-r--r--data/maps/ArtisanCave_B1F/border.bin1
-rw-r--r--data/maps/ArtisanCave_B1F/header.inc2
-rw-r--r--data/maps/ArtisanCave_B1F/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleArenaCorridor/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleArenaCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleArenaCorridor/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/map.bin3
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattleDomeCorridor/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomeCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomeCorridor/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleDomeLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomeLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomeLobby/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleDomePreBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleDomePreBattleRoom/map.binbin144 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/map.binbin312 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryLobby/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePalaceCorridor/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceCorridor/map.binbin476 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceLobby/map.bin7
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/map.binbin170 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/map.binbin170 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/map.binbin500 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc2
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.binbin630 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_Lounge1/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_Lounge1/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge1/map.bin1
-rw-r--r--data/maps/BattleFrontier_Lounge2/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_Lounge2/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge2/map.bin1
-rw-r--r--data/maps/BattleFrontier_Lounge3/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge4/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge5/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge6/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge7/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge8/header.inc2
-rw-r--r--data/maps/BattleFrontier_Lounge9/header.inc2
-rw-r--r--data/maps/BattleFrontier_Mart/header.inc2
-rw-r--r--data/maps/BattleFrontier_OutsideEast/border.bin1
-rw-r--r--data/maps/BattleFrontier_OutsideEast/header.inc2
-rw-r--r--data/maps/BattleFrontier_OutsideEast/map.binbin10368 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_OutsideWest/border.bin1
-rw-r--r--data/maps/BattleFrontier_OutsideWest/header.inc2
-rw-r--r--data/maps/BattleFrontier_OutsideWest/map.binbin8064 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_1F/header.inc2
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_2F/header.inc2
-rw-r--r--data/maps/BattleFrontier_RankingHall/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_RankingHall/header.inc2
-rw-r--r--data/maps/BattleFrontier_RankingHall/map.bin64
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/header.inc2
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/map.binbin252 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/header.inc2
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare01/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare01/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare01/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare02/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare02/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare02/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare03/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare03/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare03/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare04/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare04/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare04/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare05/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare05/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare05/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare06/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare06/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare06/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare07/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare07/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare07/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare08/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare08/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare08/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare09/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare09/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare09/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare10/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare10/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare10/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare11/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare11/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare11/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare12/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare12/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare12/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare13/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare13/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare13/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare14/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare14/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare14/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare15/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare15/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare15/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare16/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/BattlePyramidSquare16/header.inc2
-rw-r--r--data/maps/BattlePyramidSquare16/map.bin1
-rw-r--r--data/maps/BirthIsland_Exterior/border.bin1
-rw-r--r--data/maps/BirthIsland_Exterior/header.inc2
-rw-r--r--data/maps/BirthIsland_Exterior/map.binbin1800 -> 0 bytes
-rw-r--r--data/maps/BirthIsland_Harbor/border.bin1
-rw-r--r--data/maps/BirthIsland_Harbor/header.inc2
-rw-r--r--data/maps/BirthIsland_Harbor/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_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/CaveOfOrigin_UnusedRubySapphireMap1/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin1
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/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/DesertUnderpass/border.bin1
-rw-r--r--data/maps/DesertUnderpass/header.inc2
-rw-r--r--data/maps/DesertUnderpass/map.bin1
-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.binbin1008 -> 0 bytes
-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_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_Hall1/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_Hall1/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall1/map.bin1
-rw-r--r--data/maps/EverGrandeCity_Hall2/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall3/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall4/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/EverGrandeCity_Hall4/header.inc2
-rw-r--r--data/maps/EverGrandeCity_Hall4/map.bin1
-rw-r--r--data/maps/EverGrandeCity_Hall5/header.inc2
-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_1F/border.bin1
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_1F/header.inc2
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_1F/map.bin2
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_2F/header.inc2
-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.bin1
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/header.inc2
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/map.binbin180 -> 0 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentCorridor/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentCorridor/header.inc2
-rw-r--r--data/maps/FallarborTown_BattleTentCorridor/map.bin1
-rw-r--r--data/maps/FallarborTown_BattleTentLobby/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentLobby/header.inc2
-rw-r--r--data/maps/FallarborTown_BattleTentLobby/map.bin2
-rw-r--r--data/maps/FallarborTown_House1/header.inc2
-rw-r--r--data/maps/FallarborTown_House2/header.inc2
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestHall/border.bin1
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestHall/map.bin1
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestLobby/border.bin1
-rw-r--r--data/maps/FallarborTown_LeftoverRSContestLobby/map.bin1
-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/FarawayIsland_Entrance/border.bin1
-rw-r--r--data/maps/FarawayIsland_Entrance/header.inc2
-rw-r--r--data/maps/FarawayIsland_Entrance/map.binbin3128 -> 0 bytes
-rw-r--r--data/maps/FarawayIsland_Interior/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/FarawayIsland_Interior/header.inc2
-rw-r--r--data/maps/FarawayIsland_Interior/map.binbin1508 -> 0 bytes
-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.binbin1000 -> 0 bytes
-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/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.bin3
-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.bin6
-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_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.bin5
-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.binbin2812 -> 0 bytes
-rw-r--r--data/maps/MagmaHideout_2F_1R/border.bin1
-rw-r--r--data/maps/MagmaHideout_2F_1R/header.inc2
-rw-r--r--data/maps/MagmaHideout_2F_1R/map.bin2
-rw-r--r--data/maps/MagmaHideout_2F_2R/border.bin1
-rw-r--r--data/maps/MagmaHideout_2F_2R/header.inc2
-rw-r--r--data/maps/MagmaHideout_2F_2R/map.bin5
-rw-r--r--data/maps/MagmaHideout_2F_3R/border.bin1
-rw-r--r--data/maps/MagmaHideout_2F_3R/header.inc2
-rw-r--r--data/maps/MagmaHideout_2F_3R/map.bin1
-rw-r--r--data/maps/MagmaHideout_3F_1R/border.bin1
-rw-r--r--data/maps/MagmaHideout_3F_1R/header.inc2
-rw-r--r--data/maps/MagmaHideout_3F_1R/map.bin1
-rw-r--r--data/maps/MagmaHideout_3F_2R/border.bin1
-rw-r--r--data/maps/MagmaHideout_3F_2R/header.inc2
-rw-r--r--data/maps/MagmaHideout_3F_2R/map.bin7
-rw-r--r--data/maps/MagmaHideout_3F_3R/border.bin1
-rw-r--r--data/maps/MagmaHideout_3F_3R/header.inc2
-rw-r--r--data/maps/MagmaHideout_3F_3R/map.bin1
-rw-r--r--data/maps/MagmaHideout_4F/border.bin1
-rw-r--r--data/maps/MagmaHideout_4F/header.inc2
-rw-r--r--data/maps/MagmaHideout_4F/map.bin1
-rw-r--r--data/maps/MarineCave_End/border.bin1
-rw-r--r--data/maps/MarineCave_End/header.inc2
-rw-r--r--data/maps/MarineCave_End/map.bin14
-rw-r--r--data/maps/MarineCave_Entrance/border.bin1
-rw-r--r--data/maps/MarineCave_Entrance/header.inc2
-rw-r--r--data/maps/MarineCave_Entrance/map.bin7
-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.binbin420 -> 0 bytes
-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/MeteorFalls_StevensCave/border.bin1
-rw-r--r--data/maps/MeteorFalls_StevensCave/header.inc2
-rw-r--r--data/maps/MeteorFalls_StevensCave/map.bin21
-rw-r--r--data/maps/MirageTower_1F/border.bin1
-rw-r--r--data/maps/MirageTower_1F/header.inc2
-rw-r--r--data/maps/MirageTower_1F/map.bin3
-rw-r--r--data/maps/MirageTower_2F/border.bin1
-rw-r--r--data/maps/MirageTower_2F/header.inc2
-rw-r--r--data/maps/MirageTower_2F/map.bin3
-rw-r--r--data/maps/MirageTower_3F/border.bin1
-rw-r--r--data/maps/MirageTower_3F/header.inc2
-rw-r--r--data/maps/MirageTower_3F/map.bin6
-rw-r--r--data/maps/MirageTower_4F/border.bin1
-rw-r--r--data/maps/MirageTower_4F/header.inc2
-rw-r--r--data/maps/MirageTower_4F/map.bin2
-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.bin53
-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.bin40
-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/NavelRock_B1F/border.bin1
-rw-r--r--data/maps/NavelRock_B1F/header.inc2
-rw-r--r--data/maps/NavelRock_B1F/map.bin1
-rw-r--r--data/maps/NavelRock_Bottom/border.bin1
-rw-r--r--data/maps/NavelRock_Bottom/header.inc2
-rw-r--r--data/maps/NavelRock_Bottom/map.bin1
-rw-r--r--data/maps/NavelRock_Down01/header.inc2
-rw-r--r--data/maps/NavelRock_Down02/header.inc2
-rw-r--r--data/maps/NavelRock_Down03/header.inc2
-rw-r--r--data/maps/NavelRock_Down04/header.inc2
-rw-r--r--data/maps/NavelRock_Down05/header.inc2
-rw-r--r--data/maps/NavelRock_Down06/header.inc2
-rw-r--r--data/maps/NavelRock_Down07/header.inc2
-rw-r--r--data/maps/NavelRock_Down08/header.inc2
-rw-r--r--data/maps/NavelRock_Down09/header.inc2
-rw-r--r--data/maps/NavelRock_Down10/header.inc2
-rw-r--r--data/maps/NavelRock_Down11/header.inc2
-rw-r--r--data/maps/NavelRock_Entrance/border.bin1
-rw-r--r--data/maps/NavelRock_Entrance/header.inc2
-rw-r--r--data/maps/NavelRock_Entrance/map.bin1
-rw-r--r--data/maps/NavelRock_Exterior/border.bin1
-rw-r--r--data/maps/NavelRock_Exterior/header.inc2
-rw-r--r--data/maps/NavelRock_Exterior/map.binbin1008 -> 0 bytes
-rw-r--r--data/maps/NavelRock_Fork/border.bin1
-rw-r--r--data/maps/NavelRock_Fork/header.inc2
-rw-r--r--data/maps/NavelRock_Fork/map.bin1
-rw-r--r--data/maps/NavelRock_Harbor/header.inc2
-rw-r--r--data/maps/NavelRock_Top/border.bin1
-rw-r--r--data/maps/NavelRock_Top/header.inc2
-rw-r--r--data/maps/NavelRock_Top/map.bin1
-rw-r--r--data/maps/NavelRock_Up1/border.bin1
-rw-r--r--data/maps/NavelRock_Up1/header.inc2
-rw-r--r--data/maps/NavelRock_Up1/map.bin1
-rw-r--r--data/maps/NavelRock_Up2/border.bin1
-rw-r--r--data/maps/NavelRock_Up2/header.inc2
-rw-r--r--data/maps/NavelRock_Up2/map.bin1
-rw-r--r--data/maps/NavelRock_Up3/header.inc2
-rw-r--r--data/maps/NavelRock_Up4/header.inc2
-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/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/OldaleTown_House1/header.inc2
-rw-r--r--data/maps/OldaleTown_House1/map.bin1
-rw-r--r--data/maps/OldaleTown_House2/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/OldaleTown_House2/header.inc2
-rw-r--r--data/maps/OldaleTown_House2/map.bin1
-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.binbin5040 -> 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_SeasideCyclingRoadEntrance1/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc2
-rw-r--r--data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin1
-rw-r--r--data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc2
-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.binbin4000 -> 0 bytes
-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.bin10
-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_North/border.bin1
-rw-r--r--data/maps/SafariZone_North/header.inc2
-rw-r--r--data/maps/SafariZone_North/map.binbin3200 -> 0 bytes
-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_South/border.bin1
-rw-r--r--data/maps/SafariZone_South/header.inc2
-rw-r--r--data/maps/SafariZone_South/map.binbin3200 -> 0 bytes
-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.bin7
-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.bin1
-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_BattleTentBattleRoom/header.inc2
-rw-r--r--data/maps/SlateportCity_BattleTentCorridor/header.inc2
-rw-r--r--data/maps/SlateportCity_BattleTentLobby/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.binbin8 -> 0 bytes
-rw-r--r--data/maps/SootopolisCity_Gym_1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_Gym_1F/map.binbin884 -> 0 bytes
-rw-r--r--data/maps/SootopolisCity_Gym_B1F/border.binbin8 -> 0 bytes
-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_LotadAndSeedotHouse/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc2
-rw-r--r--data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin1
-rw-r--r--data/maps/SootopolisCity_Mart/header.inc2
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin1
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc2
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin2
-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/TerraCave_End/border.bin1
-rw-r--r--data/maps/TerraCave_End/header.inc2
-rw-r--r--data/maps/TerraCave_End/map.bin9
-rw-r--r--data/maps/TerraCave_Entrance/border.bin1
-rw-r--r--data/maps/TerraCave_Entrance/header.inc2
-rw-r--r--data/maps/TerraCave_Entrance/map.bin33
-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/TrainerHill_1F/border.bin1
-rw-r--r--data/maps/TrainerHill_1F/header.inc2
-rw-r--r--data/maps/TrainerHill_1F/map.bin2
-rw-r--r--data/maps/TrainerHill_2F/border.bin1
-rw-r--r--data/maps/TrainerHill_2F/header.inc2
-rw-r--r--data/maps/TrainerHill_2F/map.bin2
-rw-r--r--data/maps/TrainerHill_3F/border.bin1
-rw-r--r--data/maps/TrainerHill_3F/header.inc2
-rw-r--r--data/maps/TrainerHill_3F/map.bin2
-rw-r--r--data/maps/TrainerHill_4F/border.bin1
-rw-r--r--data/maps/TrainerHill_4F/header.inc2
-rw-r--r--data/maps/TrainerHill_4F/map.bin2
-rw-r--r--data/maps/TrainerHill_Elevator/header.inc2
-rw-r--r--data/maps/TrainerHill_Entrance/border.bin1
-rw-r--r--data/maps/TrainerHill_Entrance/header.inc2
-rw-r--r--data/maps/TrainerHill_Entrance/map.bin2
-rw-r--r--data/maps/TrainerHill_Roof/border.bin1
-rw-r--r--data/maps/TrainerHill_Roof/header.inc2
-rw-r--r--data/maps/TrainerHill_Roof/map.bin1
-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/Underwater5/border.bin1
-rw-r--r--data/maps/Underwater5/header.inc2
-rw-r--r--data/maps/Underwater5/map.bin1
-rw-r--r--data/maps/Underwater6/border.bin1
-rw-r--r--data/maps/Underwater6/header.inc2
-rw-r--r--data/maps/Underwater6/map.bin1
-rw-r--r--data/maps/Underwater7/border.bin1
-rw-r--r--data/maps/Underwater7/header.inc2
-rw-r--r--data/maps/Underwater7/map.bin1
-rw-r--r--data/maps/Underwater_MarineCave/border.bin1
-rw-r--r--data/maps/Underwater_MarineCave/header.inc2
-rw-r--r--data/maps/Underwater_MarineCave/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/UnionRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/UnionRoom/header.inc2
-rw-r--r--data/maps/UnionRoom/map.bin11
-rw-r--r--data/maps/UnknownMap_08417FC4/border.bin1
-rw-r--r--data/maps/UnknownMap_08417FC4/map.bin1
-rw-r--r--data/maps/UnknownMap_08428450/border.bin1
-rw-r--r--data/maps/UnknownMap_08428450/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_084294C4/border.bin1
-rw-r--r--data/maps/UnknownMap_084294C4/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_084294E8/border.bin1
-rw-r--r--data/maps/UnknownMap_084294E8/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E6C0/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E6C0/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E6E4/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E6E4/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E708/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E708/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E72C/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E72C/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E750/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E750/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E774/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E774/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E798/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E798/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E7BC/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E7BC/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E7E0/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E7E0/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E804/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E804/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E828/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E828/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E84C/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E84C/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E870/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E870/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0843E894/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E894/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_08447028/border.bin1
-rw-r--r--data/maps/UnknownMap_08447028/map.bin3
-rw-r--r--data/maps/UnknownMap_0845A394/border.bin1
-rw-r--r--data/maps/UnknownMap_0845A394/map.binbin724 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_0845D470/border.bin1
-rw-r--r--data/maps/UnknownMap_0845D470/map.bin1
-rw-r--r--data/maps/UnknownMap_0845ECB4/border.bin1
-rw-r--r--data/maps/UnknownMap_0845ECB4/map.bin1
-rw-r--r--data/maps/UnknownMap_08469200/border.bin1
-rw-r--r--data/maps/UnknownMap_08469200/map.bin12
-rw-r--r--data/maps/UnknownMap_084693AC/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_084693AC/map.binbin4 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_08470BD8/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_08470BD8/map.binbin11200 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_08480DAC/border.bin1
-rw-r--r--data/maps/UnknownMap_08480DAC/map.binbin340 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_08480F54/border.bin1
-rw-r--r--data/maps/UnknownMap_08480F54/map.bin1
-rw-r--r--data/maps/UnknownMap_084810FC/border.bin1
-rw-r--r--data/maps/UnknownMap_084810FC/map.bin1
-rw-r--r--data/maps/UnknownMap_084812A4/border.bin1
-rw-r--r--data/maps/UnknownMap_084812A4/map.bin1
-rw-r--r--data/maps/UnknownMap_0848144C/border.bin1
-rw-r--r--data/maps/UnknownMap_0848144C/map.bin1
-rw-r--r--data/maps/UnknownMap_084815F4/border.bin1
-rw-r--r--data/maps/UnknownMap_084815F4/map.bin1
-rw-r--r--data/maps/UnknownMap_08481B24/border.bin1
-rw-r--r--data/maps/UnknownMap_08481B24/map.bin1
-rw-r--r--data/maps/UnknownMap_08481DBC/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/UnknownMap_08481DBC/map.bin2
-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/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_BattleTentBattleRoom/border.binbin8 -> 0 bytes
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc2
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/map.binbin234 -> 0 bytes
-rw-r--r--data/maps/VerdanturfTown_BattleTentCorridor/header.inc2
-rw-r--r--data/maps/VerdanturfTown_BattleTentLobby/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.inc7606
-rw-r--r--data/maps/attributes_table.inc444
-rw-r--r--data/maps/groups.inc (renamed from data/maps/_groups.inc)0
1403 files changed, 518 insertions, 11477 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 5c6bae920..0348798fc 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_CaptainsOffice: @ 84845A4
- .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 7d1582721..2ce374617 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Corridors_1F: @ 84844C4
- .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 6­62222222
-2 622222222222222222­62012222201111222220122222011112222201222220111122222012222201111222­62%#&2222%®$"#&2222-+6.2222-¶2,*+6.2¬622222222222222222›2œ222222›2œ222222222 \ 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 2205786fe..e8d5fc419 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Corridors_B1F: @ 84844FC
- .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)Ÿ011¦2§011112¦2§01122%#$"®&22%#$22-+6,*¶2.22-+6,2222222222222222222222222¬62222222222222­62220111111122222011111112 \ 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 f83905c8f..cac71c430 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Deck: @ 84844A8
- .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`(''¡('¡((((`(*/ÉÉÉÃÄÅ`(//¡(/¡((((`(È* ]]]ËÌ2Íhiiiiiiii(((`(((33È*2*2¾2*2¿2ÉÉÉÉÉÉÉÉef(hiiiiif(2(2ei ÌÍÌÍÌÍÌÍ(((ÉÉÉÃÄů0Ï0ÃijÉÉÉÉÉÉÉÉ((( ]]]ËÌ2ͯ0Ï0ËÌ2Í]]]]]]]](((33*2*2Ⱦ2*2¿2*2Ⱦ2*2¿2È*2*2*2*2*2*2*2((((È((È(2(2(2(2È(2(2(2È(2È(2(2(2(2iiiiiiiiiiiif(2(2eiiiiiiiÉÉÉÉÉÉÉÉÉÉÉɯ0Ï0ÉÉÉÉÉÉÉËËËËËËËËËËËË ¯0Ï0 ËËËËËËËÊÊÊÊÊÊÊÊÊÊÊÊ Î2Ï2 ÊÊÊÊÊÊÊžžžžžžžžžžžž4žž4žžžžžžžžžžžžžžžžžžžžžžžžžžžžžž£žžžžžžžžžžžžžžžžžžžžžž½¾¾¾¾¾¾¾£žžžžžžžžžžžžžžpppppppp½¾¾¾¾¾¾¾¾¾¾¾¾¾¾ \ 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 fc93ec42d..c03eba0b8 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_HiddenFloorCorridors: @ 84845DC
- .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 @@
- ¨  ©¨ ±°°±±°2222222222222­622422222242222220111111122¬6­6201111111222220111111122222%#$"#$"#&22‰�-36,*36,*+6.22Vš�2222222222GVx2222222222 \ 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 cb8f99732..efa3a0bb9 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_HiddenFloorRooms: @ 84845F8
- .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;2™6š6;2;2;2;2ON:2;2;2;2;2;2;2g2;2;2™6š6;2?>=28282828282a282828282ª6?>«682a2^6_682b 6¢682828282;2;2<28282b6828282828282 6¢682?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>«682^6_6828282828282`282?>=2`2828282828282828282a282?>«682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a282828282ª6?6''''''''''''76'''''''''''''76'''''''''''''7>////////////?>/////////////?>/////////////?>:2g2;2;2;2;25;2;2;2;2;2?>:2;2;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2g2;2;2;2;2;2;2™6š6;2?>=282828282a2828282V6W682?>=28282828282`2828282b682ª6?>«682828282V6W6828282 6¢682?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>«682`2828282828282828282?>=2V6W682828282828282828282?>=28282828282828282828282ª6?>=282828282d2e282828282ª6?>=2^6_6828282d2e2828282a282?>=2`282b68282d2e282828282a2? \ No newline at end of file
diff --git a/data/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 68b484f68..e2021ea85 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Room_B1F: @ 848456C
- .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 d712be55f..227bf3e8f 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms2_1F: @ 8484588
- .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@k•c–''7>Hs�—6ž//?>PQ:2;2;2;2;2?>XY=282828282?>2;2<28282a282?>=2828282828282?>=282b82a28282?>=2828282828282?=26'''=2'''7>///=2///?>:2;2;2<2;2;2;2?>=2828282828282?>=2VW82a28282?>=2^_a2828282?>=2828282828282?>=28282d2e28282? \ No newline at end of file
diff --git a/data/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 1b5cbb68a..55d228f47 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms2_B1F: @ 8484534
- .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=282VWª6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=28282828282ª6?>«6828282828282?>«682828282`282?>=28282d2e282b?>=28282d2e28282? \ No newline at end of file
diff --git a/data/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 68dbcbbdb..62991d12e 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms_1F: @ 84844E0
- .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@k•c–''7>//�—6ž//?>Hs�—6ž//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=2828282ª6?>«682828282a282?>:2;2<282828282?>=2828282828282?>=2828282`28282?>=2b8282828282?>«6828282828282?>=2828282a28282?>=2828282828282?=26@AB'''E76'''=2CDE7>HIJ////?>///=2KLM?>PQ:2;2;2;2;2GF:2;2;2<2;2TU?>XY=282`28282ON=282828282\]?>:2;2<2b828282;2;2<282828282;2;2?>=2828282828282?>=2VW828282ª6?>=2a28282828282?>=2^_82828282?>«68282d2e28282?>=28282d2e28282? \ No newline at end of file
diff --git a/data/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 219410a9f..7838b8875 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Rooms_B1F: @ 8484518
- .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@k•¯–mE@k•c–''@k•¯–mE7>Hs�·2žuMHs�—6ž//Hs�·2žuM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<2828282ª6:2;2<28282;2;2?>=2VW828282ª6=2€‰‰‰�82=28282a2828282?>=2^_82`28282=2�pVp’82=2`2828282b82?>«6828282828282=2�VGV’82=28282828282ª6? \ No newline at end of file
diff --git a/data/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 b314f5028..cc9db3443 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Underwater1: @ 8484550
- .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 @@
-ÍÎÌÎÌÎÍÎÕ×ÔÖÔÖÕÖÏ2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2ø2Ò2Ó2É2É2Ï2Ï2ø2É2É2É2É2É2É2Ï2ø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/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 3f15871b7..87650f5b2 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -1,5 +1,5 @@
AbandonedShip_Underwater2: @ 84845C0
- .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 @@
-ÌÎØÙÚÎÍÎÌÎÍÎÌÎÌÎÍÎÍÎÌÔÖÛÜ2ÝÖÕÖÔÖÕ×Ô×ÔÖÕ×ÕÖÔÏ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2Ï2Ï2ø2É2Ò2Ó2É2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2ø2É2É2É2É2É2Ï2Ï2Ï2Ï2Ï2Ï2Ð2Ñ2Ï2Ï2Ï2Ï2Ï2Ï2ø2É2É2É2É2É2É2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2Ï2÷2ï2É2É2É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/AlteringCave/border.bin b/data/maps/AlteringCave/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/AlteringCave/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc
index 98a23f76a..2361bf769 100644
--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -1,5 +1,5 @@
AlteringCave: @ 8484A58
- .4byte AlteringCave_MapAttributes
+ .4byte AlteringCave_Layout
.4byte AlteringCave_MapEvents
.4byte AlteringCave_MapScripts
.4byte 0x0
diff --git a/data/maps/AlteringCave/map.bin b/data/maps/AlteringCave/map.bin
deleted file mode 100644
index 38bec91fa..000000000
--- a/data/maps/AlteringCave/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-f222f222ff6662222226662222226662f2222222222222######"f22222222#######"2222222 !B!B!B!B!B!B"P22222222BBBBBBP22˜2™2™2š2222222fP222BBBBBB22˜2¡2¡2¡2¢22222ffPf2BBBBBB22 2¡2¡2¡2¡2š2222222222BBBBB22 2¡2¡2¡2¡2¢2222222222222¨2¡2¡2¡2¡2¢222f2222222222222222f22¨2©2©2©2ª22222Pf22222222222222222P2222222222f22222222222222222####"22222222222222222 ##################"22222222666666222222226666662222222 #666666###"2<22#XYZ## \ 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 2d384b07b..5e958c6bd 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -1,5 +1,5 @@
AncientTomb: @ 8484630
- .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 406cf7279..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 d2f8601bf..afbba5738 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,5 +1,5 @@
AquaHideout_1F: @ 8484144
- .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)2Æ2)2Ç2)2'
-
-!!! k2l2¡2(2(2(2(2k2l2¡2(2(2(2(2(2(2(2(2(27
-
-2)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2)2
-
-'//¡2(2(2]iiiiiiiiii^™2(2(2(2(2(2
-
-/'/¡2(2(2`q1q1q1q1q1q1q1q1q1q1¤¡2(2(2(2(2(2
-
-'/±2©2(2(2`q1p1p1p1p1p1p1p1p1q1¤¡2(2(2(2(2(2
-
-/±2©2(2(2(2hiiiiiiiiii¬¡2(2(2(2(2
-
-)2©2(2(2(2(2*2*2*2*2*2*2*2*2*2*2*2*2©2(2(2(2(2'
-
-)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2/
-
-)2(2(2]iiiiiif(2(2eiiiiii^™2(2'
-
-)2(2(2`t||||||¯0Ï0||||||‰¤¡2(2/
-
-)2(2(2`u€‰‰‰‰‰‰‰‰‰‰‰‰�s¤¡2(2*2
-
-)2(2(2`u�pppppppppppp’s¤¡2(2(2
-
-Š2ƒ2(2`u�pppppppppppp’s¤¡2(2(2
-
-ˆ‰¡2ªu�pppppppppppp’sy¡2(2(2
-
-�‘¡2*­B�B�B�Btpppppr�B�B�B�B�B*©2(2(2
-
-)2*2©2((B�B�B�Buypppxs�B�B�B�B�B((2‚2ƒ2
-
-)2(2(2–t|||}�ppp’{||||‰•™2ˆ‰
-
-)2(2(2`u€‰‰‰˜pppš‰‰‰‰�s¤¡2�‘
-
-)2(2(2`u�pppppppppppp’s¤¡2*2*2
-
-Š2ƒ2(2`u�pppppppppppp’s¤¡2(2(2
-
-ˆ‰¡2`u�pppppppppppp’s¤¡2‚2ƒ2
-
-�‘¡2ªu�pppppppppppp’sy¡2ˆ‰
-
-)2*2©2*­B�B�B�B�Btpppr�B�B�B�B�B�B*©2�‘
-
-)2(2(2((B�B�B�B�Buypxs�B(B(B(B(B(B((2*2*2
-
-mmmmmmmmou�g’snmmmmmmmmm
-
-qqqqqqqqu¿ÈÉʾsqqqqqqqqq
-¿llllllll¿lllll¾lllllllll¾ \ No newline at end of file
diff --git a/data/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 e5a70a5c0..079c18ee9 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -1,5 +1,5 @@
AquaHideout_B1F: @ 8484160
- .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 97efacec8..000000000
--- a/data/maps/AquaHideout_B1F/map.bin
+++ /dev/null
@@ -1,83 +0,0 @@
-àààÃÄÅààÃÄÅààààààà³´µààààààààààà 01!ËÌ2Í
-11ËÌ2Í!ØÙØÙ
-!!»¼2½!!
-
-ØÙ!!!ØÙØÙ
-àÃÄÅST8292)2Æ2)2Ç2
-9292Æ2)2Ç2)2ÚÛÚÛ
-')2Æ2)2Ç2)2'
-
-ÚÛ)2)2)2ÚÛÚÛ
-
-!ËÌ2Í[\ )2(2(2(2(2(2
-)2(2(2(2(2(2ÜÝ7ÚÛ
-/¡2(2(2(2(2/
-
-ÜÝ7¡2(2ß2ÜÝ7ÚÛ
-
-)2Æ2)2Ç2cd2)2(2(2(2(2(2
-)2(2(2(2(2ß2*2*2ÜÝ7
-)2ß2(2(2(2ß2(2
-
-)2*2©2(2(2*2*2ÜÝ7
-
-)2(2(2(2k2l2¡2(2(2(2(2(2(2  2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 
-)2ß2(2(2ß2(2(2ß2(2
-
-)2(2(2(22A2B2222(2(2(2ààÕÔÕàààààààà+,-.
-†iiiiiii^
-
-)2(2(2(2IJ222(2(2(2
-ãã$#$!!!
-0013456
-
-`®2§2§2§2§2§2§2¦
-
-)2(2(2(2222A2B22(2(2(2
-êêæ3ó7ô7æõCæ66
-828292;<=>
-
-hiiiiiii¬
-
-)2(2(2(2222IJ(2(2(2
-�3€3å3Ã7Å7åýCå3å3å3
-)263(2CDEF
-
-)2ß2(2(2ß2(2(2ß2(2
-
-)2(2(2(2222222(2(2(2
-�3€3å3û3ü3åúå3ß2å3
-)2(2(2KLMN
-
-†iiiiiii^
-  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 î3í3í3í3í3í3í3í3í3í3 )2(2(2(2UV)2
-
-`®2§2§2§2§2§2§2¦
-ààààààààààààààààààààààà)2ß2(2(2(2(2(2
-
-hiiiiiii¬
-
-!!!!!!!!!!!!! !!!!!!!!!!  2Y2Y2Y2Y2Y2Y2 
-)2ß2(2(2ß2(2(2ß2(2
-
-)2)2)2)2)2)2)2)2)2)2)2)2)22)222222222à3ààààààà
-†iiiiiii^
-
-)2(2ß2(2(2(2(2(2(2(2(2(2(2(2(2é3  222ðñá7 !!!!!!!
-
-`®2§2§2§2§2§2§2¦
-
-†iiiiiiiiiiiii^è222øùèD322222)2)2
-
-hiiiiiii¬
-
-`®2§2§2§2§2§2§2§2§2§2§2§2§2¦222222222222222(2(2
-
-)2ß2(2(2ß2(2(2ß2(2
-
-`¯2O1O1O1O1O1O1O1O1O1O1O1O1¤2A2B2222A2B2é3é322222(2(2
-  2Y2Y2Y2Y2Y2Y2Y2Y2 
-hiiiiiiiiiiiii¬2IJ222IJèè22222(2ß2
-ààààààààà
-)2*2ß2*2*2*2*2*2*2*2*2*2*2*2*2222222222222222(2(2
- !!!!!!!!!   2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 àààààààààààààààààààààààààààààààà !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file
diff --git a/data/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 0f3849799..8089a1634 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -1,5 +1,5 @@
AquaHideout_B2F: @ 848417C
- .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 [\01»¼2½
-!!»¼2½3456!!3456!!!
-à³´µàcd8292Æ2)2Ç2
-)2)2Æ2)2Ç2;<=>)2)2;<=>)2)2)2
-
-!»¼2½!
-k2l2¡2(2(2(2(2
-)2(2(2(2(2CDEF¡2(2CDEF¡2(2(2
-
-)2Æ2)2Ç2)2
-)2(2(2(2(2(2(2
-)2(2(2(2(2KLMN¡2(2KLMN¡2(2(2
-
-)2(2(2(2(2
-)2(2(22A2B22
-)2(2(2(2(2(2UV¡2(2(2(2UV¡2(2(2(2
-
-)2(2(2
-)2(2(22IJ
-)2(2‚2ƒ2(2(2*2*2©2(2(2(2*2*2©2(2(2(2
-
-)2//(2
-)2(2(22222
-)2(2ˆ‰¡2(2‚2ƒ2(2(2‚2ƒ2(2‚2ƒ2(2(2(2
-
-)277/ß2
-)2ß2(22222
-)2(2�‘¡20ˆ‰¡2(2ˆ‰2ˆ‰¡2ß2(2
-  2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 )2(2*2*2©282�‘¡2(2�‘:2�‘¡2(2(2
-àààààààààààà)2(2(2(2(2(2*2*2©2(2*2*2©2*2*2©2(2(2
-
-!!!!! 012!!!!
-)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2
-
-)2)2)2)2)228292:2)2)2)2)2
-)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2 
-)2(2(2(2(2(2(2(2(2(2(2ß2(2 )2(2(2ß2(2(2(2'2Y2Y2Y2Y2Y2Y2Y2Y2
-)2(2(2(2(2(2(2(2(2(2(2(2(2)2(2(2(2(2(2'/àààààààà
-
-Žiiiiiiiiiiif )2(2(2(2(2(2/// !!!!!!!!
-
-€‰‰‰‰‰‰‰‰‰‰‰�2Žiiiiiii^2)2)2)2)2)2)2)2)2
-
-�VVVVVVVVpppš‰‰‰‰‰‰‰‰�¦¡2(2(2(2(2(2(2ß2(2
-
-�GGGGGGGVVVVVVVVppppp’y¡2(2(2(2(2
-
-�GGGGGGGGGGGGGGVVVVVp’*2©2(2(2(2(2''//
-
-�GGGGGGGGGGGGGGGGGGVp’•™2(2(2(2(2//)2ß2
- �GGGGGGGGGGGGGGGGGGVp’¦Œ2Y2Y2Y2Y2 2 2 2Y2 �GGGGGGGGGGGGGGGGGGVp’bàààààààà Žiiiiiiiiiiiiiiiiiiiiij !!!!!!!!  \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/border.bin b/data/maps/AquaHideout_UnusedRubyMap1/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
index b32ecf901..a643b729e 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -1,5 +1,5 @@
AquaHideout_UnusedRubyMap1: @ 84846D8
- .4byte AquaHideout_UnusedRubyMap1_MapAttributes
+ .4byte AquaHideout_UnusedRubyMap1_Layout
.4byte AquaHideout_UnusedRubyMap1_MapEvents
.4byte AquaHideout_UnusedRubyMap1_MapScripts
.4byte 0x0
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.bin b/data/maps/AquaHideout_UnusedRubyMap1/map.bin
deleted file mode 100644
index 52c2d57eb..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap1/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/border.bin b/data/maps/AquaHideout_UnusedRubyMap2/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
index dec1a5311..bb82dba18 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -1,5 +1,5 @@
AquaHideout_UnusedRubyMap2: @ 84846F4
- .4byte AquaHideout_UnusedRubyMap2_MapAttributes
+ .4byte AquaHideout_UnusedRubyMap2_Layout
.4byte AquaHideout_UnusedRubyMap2_MapEvents
.4byte AquaHideout_UnusedRubyMap2_MapScripts
.4byte 0x0
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.bin b/data/maps/AquaHideout_UnusedRubyMap2/map.bin
deleted file mode 100644
index 1406dde5d..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap2/map.bin
+++ /dev/null
@@ -1,95 +0,0 @@
-ÃÄÅÃÄÅààààààààà 01!ËÌ2Í
-01ËÌ2Í!!!!!!!Ø3Ù3Ø3Ù3
-
-ØÙ!!!ØÙØÙ
-àÃÄÅSTÃÄÅST8292)2Æ2)2Ç2
-8292Æ2)2Ç2)2)2)2)2)2)2)2Ü7Ý7Ú7Û7//
-
-ÚÛ)2)2)2ÚÛÚÛ
-
-!ËÌ2Í[\01!!
-ËÌ2Í[\
-)2(2(2(2(2(2
-)2(2(2(2(22A2B222(2(2*2*2Ü7Ý777
-
-ÜÝ7¡2(2ß2ÜÝ7ÚÛ
-
-)2Æ2)2Ç2cd8292)2)2
-'Æ2)2Ç2cd
-)2(2(2(2(2(2
-)2(2(2(2(22IJ2(2(2(2(2*2*2*2*2
-
-)2*2©2(2(2*2*2ÜÝ7
-
-)2(2(2(2k2l2(2ß2(2(2
-/¡2(2(2k2l2
-)2(2(2(2ß2(2
-)2(2(2(2(222222(2(2(2ß2(2(2(2(2
-
-)2ß2(2(2ß2(2(2ß2(2
-
-)2(2(2(2(2(2(2(2(2(2
-'¡2(2(2(2(2
-)22A2B222  2Y2Y2Y2Y2Y2Y2Y2Y22Y2Y2Y2Y2Y2Y2Y2Y2 
-âmmmmmmmo
-
-)2(2(2(2(2(2(2ß2(2(2
-/6¡2(2(2(2(2
-)22IJ2ààÕÔÕàààààààààààà
-vq0q0q0q0q0q0q0w
-  2Y2Y2Y2Y2Y2Y2Y2Y2Y2 )2©2ß2(2(2(2
-)222222
-ãã$#$!!
-001!Ø3Ù3Ø3Ù3
-
-~yyyyyyy
-àààààààààà)2(2(2(2(2(2
-)2(2(2(2(2(2
-ê7ê7æ3óôæ3õ
-828292)2ÜÝÚÛ
-
-)2ß2(2(2ß2(2(2ß2(2
- !!!!!!!!!!  2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2 �3€3å3ÃÅåýCå3å3
-)2(2(2(2*2*2ÜÝ
-
-âmmmmmmmo
-+,-.àààààààà�3€3å3û3ü3å3úå3ß2
-)2(2ß2(2(2ß2*2*2
-
-vq0q0q0q0q0q0q0w
-
-345601
-0011!! î3í3í3í3í3í3í3í3í3  2Y2Y2Y2Y2Y2Y2Y2 
-~yyyyyyy
-
-;<=>8292
-82829292)2)2ààààààààààààààààà
-)2ß2(2(2ß2(2(2ß2(2
-
-CDEF)2…2
-)2(2ß2(2(2(2 !!!!!!!!! !!!!!!!!
-
-âmmmmmmmo
-
-KLMN)2(2
-)2(2(2(2(2(22)2)2)2)2)2)2)2)2)22)2)2)2)2)2)2)2)2
-
-vq0q0q0q0q0q0q0w
-
-)2UV)2ß2(2  2Y2Y2Y2Y2Y2Y2Y2Y22é3222222222222(2(2
-
-~yyyyyyy
-
-)2)2)2)2(2(2àààààààààá  2A2B222@2B2é3é32(2(2
-
-)2ß2(2(2ß2(2(2ß2(2
-
-)2(2(2(2Ø3Ù3
-!!!!!!!!! è2IJ22HJèè2(2(2
-  2Y2Y2Y2Y2Y2Y2Y2Y2 
-)2(2Ø3Ù3ÜÝ
-)2)2)2)2)2)2)2)2)222222222222222(2ß2
-ààààààààà
-Ø3Ù3Ú7Û7(2(2
-)2(2ß2(2(2(2(2(2(2(22222222222222(2(2
- !!!!!!!!!  ç7ï7ç7ï7çï  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 ààààààààààààààààààààààààààààààà !!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/border.bin b/data/maps/AquaHideout_UnusedRubyMap3/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
index a2383a4a6..1fa34aab4 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -1,5 +1,5 @@
AquaHideout_UnusedRubyMap3: @ 8484710
- .4byte AquaHideout_UnusedRubyMap3_MapAttributes
+ .4byte AquaHideout_UnusedRubyMap3_Layout
.4byte AquaHideout_UnusedRubyMap3_MapEvents
.4byte AquaHideout_UnusedRubyMap3_MapScripts
.4byte 0x0
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.bin b/data/maps/AquaHideout_UnusedRubyMap3/map.bin
deleted file mode 100644
index 68afb0063..000000000
--- a/data/maps/AquaHideout_UnusedRubyMap3/map.bin
+++ /dev/null
@@ -1,49 +0,0 @@
-ST³´µ³´µ|}~|}~ [\01»¼2½
-!!»¼2½3456!!3456!!!
-à³´µàcd8292Æ2)2Ç2
-)2)2Æ2)2Ç2;<=>)2)2;<=>)2)2)2
-
-»¼2½! k2l2¡2(2(2(2(2
-)2(2(2(2(2CDEF(2(2CDEF¡2(2(2
-
-'Æ2)2Ç2)22)2(2(2(2(2(2(2
-)2(2(2(2(2KLMN(2(2KLMN¡2ß2(2
-
-/(2(2(2(22A2B222(2(2(2
-)2‚2ƒ2(2(2(2UV¡2(2(2(2UV¡2(2(2(2
-
-/(2(2(2(22IJ2(2(2(2
-)2ˆ‰2¡2(2(2(2(2(2(2(2*2*2©2(2(2(2
-
-)2(2(2(2(222222(2(2(2
-)2�‘:2¡2(2(2(2(2(2(2‚2ƒ2(2‚2ƒ2(2(2
-
-)2(2(2(2(222222(2(2(2
-)2*2*2©2(2(2(2(2(2(2(2ˆ‰2ˆ‰¡2(2
-  2Y22Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2Y22(2(2�‘:2�‘¡2(2
-àààààààààààààààààààà(2(2*2*2©2*2*2©2(2
-
-01
-!!!!!!!!!!
-!!!!!!!! (2(2(2(2(2(2(2(2(2
-
-8292
-)2)2)2)2)2)2)2)2)2)2 )2)2)2)2)2)2)2)22(2(2(2(2(22Y2Y2Y2 
-)2(2
-)2(2(2(2(2(2(2(2ß2(2)2(2ß2(2(2(2(2(2(2(2(2(2(2(2ààà
-)2ß2
-)2(2(2(2(2(2(2(2(2(2 Žiiiiiiiiiiii^ !!!
-
-)2(2
-)2(2(2(2piiiif2€‰‰‰‰‰‰‰‰‰‰‰�¦2)2)2)2
-
-)2(2 )2(2(2(2`€‰‰‰‰‰˜pppppVVVVVV’b¡2(2ß2(2
-
-)2(2)2(2(2(2`�ppppppVVVVVGGGGGV’b¡2(2(2(2
-
-)2(2 )2(2(2(2x�pppVVVGGGGGGGGGGV’b¡2(2(2(2
-
-)2(22)2(2(2(2*2�pVVGGGGGGGGGGGGGV’b¡2(2(2(2
-
-)2(2(2(2(2(2(2–�VGGGGGGGGGGGGGGGV’b¡2(2(2(2
-  2Y2Y2Y2Y2Y22`�VGGGGGGGGGGGGGGGV’b{3(2(2(2 àààààà`�VGGGGGGGGGGGGGGGV’bààà !!!!!! hiiiiiiiiiiiiiiiiiiij !!!  \ No newline at end of file
diff --git a/data/maps/ArtisanCave_1F/border.bin b/data/maps/ArtisanCave_1F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ArtisanCave_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc
index 1c363e7c9..a8d91737e 100644
--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -1,5 +1,5 @@
ArtisanCave_1F: @ 84849B0
- .4byte ArtisanCave_1F_MapAttributes
+ .4byte ArtisanCave_1F_Layout
.4byte ArtisanCave_1F_MapEvents
.4byte ArtisanCave_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/ArtisanCave_1F/map.bin b/data/maps/ArtisanCave_1F/map.bin
deleted file mode 100644
index 2009f24f4..000000000
--- a/data/maps/ArtisanCave_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-666666666666666666666666666666666666666666666666666666666666666666?262666666262666666262666666262666666226666662266666626U266666622262226666662226222666666 6 6 6"22U22  6 6 6666666666"22222 666666666666"222 6666666666662<2666666666666 6XYZ 6666666666666 6 6 6 6 6 6 6666666666666 6 6 6 6 6 6 6 6 6666666666666666666666666666 \ No newline at end of file
diff --git a/data/maps/ArtisanCave_B1F/border.bin b/data/maps/ArtisanCave_B1F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/ArtisanCave_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc
index 844f627c1..a82cd93f6 100644
--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -1,5 +1,5 @@
ArtisanCave_B1F: @ 8484994
- .4byte ArtisanCave_B1F_MapAttributes
+ .4byte ArtisanCave_B1F_Layout
.4byte ArtisanCave_B1F_MapEvents
.4byte ArtisanCave_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/ArtisanCave_B1F/map.bin b/data/maps/ArtisanCave_B1F/map.bin
deleted file mode 100644
index c5ce45c52..000000000
--- a/data/maps/ArtisanCave_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-22222666666666666666666666666666666666666222226666666666666666666666666666666666666222266'6622226'666666662222666666622222266222222266662222'226666666'2222222222222222266662222 6 6"2662222  B B"222222222266662222662U222 "222222222666622226622222222222222 BB"2222222266662222 6 6"222222  B B B B B B B B B BBB B B B B B B"222266662222 2 6"22222   6 6 6 6"BBBBBBBBBBBB"22266662222U2222   6"B"2266662222U222266B2266662222U222266B2266662222222266B222222222222266662222'2222'66B22  6 6 6 6"2222266662222222  6 6 6B2  " ""2222666622222  6 6666BB B B B B B BU"222666622222  6 6 6 6 6BBBBBBBBBBU    6 6 6 66622222  B B B B BBBB             6 6 6 6 6"6622222BBBBBBBB     "   " " " "6622222BUBBUUU662222222222BBUBBUUU6622222BBBBBBU        662222222222BBBBBBUBBBBBBBB6666666662222222222BBBBBBBUB         2222222222BBBBBBBBB        22222BBBBBBBBB22266666  2222222222BBBBBBBBB226     62222222222BUBBBBBB2226     2222 6 6"2222BBBBBBBB'       6    2222 6"62222BBBBBBBBB  "     62222 2" 6" 6"222BUBBBBBBBBU6666622222U6222BBBBBBBBUBBBBBBBBB62222U6U222BBBBBB66666622226622  B B2222222BBBBBB662222U622BB22BB2226U22226622BBBBBBB22BB2226666662222U22B22BB22266666622222222B22222B       66666622222222B22222B'        66666622222222U2222U6        6666662222222222222266U6        66666622222222222222'U66U66222222222222222666622222222222222222666622222222U222222222666666622222<22222222222226666666666666666666662222 XYZ             6666666666666666666662222                      6666666666666666662222  6  6  6  6  6  6   6                       666622222666666666666666666666666666666666666666662222266666666666666666666666666666666666666666 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin b/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
index 19e6f0413..7a8afda58 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleArenaBattleRoom: @ 8485484
- .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleArenaBattleRoom_Layout
.4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
.4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin
deleted file mode 100644
index 526de2248..000000000
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-PPQPPQPPPPUPPUPPXXYXXYXXXX]XX]XX``a``a````e``e``22222222222222222222(2)2*2+2,2-2.2/22222}2}2}2}20212223242526272}2}2}2}222228292:2;2<2=2>2?22222u2u2v2w2@2A2B2C2D2E2F2G2u2v2u2u2 2 2 2 2H2I2J2K2L2M2N2O2 2 2 2 222222'2'222'2'2222222222222222222222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin b/data/maps/BattleFrontier_BattleArenaCorridor/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
index d70d50b1d..5312dd0fe 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleArenaCorridor: @ 8485468
- .4byte BattleFrontier_BattleArenaCorridor_MapAttributes
+ .4byte BattleFrontier_BattleArenaCorridor_Layout
.4byte BattleFrontier_BattleArenaCorridor_MapEvents
.4byte BattleFrontier_BattleArenaCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin b/data/maps/BattleFrontier_BattleArenaCorridor/map.bin
deleted file mode 100644
index 1b124b610..000000000
--- a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-VWWVWWôôôôôôWWkWWk^__^__ôôôôôô__s__sf6g6g6f6g6g6ôôôôôôg6g6{6g6g6{6¥˜ôôôôôô¨¦n ôôôôôô°onôôôôôôôôôôôôonôôôôôôôôôôôôonôôôôôôôôôôôôonoVWWVWWWWkWWknonoVWWVWWWWkWWknono^__^____s__snonof6g6g6f6g6g6g6g6{6g6g6{6nont2222222222222z22o2£222222”•–222222¤ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/border.bin b/data/maps/BattleFrontier_BattleArenaLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleArenaLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
index 36522126d..3f5e0ff4e 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleArenaLobby: @ 848544C
- .4byte BattleFrontier_BattleArenaLobby_MapAttributes
+ .4byte BattleFrontier_BattleArenaLobby_Layout
.4byte BattleFrontier_BattleArenaLobby_MapEvents
.4byte BattleFrontier_BattleArenaLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.bin b/data/maps/BattleFrontier_BattleArenaLobby/map.bin
deleted file mode 100644
index 2792d7979..000000000
--- a/data/maps/BattleFrontier_BattleArenaLobby/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-P6Q6P6P6P6P6S6X6R6P6P6P6P6U6P6P6X6Y666Z6[6S6\6R6Z6[666]6X6X6`6a666b6c6T6d6a6b6c666e6`6`6FFFFFFF¢FFFFFFFFFFFFFFFFFFFFFFFFFFFF#FFFFFF$FFF€FFF‘’“2%FFFFFF&F2‰4…‡™š› 2FFFFFF 2§�2¡�
-2 2 22222'222 22 2��2222 2‚2ƒ2„2 2 22222�‰2222 2Š2‹2Œ2222222†22222222222222Ž
-222222œ2�2ž2222222— \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin b/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
index ab6254403..3edfad730 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleDomeBattleRoom: @ 8485388
- .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleDomeBattleRoom_Layout
.4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
.4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin
deleted file mode 100644
index ffb450f3c..000000000
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-ÐÐÑÐÐÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÐÐÐÐÑÐÐÐÐÐÑÐÐÐÒÒÓÒÒÒÒÒÒÒÓÒÒÒÒÒÓÒÒÒÔÕÖרÙÚÔÕÖרÙÚÔÕÖ×ØÙ  áâãäåæç      éêëìíîï      ñòóôõö÷ !"#$%&      ùúûüýþÿ()*+,-.      0123456       
-   89:;<=>>    \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin b/data/maps/BattleFrontier_BattleDomeCorridor/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
index f91cfe2d4..133115e33 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleDomeCorridor: @ 8485350
- .4byte BattleFrontier_BattleDomeCorridor_MapAttributes
+ .4byte BattleFrontier_BattleDomeCorridor_Layout
.4byte BattleFrontier_BattleDomeCorridor_MapEvents
.4byte BattleFrontier_BattleDomeCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin b/data/maps/BattleFrontier_BattleDomeCorridor/map.bin
deleted file mode 100644
index 2a9c49675..000000000
--- a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLQRSSUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTYZ[[]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\DBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBHA@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@AI@A@A@A@A@A@A@A@A@A@A@A=>@A@A@A@A@A@A@A@A@A@A@A@ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/border.bin b/data/maps/BattleFrontier_BattleDomeLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleDomeLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
index 0626aea77..26813d1f1 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleDomeLobby: @ 8485334
- .4byte BattleFrontier_BattleDomeLobby_MapAttributes
+ .4byte BattleFrontier_BattleDomeLobby_Layout
.4byte BattleFrontier_BattleDomeLobby_MapEvents
.4byte BattleFrontier_BattleDomeLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.bin b/data/maps/BattleFrontier_BattleDomeLobby/map.bin
deleted file mode 100644
index 655c6a39c..000000000
--- a/data/maps/BattleFrontier_BattleDomeLobby/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-%&%&%&  -.  -.    -.  -.   567     567    34     34  $; <$$; <$DBCBCBCBCBCBCBCBCBCBCBCHA@A@A@A@A@A@A@A@A@A@A@I@�‘A@A@A@A@A@A@A@Aqr@AHA˜™@A@A@ÝÞsÛÜ@A@A@yzI@I@ ¡’@tuv@A{A@`ab@“�‚HAßܨ©šI|}~àÞƒßÜhijI›‰ŠàÞI@CBœ�žBCTA@A@CB”•–BCTAHA@A@A@A@A@A@A@A@A@A@A@‹„†„†@A@A@A@A@A@A@A„†„†Œ…‡…‡A@A@A@A@A@A@A@…‡…‡'„†@A@A@A@A@A@A@A„†„†„†/…‡A@A@A@A@=>A@A@…‡…‡…‡ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin b/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
index 7e06ab60a..e25a62ce8 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleDomePreBattleRoom: @ 848536C
- .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleDomePreBattleRoom_Layout
.4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
.4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin
deleted file mode 100644
index 49f40213a..000000000
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
index 51aa2cb06..f3050926a 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
- .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleFactoryBattleRoom_Layout
.4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
.4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin
deleted file mode 100644
index feffbf038..000000000
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin b/data/maps/BattleFrontier_BattleFactoryLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
index f4304d579..7da242183 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleFactoryLobby: @ 84854A0
- .4byte BattleFrontier_BattleFactoryLobby_MapAttributes
+ .4byte BattleFrontier_BattleFactoryLobby_Layout
.4byte BattleFrontier_BattleFactoryLobby_MapEvents
.4byte BattleFrontier_BattleFactoryLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin b/data/maps/BattleFrontier_BattleFactoryLobby/map.bin
deleted file mode 100644
index 66037e302..000000000
--- a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-#""#"""#"""#""#$()$(%)$(%)$()$ÕÖÖÖ×*+,ÝÞÞÞß*+,9<S234KTUVK234S<<A:`S\3]3^3LO;I22a-.=3202;/-432432 4!_1 4!3323322XYZ22532222PQR273243222222222222222228332222222222222222@4322222222 
-  H \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
index debeb0c12..eb6e06a0f 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
- .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
deleted file mode 100644
index 15e97cb30..000000000
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-ýþÿ01ýåæçBíîïR%&'JRRõö÷=>?-./ //=>?]^_*+,*+,ABCOMN234234DEFS\UVSSSHIJS`abcdÒÓDhijkl3ÚÛL4PQ33PQXY Z[4&'4 XY&'3&'3 
- \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin b/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin
deleted file mode 100644
index 9afd13cdc..000000000
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
index 99c95d07d..b03d993fa 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
- .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattlePalaceBattleRoom_Layout
.4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
.4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin
deleted file mode 100644
index 58d0a581f..000000000
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-K2L2?6K2L2?6K2L2?6K2L2?6H6I2JM2N2G6M2N2G6M2N2G6M2N2G6P6Q2RU2V2O6U2V2O6U2V2O6U2V2O6£¤¥‰1‰1‰1�1X2Y6Z6[6\6]6^6€1�12222&2’`6a6b6c6d6e6f6�’12222&2’1hijklmn�’12222�’pqrstuv�’12222�’xyz{|}~�’12222�š‰‰‰‰‰‰‰˜’12222�pppppppppš‰‰ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin b/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin
deleted file mode 100644
index 9afd13cdc..000000000
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
index 4dec7d651..4b62687e7 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePalaceCorridor: @ 84853C0
- .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes
+ .4byte BattleFrontier_BattlePalaceCorridor_Layout
.4byte BattleFrontier_BattlePalaceCorridor_MapEvents
.4byte BattleFrontier_BattlePalaceCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin b/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin
deleted file mode 100644
index f2bc6aca4..000000000
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin b/data/maps/BattleFrontier_BattlePalaceLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
index 4bf9326b7..8104eadfc 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePalaceLobby: @ 84853A4
- .4byte BattleFrontier_BattlePalaceLobby_MapAttributes
+ .4byte BattleFrontier_BattlePalaceLobby_Layout
.4byte BattleFrontier_BattlePalaceLobby_MapEvents
.4byte BattleFrontier_BattlePalaceLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin b/data/maps/BattleFrontier_BattlePalaceLobby/map.bin
deleted file mode 100644
index cda8ff10e..000000000
--- a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin
+++ /dev/null
@@ -1,7 +0,0 @@
- 
-  
-   
-    
-    
-   
-   6   6 2 2 2 6 2 2 2 2 6666 2 6 2 2 2 6 2  6 6   666 6 2‹Œ� 6666 2 666 6 2  6 666 6626 66“”• 6#6$6%66 6626 666 6 !@A›œ�+,- !@AŽ)*ˆ‰ŠŽ)*ˆ‰Š–1¨©ª‘’"–1«¬­‘’"žž \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin b/data/maps/BattleFrontier_BattlePikeCorridor/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
index f2bf0501b..a2b84a22c 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeCorridor: @ 8485510
- .4byte BattleFrontier_BattlePikeCorridor_MapAttributes
+ .4byte BattleFrontier_BattlePikeCorridor_Layout
.4byte BattleFrontier_BattlePikeCorridor_MapEvents
.4byte BattleFrontier_BattlePikeCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin b/data/maps/BattleFrontier_BattlePikeCorridor/map.bin
deleted file mode 100644
index 5e02c145b..000000000
--- a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-¡¦§ ¡¢£¤¥¦ ¡¦§©®¯¨©ª«¬­®¨©®¯±6¶6·6°6±6²6³6´6µ6¶°±¶·¹¾¿$¹º»2¼½%¸¹¾¿Ù2Ú2Ú2,Ú2ã2ä2å2Ú2,Ú2Ú2Ú2Ú2Ã2Á2Á2Ú22Þ2ü2ß22Ú2Á2Á2Á2Á2Ã2Á22Á2Þ2ü2ß2Á22Á2Á2Á2Ã2Á2Á2Ú2æ2è2ç2Ú2Á2Á2Á2Á2 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/border.bin b/data/maps/BattleFrontier_BattlePikeLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePikeLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
index 2b7709152..96d249ab9 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeLobby: @ 84854F4
- .4byte BattleFrontier_BattlePikeLobby_MapAttributes
+ .4byte BattleFrontier_BattlePikeLobby_Layout
.4byte BattleFrontier_BattlePikeLobby_MapEvents
.4byte BattleFrontier_BattlePikeLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.bin b/data/maps/BattleFrontier_BattlePikeLobby/map.bin
deleted file mode 100644
index 4cbdfb405..000000000
--- a/data/maps/BattleFrontier_BattlePikeLobby/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-¦6§6 6¡¢6£6¤6¥6¦6§6 6®6¯¨6©ª6«6¬6­6®6¯¨6*+,±²³´µ(·)2342º»2¼20¿1:3;3<32Ô2283Ô293Ä2Ô2Â2Ô2 Â2 Ô2Â2Â2Â2Ä22Â2Â2 3!3"3Â2Â22Â22 Â22Â2Â2Â22Â2 2 Ô2Â2 Â2Â2Â2 Â2Ô2 Õ22Â2Ô2Â2Â2Â2Ô2Â22Ô2Ä2 Â2Â2Â2Â2Â2Â2Â2 Â2Ä2Ô2Â22í2î2ï22Â2Ô2Â2Ä2Â2Â2 333 Â2Â2Â2 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
index 89c74c18a..58a662bb3 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeRandomRoom1: @ 8485548
- .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes
+ .4byte BattleFrontier_BattlePikeRandomRoom1_Layout
.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin
deleted file mode 100644
index 142150cbe..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-§ ¡¢£¤¥¦§¯¨©ª«¬­®¯·°±²6³6´6µ¶·¿6¸6Û6º6»2¼6Û6¾6¿6Ù2Ú2,ã2ä2å2,Ú2Ú2Ã2Á2Ú2Þ2ü2ß2Ú2Á2Á2Ã2Á23Þ2ü2ß23Á2Á2Ã2Á2-æ2è2ç2-Á2Á2 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
index 425df7bcb..5dde0fc15 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeRandomRoom2: @ 8485564
- .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes
+ .4byte BattleFrontier_BattlePikeRandomRoom2_Layout
.4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin
deleted file mode 100644
index 27a6e52aa..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-¥6¦6§6 6¡6­6®6¯6¨6©6µ6¶6·6°6±652¾¿¸52=@3A3B3=Ù2H3I3J3Ú242P3Q3R3Ý2<X3Y3Z3ù \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
index e3518c68b..1d8848d23 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeRandomRoom3: @ 8485580
- .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes
+ .4byte BattleFrontier_BattlePikeRandomRoom3_Layout
.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin
deleted file mode 100644
index 8ce7f1c37..000000000
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-§ ¡¢£¤¥¦§¯¨©ª«¬­®¯·°±²6³6´6µ¶·¿6¸6Û2º6»2¼6Û2¾6¿Ù2Ú2Üã2ä2å2ÜÚ2Ú242Ý2 3æ2è2ç2 3Ý2Ý2>ùùÁ2Á2Á2ùùù72 3 3Ý2Ý2Ý2 3 3Ú2>ùùùùùùùÁ2Ù2 3 3 3 3 3 3 3Ý2Ã2ùùùùùùùù42 3 3 3 3 3 3Ú2 3>ùùùùùùÁ2ù3Ú2 3 3 3 3 3Ý2 3>Á2ùùùùùùù72Ý2 3 3 3 3 3Ú2 3>ùùùùùùÁ2ù3 3Ú2Ú2Ú2Ú2Ú2Ý2 3>ù3ã2ä2å23ùùÙ2Ú2æ2è2ç2Ú2Ú2 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin b/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
index a9e768832..b1178e0a0 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeThreePathRoom: @ 848552C
- .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes
+ .4byte BattleFrontier_BattlePikeThreePathRoom_Layout
.4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
.4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin
deleted file mode 100644
index 9618fe22a..000000000
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-¡¢£¤¡¢£¤¡¢£¤¥©ª«¬©ª«¬©ª«¬­±6²³´±²³´±²³´µÛ6º»2¼Û6º»2¼Û6º»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Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Á2Ã2Á2Á23Á2Á2Á2Á23Á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/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
index 150d9cc03..069dc6f76 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
- .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
deleted file mode 100644
index 62d5761e0..000000000
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-àáâàáâàáâàáâàáøèéêðùú 
-ûüòèéºÀÁ†ýþ  †ºÀ·Ž¹¸†¸¹¸†Ì¹¸–¸¹†Í¸¹¸¹¸¹†Í¸¹ž¹¸†¦ÓÔÓÔÓԆ̹¸Í¸¹øòòòòòòòü͸¹Ž¹¸ÁÀÁÀÁÀÁÀÁÕ¹¸ž¸¹¸¹¸¹¸¹¸¹¸¹¸¹Í¸¹¸¹mno¹¸¹¸¹Í¸¹¸uvw¸¹¸¹ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
index ead91f494..f2eccb9f4 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePyramidEmptySquare: @ 8485414
- .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes
+ .4byte BattleFrontier_BattlePyramidEmptySquare_Layout
.4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents
.4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin
deleted file mode 100644
index 7c224d524..000000000
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-��2�2�2�2�2�2��2�2�������2�2������2�2�2�������2�2������2��2������2��2�2�2�2�2�2�2�2�2�2�2�2�2�2� \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin b/data/maps/BattleFrontier_BattlePyramidLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
index ab9d35d81..ed68e86c7 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePyramidLobby: @ 84853F8
- .4byte BattleFrontier_BattlePyramidLobby_MapAttributes
+ .4byte BattleFrontier_BattlePyramidLobby_Layout
.4byte BattleFrontier_BattlePyramidLobby_MapEvents
.4byte BattleFrontier_BattlePyramidLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin b/data/maps/BattleFrontier_BattlePyramidLobby/map.bin
deleted file mode 100644
index 32f23d3de..000000000
--- a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-FF F
-FFFFFFFF F!F"FFFFFFFFFFFFF(F)F*FFFFFFFFFFFFFF0FFFFFF+FFFFF+FF0FFFFFF3FF F B F3FF0FFFBBF BF B B B B BF B1FBBBBB B B B B B B B B BBBB B B B B B B B B B B B B B B B B B BFFF#F$B%FFFF B B B B B BFFF#F$B%FFFF B B BFFF#F$B%FFFFFFFÊËÌFFÈ#F$B%FFFFFFÒÓÔFFÐ#F$B%FFFFF&FÚÛÜ B BØÀBÁBÂB B B B B.B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B B BÃBÄBÅB B B B B B B \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/border.bin b/data/maps/BattleFrontier_BattlePyramidTop/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattlePyramidTop/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
index fe3964510..9e9508e7e 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePyramidTop: @ 8485430
- .4byte BattleFrontier_BattlePyramidTop_MapAttributes
+ .4byte BattleFrontier_BattlePyramidTop_Layout
.4byte BattleFrontier_BattlePyramidTop_MapEvents
.4byte BattleFrontier_BattlePyramidTop_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.bin b/data/maps/BattleFrontier_BattlePyramidTop/map.bin
deleted file mode 100644
index dba9cf1b0..000000000
--- a/data/maps/BattleFrontier_BattlePyramidTop/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}…………………………………………………………………………………………;;;;;;;;;;;;;;;xyz{|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;€�‚ƒ„;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ˆ‰Š‹Œ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;�‘’“”;;;;;;;;;;;;;;;;;;;;;;;;;;;;;˜™BšB›Bœ;;;;;;;;;;;;;;;;;;;;;;;;;;;;8b9b@BABBB9b:b;;;;;;;;;;;;;;;;;;;;;;;;;8B9B@bAb@BIBJBAbBb9B:B;;;;;;;;;;;CCCCCCCCCC8b9b@BABHbAbPQRAbBbABBB9bFbCCCCCCCCCKKKKKKKKLBMB@bAbHBAB@bIbXbYbXbIbBbABBBAbBbMBNBKKKKKKKSSSSSSTU@BAB@bIb@BIBPZZQZZRIBBBAbBbABBBUVSSSSS[[[[\]@AHBAB@bIb@BIBXBXBXBYBXBXBXBIBBBIbBbABBBAB]^[[[[[\]@A@AHBAB@bIbPZZZZQZZZZRIbBbIBBBIBAB]^[\^@A@AHA@BAB@bIbXbXbXbXbXbYbXbXbXbXbXbIbBbIBBBIBIBAB^@B@AHAHA@BABPZZZZZZQZZZZZZRIBBBIBIBIBBHAHAHA@AHBABXBXBXBXBXBXBXBYBXBXBXBXBXBXBXBIBBBIBIBIBIHAHA@AHAPZZZZZZZZZZZZZZZZZRIBIBIBI@A@AHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIBIHAHAHAPZZZZZZZZZZZZZZZZZZZZZRIBIBIHAHAHAXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBXBIBIBIHAHAPZZZZZZZZZZZZZZZZZZZZZZZZZRIBI \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin b/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
index bc54d421a..32b789720 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom: @ 848521C
- .4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleTowerBattleRoom_Layout
.4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
.4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin
deleted file mode 100644
index 42d99b5a6..000000000
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/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/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
index b9e17e9aa..a9eb2b2c5 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom2: @ 8485318
- .4byte BattleFrontier_BattleTowerBattleRoom2_MapAttributes
+ .4byte BattleFrontier_BattleTowerBattleRoom_Layout
.4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
.4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin b/data/maps/BattleFrontier_BattleTowerCorridor/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
index f72c8fe29..361e6be03 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerCorridor: @ 8485200
- .4byte BattleFrontier_BattleTowerCorridor_MapAttributes
+ .4byte BattleFrontier_BattleTowerCorridor_Layout
.4byte BattleFrontier_BattleTowerCorridor_MapEvents
.4byte BattleFrontier_BattleTowerCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin b/data/maps/BattleFrontier_BattleTowerCorridor/map.bin
deleted file mode 100644
index 0b0803f91..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin b/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
index 6332bc83b..ccdcb013f 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerCorridor2: @ 84852FC
- .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes
+ .4byte BattleFrontier_BattleTowerCorridor2_Layout
.4byte BattleFrontier_BattleTowerCorridor2_MapEvents
.4byte BattleFrontier_BattleTowerCorridor2_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin b/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin
deleted file mode 100644
index 87e93b640..000000000
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/border.bin b/data/maps/BattleFrontier_BattleTowerElevator/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleTowerElevator/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
index 1dd6b495e..112c7f938 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerElevator: @ 84851E4
- .4byte BattleFrontier_BattleTowerElevator_MapAttributes
+ .4byte BattleElevator_Layout
.4byte BattleFrontier_BattleTowerElevator_MapEvents
.4byte BattleFrontier_BattleTowerElevator_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.bin b/data/maps/BattleFrontier_BattleTowerElevator/map.bin
deleted file mode 100644
index 16dfe34ab..000000000
--- a/data/maps/BattleFrontier_BattleTowerElevator/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-(***,011148999<\2]2]2]2]2d2e2e2e2e2d2e2e2e2e2d2O2W2e2e2 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/border.bin b/data/maps/BattleFrontier_BattleTowerLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleTowerLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
index 94d43eb89..6e0e3b470 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerLobby: @ 84851C8
- .4byte BattleFrontier_BattleTowerLobby_MapAttributes
+ .4byte BattleFrontier_BattleTowerLobby_Layout
.4byte BattleFrontier_BattleTowerLobby_MapEvents
.4byte BattleFrontier_BattleTowerLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.bin b/data/maps/BattleFrontier_BattleTowerLobby/map.bin
deleted file mode 100644
index 77926803a..000000000
--- a/data/maps/BattleFrontier_BattleTowerLobby/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
index 293fd6418..cc55ae591 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
- .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
deleted file mode 100644
index b0a58e016..000000000
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_Lounge1/border.bin b/data/maps/BattleFrontier_Lounge1/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_Lounge1/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc
index 97eb721b6..44acc4b6a 100644
--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge1: @ 84855B8
- .4byte BattleFrontier_Lounge1_MapAttributes
+ .4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge1_MapEvents
.4byte BattleFrontier_Lounge1_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge1/map.bin b/data/maps/BattleFrontier_Lounge1/map.bin
deleted file mode 100644
index f5f1745b1..000000000
--- a/data/maps/BattleFrontier_Lounge1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-½¾¿¾�¾¿¾¿ÆÆÇÆ•ÆÇÆÇ×ÎÏÎÎÏÎÏÝÈÉÈ¥ÈÉÈÚíÉïÉÈÉßÉàÝÈ÷ÈÉÈçÈèåÉßÉÈÉïÉÚíÈçÈÉÈ÷ÈèÑÉÈÉÈÉÈÉÈÑɬ­®ÉÈ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge2/border.bin b/data/maps/BattleFrontier_Lounge2/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_Lounge2/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc
index b5a1367b5..69a6dba30 100644
--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge2: @ 84855F0
- .4byte BattleFrontier_Lounge2_MapAttributes
+ .4byte BattleFrontier_Lounge1_Layout
.4byte BattleFrontier_Lounge2_MapEvents
.4byte BattleFrontier_Lounge2_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge2/map.bin b/data/maps/BattleFrontier_Lounge2/map.bin
deleted file mode 100644
index 11ae8d6ee..000000000
--- a/data/maps/BattleFrontier_Lounge2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-½¾½¾¿½¤¾½½½½½ÅÆÇÆÇÆÆÇÆÇÆÅÐ3ÎÏÎÏÎ¥3ÎÏÎÏÎÊ3Ý3È3÷3È3ç3È3Ü3È3É3È3ç3È3Ú3å3É3ï3É3ß3É3äÉ3ï3É3ß3É3à3í3È3É3È3É3È3Ü3È3÷3È3ç3È3è3Ñ3É3È3É3È3É3äÉ3ï3É3ß3É3È3µ3¶3È3É3È3É3È3É3È3É3È3 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc
index 21cd2cc38..3a18ce347 100644
--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge3: @ 848560C
- .4byte BattleFrontier_Lounge3_MapAttributes
+ .4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge3_MapEvents
.4byte BattleFrontier_Lounge3_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc
index e550557ca..e052e6ce6 100644
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge4: @ 8485628
- .4byte BattleFrontier_Lounge4_MapAttributes
+ .4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge4_MapEvents
.4byte BattleFrontier_Lounge4_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc
index dbe0afa67..a6fa1470f 100644
--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge5: @ 8485660
- .4byte BattleFrontier_Lounge5_MapAttributes
+ .4byte BattleFrontier_Lounge1_Layout
.4byte BattleFrontier_Lounge5_MapEvents
.4byte BattleFrontier_Lounge5_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc
index c41376cfd..ec6cfb105 100644
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge6: @ 848567C
- .4byte BattleFrontier_Lounge6_MapAttributes
+ .4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge6_MapEvents
.4byte BattleFrontier_Lounge6_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc
index 0348fd64c..5124822a8 100644
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge7: @ 8485698
- .4byte BattleFrontier_Lounge7_MapAttributes
+ .4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge7_MapEvents
.4byte BattleFrontier_Lounge7_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc
index 9ec0f336f..46fe25e2d 100644
--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge8: @ 84856D0
- .4byte BattleFrontier_Lounge8_MapAttributes
+ .4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge8_MapEvents
.4byte BattleFrontier_Lounge8_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc
index d88f40095..24e7b3005 100644
--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Lounge9: @ 84856EC
- .4byte BattleFrontier_Lounge9_MapAttributes
+ .4byte BattleFrontier_Lounge2_Layout
.4byte BattleFrontier_Lounge9_MapEvents
.4byte BattleFrontier_Lounge9_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc
index b0cd11e40..1067fc70c 100644
--- a/data/maps/BattleFrontier_Mart/header.inc
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_Mart: @ 8485740
- .4byte BattleFrontier_Mart_MapAttributes
+ .4byte Mart_Layout
.4byte BattleFrontier_Mart_MapEvents
.4byte BattleFrontier_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_OutsideEast/border.bin b/data/maps/BattleFrontier_OutsideEast/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/BattleFrontier_OutsideEast/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc
index f40bfc1f3..f9dc82cba 100644
--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_OutsideEast: @ 84852C4
- .4byte BattleFrontier_OutsideEast_MapAttributes
+ .4byte BattleFrontier_OutsideEast_Layout
.4byte BattleFrontier_OutsideEast_MapEvents
.4byte BattleFrontier_OutsideEast_MapScripts
.4byte BattleFrontier_OutsideEast_MapConnections
diff --git a/data/maps/BattleFrontier_OutsideEast/map.bin b/data/maps/BattleFrontier_OutsideEast/map.bin
deleted file mode 100644
index b073c4585..000000000
--- a/data/maps/BattleFrontier_OutsideEast/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_OutsideWest/border.bin b/data/maps/BattleFrontier_OutsideWest/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/BattleFrontier_OutsideWest/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc
index 24f1ce14b..319ecec6a 100644
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_OutsideWest: @ 84851AC
- .4byte BattleFrontier_OutsideWest_MapAttributes
+ .4byte BattleFrontier_OutsideWest_Layout
.4byte BattleFrontier_OutsideWest_MapEvents
.4byte BattleFrontier_OutsideWest_MapScripts
.4byte BattleFrontier_OutsideWest_MapConnections
diff --git a/data/maps/BattleFrontier_OutsideWest/map.bin b/data/maps/BattleFrontier_OutsideWest/map.bin
deleted file mode 100644
index d43111bda..000000000
--- a/data/maps/BattleFrontier_OutsideWest/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
index 561aba67e..22e3ff616 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_PokemonCenter_1F: @ 8485708
- .4byte BattleFrontier_PokemonCenter_1F_MapAttributes
+ .4byte PokemonCenter_1F_Layout
.4byte BattleFrontier_PokemonCenter_1F_MapEvents
.4byte BattleFrontier_PokemonCenter_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
index 6aa965d08..361c58a04 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_PokemonCenter_2F: @ 8485724
- .4byte BattleFrontier_PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte BattleFrontier_PokemonCenter_2F_MapEvents
.4byte BattleFrontier_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_RankingHall/border.bin b/data/maps/BattleFrontier_RankingHall/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_RankingHall/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc
index b068fbacc..340ba9597 100644
--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_RankingHall: @ 848559C
- .4byte BattleFrontier_RankingHall_MapAttributes
+ .4byte BattleFrontier_RankingHall_Layout
.4byte BattleFrontier_RankingHall_MapEvents
.4byte BattleFrontier_RankingHall_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_RankingHall/map.bin b/data/maps/BattleFrontier_RankingHall/map.bin
deleted file mode 100644
index df32e0665..000000000
--- a/data/maps/BattleFrontier_RankingHall/map.bin
+++ /dev/null
@@ -1,64 +0,0 @@
-(((((00000((((($88888%(((((00000&'2222222&'00000$88888%A2 2
-2 2
-22
-2 2
-2 2F2$88888%2222222I222222222N22222222&' 2 2
-22
-2 2
-2&'((("# 2 2
-2 2
-2 2
-2 2
-2 2
-2"#(((&' 2
-2 22 2
-2 2&'+22222222220P02222222222222220Q0222222222232 2
-22
-2 2
-22
-2 2
-2$8X8% 2 2
-2 2 2K2L2M2 2 2
-2 2
-2$8Y8% 2 2
-22
-2 2
-22
-2 2
-2+22222222222222222222STU2222222222222222222232 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2[2\2]2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-2 2
-22222222222222222222222222222222222222,2-2
-2 2
-2.2/2
-2 2
-2 2
-2 2
-2 2
-2 2
-2
-2;2
-2;2
-2;2
-242522226272222222222222C22C22C22
-2 2
-200 2
-2 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_ReceptionGate/border.bin b/data/maps/BattleFrontier_ReceptionGate/border.bin
deleted file mode 100644
index 9afd13cdc..000000000
--- a/data/maps/BattleFrontier_ReceptionGate/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc
index 32387ef0d..8f395bae4 100644
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_ReceptionGate: @ 84856B4
- .4byte BattleFrontier_ReceptionGate_MapAttributes
+ .4byte BattleFrontier_ReceptionGate_Layout
.4byte BattleFrontier_ReceptionGate_MapEvents
.4byte BattleFrontier_ReceptionGate_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.bin b/data/maps/BattleFrontier_ReceptionGate/map.bin
deleted file mode 100644
index 2b75ea851..000000000
--- a/data/maps/BattleFrontier_ReceptionGate/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_ScottsHouse/border.bin b/data/maps/BattleFrontier_ScottsHouse/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattleFrontier_ScottsHouse/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc
index 1ac7c9524..f0e0be773 100644
--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -1,5 +1,5 @@
BattleFrontier_ScottsHouse: @ 8485644
- .4byte BattleFrontier_ScottsHouse_MapAttributes
+ .4byte BattleFrontier_ScottsHouse_Layout
.4byte BattleFrontier_ScottsHouse_MapEvents
.4byte BattleFrontier_ScottsHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/BattleFrontier_ScottsHouse/map.bin b/data/maps/BattleFrontier_ScottsHouse/map.bin
deleted file mode 100644
index 8844e94dd..000000000
--- a/data/maps/BattleFrontier_ScottsHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-»¼»¼»¼ÃÄÃÄÃÄÐËÊËÊËÒÈÉÈÉßÑÉÈÉÈÜÒÈÉÈÉäÑÉÈÉÈÉѵ3¶3É \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare01/border.bin b/data/maps/BattlePyramidSquare01/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare01/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc
index 94605c92c..7ed6b181b 100644
--- a/data/maps/BattlePyramidSquare01/header.inc
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare01: @ 8484F60
- .4byte BattlePyramidSquare01_MapAttributes
+ .4byte BattlePyramidSquare01_Layout
.4byte BattlePyramidSquare01_MapEvents
.4byte BattlePyramidSquare01_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare01/map.bin b/data/maps/BattlePyramidSquare01/map.bin
deleted file mode 100644
index 586ccbdbd..000000000
--- a/data/maps/BattlePyramidSquare01/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�B�B�B�B�B�B�B�B�B�B�Ba�B�B`tj�B�Bs�B�Bs�B�B�B�Bs�B�Bs�BŽB�B�Bs�B�Bs�B�Bhtr�B�Bq�B�B�B�B�B�B�B�B�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare02/border.bin b/data/maps/BattlePyramidSquare02/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare02/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc
index 44a5e7a99..9eb6ef754 100644
--- a/data/maps/BattlePyramidSquare02/header.inc
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare02: @ 8484F7C
- .4byte BattlePyramidSquare02_MapAttributes
+ .4byte BattlePyramidSquare02_Layout
.4byte BattlePyramidSquare02_MapEvents
.4byte BattlePyramidSquare02_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare02/map.bin b/data/maps/BattlePyramidSquare02/map.bin
deleted file mode 100644
index 5a9b8d4ce..000000000
--- a/data/maps/BattlePyramidSquare02/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�Bhtttj�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�Ba�B�B�B�B�Ba�Bs�B�B�B�Bq�Bs�B�B�B�B�B�B�Bs�B�B�B�B�B�B�Bptj�Bhj�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare03/border.bin b/data/maps/BattlePyramidSquare03/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare03/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc
index 300825ffa..3f07295ae 100644
--- a/data/maps/BattlePyramidSquare03/header.inc
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare03: @ 8484F98
- .4byte BattlePyramidSquare03_MapAttributes
+ .4byte BattlePyramidSquare03_Layout
.4byte BattlePyramidSquare03_MapEvents
.4byte BattlePyramidSquare03_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare03/map.bin b/data/maps/BattlePyramidSquare03/map.bin
deleted file mode 100644
index 903b8a49b..000000000
--- a/data/maps/BattlePyramidSquare03/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�B�B�B�B�B�Ba�B�B�B�B�B�B�Bs�B�B�B�Ba�B�Bs�B�B�B�Bq�Bhkj�B�B�B�B�B�B�B�B�B�B�Ba�B�B`ttttr�BŽBq�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare04/border.bin b/data/maps/BattlePyramidSquare04/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare04/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc
index 4031f62e3..978c4f466 100644
--- a/data/maps/BattlePyramidSquare04/header.inc
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare04: @ 8484FB4
- .4byte BattlePyramidSquare04_MapAttributes
+ .4byte BattlePyramidSquare04_Layout
.4byte BattlePyramidSquare04_MapEvents
.4byte BattlePyramidSquare04_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare04/map.bin b/data/maps/BattlePyramidSquare04/map.bin
deleted file mode 100644
index 32a264546..000000000
--- a/data/maps/BattlePyramidSquare04/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�B�B�B�B�B�B`ttttj�B�Bs�B�B�B�B�B�B�Bq�B�B�B�B�B�B�B�B�B�B�B�B�B�B�Ba�B�B�B�B�B�B�Bq�B�B�B�BŽB�B�B�B�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare05/border.bin b/data/maps/BattlePyramidSquare05/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare05/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc
index 72575d629..09a7e4703 100644
--- a/data/maps/BattlePyramidSquare05/header.inc
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare05: @ 8484FD0
- .4byte BattlePyramidSquare05_MapAttributes
+ .4byte BattlePyramidSquare05_Layout
.4byte BattlePyramidSquare05_MapEvents
.4byte BattlePyramidSquare05_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare05/map.bin b/data/maps/BattlePyramidSquare05/map.bin
deleted file mode 100644
index d6c5a6897..000000000
--- a/data/maps/BattlePyramidSquare05/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�B�B�B�B�B�Bhb�B�B�B�B�B�B�Bs�B�Ba�B�B�B�Bs�B�Bs�B�B�B�Bs�B�Bs�B�B�B�Bq�B�Bs�B�B�B�B�B�Bpj�B�B�B�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare06/border.bin b/data/maps/BattlePyramidSquare06/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare06/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc
index 8d0fa49b1..e99531da8 100644
--- a/data/maps/BattlePyramidSquare06/header.inc
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare06: @ 8484FEC
- .4byte BattlePyramidSquare06_MapAttributes
+ .4byte BattlePyramidSquare06_Layout
.4byte BattlePyramidSquare06_MapEvents
.4byte BattlePyramidSquare06_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare06/map.bin b/data/maps/BattlePyramidSquare06/map.bin
deleted file mode 100644
index c30533aab..000000000
--- a/data/maps/BattlePyramidSquare06/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�B�B�B�B�B�Ba�Bhj�Ba�B�Bs�B�B�B�Bq�B�Bq�B�B�B�B�B�B�B�B�B�B�Ba�B�Ba�B�B�B�Bs�B�Bq�Bhj�Bq�B�B�B�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare07/border.bin b/data/maps/BattlePyramidSquare07/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare07/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc
index 12c74516a..13c23c24b 100644
--- a/data/maps/BattlePyramidSquare07/header.inc
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare07: @ 8485008
- .4byte BattlePyramidSquare07_MapAttributes
+ .4byte BattlePyramidSquare07_Layout
.4byte BattlePyramidSquare07_MapEvents
.4byte BattlePyramidSquare07_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare07/map.bin b/data/maps/BattlePyramidSquare07/map.bin
deleted file mode 100644
index 25f9c1529..000000000
--- a/data/maps/BattlePyramidSquare07/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�Ba�B�B�B�B�B�B�Bs�B�Ba�Ba�Bhr�B�Bq�Bs�B�B�B�B�B�B�Bq�B�B�B�B�Ba�B�Bhttttr�Ba�B�B�B�B�B�B�Bs�B�B�B�B�B�B�Bq \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare08/border.bin b/data/maps/BattlePyramidSquare08/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare08/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc
index cfe221f4b..a12b6016e 100644
--- a/data/maps/BattlePyramidSquare08/header.inc
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare08: @ 8485024
- .4byte BattlePyramidSquare08_MapAttributes
+ .4byte BattlePyramidSquare08_Layout
.4byte BattlePyramidSquare08_MapEvents
.4byte BattlePyramidSquare08_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare08/map.bin b/data/maps/BattlePyramidSquare08/map.bin
deleted file mode 100644
index 86a830696..000000000
--- a/data/maps/BattlePyramidSquare08/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�Bttttj�B�B�B�B�B�B�B�B�Bs�B�B�B�B�B�Bas�B�B�B�B�Bss�B�B�B�B�B�Bss�B�B�B�B�B�Bsq�B�B�B�B�B�Bq�B�Bhttj��B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare09/border.bin b/data/maps/BattlePyramidSquare09/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare09/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc
index 624b64800..486c74bc0 100644
--- a/data/maps/BattlePyramidSquare09/header.inc
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare09: @ 8485040
- .4byte BattlePyramidSquare09_MapAttributes
+ .4byte BattlePyramidSquare09_Layout
.4byte BattlePyramidSquare09_MapEvents
.4byte BattlePyramidSquare09_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare09/map.bin b/data/maps/BattlePyramidSquare09/map.bin
deleted file mode 100644
index e4f648704..000000000
--- a/data/maps/BattlePyramidSquare09/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�Ba�B�B�B�B�B�B`r�B�Ba�B�B�Bq�B�Bhr�B�B�B�B�B�B��B�B�B�Ba�B�B�B�B�Ba`r�B�Ba�B`rq�B�B`r�Bq�B�B�Bq�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare10/border.bin b/data/maps/BattlePyramidSquare10/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare10/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc
index 16206bfe9..a73718125 100644
--- a/data/maps/BattlePyramidSquare10/header.inc
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare10: @ 848505C
- .4byte BattlePyramidSquare10_MapAttributes
+ .4byte BattlePyramidSquare10_Layout
.4byte BattlePyramidSquare10_MapEvents
.4byte BattlePyramidSquare10_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare10/map.bin b/data/maps/BattlePyramidSquare10/map.bin
deleted file mode 100644
index 4aa7fd771..000000000
--- a/data/maps/BattlePyramidSquare10/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�Bhtj�B�B�B�B�B�B�B�B�B�Bhj�Bhtj�B�B�B�B�B�B�B�B�BhtjŽBhtj�B�B�B�B�B�B�B�B�Bhtj�B�B�B�B�B�B�B�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare11/border.bin b/data/maps/BattlePyramidSquare11/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare11/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc
index 34a53fdee..eac3cb1c7 100644
--- a/data/maps/BattlePyramidSquare11/header.inc
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare11: @ 8485078
- .4byte BattlePyramidSquare11_MapAttributes
+ .4byte BattlePyramidSquare11_Layout
.4byte BattlePyramidSquare11_MapEvents
.4byte BattlePyramidSquare11_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare11/map.bin b/data/maps/BattlePyramidSquare11/map.bin
deleted file mode 100644
index f393f51e5..000000000
--- a/data/maps/BattlePyramidSquare11/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�B�Bhj�B�B�B`j�B�B�B�B�B�Bs�B�Ba�B�Bhtr�B�Bptb�B�B�B��B�Bq�B�Ba�B�B�B�B��Bhr�B�B�B�B�B�B�B�B�Bhj�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare12/border.bin b/data/maps/BattlePyramidSquare12/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare12/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc
index c514b4f4f..a1d5585c8 100644
--- a/data/maps/BattlePyramidSquare12/header.inc
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare12: @ 8485094
- .4byte BattlePyramidSquare12_MapAttributes
+ .4byte BattlePyramidSquare12_Layout
.4byte BattlePyramidSquare12_MapEvents
.4byte BattlePyramidSquare12_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare12/map.bin b/data/maps/BattlePyramidSquare12/map.bin
deleted file mode 100644
index 64dd96955..000000000
--- a/data/maps/BattlePyramidSquare12/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-htj�Bhtj�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�Bhj�Bhttj�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�Bhtttttj�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare13/border.bin b/data/maps/BattlePyramidSquare13/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare13/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc
index 23df0c29c..1c67b55e7 100644
--- a/data/maps/BattlePyramidSquare13/header.inc
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare13: @ 84850B0
- .4byte BattlePyramidSquare13_MapAttributes
+ .4byte BattlePyramidSquare13_Layout
.4byte BattlePyramidSquare13_MapEvents
.4byte BattlePyramidSquare13_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare13/map.bin b/data/maps/BattlePyramidSquare13/map.bin
deleted file mode 100644
index 5fc1485a7..000000000
--- a/data/maps/BattlePyramidSquare13/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-a�B�B�Ba�B�B�Bs�Ba�Bs�Ba�Bq�Bq�Bs�Bs�B�B�B�B�Bq�Bq�B��B��BŽB�B�B�Bs�Bs�Ba�a�Bq�Bs�Bq�Bs�B�B�Bq�B�B�Bq�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare14/border.bin b/data/maps/BattlePyramidSquare14/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare14/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc
index 8570d95ef..9dcea14fa 100644
--- a/data/maps/BattlePyramidSquare14/header.inc
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare14: @ 84850CC
- .4byte BattlePyramidSquare14_MapAttributes
+ .4byte BattlePyramidSquare14_Layout
.4byte BattlePyramidSquare14_MapEvents
.4byte BattlePyramidSquare14_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare14/map.bin b/data/maps/BattlePyramidSquare14/map.bin
deleted file mode 100644
index 21655a872..000000000
--- a/data/maps/BattlePyramidSquare14/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�Be�Be�Be�Be�B�B�B�B�B�B�B�Be�Be�Be�Be�B�B�B�B�B�B�B�B�Be�Be�Be�Be�B�B�B�B�B�B�B�Be�Be�Be�Be�B�B�B�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare15/border.bin b/data/maps/BattlePyramidSquare15/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare15/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc
index 6120ec220..0429cbb0b 100644
--- a/data/maps/BattlePyramidSquare15/header.inc
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare15: @ 84850E8
- .4byte BattlePyramidSquare15_MapAttributes
+ .4byte BattlePyramidSquare15_Layout
.4byte BattlePyramidSquare15_MapEvents
.4byte BattlePyramidSquare15_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare15/map.bin b/data/maps/BattlePyramidSquare15/map.bin
deleted file mode 100644
index ccbd87d9a..000000000
--- a/data/maps/BattlePyramidSquare15/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�Be�B�B�Be�Be�B�B�Be�B�B�B�B�Be�B�B�Be�Be�B�BŽe�B�B�B�B�Be�B�B�Be�Be�B�B�Be�B�B�B�B�Be�B�B�Be�Be�B�B�Be�B�B \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare16/border.bin b/data/maps/BattlePyramidSquare16/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/BattlePyramidSquare16/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc
index 4df56bbc7..ea4627aa5 100644
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -1,5 +1,5 @@
BattlePyramidSquare16: @ 8485104
- .4byte BattlePyramidSquare16_MapAttributes
+ .4byte BattlePyramidSquare16_Layout
.4byte BattlePyramidSquare16_MapEvents
.4byte BattlePyramidSquare16_MapScripts
.4byte 0x0
diff --git a/data/maps/BattlePyramidSquare16/map.bin b/data/maps/BattlePyramidSquare16/map.bin
deleted file mode 100644
index 601eb526e..000000000
--- a/data/maps/BattlePyramidSquare16/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�BŽB�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B�B \ No newline at end of file
diff --git a/data/maps/BirthIsland_Exterior/border.bin b/data/maps/BirthIsland_Exterior/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/BirthIsland_Exterior/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc
index 5697555de..069bbc99c 100644
--- a/data/maps/BirthIsland_Exterior/header.inc
+++ b/data/maps/BirthIsland_Exterior/header.inc
@@ -1,5 +1,5 @@
BirthIsland_Exterior: @ 8485794
- .4byte BirthIsland_Exterior_MapAttributes
+ .4byte BirthIsland_Exterior_Layout
.4byte BirthIsland_Exterior_MapEvents
.4byte BirthIsland_Exterior_MapScripts
.4byte 0x0
diff --git a/data/maps/BirthIsland_Exterior/map.bin b/data/maps/BirthIsland_Exterior/map.bin
deleted file mode 100644
index 38dfe77a8..000000000
--- a/data/maps/BirthIsland_Exterior/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/BirthIsland_Harbor/border.bin b/data/maps/BirthIsland_Harbor/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/BirthIsland_Harbor/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc
index 9a9a5954b..e9dc265f5 100644
--- a/data/maps/BirthIsland_Harbor/header.inc
+++ b/data/maps/BirthIsland_Harbor/header.inc
@@ -1,5 +1,5 @@
BirthIsland_Harbor: @ 84857B0
- .4byte BirthIsland_Harbor_MapAttributes
+ .4byte IslandHarbor_Layout
.4byte BirthIsland_Harbor_MapEvents
.4byte BirthIsland_Harbor_MapScripts
.4byte 0x0
diff --git a/data/maps/BirthIsland_Harbor/map.bin b/data/maps/BirthIsland_Harbor/map.bin
deleted file mode 100644
index e14816107..000000000
--- a/data/maps/BirthIsland_Harbor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-¥      ¥­ ­¡¡¡¡¡¡¡¡¡¡¡¡¡¡¡Á     Å‰‰‰‰�*+89:+.€‰‰‰‰ppppš‰‰@AB‰‰˜pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂà \ 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 97b1a7664..0fa252cc5 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_1F: @ 84842E8
- .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 d9d011a50..629806ad6 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_B1F: @ 8484358
- .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 1fb2d71bb..000000000
--- a/data/maps/CaveOfOrigin_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-)))))))))))))))))3)))))))))))))3 "3"333))@))333H3 "*3)*33A333()3( "3*333333333(3 H"3M333)))333 3& ""3"33*#0#(33N3  ""33*0###0(3 3 H"3"3"####### 3 3  ""3"3"0##0##0 3H3& "3M3"####### 3 3  ""3"3$30###0$33N3&H"3"33$3#0#$333 3  "M3$33$3$3$3$3$333$3  "$3$3333333$3$ "3332222222$233N3 "3$22223332222$3 "333333$222$333333N$222222232222222$ \ No newline at end of file
diff --git a/data/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 f2eab2e2b..b3e4dea97 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_Entrance: @ 84842CC
- .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/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
index 081d1bba3..1edd4c6c2 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
- .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout
.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
deleted file mode 100644
index 0ffbdaaa0..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/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_UnusedRubySapphireMap2/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
deleted file mode 100644
index 4117717f2..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-#### \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
index ef1747de8..6b046b61a 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
- .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout
.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
deleted file mode 100644
index 4c1fd5ab8..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/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_UnusedRubySapphireMap3/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
index 623c9c2bc..819afc08f 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
- .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout
.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts
.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
deleted file mode 100644
index ea574b224..000000000
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/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/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 dcc150a4f..8f076bf77 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -1,5 +1,5 @@
DesertRuins: @ 8483F68
- .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 406cf7279..000000000
--- a/data/maps/DesertRuins/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/DesertUnderpass/border.bin b/data/maps/DesertUnderpass/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/DesertUnderpass/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
index b01e7638a..2a420d703 100644
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -1,5 +1,5 @@
DesertUnderpass: @ 8484978
- .4byte DesertUnderpass_MapAttributes
+ .4byte DesertUnderpass_Layout
.4byte DesertUnderpass_MapEvents
.4byte DesertUnderpass_MapScripts
.4byte 0x0
diff --git a/data/maps/DesertUnderpass/map.bin b/data/maps/DesertUnderpass/map.bin
deleted file mode 100644
index 2f82e9357..000000000
--- a/data/maps/DesertUnderpass/map.bin
+++ /dev/null
@@ -1 +0,0 @@
- ##" #" !!" !!"##" #" #" ####" ####" #" #" "#"˜™™™™š ###" # #˜š #" "#" ¡©©©ª # #"#" #"¨ª ###" "¨ª ######"##˜š' # " " ' ¡š #˜š˜¡¡¡š#"#"' "˜¡¢˜š˜¡¡¡¡¡š#"˜š˜h˜¡©¡š˜¡ª˜™¡¡¡¡¡¡¢˜™¡ª¨¡š˜¡ª ¢˜¡ª˜¡¡¡¡¡¡¡¡¢ ####" ##" ##" #"¨©ª¨¡š¨ª¨ª¨ª #q¡¡¡¡¡¡¡¡¢##"##"< # #"#" " # "#" " ##" #####" ##"##"¨ª ###"˜š q¡¡¡¡¡¡¡¢#"#"#XYZ# ##"#"#" #" " ###" " #"#" # #" #"" ###"  #""˜¡¢ ###q¡¡¡¡¡p######" ##"  #01##"##" 0#101#####"#####" ####" #### #01######q¡¢ 0##101##q¡¡¡p#"" ######" #######"  ##"##" #"#" ##########" #####"#q¢###### "####################" ##########" #############" #"" " #####" #" ########" ##############" #### ######" #####" ##" ##" ##"  ##" #" ###" # ####" ######"" # " ##"˜š#"'˜š˜š ## ##"##" # #"#" # "#########" ########" ##"#" #"### ##### #"##### " ##"####"#" #####" ###### # ##"### ##"#" ## ######" "### " ###"#"#"#" # #" #" #"#" ## #####" ##" # " #" ###"### ## " #"##"#"#"###" ##"##" #####" ##" #"## # # #"#" #"#" ############# \ No newline at end of file
diff --git a/data/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 7437a42a2..7c6638aed 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -1,5 +1,5 @@
DewfordTown: @ 84825EC
- .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%p‚yy‰:::$12222$1$1%pppp‚yyy$1PQRS$1$1%&%pppppppp$1XYZ[$1$1$1$1$1$1(2)2)2pppppp$1 ab
-$1$1$1$1$101111111$1$1$1$1$1$1$1$1$1$1$1>111=1$1 2 2 2 2$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1222222$1$1$1$1$192$1$1$1$1"####$$1$1$1$1$1%&C$1$1$1$1+,-³./2$1$1$1$1$1$1â92C$1$1$1$1345Å67$1$1$1$1$1$1$1C:92$1$1$1;2<2=Í>?2$1$1$1$1$1929292:92C92$1$1$1$1$1$1$1$1$1$1â49292:CCâCCC9292929292929292929292CC92CC92 \ No newline at end of file
diff --git a/data/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 4d2dbcef9..fcb55ee29 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -1,5 +1,5 @@
DewfordTown_Gym: @ 8482C60
- .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 43cd6e64a..000000000
--- a/data/maps/DewfordTown_Gym/map.bin
+++ /dev/null
Binary files differ
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 22466b2a8..31af0f14d 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -1,5 +1,5 @@
DewfordTown_Hall: @ 8482C7C
- .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 399786aa9..c317b12bb 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -1,5 +1,5 @@
DewfordTown_House1: @ 8482C0C
- .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 @@
-㾿¦§äëÆÇ®¯¡ìó2Î2Ï2!2!2@2¶2·2©2ô2!2)2)2D2NOD2)2)2)2!2)2)2D2VWD2)2)2)2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/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 d9a2162e2..6d285c437 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -1,5 +1,5 @@
DewfordTown_House2: @ 8482C98
- .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 @@
-㾿äëÆÇ ìó2Î2Ï2³6³6!2!2!2¨2ô2!2)2D2)2)2)2)2)2)2)2!2)2)2)2)2)2)2N_D2!2)2)2)2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index bdc1b5090..99d29f69c 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
DewfordTown_PokemonCenter_1F: @ 8482C28
- .4byte DewfordTown_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 f5302fff1..4d6a71785 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
DewfordTown_PokemonCenter_2F: @ 8482C44
- .4byte DewfordTown_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 6d102c5b1..d8275de59 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -1,5 +1,5 @@
DoubleBattleColosseum: @ 8484D84
- .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_€�2‚2L2M2ƒ2„2„2…2M2N2‚2†2‡ŒŠ2U2`2U2U2b2c2U2U2a2U2‹2�ŒŠ2U2T2U2U2d2e2U2U2V2U2‹2�ŒŠ2U2`2U2U2f2g2U2U2a2U2‹2�ˆ‰2U2\2]2]2]2]2]2]2^2U2Ž2�!2!2!2!2 \ No newline at end of file
diff --git a/data/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 f7fc65752..890d8b79f 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity: @ 8482598
- .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 445536d27..e239ed146 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_ChampionsRoom: @ 8483C3C
- .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_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 6d6438a79..0a4878176 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_DrakesRoom: @ 8483C20
- .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 @@
-      
-      ¢2¢2¢2¢2¢2¸2¸2¸2¢2¢2¢2¢2¢2Φ¼2¼2 2£2£2£2¤2¼2¼2§¥­®¼2¼2¨2©2ª2«2¬2¼2¼2¯­µ¶¼2¼2°2±2²2³2´2¼2¼2·µ½¡¼2¼2¨2¹2º2»2¬2¼2¼2·½½¾¼2¼2¨2Á2Â2Ã2¬2¼2¼2¿½Í2Æ2¼2¼2È2Ë2Ë2Ë2Ì2¼2¼2Ç2Å2Ê2É2É2É2É2É2É2É2É2É2É2É2É22222222222222ÕÖÕÖå¼2¼2¼2×ÕÖÕÖHIHIæÄ2Ä2Ä2ßHIHI \ 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 b301c2aa1..dbc20fd80 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_GlaciasRoom: @ 8483C04
- .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 @@
-      
-      r2r2r2r2r2ˆ2ˆ2ˆ2r2r2r2r2r2žvŒ2Œ2p2s2s2s2t2Œ2Œ2wu}~Œ2Œ2x2y2z2{2|2Œ2Œ2}…†Œ2Œ2€2�2‚2ƒ2„2Œ2Œ2‡…�qŒ2Œ2x2‰2Š2‹2|2Œ2Œ2‡��ŽŒ2Œ2x2‘2’2“2|2Œ2Œ2���2–2Œ2Œ2˜2›2›2›2œ2Œ2Œ2—2•2š2™2™2™2™2™2™2™2™2™2™2™2™22222222222222ÕÖÕÖåŒ2Œ2Œ2×ÕÖÕÖHIHIæ”2”2”2ßHIHI \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall1/border.bin b/data/maps/EverGrandeCity_Hall1/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_Hall1/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc
index 332a6cbb2..4dacefc77 100644
--- a/data/maps/EverGrandeCity_Hall1/header.inc
+++ b/data/maps/EverGrandeCity_Hall1/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Hall1: @ 8483C58
- .4byte EverGrandeCity_Hall1_MapAttributes
+ .4byte EverGrandeCity_ShortHall_Layout
.4byte EverGrandeCity_Hall1_MapEvents
.4byte EverGrandeCity_Hall1_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Hall1/map.bin b/data/maps/EverGrandeCity_Hall1/map.bin
deleted file mode 100644
index 75812b238..000000000
--- a/data/maps/EverGrandeCity_Hall1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÕÖÕÖDÕÖÕÖHIHI E HIHIÑ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2ÜÜÜØÙ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/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc
index b9029c027..0c160c76e 100644
--- a/data/maps/EverGrandeCity_Hall2/header.inc
+++ b/data/maps/EverGrandeCity_Hall2/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Hall2: @ 8483C74
- .4byte EverGrandeCity_Hall2_MapAttributes
+ .4byte EverGrandeCity_ShortHall_Layout
.4byte EverGrandeCity_Hall2_MapEvents
.4byte EverGrandeCity_Hall2_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc
index 282d06c66..da2ef5259 100644
--- a/data/maps/EverGrandeCity_Hall3/header.inc
+++ b/data/maps/EverGrandeCity_Hall3/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Hall3: @ 8483C90
- .4byte EverGrandeCity_Hall3_MapAttributes
+ .4byte EverGrandeCity_ShortHall_Layout
.4byte EverGrandeCity_Hall3_MapEvents
.4byte EverGrandeCity_Hall3_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Hall4/border.bin b/data/maps/EverGrandeCity_Hall4/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/EverGrandeCity_Hall4/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc
index 72fa22d75..da0b96380 100644
--- a/data/maps/EverGrandeCity_Hall4/header.inc
+++ b/data/maps/EverGrandeCity_Hall4/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Hall4: @ 8483CAC
- .4byte EverGrandeCity_Hall4_MapAttributes
+ .4byte EverGrandeCity_Hall4_Layout
.4byte EverGrandeCity_Hall4_MapEvents
.4byte EverGrandeCity_Hall4_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_Hall4/map.bin b/data/maps/EverGrandeCity_Hall4/map.bin
deleted file mode 100644
index 580ae095a..000000000
--- a/data/maps/EverGrandeCity_Hall4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÕÖÕÖDÕÖÕÖ     E     Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ñ2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2Ð2ÜÜÜØÙ2Ú2Ú2ÛÜÜÜäääàá2â2â2ãäääçJçàá2â2â2ãçJççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççççàá2â2â2ãççççJçàá2â2â2ãçJççççàá2â2â2ãççççççàá2â2â2ãççççççàá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/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc
index eac2ba3fa..0c541bd58 100644
--- a/data/maps/EverGrandeCity_Hall5/header.inc
+++ b/data/maps/EverGrandeCity_Hall5/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_Hall5: @ 8483CC8
- .4byte EverGrandeCity_Hall5_MapAttributes
+ .4byte EverGrandeCity_ShortHall_Layout
.4byte EverGrandeCity_Hall5_MapEvents
.4byte EverGrandeCity_Hall5_MapScripts
.4byte 0x0
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 dd3726db9..786b7c598 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_HallOfFame: @ 8483D00
- .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 @@
-ÌÍôõôÐÑÑÒÓôõôÎÏÔÕüýüØÙÙÚÛüýüÖ×ÜÝþ2þ2þ2àááâãþ2þ2þ2Þßäå2ö2ö2ö2èéêðëö2ö2ö2æ2çäå2ö2ö2ö2ö2ñòóö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ù2ú2û2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çäå2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2æ2çìí2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2ö2î2ïÿ6ø2ø2ø2÷6 \ No newline at end of file
diff --git a/data/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 a5ebfb823..2e7bef16d 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PhoebesRoom: @ 8483BE8
- .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\2×ÕÖÕÖHIHIæd2d2d2ßHIHI \ 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 a3747320b..613b47446 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PokemonCenter_1F: @ 8483D1C
- .4byte EverGrandeCity_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 1ad6c5727..63539b7a1 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PokemonCenter_2F: @ 8483D38
- .4byte EverGrandeCity_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_1F/border.bin b/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
index 46fa79a73..d99e18907 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PokemonLeague_1F: @ 8483CE4
- .4byte EverGrandeCity_PokemonLeague_1F_MapAttributes
+ .4byte EverGrandeCity_PokemonLeague_1F_Layout
.4byte EverGrandeCity_PokemonLeague_1F_MapEvents
.4byte EverGrandeCity_PokemonLeague_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin b/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin
deleted file mode 100644
index 6bab68102..000000000
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-  JK   ³´´µ     "#RSI»¼2¼2½Hs2*+2[Q$22Ã2Ä2Ä2Å222P}2)2t2u2!!!!Y<2@2@2@2@2@2@2@2X!!! 222222%2@2@20232@2@2@2g2222D2 2@2@2@2@2@2@2@2v2{2{2w2@2@2@2@2@2@2'2€2�222@2@2@202{2†2‡2{232@2@2@2@2^2
-2ˆ6‰B2@2@2@282|2Ž2�2|2;2@2@2@2&2f�2‘22@2@2@2@2@2~2|2|22@2@2@2=>@2'2 2@2@2&2@2@2@2@2@2A2B2@2@2@2@2EF42'2 2^2^2=>42@2@2@2@2@2@2@2@22&242@2'2(ffEF&2@2@2@222@2@2@2@2@2@2@27 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
index 1d7775bfc..61d0b857a 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_PokemonLeague_2F: @ 8483D54
- .4byte EverGrandeCity_PokemonLeague_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte EverGrandeCity_PokemonLeague_2F_MapEvents
.4byte EverGrandeCity_PokemonLeague_2F_MapScripts
.4byte 0x0
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 594347dc3..3855eb87a 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -1,5 +1,5 @@
EverGrandeCity_SidneysRoom: @ 8483BCC
- .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,2×ÕÖÕÖHIHIæ424242ßHIHI \ 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 a6ea87c04..c26b91f29 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,5 +1,5 @@
FallarborTown: @ 8482624
- .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 950a54761..000000000
--- a/data/maps/FallarborTown/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-yyyyyiiiiiiiiiiiiijiiiiiiiiiiiijziiiiij"##$ÂÃJKLMNjziiiiijz…††‡Ê6Ë6RSTUVzi ¡¢£jzi��ž�§2y2Z[\]^q2q2PQRSzii•¥¦—y2#6bcdef#6y2XYZ[q2q2q2y2y2y2y2#6jklmn#6y2©abªy2y2Ÿ2Ÿ2y2y2y2y2y2è2é2ê2y2y2y2y2è2ê2y2y2y2y2y2è2é2é2é2é2é2ñ2ñ2ñ2é2é2é2é2ñ2ñ2é2é2ê2y2y2ø2ù2ù2ù2ù2ù2ù2ù2ù2ù2ñ2ñ2ù2ù2ù2ù2ù2ú2y2y2Ÿ2Ÿ2Ÿ2Ÿ2y2y2y2y2y2ð2ò2y2y2Ÿ2Ÿ2Ÿ2Ÿ2y2y2y2y2y2y2y2y2y2y2y2y2ð2ò2y2»2¨2¨2¼2y2y2y2y2y2y2y2y2y2 3!3y2y2ð2ò2y20123y2Ÿ2y2%3&3'3y2}2~2(3)3y2y2ð2ò2y289:;22y2-3.3/3y2…††‡y2Ÿ2ð2ò2y2©AB«6t6y2536373y2��ž�y2y2ð2ñ2é2é2ê2y2Ÿ22l2y2y2y2y2•¥¦—y2y2ø2ù2ù2ù2ú2y22s6t6k222§2y2y2y2y2y2y2y2y2y2222l6kllklk2222222222st6sts6t6 \ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin b/data/maps/FallarborTown_BattleTentBattleRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
index 2a5695153..be81ffe6e 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
@@ -1,5 +1,5 @@
FallarborTown_BattleTentBattleRoom: @ 8482DCC
- .4byte FallarborTown_BattleTentBattleRoom_MapAttributes
+ .4byte BattleTentBattleRoom_Layout
.4byte FallarborTown_BattleTentBattleRoom_MapEvents
.4byte FallarborTown_BattleTentBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin b/data/maps/FallarborTown_BattleTentBattleRoom/map.bin
deleted file mode 100644
index 92a738d5e..000000000
--- a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentCorridor/border.bin b/data/maps/FallarborTown_BattleTentCorridor/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/FallarborTown_BattleTentCorridor/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc
index 6ac376874..5f2023a71 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/header.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc
@@ -1,5 +1,5 @@
FallarborTown_BattleTentCorridor: @ 8482DB0
- .4byte FallarborTown_BattleTentCorridor_MapAttributes
+ .4byte BattleTentCorridor_Layout
.4byte FallarborTown_BattleTentCorridor_MapEvents
.4byte FallarborTown_BattleTentCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.bin b/data/maps/FallarborTown_BattleTentCorridor/map.bin
deleted file mode 100644
index 4cd270b21..000000000
--- a/data/maps/FallarborTown_BattleTentCorridor/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-6b6c6d66 jkl +*+*#:;:;$;:;:#:;:;$;:;:#%; \ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentLobby/border.bin b/data/maps/FallarborTown_BattleTentLobby/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/FallarborTown_BattleTentLobby/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc
index 64d4180a5..ba86df464 100644
--- a/data/maps/FallarborTown_BattleTentLobby/header.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/header.inc
@@ -1,5 +1,5 @@
FallarborTown_BattleTentLobby: @ 8482D94
- .4byte FallarborTown_BattleTentLobby_MapAttributes
+ .4byte BattleTentLobby_Layout
.4byte FallarborTown_BattleTentLobby_MapEvents
.4byte FallarborTown_BattleTentLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_BattleTentLobby/map.bin b/data/maps/FallarborTown_BattleTentLobby/map.bin
deleted file mode 100644
index 9ff37dc2c..000000000
--- a/data/maps/FallarborTown_BattleTentLobby/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-666b6c6d6666
- `a jkl fg2hi 22 22 2no2p 22222 w6"2xyz{2|}~6'”22€�‚ƒ2„…†‡&22“22ˆ2‰2Š2‹22Œ2�2Ž2�222’2222222222222•222222222220(2222./222( \ No newline at end of file
diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index bbe9d895c..443a4dc27 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -1,5 +1,5 @@
FallarborTown_House1: @ 8482E20
- .4byte FallarborTown_House1_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 bf6d91d02..17cadef2b 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -1,5 +1,5 @@
FallarborTown_House2: @ 8482E3C
- .4byte FallarborTown_House2_MapAttributes
+ .4byte House2_Layout
.4byte FallarborTown_House2_MapEvents
.4byte FallarborTown_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin b/data/maps/FallarborTown_LeftoverRSContestHall/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin b/data/maps/FallarborTown_LeftoverRSContestHall/map.bin
deleted file mode 100644
index d65e7c489..000000000
--- a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-/////////////////////nnn€€€bbbbbbbbbbbbbbbbbbbbb 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2(2`2`2              f2`2*2(2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2*2(2`2`2$%2%2hiiiiiiij%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2�2qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q2‰2q2qq2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2*2(2`2`2$%2%2xyyk2l2m2yyz%2%2&f2`2*2(2`2`222222s2t2u222222f2`2*2(2`2`26s2t2u26f2`2*2(2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2*2(2`2J2`2`2J2`2`2`2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R6`2`2R6`2`2`2`2`2`2`2R6`2`2R6`2*2 \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin
deleted file mode 100644
index 87407546a..000000000
--- a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-[\]ÊËNËÊMÊÊÊÊÊÊcdeÌbVbÌbbÉbTb 2!2!2ÐÑ2Ò2Ó2ÔU2!2!2!2!2!2"2(2`2`2ØÙÚÛÜf2`2Ý`2`2`292(2`2`2Æ2_2_2_2_2g2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2Ý`292(2`2`2`2`2`2`2`2`2`2`2`2A2 \ No newline at end of file
diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc
index 70ff79eb7..6e8aa3ef3 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -1,5 +1,5 @@
FallarborTown_Mart: @ 8482D78
- .4byte FallarborTown_Mart_MapAttributes
+ .4byte Mart_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 c3b9ec95d..515518d9a 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
FallarborTown_PokemonCenter_1F: @ 8482DE8
- .4byte FallarborTown_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 655221b8a..2c67be178 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
FallarborTown_PokemonCenter_2F: @ 8482E04
- .4byte FallarborTown_PokemonCenter_2F_MapAttributes
+ .4byte PokemonCenter_2F_Layout
.4byte FallarborTown_PokemonCenter_2F_MapEvents
.4byte FallarborTown_PokemonCenter_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/FarawayIsland_Entrance/border.bin b/data/maps/FarawayIsland_Entrance/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/FarawayIsland_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc
index 8e943d6c3..5d7879d64 100644
--- a/data/maps/FarawayIsland_Entrance/header.inc
+++ b/data/maps/FarawayIsland_Entrance/header.inc
@@ -1,5 +1,5 @@
FarawayIsland_Entrance: @ 848575C
- .4byte FarawayIsland_Entrance_MapAttributes
+ .4byte FarawayIsland_Entrance_Layout
.4byte FarawayIsland_Entrance_MapEvents
.4byte FarawayIsland_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/FarawayIsland_Entrance/map.bin b/data/maps/FarawayIsland_Entrance/map.bin
deleted file mode 100644
index 389f6b0cd..000000000
--- a/data/maps/FarawayIsland_Entrance/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FarawayIsland_Interior/border.bin b/data/maps/FarawayIsland_Interior/border.bin
deleted file mode 100644
index addb5d6ce..000000000
--- a/data/maps/FarawayIsland_Interior/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc
index 6d5e3f2d7..dd29fcc26 100644
--- a/data/maps/FarawayIsland_Interior/header.inc
+++ b/data/maps/FarawayIsland_Interior/header.inc
@@ -1,5 +1,5 @@
FarawayIsland_Interior: @ 8485778
- .4byte FarawayIsland_Interior_MapAttributes
+ .4byte FarawayIsland_Interior_Layout
.4byte FarawayIsland_Interior_MapEvents
.4byte FarawayIsland_Interior_MapScripts
.4byte 0x0
diff --git a/data/maps/FarawayIsland_Interior/map.bin b/data/maps/FarawayIsland_Interior/map.bin
deleted file mode 100644
index 847295734..000000000
--- a/data/maps/FarawayIsland_Interior/map.bin
+++ /dev/null
Binary files differ
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 0cb60553b..c02896935 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,5 +1,5 @@
FieryPath: @ 8484048
- .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 6b78eeee1..b091e166f 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -1,5 +1,5 @@
FortreeCity: @ 8482528
- .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+,-./**+,-./ÆÆÆ+,-./ÆÆ34567ÇÇÇÇÇÇD\DHIJK34567ÆÆ34567Ç**34567Æ*3<B>B>B7ÇÇÇÇÇÇÆÇÇPQRS3<B=B>B?BVBVB;B<B>B>B?BVBVBVB;B<B=B>B?BVBVB;B<B>B>B7ÇÇÇÇÇÇÇÆXYZ[CFEFGDDCFFFGDDDCFEFGDDCFEFGÇÇÇÇÇ0`abcÆÇMÇHIJÇÇÇÇÇÇÇÇÇÇMÇÇHIJÇMÇÇÇÇ00000X2Y2Y2SSa2ÇPQRÇÇÇÇcddddea2ÇÇPQRÇa2SSS00000000`2a2a2a2a2a2ÇÇAÇÇÇÇDz³³³³´a2SÇÇAÇÇa2a2a2b2000000000h2a2a2a2a2ÇÇsÆÆÇÇS¸¹º³»¼`2U2ÇÇsÆÇa2a2a2j200000000000h2a2a2a2ÇÇÆÆÆÇÇ0ÀÁÂÅÃÄ`2]ÇÆÆ*Sa2a2j200000Æ00(0)0)0+00`2a2K2$%&**ÇÇ0È1É1ÊÍËÌ1`2a2ÇÆÆÇa2a2a20Æ$%&ÆÆÆÆ01230`2K2+,-./ÇÇÇÇ0X2Y2Y2Y2Y2a2K2Ç*ÇSa2a2a2Ç+,-./ÆÆÆ89:;0`2Æ34567ÆÇÇÇÇK2K2K2K2K2K2ÇÇÇÇ0h2i2i2Ç34567ÆÆÆ`ABCX2a2Æ3<B=B>B?BVBVBVBVBVBVBVBVBVBVBVBVBVBVBVBNòNòNòNòVB;B<B>B>B7ÆÆÆ000X2a2a2SCFEFGDDDDDDDDDDDDDDD00X2Y2DCFEF6GÆÆÆÆX2Y2a2a2a2a2SSMÆHIJÆÆÆÆÆÆÆÆÇÇÇÇÇL2Y2a2a2S6S6S6MÇÇÆÆÆÆK2K2a2a2a2a2a2a2a2ÆPQRÆÆÆÆÆÆÆÆÇÇHIJÇK2a2a2a2a2a2a2ÇÇÆÆÆÆÆÆK2K2K2a2a2a2a2ÆD\DÆÆÆÆÆÆÆÆÆÇPQRÇÇK2K2a2a2a2K2ÇÇÇ**ÆÆÆÆÆÆK2K2K2K2ÆÆÇÇ*ÇÆÆÆÆÆÆÆÇD\DÇÇÇÇK2K2K2ÇÇÇ \ No newline at end of file
diff --git a/data/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 000c589c6..4ebde8a93 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -1,5 +1,5 @@
FortreeCity_DecorationShop: @ 848361C
- .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 @@
-ÈÉɾ¿ÉÉÊÐÑѾ¿ÑÑÒíî3Ï3¾¿Î3î3ïõöׯÇÖö÷Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ 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 08e50e944..eb241b368 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -1,5 +1,5 @@
FortreeCity_Gym: @ 848353C
- .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 cff943707..000000000
--- a/data/maps/FortreeCity_Gym/map.bin
+++ /dev/null
Binary files differ
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 4aeeb4425..06dd18e1c 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House1: @ 8483520
- .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 @@
-ÈÉɾ¿ÉÉÊÐàѾ¿ÑÑÒØ3è3Ü3¾¿Û3Ù3Ú3Ù3Ù3Ü3ÆÇÛ3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ 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 30cad4def..62461784f 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House2: @ 84835AC
- .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 @@
-ÈÉɾ¿ÉËÊÐã便ÑÒØ3ë7ì7¾¿Û3Ó3Ú3Ù3Ù3Ü3ÆÇÛ3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ù3Ì7Ù3Ù3ÔÕÙ3Ù3Í7 \ No newline at end of file
diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc
index 2e2c7813d..54297f446 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House3: @ 84835C8
- .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 59c17803e..71002c7da 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House4: @ 84835E4
- .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 deaa634a8..6513cde1e 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -1,5 +1,5 @@
FortreeCity_House5: @ 8483600
- .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 03ee88852..18cb7b971 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -1,5 +1,5 @@
FortreeCity_Mart: @ 8483590
- .4byte FortreeCity_Mart_MapAttributes
+ .4byte Mart_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 d065198ad..ae2b8e0e8 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
FortreeCity_PokemonCenter_1F: @ 8483558
- .4byte FortreeCity_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 5eb3483c3..adb7a7bde 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
FortreeCity_PokemonCenter_2F: @ 8483574
- .4byte FortreeCity_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 ebd93d4eb..3d29c272a 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -1,5 +1,5 @@
GraniteCave_1F: @ 8483F84
- .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 de946f84c..6ab42f082 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -1,5 +1,5 @@
GraniteCave_B1F: @ 8483FA0
- .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#!#!#!#!!!!!!!#222222�è0Ž2•è0–222222222222222222222222222222222222222222222222>2222?22222  
-222  
-222222222222222222222222222  #222222222222222#  
-2222222222222222222222222222222222#  
-222222=22# 
-222 !!!!"2222?222222222#     !!!"#   ###    ##      #     ##       ##                              # \ No newline at end of file
diff --git a/data/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 0442638f9..95935c283 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -1,5 +1,5 @@
GraniteCave_B2F: @ 8483FBC
- .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 569d46b98..0644d8cb7 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -1,5 +1,5 @@
GraniteCave_StevensRoom: @ 8483FD8
- .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/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 7e63d060f..c77ea5934 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -1,5 +1,5 @@
InsideOfTruck: @ 8484EF0
- .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 9b9e2b739..6ff291c29 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -1,5 +1,5 @@
IslandCave: @ 8484614
- .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 ad1a4640f..f6fc90e4e 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -1,5 +1,5 @@
JaggedPass: @ 848402C
- .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 57195b4f5..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 138cc6778..12cc74b5f 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown: @ 8482608
- .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{tttzq2®2®2®2®2xttttttttr{™š››œ2�tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»233»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0
-00 0 0
-00rr¸¹º³»¼0000rrÀÁÂÅß000  Æ4rrÈ1É1ÊÍ˧000 !" !"Æ4rr00000000000040000Æ4m000000000000000Æ4Æ4qqrm0000000000000044qqllllllllllllllll \ 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 f473ddaee..30cde2e9c 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_Gym_1F: @ 8482CD0
- .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 31d16da5e..000000000
--- a/data/maps/LavaridgeTown_Gym_1F/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-   22222' 222 2222  22222  2222 222  222222  2222  2222  222222  2222  2222 2222  22  222      2222 2 2  22  22  22  !"#$  2222  22  22  22222  2222  22  22  2222  2222  22  22 %&&&&  22 2  22 22222 222 %&  22 22222 2222  22  222
-2222222222
-22  222222222 2222222  22220022 \ No newline at end of file
diff --git a/data/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 c188cd5ba..66d732921 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_Gym_B1F: @ 8482CEC
- .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 aeaf0177c..000000000
--- a/data/maps/LavaridgeTown_Gym_B1F/map.bin
+++ /dev/null
@@ -1,6 +0,0 @@
-++++)+++++)++++++3333(33333(3333332222022;220222222 22822
-222222
-282222++++)++)+)+++)+++33331331313331333<22;1221212221222 22221 221 21 2221 222 22221 221 21 2221 222 22221 22191 2221 22292221 221 21%&&1%&& 22221%&1 21 2221 222%&&&1 221 21 2281 222 22221 221 21 2221 222 2822(92( 21 2221 222 22220 220 21%&&( 222 2222:
-222
-21 2220 2229222222221 222:
-222 22228222219222222 \ No newline at end of file
diff --git a/data/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 5e3fd99a0..c9ef33f92 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_HerbShop: @ 8482CB4
- .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 @@
-ˆ‹�ˆˆˆ‡‡�“•��‡‡‡�3¦2¦2¦2¦2¥x2p2p2p2p2¢¢¢¢¢­€2h2h2h2x2p2p2p2p2p2y2h2h2h23€2h2h2h2h2h2h2h2h2h2ß2g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc
index f48bf4035..aa8a822f5 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_House: @ 8482D08
- .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 b3f901570..72d8699f1 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_Mart: @ 8482D24
- .4byte LavaridgeTown_Mart_MapAttributes
+ .4byte Mart_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 30009b084..b3444dc0f 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_PokemonCenter_1F: @ 8482D40
- .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"#RSI2À2Á2Â2P*+2[Q$2222 2&222X!!!Y<222'2 24222`2l2m2n2o22%222'2€2�2222021222322222'2ˆ6‰B228292:2;2242=>'2�2‘2222@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 26a5fd642..596b0e189 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
LavaridgeTown_PokemonCenter_2F: @ 8482D5C
- .4byte LavaridgeTown_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 37ec48371..1ec7fa26e 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -1,5 +1,5 @@
LilycoveCity: @ 8482544
- .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 5d6b56ad9..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 f8f05f874..d0b17f863 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_ContestHall: @ 84836C4
- .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%2pq2q2q2‘2qwBqr%2%2&f2`2`2Q2`2Q2`2`2`2`2`2`2R`2`2R`2*2(2`2`2`2`2`2`2`2`2`2`2`2X2`2X2`2`2`2$%2%2pq2q2q2™2q2qq2r%2%2&f2`2`2Y2`2Y2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2xyy{2|2}2yyz%2%2&f2`2`2I2`2I2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2P2`2P2`2`2`222222ƒ2„2…222222f2`2`2Q2`2Q2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2ƒ2„2…2f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2              f2`2`2`2`2*2(2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2*2(2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2I2`2`2`2`2`2H2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2Q2`2`2`2`2`2P2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2I2`2I2`2*2(2`2P2`2P2`2$%2%2pq2q2q2¡2qwBqr%2%2&f2Y2`2`2`2`2`2X2`2$%2%2pq2q2q2’2qwBqr%2%2&f2Q2`2Q2`2*2(2`2X2`2X2`2$%2%2pq2q2q2©2q2qq2r%2%2&f2`2`2`2`2`2`2`2`2$%2%2pq2q2q2š2q2qq2r%2%2&f2Y2`2Y2`2*2(2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2I2`2`2`2`2`2H2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2xyy‹2Œ2�2yyz%2%2&f2Q2`2`2`2`2`2P2`2$%2%2xyy«2¬2­2yyz%2%2&f2I2`2I2`2*2(2`2P2`2P2`222222“2”2•222222f2Y2`2`2`2`2`2X2`222222³2´2µ222222f2Q2`2Q2`2*2(2`2X2`2X2`2“2”2•2f2`2`2`2`2`2`2`2`2³2´2µ2f2Y2`2Y2`2*2(2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2J2`2`2`2J2`2`2`2J2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2J2`2`2`2J2`2`2`2J2`2`2*2(2`2`2R`2`2`2R`2`2`2R`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2R`2`2`2R`2`2`2R`2`2*2 \ No newline at end of file
diff --git a/data/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 674726f47..ddd0d6284 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_ContestLobby: @ 84836A8
- .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 122962e42..000000000
--- a/data/maps/LilycoveCity_ContestLobby/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÊÊÊÊÊÊÊÊ[\]ÊÊÊ:;ÊÊÊM[\]ÊÊÊÊÊÊÊÊbbbÉbÉbÉc6deÌbbBCbbÌc6deÉbÉbÉbbT 2!2!2!2!2!2!2!2!2!2!2ÐÑ2ž2×2×2®2Ñ2àU2!2!2!2!2!2!2!2!2!2!2"2(2`2`2`2`2`2`2`2`2`2`2ØÙ¦ßß¶Ùèf2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2Æ2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Ý`2`2`2Ý`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*282`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2Ý`2`2`2Ý`2`292@2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2 \ No newline at end of file
diff --git a/data/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 149ff5359..ed380598b 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_CoveLilyMotel_1F: @ 8483638
- .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!2Î2Ï2¨2!2!2@2ô2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2D2N_D2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file
diff --git a/data/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 ade9f1a37..200e1b7bb 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_CoveLilyMotel_2F: @ 8483654
- .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 @@
-ãa°¾¿äë¸ÆÇìó2!2!2!2!2!2!2!2À2Î2Ï2ô2!2)2N_D2)2)2D2NOD2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2)2N_)2)2!2D2VWD2)2)2D2VW)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file
diff --git a/data/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 959699237..b5135b1ff 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStoreElevator: @ 84838A0
- .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 7d9ae193b..000000000
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-(***,011148999<\2]2]2]2]2d2e2e2e2f2d2O2W2e2f2 \ 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 3cf0cac45..3a96f4c3b 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStoreRooftop: @ 8483884
- .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/6É2Ê2J2J2J2J2J2J2M2M23VW=z�'6ËÌJ2J2J2J2J2J2J2J2J2^_ET2S2/6É2Ê2J2J2J2J2J2J2J2J2J2M2M2M2M2À676ËÌJ2J2Á6Â6J2J2Á6Â6J2J2J2J2J2À67>U2[2[2[2[2[2[2[2[2[2[2[2[2[2[2[2?FccccccccccccccccGäååååååååååååååååæìðñíííííðñíííííðñîìøùíííííøùíííííøùîìííííííííííííííííî \ No newline at end of file
diff --git a/data/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 140fe3568..2ad060976 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_1F: @ 84837F8
- .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 @@
-ˆ|}~ˆˆˆˆˆˆˆˆˆˆˆ  �„…†��œ��������Px2Ž2Ÿ2�2p2p2¤Ô2˜2™2˜2¥x2p2p2p2p2p2€2h2h2h2h2h2¬¡ ¡ ­€2h2h2h2n2h2ß2g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h2ß2g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt \ 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 7d28c44b6..e4ebc314a 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_2F: @ 8483814
- .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 2–2§2—22222222222222222222222222222222m222ª«22Ý2›2›2›2›2Ý222ª«2u223422ž££££ž22342222²³22¤ 2222ž22²³2m2222222Þ2222Ñ22222u \ 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 2f94cc924..bb8cd73f7 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_3F: @ 8483830
- .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 2–2¯2—222¤C2®2®2®2¥ 222222222222¬¢¢¢¢­22222222+,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 8318c0edc..9bc54b809 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_4F: @ 848384C
- .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 2–2·2—222222222222222222222222222222222222222Ý2›2›2›2Ý222222222ª6«6222ž£££ž22ª6«6ª6«622²6³6222¤ 222ž22²6³6²6³62222222Þ222Ñ2222222 \ 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 da0c4a399..cf1448ab8 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_DepartmentStore_5F: @ 8483868
- .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_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
index 1d8faa5d4..abaf3ad3f 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_Harbor: @ 8483750
- .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 c298fe5f1..3d884a5d2 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House1: @ 8483788
- .4byte LilycoveCity_House1_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 b2276441c..3d184d345 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House2: @ 84837A4
- .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 @@
-ã±²¾¿ä빺ÆÇìó2Á2Â2!2!2Î2Ï2ô2Y2N6O6)2)2)2)2)2Y2V6W6D2)2)2)2)2!2)2)2)2)2)2)2)2 33333333#333333 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
index 2f3c3dc74..1a818490e 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House3: @ 84837C0
- .4byte LilycoveCity_House3_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 6a2acb155..9632ffa39 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_House4: @ 84837DC
- .4byte LilycoveCity_House4_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 8b534ed9a..3721b4432 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_LilycoveMuseum_1F: @ 8483670
- .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 0cbbfb2e5..c5adc0fb1 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_LilycoveMuseum_2F: @ 848368C
- .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 @@
-yyyz��������jkl���xyyy���‚‰‰‰‰‰‰‰„rst…‰‰€���‰‰‰Šq2p2q2p2q2p2q2Œq2p2q2�q2p2ˆ‰‰‰p2q2p2q2p2i2h2i2h2i2h2i2h2i2h2i2h2i2p2q2p2q2q2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2p2†nnoƒ2h2i2h2†nnoƒ2h2i2h2†nnoƒ2q2ŽXYw{2i2h2i2ŽXYw{2i2h2i2ŽXYw{2p2|2}2~22ƒ2h2i2h2|2}2~22ƒ2h2i2h2|2}2~22ƒ2q2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2h2p2i2h2i2h2†nnoƒ2h2i2h2†nnoƒ2h2i2h2i2q2h2i2h2i2ŽXYw{2i2h2i2ŽXYw{2i2h2i2h2p2i2h2i2h2|2}2~22ƒ2h2i2h2|2}2~22ƒ2h2i2h2i2q2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index 5ef550b69..19e61cf16 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_MoveDeletersHouse: @ 848376C
- .4byte LilycoveCity_MoveDeletersHouse_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 81f460c86..782efd3d0 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_PokemonCenter_1F: @ 84836E0
- .4byte LilycoveCity_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 d145bab55..7db9bcb62 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_PokemonCenter_2F: @ 84836FC
- .4byte LilycoveCity_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 8d2f17dc6..0e23469c1 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_PokemonTrainerFanClub: @ 8483734
- .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$2‹2Œ292#2#2+2LMLM,2#2#2#292#2#2#2TUTU#2#2#2#292#2#2#2#2#2#2,2#2#2#2#2 3û2ü2#2#2#2#2#2#2ú2û2û2#2#2#2#2#2#2ƒ„ 526262626272
-hi‹2Œ2$2=2H^HI?2%2p2q292#2#2=2PQPQ?2#2#2#292#2#2E2F2F2F2F2G2#2#2#292#2#2#2#2#2#2#2#2#2#2#292#2#2#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
index 29e3bd57c..bf648b5da 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -1,5 +1,5 @@
LilycoveCity_UnusedMart: @ 8483718
- .4byte LilycoveCity_UnusedMart_MapAttributes
+ .4byte Mart_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 f5d7b9b78..dcd7be859 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom1: @ 8484DA0
- .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%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2‰2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ No newline at end of file
diff --git a/data/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 b083a3a93..2afb7ae00 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom2: @ 8484E64
- .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%2pq2q2q2‘2q2w6q2r%2%2&$%2%2pq2q2q2™2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&22222ƒ2„2…2222226ƒ2„2…26 \ 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 ec0e6ee7b..97f0cdcae 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom3: @ 8484E80
- .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%2pq2q2q2±2q2w6q2r%2%2&$%2%2pq2q2q2¹2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy›2œ2�2yyz%2%2&22222£2¤2¥2222226£2¤2¥26 \ 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 4a172b61f..9c0dfdc65 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom4: @ 8484E9C
- .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%2pq2q2q2¢2q2w6q2r%2%2&$%2%2pq2q2q2ª2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy»2¼2½2yyz%2%2&22222Ã2Ä2Å2222226Ã2Ä2Å26 \ 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 a26034ac6..42c2f3fdb 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom5: @ 8484EB8
- .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%2pq2q2q2¡2q2w6q2r%2%2&$%2%2pq2q2q2©2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy‹2Œ2�2yyz%2%2&22222“2”2•2222226“2”2•26 \ 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 436f89047..f1487f334 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -1,5 +1,5 @@
LinkContestRoom6: @ 8484ED4
- .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%2pq2q2q2’2q2w6q2r%2%2&$%2%2pq2q2q2š2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy«2¬2­2yyz%2%2&22222³2´2µ2222226³2´2µ26 \ 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 240429a6d..04010b50c 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -1,5 +1,5 @@
LittlerootTown: @ 84825B4
- .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 @@
-ÔÕÔÕÔÕÔÕÔÕ500ÔÕÔÕÔÕÔÕÜÝäåäåäåäç00æåäåäåÜÝÔÕ0000000000000000ÔÕäç0000000000000000æå002 2 2 2
-20000002 2 2 2
-2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000ð00000000ð0000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-00000000Î1Ï1000&4I5'00000000ÖÕÎ1Ï10000200000000Î1Ï1ÜÝÔ×00000000000000ÖÕÔÕÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝ \ 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 781e37506..d5a87bae9 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_BrendansHouse_1F: @ 8482AF4
- .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 12047b040..0153a3f27 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_BrendansHouse_2F: @ 8482B10
- .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 bfa5b907e..000000000
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-RTPTV‡   Z[Ue�b2c2x2f2]2x2222{2|2}22˜2™2™2š22ƒ„2…2 2¡2¡2¢22‹BŒ�B 2¡2¡2¢2222¨2©2©2ª22222222222 \ 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 624be65cb..1e72c91b5 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_MaysHouse_1F: @ 8482B2C
- .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 21f62ebe3..000000000
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-nnnnno m&&CD120vwux22KL9:82222y22F22222222222@A222222°¸³±²»22222£À¹ºÃ¥22222£ÀÁÂÃ¥222«¬¬¬¬­2 \ 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 a22e64716..20e9e3f5a 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_MaysHouse_2F: @ 8482B48
- .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 5904a9639..000000000
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-'VTPTQ/WUXYE2222]2g22`2a22›2œ2œ2�22€2�2‚22£2¤2¤2¥22ˆ‰2Š2£2¤2¤2¥2�B‘’B2«2¬2¬2­222222222222 \ 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 c58220612..8cd5eaf79 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -1,5 +1,5 @@
LittlerootTown_ProfessorBirchsLab: @ 8482B64
- .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 0f84e80b2..000000000
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
+++ /dev/null
@@ -1,5 +0,0 @@
-  <
-   
-
-
- !2D"2#2>2"232"232>2šš(2*2*2A22222)2:2222222222221B22$2%2627222222?2?222,-,-22222224545222222=2>2>2>2222222G2?2’220222222222;.H8922222222I2C:2H@2&22222222KBO2?22.22222?2?2 \ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/maps/MagmaHideout_1F/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index eab20d0d0..6158ed3cb 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_1F: @ 8484828
- .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 fdf0d4252..000000000
--- a/data/maps/MagmaHideout_1F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MagmaHideout_2F_1R/border.bin b/data/maps/MagmaHideout_2F_1R/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_2F_1R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc
index ff19befab..1a685fe55 100644
--- a/data/maps/MagmaHideout_2F_1R/header.inc
+++ b/data/maps/MagmaHideout_2F_1R/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_2F_1R: @ 8484844
- .4byte MagmaHideout_2F_1R_MapAttributes
+ .4byte MagmaHideout_2F_1R_Layout
.4byte MagmaHideout_2F_1R_MapEvents
.4byte MagmaHideout_2F_1R_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_2F_1R/map.bin b/data/maps/MagmaHideout_2F_1R/map.bin
deleted file mode 100644
index d74c32347..000000000
--- a/data/maps/MagmaHideout_2F_1R/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq{tttttVttttttttttttttttttttt|qqqqrqqq{t^ttttt-|qqqqq{ttttt|qqqqqrqq33333333tttttz33333qqqqqqrqqq33333333333333333333t|qqqqr{tt3333333333333333333333qqqqrr3333333333333333333333333qqqqrr{ttttttttttttttttt¯¯t|333qqqqrrr33333333333333333333333qqqqrrr33333333333333333333tt|qqqqrrr33333333333333333333333qqqqrrr33333333333333333333333qqqqrrr{ttt¯¯tttttttttttttttt|pqqqqrrrr7{t¯¯ttttttttttttt|77pqqqqrrrr7r33333333333377pqqqqrrr17r333333333333t|pqqqqrrrr7r333333€�mn33333333pqqqqrrrr7r333333ˆ‰uv33333333pqqqqrrrr{333333�‘}~33333333pqqqqrrrrr3333333333333333333pqqqqrrrrr3333333333333333333pqqqqrrrrr{tttttttttttt¯¯ttt|pqqqqrrrrrr{ttVt#tttttt¯¯tt|pqqqqrrrrrrr{t^tt|333333333qqqqrrr1rrrr3333|33333333qqqqrrrrrrrr33333t¯ttttt|pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr{t¯tttt-tttt|pqqqqrrrrrrrrr{¯tttttttt|pqqqqrrrrrrrrr1333333333pqqqqrrrrrrr1rr3333333
-7 pqqqqrrrrrrrrrr3333333qqpqqqqrrrrrrrrrr33333 33qqpqqqqrrrrrrrr1     ~qqpqqqqrrrrrrrrrqqqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqpqqqqrrrrrrrrrqqqqqqqqqqpqqqqrrrr1rrrrqqqqqqqqqqqpqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_2F_2R/border.bin b/data/maps/MagmaHideout_2F_2R/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_2F_2R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc
index 8fe07f9ca..410522097 100644
--- a/data/maps/MagmaHideout_2F_2R/header.inc
+++ b/data/maps/MagmaHideout_2F_2R/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_2F_2R: @ 8484860
- .4byte MagmaHideout_2F_2R_MapAttributes
+ .4byte MagmaHideout_2F_2R_Layout
.4byte MagmaHideout_2F_2R_MapEvents
.4byte MagmaHideout_2F_2R_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_2F_2R/map.bin b/data/maps/MagmaHideout_2F_2R/map.bin
deleted file mode 100644
index 34cbf7eaa..000000000
--- a/data/maps/MagmaHideout_2F_2R/map.bin
+++ /dev/null
@@ -1,5 +0,0 @@
-qqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqxtttttttttt|qq{ttt|qqqqqqqqqqqqqqq{t„…‚ƒtttttttttttttt„…‚ƒt|p{¢¢¢x|qqqqqqqqqqqqq{z{Œ�Š‹ttt-ttttttttttŒ�Š‹|pp{¢¢¢¢¢pqqqqqqqqqqqqr{z¨©–—{GGGGGGGGGGG|¢¨©–—pppr¢¢¢¢¢x|qqqqqqttttttzr¢¢¢¢¢F½½½½½½½½‰¢¢¢¢¢ppp  j¢¢pqqqqqqqqqqqqqrq23¢¢q2¤£½½½½½½‰¢¢¢¢hppqqq{¢¢x|qqqqqqqqqqqqr¢¢¢¢¢¢¢¤£½££££¤¢3¢¢pqpx|qqqr{¯|¢pqqqqqqqqqqqqr¢¢h     jF½‰3¢¢¢¢¢¢¢¢pqx|pqq{r¢p¢pqqqqqqqqqq{z¢¢pqh  j££j¢¢¢¢¢¢h qqppq{{¢x|x|qqqqqqqqqqr¢¢¢ppqqjqqqq j¢¢¢¢ph   p{qr{¯|x|pqqqqqqqqqqr¢¢¢pqpqq{z{tt|qqj¢¢¢px|qqqpr{tr¢pq2ppqqqqqqqqqqr¢¢¢pqpq{zqrqqpqqqr¢¢¢x|xt|qxr{tx|pxttttqqqqq{z¢¢¢x|xtz{tzqhqqr¢¢¢¢x|qx|{tr{t¯|pxtttttqqqqqr{t¯t|xt-tzqqqpqqq{¢3¢¢¢x|qxq{r33ppqqqqqqqqqqq1r333ttttt-t|x|qqr{-t¯tt|xt-ttqr33ppqqqqqqqqqqqrr33333333333pqxttzr33333xttttttt33ppqqqqqqqqqqqrr33333333333xttttt3333333333333333ppqqqqqqqqqqqrr33333
-   3333333333333333333333333ppqh    qqqqq 3333pqqr3333333333333
-           pqpqqqqqqqqqqqr 333pqq  3333333
-               qpqqqqqqqqqqqr1333pqqqq 33333
-qqqqqqqqqqqqqqqqqqpqqqqqqqqqqrr3 33pqqqqq     qqqqqqqqqqqqqqqqqqpqqqqqqqqqqq qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_2F_3R/border.bin b/data/maps/MagmaHideout_2F_3R/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_2F_3R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc
index 45ea7c94b..407408bf3 100644
--- a/data/maps/MagmaHideout_2F_3R/header.inc
+++ b/data/maps/MagmaHideout_2F_3R/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_2F_3R: @ 84848EC
- .4byte MagmaHideout_2F_3R_MapAttributes
+ .4byte MagmaHideout_2F_3R_Layout
.4byte MagmaHideout_2F_3R_MapEvents
.4byte MagmaHideout_2F_3R_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_2F_3R/map.bin b/data/maps/MagmaHideout_2F_3R/map.bin
deleted file mode 100644
index f25017291..000000000
--- a/data/maps/MagmaHideout_2F_3R/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-{tttttttttttttttVttttttttttttttt|r{ttt#ttt#tttttt^ttttttttttr{ttt#ttt#tttttt^tttttttttttttt|rr{tttttttttttt|{tttttt###rr{tttttttttttt|{tttttt###ttt|rr{tttttt#ttt|x¯z{ttttttttrr{tttttt#ttt|x¯z{tttttttttt|rrr{tttttttt|r{tttt#ttrrr{tttttttt|r{tttt#ttt|rrrr{tttttt|xt¯tzr{tt#tttrrrr{tttttt|xt¯tzr{tt#ttt|rrrrr{tttt|xtt¯ttzr{tttt|rrrrr{tttt|xtt¯ttzr{tttt|rrrrrr{tt|xttt¯tttzr{tt|rrrrrr{tt|xttt¯tttzr{tt|rrrrrrr{|xtttt¯ttttzr{|rrrrrrr{|xtttt¯ttttzr{|rrrrrrrrxtttt#¯ttt#tzrrrrrrrrrxtttt#¯ttt#tzrrrrrrrrrxtttttt¯ttt#ttzrrrrrrrrxtttttt¯ttt#ttzrrrrrrrrXYXYrrrrrrrrXYXYrrrrrrrr`a`arrrrrrrr`a`arrrrr1rr rrrrr1rr                           qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqx|pxttttqqqqq{z¢¢¢x|xtz{t \ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_1R/border.bin b/data/maps/MagmaHideout_3F_1R/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_3F_1R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc
index 70ce39e74..228b197eb 100644
--- a/data/maps/MagmaHideout_3F_1R/header.inc
+++ b/data/maps/MagmaHideout_3F_1R/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_3F_1R: @ 848487C
- .4byte MagmaHideout_3F_1R_MapAttributes
+ .4byte MagmaHideout_3F_1R_Layout
.4byte MagmaHideout_3F_1R_MapEvents
.4byte MagmaHideout_3F_1R_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_3F_1R/map.bin b/data/maps/MagmaHideout_3F_1R/map.bin
deleted file mode 100644
index da590f5dd..000000000
--- a/data/maps/MagmaHideout_3F_1R/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqqqqqqqqqq{tttttt|qqqqqq{ttttttttt|qqqr{„…‚ƒ|qqqqqr{-t#tt-t|xtttzrŒ�ˆ‰xtVttt|r*+++++,xt#-tt}~�‘xtt^tt|r12½3½½3+++,r23½3½½½3½34r:;;;;;;;;;<r{t„…t|r{tttt¯ttttttz{Œ�|xtVttt|rrr{ttt¯ttttt-tz}~xtt^tt|rMrrrrrr{t„…‚ƒt|rrMr{ttz{Œ�Š‹|xttttt¯tt|rrrrr{t#z}~�‘x--t#tt¯t|rrrrr1¢¢{GGGGGGGGGG|¢¢rrrrrr¢F3½½½3½½½½½‰¢¢rrrrrr¢¢¤£½3½½3½3½‰¢rr1rrr¢¢¢F½½½3½½½¤¢qrrrrrr¢¢{G½3½½½½½‰¢¢¢rrrrrr¢F½3½½3½½£¤¢¢¢rrrrMr¢¢¤£½3½½½‰¢¢¢¢rrrrrr¢¢¤£££££¤¢¢¢¢~~~~~~ iiiiiiiiiiiii~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_2R/border.bin b/data/maps/MagmaHideout_3F_2R/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_3F_2R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc
index 74266da9c..d070dd32a 100644
--- a/data/maps/MagmaHideout_3F_2R/header.inc
+++ b/data/maps/MagmaHideout_3F_2R/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_3F_2R: @ 8484898
- .4byte MagmaHideout_3F_2R_MapAttributes
+ .4byte MagmaHideout_3F_2R_Layout
.4byte MagmaHideout_3F_2R_MapEvents
.4byte MagmaHideout_3F_2R_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_3F_2R/map.bin b/data/maps/MagmaHideout_3F_2R/map.bin
deleted file mode 100644
index 49857819a..000000000
--- a/data/maps/MagmaHideout_3F_2R/map.bin
+++ /dev/null
@@ -1,7 +0,0 @@
-qqqqq{tttttttttttttt|qqqqqqqqr{’“’“’“”•”•”•|qqqqqqqqrr`a`a`abcbcbcxtt|qqqqrrXYXYZ[7„…|qqqqqrr`a`abcuvq{-ttzr}~qr{‚ƒ‚ƒhijkkknZ[qrˆ‰Š‹pqrsssvbcqrr�‘�‘xyz{{{~Z[qrXY€�mnmnbcqrr`aXYˆ‰uvuv
-7 ~~qr`a�‘}~}~
-7p6q6q6q6qrr
-7~~7q6q6q~~  7
-7p6q6qqqq6q6q6q6r  7
-7~~q6qqqq6qq6q67rq6r 7 
-7p6q6q6q6q6q6q6q67q6q6q6~~~~     ~~q6q6qqq6 \ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_3R/border.bin b/data/maps/MagmaHideout_3F_3R/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_3F_3R/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc
index 5c1cdc9de..24ed48ff5 100644
--- a/data/maps/MagmaHideout_3F_3R/header.inc
+++ b/data/maps/MagmaHideout_3F_3R/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_3F_3R: @ 84848D0
- .4byte MagmaHideout_3F_3R_MapAttributes
+ .4byte MagmaHideout_3F_3R_Layout
.4byte MagmaHideout_3F_3R_MapEvents
.4byte MagmaHideout_3F_3R_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_3F_3R/map.bin b/data/maps/MagmaHideout_3F_3R/map.bin
deleted file mode 100644
index 7c808ffb5..000000000
--- a/data/maps/MagmaHideout_3F_3R/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-{tttttttttttttttVttttttttttttttt|r{tttttttttttttt^tttttttttttttt|rr{tttttttttttt|¢{tttttttttttt|rr{tttttttttt|x¯z{tttttttttt|rr1r{tttttttt|¢¢¢r{tttt#ttt|rr1rr{tttttt|xt¯tzr{tttttt|rrrrr{tttt|¢¢¢¢¢rr{tttt|rrrrrr{#t|xtt¯ttzrr{#t|rrrrrrr{|¢¢¢¢¢¢¢rrr{|rrrrrrrrxttt¯#t#zrrrrrrrrrrrr¢¢¢¢¢¢¢¢{zrrrrMrrrrrrx#ttt¯tttz¢rrrrrrrrrrrx|¢¢¢¢¢¢¢¢rrrrrrrrrrr¢xtttt¯ttt#tzrrrrrrrrrr¢¢¢¢¢¢¢¢¢{ttzrrrrrrrrrxt#tttt¯tttz{G|rrrrrrrrr¢¢¢¢¢¢¢¢¢¢¢F½‰rrrrrrrrr{GGGG|qq{GGG½‰rrrrrrrrrF½½½‰qqF½½½½‰rrrrrrrrr¤½½‰¢¢¤££½½‰rrrrrMrrrF½½‰q¢¢efF½½‰rrrrrrrrr¢~£££¤¢¢œ�F½½‰~~~~~~~~~iiiiii ii~~~~~~~~~~~qqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_4F/border.bin b/data/maps/MagmaHideout_4F/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/MagmaHideout_4F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc
index 441643653..45b5a40e6 100644
--- a/data/maps/MagmaHideout_4F/header.inc
+++ b/data/maps/MagmaHideout_4F/header.inc
@@ -1,5 +1,5 @@
MagmaHideout_4F: @ 84848B4
- .4byte MagmaHideout_4F_MapAttributes
+ .4byte MagmaHideout_4F_Layout
.4byte MagmaHideout_4F_MapEvents
.4byte MagmaHideout_4F_MapScripts
.4byte 0x0
diff --git a/data/maps/MagmaHideout_4F/map.bin b/data/maps/MagmaHideout_4F/map.bin
deleted file mode 100644
index 45a5547c6..000000000
--- a/data/maps/MagmaHideout_4F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqqqqqqq{tttttttt-ttttt|{|ppqqqqpqhiiiiijpppqqq{ttz{ttttttqqqq{ttttz{ttttttt|qq{-|xzppxttt|pqxttt|qrppp{ttz{ttzqqqqqqqqqqr{t„…tz{’“’“|qp{tzqx|qpxt|qqpxtt-t|pqrppxzq{tz{tttttttt{-ttzr{Œ�’“zš›š›x|xz{-t|pqx|qpqqpqqqqqppqrppq{zqqrhiiiiiiir{t‚ƒzr¨©š›¢¢¢¢¢xttz¢¢pxt|x|pqqx--t|qppqrpxttzqq{zpqqqqqqrr{Š‹tz¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢xt||pxttttt|pqpxtzxttttt-zqpqqqqqqqrrr–—¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢pqpxtt|qqqppqxt|q{tttVttt|p{ttttttrrr¢qef¢¢¢¢¢¢h     jq¢¢¢¢x|tt|t|ppqqqpq1{tt^tt|ppr{tttttrrr¢qœ�¢¢¢¢h {-t#| j¢¢¢¢pqqqt|pqpxt|qxtzrppxzrqqqqqrrj¢¢¢¢¢h {t{G|xt|j¢¢¢x„…†‡|px|pqqpqq{zpxttzqq{ttrrqr¢¢qhjqr{G½G|x|j¢¢¢Œ�Ž�ppqpx|qxtttzxttttttzqqMrqr¢¢¢hp{{F½½½3½‰qx|j¢¢¨©–—ppqx|p{-tttttt¯¯ttttttt-ttttrjr¢¢¢ppr{{3½½½3|qpr¢¢¢¢¢¢pxt|pxz{ttttt-¯¯ttttt|qqqhijjrr¢¢¢pp1rqF½½3½½½½|x|j¢¢¢¢¢x|qppqqr{t„…‚ƒ¯¯tttt|pqhqrqrrM¢¢¢ppr1{3½½½½33½|pq  j¢¢x|pxttzr{Œ�Š‹¯¯’“-|ppqhqqr{rr¢¢¢pxzrF½½3½3½½½3½‰ph  j1¢¢¢¢px|q{tzr¨©–—qqš›¢ppphqqqrr{r¢¢¢pqq1F3½½½½3½½½½‰pphjrj¢¢¢x|pr{tz¢¢¢¢¢¢¢¢¢ppppqqqrrrqM¢¢|qrF½½½½½½3½3pppprjr¢¢¢¢ppqrr¢¢¢¢¢¢¢ef¢ppppqqqqrr1qr¢¢¢qtz¤\½3½½½½½‰ppppjrr¢¢¢¢pp{zr¢ef¢¢¢¢¢œ�¢pppxtt|qrrr{¢¢¢q¢¢¢¢¤d½3½½½½‰ppppqrrr¢¢¢¢pxz{z¢œ�¢¢¢¢¢¢¢¢pppqqqpqrrrrmn¢¢¢¢¢¢¢¢F½½½½£¤ppppqrrj¢¢x|qrq¢¢¢¢¢¢¢¢¢h ppqqqpqrrrruv†‡q¢¢¢¢¢¢¤££££¢ppppqrjr¢¢¢¢xtzq¢¢¢h     h pqqqpqrr1r}~Ž�mn¢¢¢¢¢q¢h   qjrr¢¢¢¢¢¢¢h  qqqqqpqpqqqpqr j–—uv¢qmn†‡pqqqqqqqqqqq j¢¢¢q¢pqqqh     qqpqqqpqrqqqqr j}~¢¢quvŽ�pqqqqqqqqqqqqqqrj¢¢¢¢¢pqqqpqqqhiiiiqqpqrqqqq     j}~–—pqqqqqqqqqqqqqqq     qqqpqqqpqqhiiiiiqrqqqqqqqqqq    qqqqqqqqh                qqqpqhqqqqqqqrqqqqqqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqpqxttttttttz \ No newline at end of file
diff --git a/data/maps/MarineCave_End/border.bin b/data/maps/MarineCave_End/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/MarineCave_End/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ññññ \ No newline at end of file
diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc
index 2eda73be9..8e3cf5a5f 100644
--- a/data/maps/MarineCave_End/header.inc
+++ b/data/maps/MarineCave_End/header.inc
@@ -1,5 +1,5 @@
MarineCave_End: @ 8484A04
- .4byte MarineCave_End_MapAttributes
+ .4byte MarineCave_End_Layout
.4byte MarineCave_End_MapEvents
.4byte MarineCave_End_MapScripts
.4byte 0x0
diff --git a/data/maps/MarineCave_End/map.bin b/data/maps/MarineCave_End/map.bin
deleted file mode 100644
index 85138661d..000000000
--- a/data/maps/MarineCave_End/map.bin
+++ /dev/null
@@ -1,14 +0,0 @@
-ññññññññëùùùùùùùùùùùùùùùìññññññññññ ëùùùùùùùùùùùùùì
-ñññññññññë õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2
-
-ñññññññññ ëõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2
-
-ñññññññññ  õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2öõ2õ2
-
-ñññññññññ  õ2õ2õ2õ2õ2õ2õ2ééåæçéé
-ññññññññë õ2õ2õ2õ2õ2õ2õ2
-ññññéééññññññññ ñ õ2õ2õ2õ2õ2õ2õ2
-ññññ
-ññññññëùùùùëõ2õ2õ2õ2õ2õ2õ2
-ññññùìññññ ëùùùùúùùùùìñðññññ ò  "22222222222ðñ
-ññññ ò222222222ðñùìññ ò2222222222222ðñññìñ ò#####"2222222øùìññðñ ò#####"##"22222222ðññðñ ò##"2222ðññðñ ò#"22222ðññðñ ò‰‘�2#"2222øùìðñ ò‰’O��2222ððñ ò‰‘’OOO�‘‘�222222ððñ òŠNOOOOOONˆ222222ððñ òŠNOOOOOONˆ222222ððñ ò‰’NNOOOONNˆ222222ððñ òŠNNNNOONNNˆ222222ððñ ò#2lpNNNNNNpˆ222222ððñ ò2#2lpppppjs2s2222222ððñ ò#"2#2s2s2s2s2s2$222222 ##2ððñ ò2###"2222222222222222ððñ óóóóóóóóóóóóóóóóóóóóóóóóðñóóóóóóóóóóóóóóóóóóóóóóóóóó \ No newline at end of file
diff --git a/data/maps/MarineCave_Entrance/border.bin b/data/maps/MarineCave_Entrance/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/MarineCave_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ññññ \ No newline at end of file
diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc
index a1e97eb95..17212c4f6 100644
--- a/data/maps/MarineCave_Entrance/header.inc
+++ b/data/maps/MarineCave_Entrance/header.inc
@@ -1,5 +1,5 @@
MarineCave_Entrance: @ 84849E8
- .4byte MarineCave_Entrance_MapAttributes
+ .4byte MarineCave_Entrance_Layout
.4byte MarineCave_Entrance_MapEvents
.4byte MarineCave_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/MarineCave_Entrance/map.bin b/data/maps/MarineCave_Entrance/map.bin
deleted file mode 100644
index 62aa8537f..000000000
--- a/data/maps/MarineCave_Entrance/map.bin
+++ /dev/null
@@ -1,7 +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¤¿ppµ�1ðñññëù$1Ž1§1ž1¤¿pppµ�1ùìñ ëù Ž1§1ž1¤¿ppppµ�1 ùì
-ñ $1Ž1§1ž1¤¿pppppµ¥1�1$1
-ñ Ž1§1ž1¤¿ppppppµž1�1$1
-ñ Ÿ1ž1¤¿ppppppp½£¥1�1
-ñ §1ž1·pppppppppµž1�1
-ñ ž1ž1·pppppppppµž1�1
-ñô�§ž1·ppVVVVpppµ¯—óóñññ�§·pV””””Vp˜��ñññññññ��™V””””V˜�ñññññññññññ��������ññññññ \ 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 f8dada766..6e83a33bd 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -1,5 +1,5 @@
MauvilleCity: @ 84824F0
- .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 723d61151..8b7ecd54d 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_BikeShop: @ 8483280
- .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 9ef8ce976..11a71f8c6 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_GameCorner: @ 84832B8
- .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 343a2f01a..aa6430475 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_Gym: @ 8483264
- .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 8860e5651..000000000
--- a/data/maps/MauvilleCity_Gym/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index 1cf42f8cf..db4371175 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_House1: @ 848329C
- .4byte MauvilleCity_House1_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 c1d2da264..4acd48c6d 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_House2: @ 84832D4
- .4byte MauvilleCity_House2_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 c8f5dfb88..3130c2d35 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_Mart: @ 8483328
- .4byte MauvilleCity_Mart_MapAttributes
+ .4byte Mart_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 39a942e6f..5bb682b98 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F: @ 84832F0
- .4byte MauvilleCity_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 c09589b5a..d29063e86 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_2F: @ 848330C
- .4byte MauvilleCity_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 6ec850978..1b1371370 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_1F_1R: @ 8483EC0
- .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 4891475a3..000000000
--- a/data/maps/MeteorFalls_1F_1R/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-4deDDDLDDDDDDDDDDDDDDdeDDDDfg<4lmDDDTDDDDDDfgDDDDDDlmDDDDno<4tu.D/\.DEFGDnoDDDDD/tu.DDDno<42222242DMN2O/vw.DD<22222242vw<42222 242222242€‰‰‰�(<222222422<42‚2ƒ222?2>2>2>2>2?2�ppp’(<222222?222<42Š2‹22422€‰‰‰‰˜ppp’(<222224222<42222?2€˜pppppppp’(<2222242222<4>2>2>2?2�ppppppppp’(=2>2>2>2>2?2222<46666>272yppppppx5262>2>2>2<4deDDDD/»³³³³³³¼.DDfgDDDdeD2D<4lmDDDD/¹¹¹¹¹¹¹¹.DDnoDDDlmD2D<4tu.DDD/¹¹¹¹¹¹¹¹.LDnoDD/tu.2D<42242DD/¹¹¹¹¹¹¹¹.TDnoDD<2‚2ƒ22<42242*D/LLLLLLLL.\.vw.(<2Š2‹222<4>2>2?2*€‰TTTTTTTT‰Z[�22((=2>2>2>2>2<422�ppppppppppXYš‰�(<4>2>2>2?2�pppp8pBqBqBqBqBrB9pp’(<BBBBB<42�pppx(<BBBBB4B`BaòaòaòbB<BBBBBB<42222�ppp’<B4BhBiòiòiòjB=B3}~<42222222222222(<B4B*€q�0(<<4222222222‚2ƒ22(<B4B*�pš�((=>>><42>2>2>2>2>2>222Š2‹22(=B?B*�pp’(01111<4>2?2LDD2Dde<2222272yp’011111<4fgTDD2Dlm=2>2>2?2DLDD/»³¼.DDDDD<4no\)2)2)2)2tu.DDD/DTDD/¹¹¹.DDDDD<4vw)2)2)2)2)2)2)2.DDD/\.D/¹¹¹.DDDDL<4)2)2)2)2)2)2)2)2)2)2)2)2)2)2*DD/¹¹¹.DEFGT<4)2)2)2ŽU2V2W2�)2)2)2)2)2)2**D/¹¹¹.DMN2O\<411ž]^_�1111212**/LLL.<2222<4*)2ŽU2W2U2V2V2W2�)2)2)2)2)2***€TTT�(<222<42ž]_]^^_�112112**�ppp’(<2222<41žŽU2V2V2V2W2U2W2�)2)2)2)**�ppp’(<2‚2ƒ22<41ž]^^^_]_�121112*�ppp’(<2Š2‹22<4*ŽU2W2U2V2V2W2U2V2W2�)2)2)2)2*�ppp’(<2222<4*–]_]^^_]^_•)2‚2ƒ2)22�pPQ’(=222<4*–U2V2V2V2W2U2V2V2W2•)2Š2‹2)2*€˜pXY’0=2>2<4*–]^^^_]^^_�21112�ppppš�0111<4*)2)2)2)2)2)2)2)2)2)2)2)2)2€˜pppppš‰Z[�<42)2)2)2$2)2)2)2)2)2)2)2)26)2�ppppPQppXY’<4XXYHIJY")2)2)2)2)2)26�ppppXYpppp’<6666666666666666666666666666 \ No newline at end of file
diff --git a/data/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 946b15c66..a96c5648e 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_1F_2R: @ 8483EDC
- .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 67ce2b784..000000000
--- a/data/maps/MeteorFalls_1F_2R/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
->>>>>>>>>>>>>>4111111111111<4222222222222(=>>>>?22222222222201111=>>>>>>>>?2>2>2>2>2>2ŽU2V2V2W2U2W2�=>>01111111111212111ž]^^_]_�11=>>>>>11111112>2>2>2>2>2ŽU2W2U2V2V2V2W2�=01111114112111ž]_]^^^_�1111<>>>>?*>2>2>2>2>2ŽU2V2W2U2W2U2V2V2W2�=>>(<4111121211ž]^_]_]^^_�11(<4*11112>2>2>2ŽU2W2U2V2V2W22U2V2V2W2�=((=>4**4111121ž]_]^^_Œ]^^_�(01<4**?222222Œ2U2V2V2W22Œ22222•01(<4**22222Œ22]^^_Œ2U2W2U2V2W2•=>((<4** 22222�ŽU2V2V2W222Œ2]_]^_�1((<4**2222Œ�ž]^^_�…‡Ž2222222(((<4**†††‡
-2222222•<4–2U2W2U2V2V2W2(((<4**>?2222U2V2W2•=?–2]_]^^_(((<4**?22�Ž]^_�ž2222222(((<4**?2222•–2222Œ222222222(((<4**22 222�ž2222222Œ222222(((<4**22222€‰Z[�22222222223††(<4**€‰‰‰‰˜pXYš‰‰�222222(<(<4**�pppppPQpppp’2222 22((3††4**dQppPQXYpppp’222222(((<4**lYPQXYpppppp’222222(((<4**�pXYppppp’6262622223††((<4**�pppppppp’222222(<((<4**�pp’626262626262222222(<3†(<4**�pp’222222222222(<(<34**kzqqzk}Q†††††††††(<(<66†††††††††††††††††††††† \ No newline at end of file
diff --git a/data/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 a138eeb06..11402d3d5 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_B1F_1R: @ 8483EF8
- .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*2222222222�p’(((<4*BBBBBB*€‰‰‰‰‰‰‰‰‰˜p’(((<4*BBBBBB*�ppppppppppp’((=4*BB…R†R‡R
-*�ppppppppppp’((0<4*BB<R4R*�ppppppppppp’0(<4*BB<R R4R*�pppBqBqBqBqBpp’0((<4*BB<RR4R*�px(<B…‡
-*ypš�((<4*BB=R>R?R*�p’(<B=?*�pp’(<4*BB1*�p’(<Bc*�pp’(<4*BBB211�p’(<BBB BB*�pp’(<4*BBB222€˜p’(<BBBBB*�pp’(<4*BBB222�pp’(<BBBBB*�pp’(<4*BBB222�pp’(<BBBB*�pp’(<4*BBB†B†B†BkBzBqBqBzBkBBBB12�pp’(<4*BBBBBBBBBBBBBBB*€‰˜pp’(<4*6R†R†R†R†R†R†R‡R
-BBBBB>BB*�pppp’(<4*RRRRRR4RBBBBB12�pppp’(<4R RRRRR>R?RBBBBB*€‰˜pppp’(<4RRR4RBBBBB*�pppppp’(<4RRRR4RBBBBBBB*�pppppp’(<4RRRR4RBBBBBBB2�pppppxk(<6††††††††††‡
-B*€˜ppppx(<(<R4
-*�ppppp’(<(<R4*�ppppp’(<…(<R4*�ppppp’(<…R4*�ppppp’(<<R4*�ppppp’(<<R4*�ppppp’(<<R4*2222222<<R4*222222<<R4*222222<<R†66†††}~††††† \ No newline at end of file
diff --git a/data/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 2d3f50932..81c6276d2 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_B1F_2R: @ 8483F14
- .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/MeteorFalls_StevensCave/border.bin b/data/maps/MeteorFalls_StevensCave/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MeteorFalls_StevensCave/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc
index d5415ea46..22b3aaeb6 100644
--- a/data/maps/MeteorFalls_StevensCave/header.inc
+++ b/data/maps/MeteorFalls_StevensCave/header.inc
@@ -1,5 +1,5 @@
MeteorFalls_StevensCave: @ 8484A74
- .4byte MeteorFalls_StevensCave_MapAttributes
+ .4byte MeteorFalls_StevensCave_Layout
.4byte MeteorFalls_StevensCave_MapEvents
.4byte MeteorFalls_StevensCave_MapScripts
.4byte 0x0
diff --git a/data/maps/MeteorFalls_StevensCave/map.bin b/data/maps/MeteorFalls_StevensCave/map.bin
deleted file mode 100644
index e509d66c2..000000000
--- a/data/maps/MeteorFalls_StevensCave/map.bin
+++ /dev/null
@@ -1,21 +0,0 @@
-               "11111     
-             "111((   
-(  "1111111121((((666(61111111122((((�1112(61111111122(((�111112(61111111122((�111116(61111111122(�11111(6(6222Œ222222011111((6(6Œ22Œ22Œ222222222(((6(62222Œ222         (6(622Œ2222(       
-(6(�1ž2222222((�1111111ž(6(�111ž      
-22(�111111!!6�11111ž     "
-2�1
-1(( 
-111111ž� 
-222((Œ((((6111111((6 
-22((2((((61111(((6622((2((((6*2222(((�1ž622(�ž–2((((6*2222(((612622�11ž2((((6*2ŒŒ2(((612ž2Œ22222((((6*2Œ22(((*1ž222ŒŒ222((((6   
-222(((6**22222Œ22    (6 
-
-Œ2((�ž**2222Œ22(6   6(6**
-2(�ž222222((6(  
-(6***2�ž222   ((6((
-(6***222222222Œ2(66  6((((6** 
-2222Œ22ŒŒ2(6(666((((6**6  
-22222222(((   (((6*   
-*222Œ2   ((((6  ((6*   
-**22222(   (((6(66�ž(6   
-* HIJ   (666(((6�ž�ž               �ž \ No newline at end of file
diff --git a/data/maps/MirageTower_1F/border.bin b/data/maps/MirageTower_1F/border.bin
deleted file mode 100644
index 58596f99a..000000000
--- a/data/maps/MirageTower_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc
index 27611506e..cd0717add 100644
--- a/data/maps/MirageTower_1F/header.inc
+++ b/data/maps/MirageTower_1F/header.inc
@@ -1,5 +1,5 @@
MirageTower_1F: @ 8484908
- .4byte MirageTower_1F_MapAttributes
+ .4byte MirageTower_1F_Layout
.4byte MirageTower_1F_MapEvents
.4byte MirageTower_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/MirageTower_1F/map.bin b/data/maps/MirageTower_1F/map.bin
deleted file mode 100644
index b77d14890..000000000
--- a/data/maps/MirageTower_1F/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-EE  EEEEEE22˜2™2™2™2™2™2™2š2222˜2™2¡2¡2©2©2©2©2©2¡2š22222 2¡2¡2p     q¢2˜2š2222 2¡2p 22222 q™2¡2¡2š222¨2p2222222q¡2¡2¢22222222222 2¡2¢22222222222 2¡2¢2˜2™2š22222222 2¡2¢2¨2¡2¢222222 2¡2¢22¨2¡2hi¡2¡2ª2š22 2¡2hi¡2¡2¢2  
-¨2©2¡2š22222˜2™2¡2¡2¡2p    
-22¨2ª22<2¨2©2©2©2ª2   E      XY       EE                 E \ No newline at end of file
diff --git a/data/maps/MirageTower_2F/border.bin b/data/maps/MirageTower_2F/border.bin
deleted file mode 100644
index 58596f99a..000000000
--- a/data/maps/MirageTower_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc
index f512754e7..e449c3a37 100644
--- a/data/maps/MirageTower_2F/header.inc
+++ b/data/maps/MirageTower_2F/header.inc
@@ -1,5 +1,5 @@
MirageTower_2F: @ 8484924
- .4byte MirageTower_2F_MapAttributes
+ .4byte MirageTower_2F_Layout
.4byte MirageTower_2F_MapEvents
.4byte MirageTower_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/MirageTower_2F/map.bin b/data/maps/MirageTower_2F/map.bin
deleted file mode 100644
index 79c3056a9..000000000
--- a/data/maps/MirageTower_2F/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-EE  EEEEEE222˜2™2™2™2™2™2š22?2222˜2¡2©2©2©2©2©2¡2š222/2/22˜2¡2p     q¢2222/2/2˜2¡2p 22222 q™2š222/2/2¨2p2222222qª222/2/222222222222/2222222222/2˜2222222222/2˜2¢222222222¨2¡2hiš2222 2¡2hi©2ª222  
-¨2©2ª2222222¨2ª222    
-2222222222222   E2               2EE2                 2E \ No newline at end of file
diff --git a/data/maps/MirageTower_3F/border.bin b/data/maps/MirageTower_3F/border.bin
deleted file mode 100644
index 58596f99a..000000000
--- a/data/maps/MirageTower_3F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc
index bdd93292e..def0a15c9 100644
--- a/data/maps/MirageTower_3F/header.inc
+++ b/data/maps/MirageTower_3F/header.inc
@@ -1,5 +1,5 @@
MirageTower_3F: @ 8484940
- .4byte MirageTower_3F_MapAttributes
+ .4byte MirageTower_3F_Layout
.4byte MirageTower_3F_MapEvents
.4byte MirageTower_3F_MapScripts
.4byte 0x0
diff --git a/data/maps/MirageTower_3F/map.bin b/data/maps/MirageTower_3F/map.bin
deleted file mode 100644
index 376ac2836..000000000
--- a/data/maps/MirageTower_3F/map.bin
+++ /dev/null
@@ -1,6 +0,0 @@
-EE  EEEEEE˜2™2™2™2™2™2š2222˜2™2š2¨2©2©2©2©2©2ª2222 2¡2ª222222     
-¨2ª22222222 22222 
-22222222222
-/222˜2š22222222/22/2¡2¢222222222˜2š2˜2¡2¢22222222˜2¡2¢2¨2¡2¢222222¨2©2ª22 2¢22222¨2ª222222  
-222˜2™2™2™2™2™2™2™2š22    
-222¨2©2©2©2©2©2©2©2ª22   E2               2EE2                 2E \ No newline at end of file
diff --git a/data/maps/MirageTower_4F/border.bin b/data/maps/MirageTower_4F/border.bin
deleted file mode 100644
index 58596f99a..000000000
--- a/data/maps/MirageTower_4F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc
index ff38fd9ca..7c1351ea6 100644
--- a/data/maps/MirageTower_4F/header.inc
+++ b/data/maps/MirageTower_4F/header.inc
@@ -1,5 +1,5 @@
MirageTower_4F: @ 848495C
- .4byte MirageTower_4F_MapAttributes
+ .4byte MirageTower_4F_Layout
.4byte MirageTower_4F_MapEvents
.4byte MirageTower_4F_MapScripts
.4byte 0x0
diff --git a/data/maps/MirageTower_4F/map.bin b/data/maps/MirageTower_4F/map.bin
deleted file mode 100644
index 283534fb7..000000000
--- a/data/maps/MirageTower_4F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-EE EE2˜2™2™2™2™2š22  B B B B Bqš222˜2˜B™B™B™BšB¡2š22 2 B¡B¡B¡B¢B¡2ª22¨2¨B©B©B©BªB¢2222iª222222˜2™2¡2¢222  
-˜2™2™2¡2¡2¡2¢2   E         E \ 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 c21d4f7f9..fc5af866a 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -1,5 +1,5 @@
MossdeepCity: @ 8482560
- .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 bf150f5bb..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 7e2adace8..9b886677e 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_GameCorner_1F: @ 84839F0
- .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 8be990dde..000000000
--- a/data/maps/MossdeepCity_GameCorner_1F/map.bin
+++ /dev/null
@@ -1,53 +0,0 @@
-)2(2  12  22*22022 2
-2"#$2%&'
-2
-2
-2 2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2 2
-222
-2
-2
-222
-2
-2
-2 22
-2
-2
-22
-2
-2 22 !
-2
-2
-2 !2
-2
-2 2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2
-2 2
-2
-2
-2
-2-2.2
-2
-2
-2
-2
-2 \ No newline at end of file
diff --git a/data/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 6b4a75713..623b5f970 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_GameCorner_B1F: @ 8483A0C
- .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$2˜692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#2#2‘2#2#2#2#2#2#2#2#2#2#2"2™#2#2#2#2#2#2#2#2#2#2* \ No newline at end of file
diff --git a/data/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 1bb806541..321271f78 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_Gym: @ 84838BC
- .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 da585f73f..000000000
--- a/data/maps/MossdeepCity_Gym/map.bin
+++ /dev/null
@@ -1,40 +0,0 @@
-666666666666666666666666666666626666666666666666666 66666666666666666 66666666666666666$ 666666666666666 
-q2r2
-q2r266666666 6666 
-p2s2t2 p2s266666666()6666 \2
- 666666666 6666 
-Y2Z2Y2Z2666666666  !"#666666X2[2
-X2[2
-666666666 
-
-
-
-66666666]2666666666666666666666666 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666266
-66666666666666Q2R2
-66666666666 6T2P2S266666666666666m26 
-
-
-
-66666666666666i2j2i2j26266666666666666666h2k2
-h2k266666666666666666666
-l2
-66666666666666666666666i2j2
-$6666666666666666666h2k2
-66 6666666666666666 
-6666666666666666666Q2R2Q2R26666666666666 66P2S2T2P2S2% 666666666 66 
-
-
-
-$666666666 6
-
-
-
-$6666626 
-
-
-
-6a2b26666666  
-
- 6`2c2
-6d26666666 $00$62
-6666666666666 \ No newline at end of file
diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 5260cf931..64dedcba6 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House1: @ 84838D8
- .4byte MossdeepCity_House1_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 1d0463231..b3cf19738 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House2: @ 84838F4
- .4byte MossdeepCity_House2_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 d474eab75..d54538b4e 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House3: @ 8483964
- .4byte MossdeepCity_House3_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 30fe8c01a..33acf2e51 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_House4: @ 848399C
- .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 d745cc8f4..586c976e7 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_Mart: @ 8483948
- .4byte MossdeepCity_Mart_MapAttributes
+ .4byte Mart_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 0b9faca99..5ee83f3ce 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_PokemonCenter_1F: @ 8483910
- .4byte MossdeepCity_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 45e4f0881..a6659fafb 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_PokemonCenter_2F: @ 848392C
- .4byte MossdeepCity_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 b503f8580..abfb64ee8 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_SpaceCenter_1F: @ 84839B8
- .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 388482c64..3a7fce680 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_SpaceCenter_2F: @ 84839D4
- .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 179ebd36e..83a907bda 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -1,5 +1,5 @@
MossdeepCity_StevensHouse: @ 8483980
- .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     ii–2—2p2$2$2$2$2$2$2q2q292#2#2#2è6é6é6ê6#2#2[392#2#2#2ð6ñ6Ñ6ò6#2#2c792#2#2#2#2#2,2#2#2#2[392#2#2#2#2#2#2#2#2#2c792#2#2 #2#2#2#2#2#2 \ No newline at end of file
diff --git a/data/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 885541dde..bbdfaeb44 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -1,5 +1,5 @@
MtChimney: @ 8484010
- .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 1e7e2868d..000000000
--- a/data/maps/MtChimney/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-h~qpqqpqpqrrrq2r‰x|q2{z½‰ppppqrrqqqrqqpqqpqqpqpqrrr{z½|xtz{½~6ppppqrrqqqrqqpqh~qqph~qrrrr{½yyy½‰qppppqrrqqqrq{pqpqqqppqqrrrr½½½½½½½‰h~pppqrrqq{zqrpqpqqqppqqrrrr½½½½½½½½‰ph~pxtzrqqrqqrpqpqqqppq{zrrrU½½½½½½½½~pph~2q2q2q2rqqrqqrpqpqqqpxtzq22227½½½½½½½‰qpppq2q2q2q2rq{zqqrpqpqqqpq2q2q2q2q2q2q2q2½½½½½½½‰h~ppq2q2q2q2rqrqq{zpqpqqqpq2q2q2q2{ttt½½½½½‰pqppq2q2q2q2rqrqqrqpqx|qqpq2q2q2q2rrr½½½½½½~~h~pq2q2q2{zqrq{zqx|qpqqphijq2rr£½½½£pqh~h~2q2q2q2rq{zqrqqqpqx|qppqrq222jqqr££££~h~qph~2q2q2q2q2rqrqqrq{qpqqpqpxtzq2q2q22i2jiiiii~qh~6pq2q2q2q2q2rqrqqrqr|x|qx|x|q2q2q2q2hijriijqqhii~6q6pq2q2q2q2q2rqrqqr{zpqpqqpqx|q2q2q2pqr2i2jii~hi2i2i2~2q2q2q2q2q2rqrq{zr{x|x|qpqqpq2q2q2xtzq2q22i2i2i2i2~2q2q2q2q2q2q2q2q2q2r{zqr{zrqpqpqx|qpq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zrq{zr{z|pqpqqpqx|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6rqrqrrqppqx|qpqqxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6r{z{zr{px|qx|xttt|pq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6rrqrqrrpqx|qxttt|pxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6q6rrqr{zrpqqxt|qqqppq6q6x|q2q2q2q2q2q2q2q2q2q2q2q2q2{z{ttzrqrrqrxtt|qxt|qpxt|q2xt|q2q2{ttttt¯2ttz{z{ttz{zrqrqqqxt|qpqxt|xtt|xttzq2q2q2q2q2q2{ttz{z{ttz{zqrttt|qx|xt|qxt|q6x|q2q2{¯2tttttzq2q2{z{z{ttz{tztt|pqqxt|x|qqxt|xttzq2q2q2q2q2q2q2q2q2r{z{z{ttzqqqqpx|qqqpqxtt|qxt|q2q2q2q2q2q2q2q2q2{tzrq2rq2rqqq2{tqqpqxt|qÅ|qqqx|qqx|q2q2q2{ttt¯2z{tz{Ç{zqq{Çqqqx|qÄ2pqÌ6pqqqqxtt|xtttzq2q2q2q2{zq2q2rÌ6r{ttzÍqqqqx|ÍÅt|xttttt|qxtttttttt¯2zq2q2q2rqrrqÄ2q2Ì6Ä2qqqqpÌ6Ì6qpqqqqqqxtttttt|q2q2q2q2q2q2q2q2r{ÇrqÌ6qqÌ6qqqqxtt|pqq2qqŽ––––––––pq2q2q2q2q2{ttzrÌ6rÄ2Ä2{tt|qqqqqqppqq2qq�q2&2'2!2!2"2q2q2xttt¯2tzq2q2q2r{zÍÌ6rÄ2qxtt|qqqppqÄ2Ä2q�&2.6/))*Z2Z2Z2Z2Z2Z2Z2Z2T2S2q2{zrÄ2Ì6{zÍÄ2tt|pqqqppqÌ6Íq�-67112q2q2q2q2q2q2q2q2\2[2R2Qq2rÌ6{zÄ2Ì6Ì6qqpxt|Ä2pxt|Ì6Ä2�->?9:%q2q2q2q2q2q2q2q2d6q2q2YRQqrqÌ6{Æ|qxt|pÍÅt|Å|Í�5FGABWq2q2q2q2q2q2q2q2q2q2q2rqYRQq{zÌ6pqÄ2qppÌ6Ì6qpÍpÍ�Ä2Ä2q2q2q2q2q2q2q2q24q2q2q2Ä2Ä2q2rqrqYRQ{tpÄ2ÍÄ2pxt|qpÌ6pÌ6�Ì6Ì6q2q2q2q2q2q2q2q2q2q2q2q2Ì6Ì6{z{ÇÄ2rqYPapÌ6Ì6ÍÅt|pÄ2x|pq“––––‡q2q2q2q2…–––––{z{ÇÍÌ6rÄ2rrYxÆ|Ì6Ì6qppÍqpÅÆtÆ|q2q2“q2q2q2q2”q2q2q2q2{z{zÌ6Ì6{zÍrrrqÍÅt|qppÌ6qpÌ6Ì6qÍÅtÆ6ÆÆ22ÆÆÆ6ttÆz{zÄ2q2q2rq2Ì6rrrqÌ6Ì6qpÄ2px|Ä2ÅÆÆ|Ì6ÍÄ2ÍÍÍ77ÍÍÍÄ2Ä2Í6{zq2Ì6{Æzq2{zrrtt|qpÍx|pÌ6Ì6Ì6ÍÅ|ÍÍÍÍÍ77ÍÍÍÍÍÌ6rq2q2{zÍÄ2q2rq2rrÄ2Ä2pÄ2pÍqpÅtÆ|ÍÍpÍÍÍÍÍÍÍÍÍÍÍÍ{zÄ2Ä2rq2ÍÍq2rÄ2rrÍÍpÍpÍÄ2pÌ6qÌ6pÌ6ÍpÌ6ÍÍÍÍÍÍÍÍÍÍÍrÄ2ÍÍrÄ2Ì6Ì6Ä2rÍrrÍÍpÍpÌ6Íxtt|x|Íx|Ì6ÍÍÍÍÍÍÍÍÍÍrÍÍÌ6rÍÄ2Ä2ÍrÍrr \ No newline at end of file
diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index e3f29070f..efd224564 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -1,5 +1,5 @@
MtChimney_CableCarStation: @ 8483DFC
- .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 519211b49..17b7673c7 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -1,5 +1,5 @@
MtPyre_1F: @ 8484064
- .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 @@
-ï³´µïïäïïäïïä÷»¼2½÷÷ì÷÷ì÷÷ìç2è2ç2é2&7&7ç2ç2ç2ç2ç2ç2ç2ïäïïäç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6÷ì÷÷ì'7ç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6ç2ç2ç2ç2ç2ç2ç2æ2æ2æ2î6î6æ2æ2æ2æ2æ2æ2æ222æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2î6î6î6æ2î6î6&7î6æ2æ2æ2æ2æ2î6î6î6æ2î6î6&7î6æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6ç2æ2ç2æ2ç2æ2ç2æ2ç2æ222 \ No newline at end of file
diff --git a/data/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 6eb960c01..d4a35c4c6 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,5 +1,5 @@
MtPyre_2F: @ 8484080
- .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 97b7e9e31..000000000
--- a/data/maps/MtPyre_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-äÃÄÅïäïäï³´µäìËÌ2Í÷ì÷ì÷»¼2½ìç2è2ç2é2ç2ç2&&ç2è2ç2é2&ç2æ2æ2æ2æ2æ2æ2îæ2æ2æ2æ2î&îæ2æ2æ2æ2îæ2îîæ2æ2æ2&îæ2æ2æ2æ2îæ2îæ2æ2æ2æ2ç2æ2îæ2æ2æ2æ2æ2æ2æ2îîæ2ç2æ2îæ2æ2æ2æ2æ2æ2æ2îîæ2&îîîîîæ2æ2îîæ2æ2î&æ2æ2æ2îîæ2æ2îîæ2ò3îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îæ2æ2îîæ2æ2îîæ2îî&îæ2æ2îîæ2æ2îîæ2îî \ No newline at end of file
diff --git a/data/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 9dcd40578..8bf9f015a 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,5 +1,5 @@
MtPyre_3F: @ 848409C
- .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 758eccc3a..000000000
--- a/data/maps/MtPyre_3F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ä³´µïäïäïÃÄÅä컼2½÷ì÷ì÷ËÌ2Íì&è2ç2é2ç2&&&ç2è2ç2é2&&æ2æ2æ2îîîîîæ2æ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&æ2æ2æ2æ2æ2îæ2æ2æ2æ2æ2î&æ2æ2îîîîîîîæ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îîîîîîîîîæ2æ2æ2&îîîîîîîîîæ2æ2æ2ç2æ2æ2æ2æ2æ2æ2îîæ2æ2æ2æ2ç2æ2æ2îîæ2æ2îîæ2æ2îîç2æ2æ2îîæ2ò3îîæ2ò3îî \ 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 c94284c2f..9360976d4 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,5 +1,5 @@
MtPyre_4F: @ 84840B8
- .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½ëïïïïïï&&è2ç2é2&÷÷÷÷÷÷'&îæ2æ2æ2îïÃÄÅïïïïêÞ2Ï0Ï0ä÷ËÌ2Í÷÷÷÷ëÞ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í6æ2æ2îîîò3æ2æ2æ2&æ2æ2æ2æ2æ2îîîîîîî&æ2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2 \ No newline at end of file
diff --git a/data/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 efabc0917..193120ca8 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,5 +1,5 @@
MtPyre_5F: @ 84840D4
- .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½÷ë&è2ç2é2&ç2ïïïïïï&æ2æ2æ2îæ2÷÷÷÷÷÷ïêÞ2äïïïïïÃÄÅï÷ëÞ2ì÷÷÷÷÷ËÌ2Í÷&ç2ç2ç2&&&&&è2ç2é2&&æ2æ2æ2îæ2æ2æ2îæ2æ2æ2îç2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îæ2æ2æ2îîîæ2æ2æ2îîç2æ2îîîæ2í6æ2îîîæ2ò3&æ2æ2îæ2æ2æ2æ2æ2îæ2æ2î&æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ò3 \ No newline at end of file
diff --git a/data/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 f6931369b..3c390f962 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,5 +1,5 @@
MtPyre_6F: @ 84840F0
- .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 1f7438bfb..000000000
--- a/data/maps/MtPyre_6F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-êÃÄÅäïïïïïïïïëËÌ2Íì÷÷÷÷÷÷÷÷&è2ç2é2&&ç2ç2ç2ç2ç2ç2&ç2æ2æ2æ2îæ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îîæ2æ2æ2î6æ2æ2æ2æ2&æ2æ2æ2æ2æ2æ2î6î6æ2æ2æ2îïïïïïïïïïêÞ2äï÷÷÷÷÷÷÷÷÷ëÞ2ì÷&ç2ç2&&ç2×7ç2&&ç2ç2&ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2ç2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2&æ2æ2îîæ2æ2æ2îîæ2æ2î \ No newline at end of file
diff --git a/data/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 7d9df6a8e..013d84e84 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -1,5 +1,5 @@
MtPyre_Exterior: @ 848410C
- .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 ffdb8fb8a..55f9d512b 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -1,5 +1,5 @@
MtPyre_Summit: @ 8484128
- .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/NavelRock_B1F/border.bin b/data/maps/NavelRock_B1F/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/NavelRock_B1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc
index 8570628b2..9a9b308de 100644
--- a/data/maps/NavelRock_B1F/header.inc
+++ b/data/maps/NavelRock_B1F/header.inc
@@ -1,5 +1,5 @@
NavelRock_B1F: @ 84858C8
- .4byte NavelRock_B1F_MapAttributes
+ .4byte NavelRock_B1F_Layout
.4byte NavelRock_B1F_MapEvents
.4byte NavelRock_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_B1F/map.bin b/data/maps/NavelRock_B1F/map.bin
deleted file mode 100644
index 861fb6575..000000000
--- a/data/maps/NavelRock_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222?22GGGGGGGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Bottom/border.bin b/data/maps/NavelRock_Bottom/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/NavelRock_Bottom/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc
index e40c64d91..84d942a9e 100644
--- a/data/maps/NavelRock_Bottom/header.inc
+++ b/data/maps/NavelRock_Bottom/header.inc
@@ -1,5 +1,5 @@
NavelRock_Bottom: @ 8485AC0
- .4byte NavelRock_Bottom_MapAttributes
+ .4byte NavelRock_Bottom_Layout
.4byte NavelRock_Bottom_MapEvents
.4byte NavelRock_Bottom_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Bottom/map.bin b/data/maps/NavelRock_Bottom/map.bin
deleted file mode 100644
index af2f8a245..000000000
--- a/data/maps/NavelRock_Bottom/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-r¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeŠGGGˆcc¸  pr¢¢ºeeeF���Gcc¸  pr¢¢ºeFF]ddd[GG¸  pr¢¢ºedde]d[cdd¸  pr¢¢ºeddee{ccdd¸  pr¢¢ºeddeFdGcdd¸  pr¢¢ºedde=ddcdd¸  pr¢¢ºeslmdddkƒt¸  pr¢¢ºee=ddddd‹c¸  pr¢¢ºeed=dddd>c¸  pGGGGGGGGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc
index af66bb9bc..4f8237761 100644
--- a/data/maps/NavelRock_Down01/header.inc
+++ b/data/maps/NavelRock_Down01/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down01: @ 848598C
- .4byte NavelRock_Down01_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Down01_MapEvents
.4byte NavelRock_Down01_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc
index 8b70d543f..027de3f91 100644
--- a/data/maps/NavelRock_Down02/header.inc
+++ b/data/maps/NavelRock_Down02/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down02: @ 84859A8
- .4byte NavelRock_Down02_MapAttributes
+ .4byte NavelRock_LadderRoom2_Layout
.4byte NavelRock_Down02_MapEvents
.4byte NavelRock_Down02_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc
index 78d1e1db3..41ae68722 100644
--- a/data/maps/NavelRock_Down03/header.inc
+++ b/data/maps/NavelRock_Down03/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down03: @ 84859C4
- .4byte NavelRock_Down03_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Down03_MapEvents
.4byte NavelRock_Down03_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc
index ea459e2ff..a45886c16 100644
--- a/data/maps/NavelRock_Down04/header.inc
+++ b/data/maps/NavelRock_Down04/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down04: @ 84859E0
- .4byte NavelRock_Down04_MapAttributes
+ .4byte NavelRock_LadderRoom2_Layout
.4byte NavelRock_Down04_MapEvents
.4byte NavelRock_Down04_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc
index ddb4d997f..2ab0c76ba 100644
--- a/data/maps/NavelRock_Down05/header.inc
+++ b/data/maps/NavelRock_Down05/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down05: @ 84859FC
- .4byte NavelRock_Down05_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Down05_MapEvents
.4byte NavelRock_Down05_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc
index 256d2d1c1..d8a17e85f 100644
--- a/data/maps/NavelRock_Down06/header.inc
+++ b/data/maps/NavelRock_Down06/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down06: @ 8485A18
- .4byte NavelRock_Down06_MapAttributes
+ .4byte NavelRock_LadderRoom2_Layout
.4byte NavelRock_Down06_MapEvents
.4byte NavelRock_Down06_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc
index d49181bc4..0a77e6406 100644
--- a/data/maps/NavelRock_Down07/header.inc
+++ b/data/maps/NavelRock_Down07/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down07: @ 8485A34
- .4byte NavelRock_Down07_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Down07_MapEvents
.4byte NavelRock_Down07_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc
index db1c426c2..a3cbed38a 100644
--- a/data/maps/NavelRock_Down08/header.inc
+++ b/data/maps/NavelRock_Down08/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down08: @ 8485A50
- .4byte NavelRock_Down08_MapAttributes
+ .4byte NavelRock_LadderRoom2_Layout
.4byte NavelRock_Down08_MapEvents
.4byte NavelRock_Down08_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc
index 6f53a936f..6aed92500 100644
--- a/data/maps/NavelRock_Down09/header.inc
+++ b/data/maps/NavelRock_Down09/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down09: @ 8485A6C
- .4byte NavelRock_Down09_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Down09_MapEvents
.4byte NavelRock_Down09_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc
index f3945194a..bb96b7e3d 100644
--- a/data/maps/NavelRock_Down10/header.inc
+++ b/data/maps/NavelRock_Down10/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down10: @ 8485A88
- .4byte NavelRock_Down10_MapAttributes
+ .4byte NavelRock_LadderRoom2_Layout
.4byte NavelRock_Down10_MapEvents
.4byte NavelRock_Down10_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc
index d02b578a1..48ed319eb 100644
--- a/data/maps/NavelRock_Down11/header.inc
+++ b/data/maps/NavelRock_Down11/header.inc
@@ -1,5 +1,5 @@
NavelRock_Down11: @ 8485AA4
- .4byte NavelRock_Down11_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Down11_MapEvents
.4byte NavelRock_Down11_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Entrance/border.bin b/data/maps/NavelRock_Entrance/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/NavelRock_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc
index 521af14c7..cc8d2446b 100644
--- a/data/maps/NavelRock_Entrance/header.inc
+++ b/data/maps/NavelRock_Entrance/header.inc
@@ -1,5 +1,5 @@
NavelRock_Entrance: @ 84858AC
- .4byte NavelRock_Entrance_MapAttributes
+ .4byte NavelRock_Entrance_Layout
.4byte NavelRock_Entrance_MapEvents
.4byte NavelRock_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Entrance/map.bin b/data/maps/NavelRock_Entrance/map.bin
deleted file mode 100644
index 6fd5b9fa0..000000000
--- a/data/maps/NavelRock_Entrance/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-22222222222222222222222222222222222?2222222222222222222222222222222222222222222222222222222222222222222ÜGGGGÒ2222222ÐGGGGGÒ2222ÕÐ222222222222222222222222222222Ù2222Õ22222222222222Õ222222222222222222222222GGXYZGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Exterior/border.bin b/data/maps/NavelRock_Exterior/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/NavelRock_Exterior/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc
index 5d74b9eab..a01250cab 100644
--- a/data/maps/NavelRock_Exterior/header.inc
+++ b/data/maps/NavelRock_Exterior/header.inc
@@ -1,5 +1,5 @@
NavelRock_Exterior: @ 8485874
- .4byte NavelRock_Exterior_MapAttributes
+ .4byte NavelRock_Exterior_Layout
.4byte NavelRock_Exterior_MapEvents
.4byte NavelRock_Exterior_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Exterior/map.bin b/data/maps/NavelRock_Exterior/map.bin
deleted file mode 100644
index 9b3342a1a..000000000
--- a/data/maps/NavelRock_Exterior/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/NavelRock_Fork/border.bin b/data/maps/NavelRock_Fork/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/NavelRock_Fork/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc
index 94740f43b..a6dab9d20 100644
--- a/data/maps/NavelRock_Fork/header.inc
+++ b/data/maps/NavelRock_Fork/header.inc
@@ -1,5 +1,5 @@
NavelRock_Fork: @ 84858E4
- .4byte NavelRock_Fork_MapAttributes
+ .4byte NavelRock_Fork_Layout
.4byte NavelRock_Fork_MapEvents
.4byte NavelRock_Fork_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Fork/map.bin b/data/maps/NavelRock_Fork/map.bin
deleted file mode 100644
index 0b314cc16..000000000
--- a/data/maps/NavelRock_Fork/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-2222222222222222222?22222222222222222222222222222222222222222222GGGGGGGGGGÒ222ÐGGGGGGGGGG2222222222222222222222222222222222222222222222222222222222222222222ÐGGGGGGGGGG22Ð222222222222222222222222222GGGGGGGGGGÒ22Ò2222222222222222222222222222Óáâ2àáÔÓâ2àáÔ2222222222222222222222222GGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc
index 644442986..c7243f452 100644
--- a/data/maps/NavelRock_Harbor/header.inc
+++ b/data/maps/NavelRock_Harbor/header.inc
@@ -1,5 +1,5 @@
NavelRock_Harbor: @ 8485890
- .4byte NavelRock_Harbor_MapAttributes
+ .4byte IslandHarbor_Layout
.4byte NavelRock_Harbor_MapEvents
.4byte NavelRock_Harbor_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Top/border.bin b/data/maps/NavelRock_Top/border.bin
deleted file mode 100644
index 8d839d092..000000000
--- a/data/maps/NavelRock_Top/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-<<<< \ No newline at end of file
diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc
index f6e72236f..4d1535615 100644
--- a/data/maps/NavelRock_Top/header.inc
+++ b/data/maps/NavelRock_Top/header.inc
@@ -1,5 +1,5 @@
NavelRock_Top: @ 8485970
- .4byte NavelRock_Top_MapAttributes
+ .4byte NavelRock_Top_Layout
.4byte NavelRock_Top_MapEvents
.4byte NavelRock_Top_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Top/map.bin b/data/maps/NavelRock_Top/map.bin
deleted file mode 100644
index fce085ae6..000000000
--- a/data/maps/NavelRock_Top/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<PQ3R<<<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X22222Z<<<<<<<<<<<<<<<<CDp22222rDE<<<<<<<<<<<<CDFLp22222rLGDE<<<<<<<<<CF[\\p22222r\\]GE<<<<<<<CFLcLLp222?22rLLeLGE<<<<<CFL[FLLp22222rLLG]LGE<<DDFL[FLLL“”LLLG]LGDD\\\\F[\\\›œ\\]LG\\\\LL[\\FLLL£ÁÁÁÁÁ¤LLGG]LLLLL[FLLLL[\«lllll¬\]LLG]LLLFFLLLL[FL«lllll¬LG]LLG\\\LLLL[\FLL«lllll¬LLGG]LLLL \ No newline at end of file
diff --git a/data/maps/NavelRock_Up1/border.bin b/data/maps/NavelRock_Up1/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/NavelRock_Up1/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc
index d9a51ab0f..c7484c59f 100644
--- a/data/maps/NavelRock_Up1/header.inc
+++ b/data/maps/NavelRock_Up1/header.inc
@@ -1,5 +1,5 @@
NavelRock_Up1: @ 8485900
- .4byte NavelRock_Up1_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Up1_MapEvents
.4byte NavelRock_Up1_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Up1/map.bin b/data/maps/NavelRock_Up1/map.bin
deleted file mode 100644
index c2951c043..000000000
--- a/data/maps/NavelRock_Up1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-22222222?2GGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Up2/border.bin b/data/maps/NavelRock_Up2/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/NavelRock_Up2/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc
index 94d42c6c4..824ef267d 100644
--- a/data/maps/NavelRock_Up2/header.inc
+++ b/data/maps/NavelRock_Up2/header.inc
@@ -1,5 +1,5 @@
NavelRock_Up2: @ 848591C
- .4byte NavelRock_Up2_MapAttributes
+ .4byte NavelRock_LadderRoom2_Layout
.4byte NavelRock_Up2_MapEvents
.4byte NavelRock_Up2_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Up2/map.bin b/data/maps/NavelRock_Up2/map.bin
deleted file mode 100644
index 47dd37b93..000000000
--- a/data/maps/NavelRock_Up2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-?22V22^22fGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc
index 2a57b2444..7782ca0f4 100644
--- a/data/maps/NavelRock_Up3/header.inc
+++ b/data/maps/NavelRock_Up3/header.inc
@@ -1,5 +1,5 @@
NavelRock_Up3: @ 8485938
- .4byte NavelRock_Up3_MapAttributes
+ .4byte NavelRock_LadderRoom1_Layout
.4byte NavelRock_Up3_MapEvents
.4byte NavelRock_Up3_MapScripts
.4byte 0x0
diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc
index 17e8ae965..c022d9d0b 100644
--- a/data/maps/NavelRock_Up4/header.inc
+++ b/data/maps/NavelRock_Up4/header.inc
@@ -1,5 +1,5 @@
NavelRock_Up4: @ 8485954
- .4byte NavelRock_Up4_MapAttributes
+ .4byte NavelRock_LadderRoom2_Layout
.4byte NavelRock_Up4_MapEvents
.4byte NavelRock_Up4_MapScripts
.4byte 0x0
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 8bdf39e18..147f003d0 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -1,5 +1,5 @@
NewMauville_Entrance: @ 8484470
- .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||ÃÄÅ||‰ut©ËÌ2Í©‰suuÐ3Î3Ð3Ï3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ð3Ð3Ð3ÔsuuÐ3Ð3Ç3Ð3Ð3Ôsu¿ÖÑÒÓÖ¾s¿lllllll¾ \ 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 585719630..3eda8df5e 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -1,5 +1,5 @@
NewMauville_Inside: @ 848448C
- .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 @@
-h¨·jh™šjp'°±'''¿'××Örp×'¡¢ÔÕ'ÐÑÒÓÖ×ÔÕrpu2¸2¹2u2/2/2Ç6/2ï2ß2Þ2Œ¶‹ß2u2©2ª2Ü6Ýu2ØÙÚÛÞ2ß2Ü6Ý6rp}2Ž272727272Ï67272�2…2”'''''¾''“}2222ä6å6}2à6á6â6ã6}2È2ä6å6rp}2–'''''''•}22/2/2/2/2/2Æ6/2/2/2~22222/2~2è6é6ê6ë6}222/2rh‹}2Œ™šjp}2Ž27272727272Î67272�2…22222222/2/2/2~2222rp'³“}2”¡¢rp}2–''''''''•}22222222>22222ÁÀrpu2»2/2~22©2ª2rh‹}2Œ™šjp}22Á22222222Á2ÀÀr‰y2o2�2…2ž2o272ŠpÖ“}2”'¡¢rxy27272727272727272727272727272zp'w¥}2¦w'rpÞ2/2~22/2©2ª2r€'''''''''''''''‚pu2/2/2~22/2/2rp}262222.22rp}2.2222622rxy2727272727272z‰y272�2…2ž27272Š€'''''''‚pÔÕ¥}2¦''rh¨™ˆjpÜ6Ý6u2~22/2/2rp'°±''Ö²¡�'ÔÕÖ×rpä6å6}22222rpu2¸2¹2u2/2î2Ä2©2�u2Ü6Ý6Þ2ß2rpu2/2~22222Œ·‹}22222222˜}2ä6å6}22rp}2Á22222”'¿“}22222222 }22/2~22rpÃ22£2¤2222/2Ç6/2~222222222~2222.2rpÂX62«6¬622Ž272Ï6�2…22ž272727272’272o27272o272ŠpÂÁX62È222–''•}22¦''''�'w''Ö×r‰y2o272o272o272Šp}222/2/2/2/2�u2/2/2/2î2ß2rŸ¨§p'w'w³w´rp}22226222�}222222Œ¶`'´´'°±ajpu2/2/2/2»2/2¼2rp}222222Á�}222222”'¾“u2¼2½2/2¸2¹2”'''rp}2Á2ÁÀÁÀŒ¶‹—272�2…2ž27272‘‡2�2…22222/2Æ6/2~2222222/2/2/2rpÃ6222ÁÀÀ”'¾“¦'¥}2¦³´�'¥}2222Ž272Î6�2…222222Ž272�2…2rpÃÀ2622222/2Æ6/2/2/2/2~22»2¼2˜u2/2~2222–''•}222222–'•}2rpÂÀ22222Ž272Î6�2…2À22222 }222222rxy27272727272zp}2rpÂÀ222ÀÀ–''•}2ÀÁ22222~222222r€''''''‚p}2rxy2�2…22Ž27272zxy272727272727272727272727272zp}2r€'•}22–''‚€''''''''''''''‚p}2rp}22rp}2rp}22rh™šˆjh™š\n]™š§p}2rp}22rp¡¢�'³²³rp¡¢²´“v2”¡¢a¶‹}2rp}22Œ‹µ2ª2�u2»2º2»2Œ·‹µ2ª2º2¼2/2/2/2©2ª2”¾“}2rp}22”'³³²³''“}22˜}2222”'¿''“}2222222222Æ6/2~2rp}222/2»2»2º2»2/2/2/2~22 }2.2222/2Ç6/2/2/2~2222ž2o2727272Ž2Î67272zxy2727272727272727272�2…222~2222Ž272Ï67272�2…2222¦w´´'–'''‚€''''''''''•}2222222–''''•}222622/2¼2½2/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 3eeb1e72d..3d8ae1db5 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -1,5 +1,5 @@
OldaleTown: @ 84825D0
- .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 28b17c441..000000000
--- a/data/maps/OldaleTown/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÔÕÔÕÔÕÔÕ0Ð1Ò10ÔÕÔÕÔÕÔÕÜÝÜÝäåäçÐ1Ù1Ú10æåäåÜÝÜÝÔÕÔÕ0000Ø1Ù1Ù1Ò10000ÔÕÔÕÜÝäç0000Ø1Ù1Ù1Ú10(0)0)0…åÜÝÔÕ00l2m2m2n2Ø1Ù1Ù1Ú1001230ÔÕÜÝ00tuuvØ1Ù1Ù1Ù1Ò189:;0ÜÝÔÕ00|}~Ø1Ù1Ù1Ù1Ú1`ABC0ÔÕÜÝ00„‡�†Ø1á1á1á1Ù1Ñ1Ñ1Ñ1Ñ1Ò1æåÔÕ000Ð1Ñ1Ñ1Ú1000Ø1Ù1Ù1Ù1Ù1Ù1Ò10äç0Ð1Ñ1Ù1Ù1Ù1Ú100Ø1Ù1Ù1Ù1Ù1Ù1â1020Ð1Ù1Ù1Ù1Ù1Ù1Ú1000Ø1Ù1Ù1Ù1Ù1â1002Ï1à1á1á1Ù1Ù1Ù1Ù1Ñ1Ñ1Ñ1Ù1Ù1Ù1á1â10Î1Ï1Ô×000à1á1Ù1Ù1Ù1Ù1Ù1Ù1Ù1Ú1000ÖÕÜÝ000H0I0‚2ƒ2Ù1Ù1Ù1Ù1á1l2m2m2n2ÜÝÔÕ000PQRSÙ1Ù1Ù1Ú10tuuvÔÕÜÝÎ1Ï10XYZ[Ø1Ù1Ù1Ú10|}~ÜÝÔÕÔ×0`abcØ1Ù1Ù1â10„‡�†ÔÕÜÝÜÝ000Ð1Ñ1Ù1Ù1Ú10000Î1Ï1ÜÝÔÕÔÕ000Ø1Ù1Ù1Ù1Ú10000ÖÕÔÕÜÝÜÝÎ1Ï1Î1x2Ù1Ù1Ù1â1Î1Ï1Î1Ï1ÜÝÜÝ \ No newline at end of file
diff --git a/data/maps/OldaleTown_House1/border.bin b/data/maps/OldaleTown_House1/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/OldaleTown_House1/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 245f1e146..6039540cc 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -1,5 +1,5 @@
OldaleTown_House1: @ 8482B80
- .4byte OldaleTown_House1_MapAttributes
+ .4byte House1_Layout
.4byte OldaleTown_House1_MapEvents
.4byte OldaleTown_House1_MapScripts
.4byte 0x0
diff --git a/data/maps/OldaleTown_House1/map.bin b/data/maps/OldaleTown_House1/map.bin
deleted file mode 100644
index ea185484d..000000000
--- a/data/maps/OldaleTown_House1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-†‡yzŽ��‚   �2�2–2—2‰2Š2$2$2$2$2˜˜9252626262626272#2#292=H6I6â2>2>2?2#2#292=P6Q6â2>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file
diff --git a/data/maps/OldaleTown_House2/border.bin b/data/maps/OldaleTown_House2/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/OldaleTown_House2/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
index 7bf092b6b..75753041f 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -1,5 +1,5 @@
OldaleTown_House2: @ 8482B9C
- .4byte OldaleTown_House2_MapAttributes
+ .4byte House2_Layout
.4byte OldaleTown_House2_MapEvents
.4byte OldaleTown_House2_MapScripts
.4byte 0x0
diff --git a/data/maps/OldaleTown_House2/map.bin b/data/maps/OldaleTown_House2/map.bin
deleted file mode 100644
index 0e9f07964..000000000
--- a/data/maps/OldaleTown_House2/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-†‡0xŽ�   hlm€–2—282$2$2$2$2p2t2u2ˆ292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#2‘2#2#2#2#2#2#2#2#2#2"2™#2#2 #2#2#2#2#2* \ No newline at end of file
diff --git a/data/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 4f4ea646f..043acab8d 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -1,5 +1,5 @@
OldaleTown_Mart: @ 8482BF0
- .4byte OldaleTown_Mart_MapAttributes
+ .4byte Mart_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 08f393264..000000000
--- a/data/maps/OldaleTown_Mart/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-"#$#$D*()() 222 2220212!212%292: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 cc564e6ae..d51331b61 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
OldaleTown_PokemonCenter_1F: @ 8482BB8
- .4byte OldaleTown_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'2€2�2222021222322222'2ˆ6‰B228292:2;2242=>'2�2‘2222@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 798a5f72b..9b9df67fd 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
OldaleTown_PokemonCenter_2F: @ 8482BD4
- .4byte OldaleTown_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 c623d86fc..000000000
--- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-  ? \  ?\  ?Gd6Gd6GØÙÙ¦Ï2ÍÏO2ÍÏOb2Öàà×]Õ×Û]Õ×Ú/2 2l2l2¶2a2¿2l2ã<¿2l2â/2˜2™222Ê2Ë2Ì22g2È2É22g2D ¡B2Ò2Ó2Ô222Ð2Ñ222'2¨2©222222222222'2 22222^2^222^2^222'2(622422ff42&2ff&24276 \ 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 a630f5efa..3244c01b8 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown: @ 848265C
- .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©©©|}‰‰‰‰�{©©©©©©©©}€‰‰‰‰pppš‰‰‰‰‰‰‰‰‰‰˜ppuv 
-  pppppppppppp}~22ppppppppp 
-  p22pp0123ppp22p2!2!2!22pPQRS p22p 2!2!2!2$2p2XYZ[2p 2!2!2!2$2p())*2,p2HabK2p()*2),ppX2p2!2!2!22pX2ppp`2P2Q2 2!2!2!2!2$2P2Q2P2Q2`2pp()*2)),pppppppppppppX2ppppp 
-  p 
-  pp`2ppppp22p22ppX2pppp22p22pp`2p 
-   2!2!2!2$2p 2!2!2!2$2ppX2p22()*2),()*2),`2p22ppX2ppppX2ppppX2p 2!2!2!2$2pp`2ppppp`2P2Q2P2Q2`2p()*2),ppX2ppppppppX2P2Q2P2Q2P2Q2P2Q2`2pppppppp`2pppppppppppuvpppppppppppppppppp}~ppppppppppppppuvppppr{{{{{{{{{{{{t}~pp{{´qqqqklllllmq´{{{{qqqqkll¾qqqqq¿lllmqqkll¾¾qqqqqqqqqqqq¿ll¾qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/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 a0e8763e3..b78d36a2a 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House1: @ 8482F8C
- .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 @@
-�‘´µ‘‘‘‘—’˜¨¼½™™¸¹Ÿš 3°3Ä3Å3¡3·7À3Á3§3¢3¡3”3•3•3•3•3•3•3–3£3¡3œ3�3®3ª«¯3�3ž3£3·7œ3�3®3²³¯3�3ž3£3¡3¤3¥3¥3¥3¥3¥3¥3¦3£3·7£3£3£3£3£3£3£3£3£3æ7£3£3£3¬­£3£3£3ç7 \ 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 8548cfc32..571dcd9ce 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House2: @ 8482FA8
- .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 @@
-�º»´µ‘‘“‘’˜ÆÇ¼½™™©š 3Â3Ã3Ä3Å3¡3¡3›3±3¢3·7”3•3•3•3•3•3•3–3£3·7œ3�3�3ª«¯3�3ž3£3¡3œ3�3®3²³�3�3ž3£3¡3¤3¥3¥3¥3¥3¥3¥3¦3£3¡3£3£3£3£3£3£3£3£3£3æ7£3£3£3¬­£3£3£3ç7 \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc
index 7fa97cda2..fb60530a6 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House3: @ 8482FC4
- .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 b505892ad..7beed0a39 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House4: @ 8482FE0
- .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 055a1b566..671c7d28e 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_House5: @ 8482FFC
- .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 0c84c8b8a..d11ea93d2 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_PokemonCenter_1F: @ 8482F54
- .4byte PacifidlogTown_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 6804ac368..00724203f 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
PacifidlogTown_PokemonCenter_2F: @ 8482F70
- .4byte PacifidlogTown_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 d87259512..248c6d2ae 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -1,5 +1,5 @@
PetalburgCity: @ 84824B8
- .4byte PetalburgCity_MapAttributes
+ .4byte PetalburgCity_Layout
.4byte PetalburgCity_MapEvents
.4byte gStdScripts_End
.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 @@
-ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝUNMNMNVòóòóòóòóåäåäåäåÜÝÜÝÔÕÔÕD   
-FÔÕÔÕÔÕÔÕ000°±±²ÔÕÔÕÜÝÜÝLLæ5åäåäåäç5°±±À¡¡ºÜÝÜÝÔÕÔÕT  L?ª««««¬?¸¡¡¡¡¡ºÔÕÔÕÜÝÜÝ0 !"LL²³³³³´L¸¡¡¡¡¡ºÜÝÜÝÔÕÔÕ001100LL¸¹º³»¼L¸¡¡¡¡¡ºÔÕÔÕÜÝÜÝ00 1"100LLÀÁÂÅÃÄL¸¡¡¡¡¡ºÜÝÜÝÔÕÔÕ00 1"10<2fLÈ1É1ÊÍËÌ1L¸¡¡¡¡¡ºÔÕÔÕÜÝä5ç500 1"1deT0011101T00000P2Q2XYÜÝÔÕ0000 1"1000000 1!1"110000000123ÔÕæ5ç50000 1"1000000 1!1"1000000089:;ÜÝ001111!1!1111111!1!1"10000000`ABCÔÕÎ1Ï1(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110ÜÝÔ×°±±±²Ö×000000 1"100PQRS00 1"10ÔÕÜݸ¡¡¡ºÜÝ000000 1"100XYZ[00 1"10æ5åÔÕ¸¡¡¡ºÔÕ0 0 0
-000 1"10`abc00 1"1000Üݸ¡¡¡ºÜÝ00 1!111111111!1!1100ÔÕ¸¡¡¡ºÔÕ 00 1!1)1)1)1)1)1)1)1)1)1)1*100Üݸ¡¡¡ºæ5ç5 !"00 1"1000000000Î1Ï1Î1Ï1ÔÕ¸¡¡¡º00020000 1"10<2=2=2=2=2=2=2>2ÖÕÔÕÜݸ¡¡¡º00000000 1"10D  
-EEFÜÝÜÝÔÕ¸¡¡¡º00000000 1"10LLÔÕÔÕÜݸ¡¡¡Â±±±±²Î1Ï10 1"10T LÜÝÜÝÔÕ¸¡¡¡¡¡¡¡¡ºÖ×0 1"100 !"00LÔÕÔÕÜݸ¡¡¡¡¡¡¡¡ºÜÝ0 1!111111000LÜÝÜÝÔÕ¸¡¡¡¡¡¡¡¡ºÔÕ0(1)1)1)1)1)1*1000TÔÕÔÕÜݸ¡¡þÿþÿþÿºÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝÔÕ000üýüýüý0ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÎ1Ï1Î1óòóòóòÏ1ÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ 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 18a39e943..739f19b74 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_Gym: @ 8483034
- .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 17d5ba980..000000000
--- a/data/maps/PetalburgCity_Gym/map.bin
+++ /dev/null
@@ -1,10 +0,0 @@
-()()
-01  01 2*234567*22 222;<=>?222 222222222 222222222 222222222 222222222
-        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
-        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
-        222222222 2ABCDEFG2 2IJKLMNO2 2QRSTUVW2 2YZ[\]^_2 222222222
-        222222222 2ÁÂÃÄÅÆÇ2 2ÉÊËÌÍÎÏ2 2ÑÒÓÔÕÖ×2 2ÙÚÛÜÝÞß2 222222222
-        222222222 2¡¢£¤¥¦§2 2©ª«¬­®¯2 2±²³´µ¶·2 2¹º»¼½¾¿2 222222222
-        222222222 2ÁÂÃÄÅÆÇ2 2ÉÊËÌÍÎÏ2 2ÑÒÓÔÕÖ×2 2ÙÚÛÜÝÞß2 222222222
-        222222222 2¡¢£¤¥¦§2 2©ª«¬­®¯2 2±²³´µ¶·2 2¹º»¼½¾¿2 222222222P °
-  X¨¸    222222222,++++++++,++++++++,@+++++@2+,H++++H2,2+00+22 \ No newline at end of file
diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index 2175ff856..6aeb5deef 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_House1: @ 8483050
- .4byte PetalburgCity_House1_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 9213bc710..9595c1372 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_House2: @ 848306C
- .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 d2dc3edf3..7742f8bfe 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_Mart: @ 84830C0
- .4byte PetalburgCity_Mart_MapAttributes
+ .4byte Mart_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 581432e20..af57b7bab 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_PokemonCenter_1F: @ 8483088
- .4byte PetalburgCity_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 c16cfdee2..1528ab624 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_PokemonCenter_2F: @ 84830A4
- .4byte PetalburgCity_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 fc953bf81..4e207706d 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -1,5 +1,5 @@
PetalburgCity_WallysHouse: @ 8483018
- .4byte PetalburgCity_WallysHouse_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 1b1731f58..096f4a704 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -1,5 +1,5 @@
PetalburgWoods: @ 8483FF4
- .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 0ÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝIIIIÜÝÜÝÜÝÜÝäòóòóç00000Æ1Ç1Æ1Ç1 0 0 0æåÜÝÔÕÔÕÔÕÔÕÔÕÔÕ000000ÔÕÔÕÔÕÔÕ0ÔÕÔÕ000000Ö5Õ5Ô5×5 0 0 000ÔÕÜÝÜÝäåäåäåäç000000ÜÝÜÝÜÝäç0æåäç000000ÜÝÜÝ 0 0000ÜÝÔÕÔÕ000 0 0 0 04000000ÔÕÔÕÔÕ 0 0000000 0 0 000ÔÕÔÕÕ‡‡‡ÖÔÕÜÝÜÝ0 0 0 0 0 0 00000000æåäåäç 0 0 00Î1Ï1Æ1Ç1Æ1Ç1 0 00æåäç00000ÜÝÔÕÔÕ 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô5×5 0 0 000000000 0ÔÕÜÝÜÝ 0 0 0 0Æ1Ç1Î1Ï1Î1Ï10000Î1Ï1Î1Ï1Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜÝÆ1Ç1Æ1Ç1Î1Ï10000 0 0ÜÝÔÕÔÕ0 0 0 0Ö5Õ5Ô5Õ5Ô5×50000Ö5Õ5Ô5Õ5Ô5Õ5Ô5Õ5Ô5Õ5ÔÕÔÕÔÕÔÕ5Ô5Õ5Ô5×5000 0 0 0ÔÕÜÝÜÝ0000ÜÝÜÝÜÝ0000æòóòóòóòóòóòóòóòóòóòóòÏ100 0 0 0ÜÝÔÕÔÕ0000ÔÕÔÕÔÕÕ‡‡‡ÖÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×500 0 0 0ÔÕÜÝÜÝ000 0æåäåäç00000æåäåäåäåäòóòóòóòóòóòóòÏ10 0 0 0ÜÝÔÕÔÕ0 0 0 0 0 0 000000000000000000ÔÕÔÕÔÕÔÕÔÕÔÕÔ×50 0 0 0ÔÕÜÝÜÝ 0 0 0 0 0 0 0000000 0 0 0 00000000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ00 0 0ÜÝÔÕÔÕ 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ000 0ÔÕÜÝÜÝÎ1Ç1Æ1Ç1Æ1Ç1Î1Ï10000Æ1Ç1Æ1Ç1Æ1Ç1Æ1Ç1Æ1Ç100ÜÝÜÝÜÝäåÜÝÜÝÜÝ0000ÜÝÔÕÔÕÔ5Õ5Ô5Õ5Ô5Õ5Ô5×50000Ö5Õ5Ô5Õ5Ô5Õ5Ô5Õ5Ô5×500ÔÕÔÕÔÕ00ÔÕÔÕÔÕÕ‡‡ÖÔÕÜÝÜÝÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝ00ÜÝÜÝäç00æåÜÝÜÝ 0000ÜÝÔÕÔÕÔÕÔÕÔÕÔÕÕ‡‡ÖÔÕÔÕÔÕÔÕÔÕ00ÔÕÔÕ 000000ÔÕÔÕ 0 000ÔÕÜÝÜÝÜÝäåäåäç0000æåäåäåäåäç00ÜÝÜÝ 000000æåäç 0 0 00ÜÝÔÕÔÕÔÕ000000000000 0 0 0 0 0 0 0 000ÔÕÔÕ 0 0000000 0 0 0 0 00ÔÕÜÝÜÝäç 0 0 00000000000 0 0 0 0 0 0000ÜÝÜÝ 0 0 00Î1Ï10 0 0 0 0 0 0 0ÜÝÔÕÔÕ0 0 0 0 0 0 0 0 0000000000000000ÔÕÔÕ 0 0 0 0Ö5×50 0 0 0 0 0 0 0ÔÕÜÝÜÝ 0 0 0 0 0 0Æ1Ç1Æ1Ç1Î1Ï1000000Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝ 0 0 0 0ÜÝÎ1Ç1 0 0 0 0Æ1Ç1ÜÝÔÕÔÕ 0 0 0 0 0 0Ö5ÕÔÕÔ5×5000000Ö5Õ5Ô5Õ5Ô5Õ5ÔÕÔÕ 0 0 0 0ÔÕÔ×5 0 0 0 0Ö5ÕÔÕÜÝÜÝ 0 0 0 0 0 0ÜÝÜÝÜÝ000000ÜÝÜÝÜÝÜÝÜÝ0 0 0 0ÜÝÜÝÎ1Ç1Æ1Ç1ÜÝÜÝÔÕÔÕ 0 0 0 0 0 0ÔÕÔÕÔÕÕ‡‡‡‡ÖÔÕÔÕÔÕÔÕÔÕ000 0ÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝ 0 0 0 0 0 0æåäåäç000000æåäåÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕ0 0 0 0 0 0 0 0 0 040000000 0 0 0 0ÔÕÔÕÔÕÕ‡‡ÖÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÎ1Ï10 0 0 0 0 0 000000000 0 0 0 0 0æåäåäç0000æåäåäåÜÝÜÝÜÝÔÕÔÕÔ×5000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 0ÔÕÔÕÔÕÜÝÜÝÜÝÎ1Ï1Î1Ï1Î1Ï1Î1Ï1000000Î1Ç1Æ1Ç1Æ1Ç1Æ1Ï1Î1Ï1Î1Ï1Î1Ï1000 0 00 0 0ÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔ×5000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×5000 0 0 0 0 0ÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝ000000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ0000 0 0Æ1Ç1ÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕIIIIÔÕÔÕÔÕÔÕÔÕÔÕÔÕIIIIÖ5ÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÎÏÎÏÜÝÜÝÜÝÜÝÜÝÜÝÜÝÎÏÎÏÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×ÖÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ×ÖÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ 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 67ebd9405..7235504fa 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -1,5 +1,5 @@
RecordCorner: @ 8484D68
- .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 @@
-�‘———”••–———’“˜™ŸŸŸœ��žŸŸŸš› ¡2§2§2§2¤2¥2¥2¦2§2§2§2¢2£¨©2Ä2Ä2´2Ä2Ä2Ä2Ä2¶2Ä2Ä2ª2«¨©2Ä2¬2¼¸¹º»¾®2Ä2ª2«¨©2Ä2Ä2µ2ÀÁÂ÷2Ä2Ä2ª2«¨©2Ä2­2½ÈÉÊË¿¯2Ä2ª2«¨©2Ä2Ä2Æ2Æ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/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 9550dc26b..ef027d1c6 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -1,5 +1,5 @@
Route101: @ 8482678
- .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 @@
-ÔÕÔÕÔÕÔר1Ù1Ú10ÖÕÔÕÔÕÔÕÜÝäåäåäçà1á1â10æåäåÜÝÜÝÔÕ 0 0 000000000 0 0 0ÔÕÔÕäç5 0 0 0 0000000 0 0 0 0äåÜÝ 0 0 0 0 0 0000000 0 0 0 0 0 0ÔÕÆ1Ç1 0 0 0000000Î1Ç1 0 0 0 0 0æåÔ× 0 000n‡‡‡ÖÖׯ1Ç1 0 0000ÜÝÕ‡‡‡Ž0000ÜÝÔ×00Ð1Ò10ÔÕÎ1Ï10000000ÔÕäç0Ð1Ù1Ú10ÜÝÔ×00Ð1Ñ1Ò10æç 0 00à1Ù1Ù1Ò1ÔÕÜÝ0Ð1Ñ1Ù1Ù1Ú10 0 0 0 0 00à1Ù1Ú1ÜÝÔÕ0à1Ù1Ù1Ù1â10 0 0 0 0 0 00à1â1ÔÕäç00à1á1â100 0 0 0 0 0 0000äç 0 00000Õ‡‡ÖÆ1Ç1 0 0 00Î1Ï1 0 0 0 0 00000000Ö× 0 000ÖÕÆ1Ç1 0 0 0 0000000ÜÝÆ1Ç1Î1Ï1ÜÝÔ× 0 0 0 0000000ÔÕÔÕÔÕÔÕÜÝÆ1Ç1Æ1Ï1Î1Ï1Î1Ï100ÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔ×00ÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝ00ÜÝÜÝÜÝÜÝ \ 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 2c06344b0..22da93b7a 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -1,5 +1,5 @@
Route102: @ 8482694
- .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 000000000000Œ2�6�6Ž20ÔÕÔÕÔÕÔÕ 0 0 0 0°±±²ÔÕÔÕÔÕÜÝäåäåäç 0 0 0000Ð1Ñ1Ñ1Ò10000011110æåäåäåäç 0 0 0 0¸¡¡ºäåÜÝÜÝÔÕ 0 0 0 0 0 0 0 0 00Ð1Ñ1Ù1Ù1Ù1Ù1Ñ1Ò100000000000000ÿ0 0 0 0 0¸¡¡Â±²ÔÕÔÕäç 0 0 0 0 0 0 0 00Ð1Ù1Ù1q2y2á1á1á1â10000000000Î1Ï100†00 0 0 0¸¡¡¡¡ºÜÝÜÝ000 0 0 0 0 0 0 00Ø1Ù1â1Ö×ÕÖ00Õ‡‡‡‡ÖÎ1Ï1Î1Ï1Ö×00†000 0 0¸¡¡¡¡ºÔÕÔÕ0000 0 0 0 0000à1r2Ï1ÜÝ0000 0 0 0 0 00ÖÕÔÕÜÝÎ1Ï1†00000000000æåÜÝ000000000000ÖÕÔÕ00 0 0 0 0 0 0 00ÜÝÜÝÔÕÔ×{0000000000000ÔÕÎ1Ï1Î1Ï1Î1Ï1Î1Ï10000ÜÝÜÝ0 0 0 0 0 0 0 000ÔÕÔÕÜÝÜÝÎ1Ï100000000000æåÔÕÔÕÔÕÔ×00Î1Ï1ÔÕÔÕ 0 0 0 0 0 00000ÜÝÜÝÔÕÔÕÔ×00000Ð1Ñ1Ñ1Ò100000ÜÝÜÝÜÝäç00ÖÕÜÝÜÝ 0 0 0 0000000ÔÕÔÕäåÜÝÜÝ00Ð1Ñ1Ñ1Ù1Ù1Ù1Ú1000Î1Ï1ÔÕÔÕÔÕ 0 000æåÔÕÔÕ 0 0 000Î1Ï1000æåäç 0 0ÔÕÔÕÐ1Ñ1Ù1Ù1Ù1Ù1Ù1á1â1000ÖÕÜÝÜÝÜÝ 0 0Õ‡‡ÖÜÝÜÝÆ1Ç1000Ö×Î1Ï1000 0 0 0 0æåäçØ1Ù1Ù1Ù1Ù1á1â10Î1Ï1Î1Ï1ÜÝÔÕÔÕÔÕ 0 0 0000ÔÕÔÕÔ×000æåÔ×000 0 0 0 0 000Ð1Ù1Ù1á1á1â1000ÖÕÔÕÔÕÜÝÜÝÜÝ 0 0 00Î1Ï1ÜÝÜÝÜÝ00 0 0 0æç0000 0 0 0000à1á1â100Î1Ï1Î1Ï1ÜÝÜÝÜÝÔÕÔÕÔÕ 0 0 0 0ÖÕÔÕÔÕÔÕ0 0 0 0 0 0 0 000000000000000ÖÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÆ1Ç1Æ1Ç1ÜÝÜÝÜÝÜÝÎ1Ç1Æ1Ç1Æ1Ç1 0 0 000000Î1Ï1Î1Ï1Î1Ï1Î1Ï1ÜÝÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔ× 0 0 0 00000ÖÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÆ1Ç1Æ1Ç1Î1Ï1Î1Ï1ÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝ \ 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 6bc4c0070..1a8825bc1 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -1,5 +1,5 @@
Route103: @ 84826B0
- .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 44518dc92..000000000
--- a/data/maps/Route103/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕ�pppppppppp’sq{‰sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquÜÝÜÝäåäåäåäåäåäåÜÝÜÝÜÝÜÝÜÝ�uvpppppppp’{|‰s{‰qquqq{‰qqqqt|||||||‰qqqqqqqqt}qqqqquÔÕÔÕ000000 0 0 0 0 0 0ÔÕÔÕÔÕÔÕÔÕ�}~ppppppppš‰�s{‰sqquqt‰{||||}qt©©©‰q{||||||||}qqqqqquÜÝäç000Ð1Ñ1Ñ1Ò1 0 0 0 0 0æåÜÝÜÝÜÝäç�ppppppuvPQpp’{‰s{‰ququ{©©|||||}qqq{|©©©©©©©©©©||||||}ÔÕ 0 0000à1á1á1â100 0 0 0 0 0ÔÕÔÕÔÕˆ‰˜puvppp}~XYppš�s{‰{|}t}t‘‘‘‘‘‘‘‘yyy‘ÎÎÎΑ‘‘‘ÎÎÎÎÎÎÎÎÎÎÜÝ 0 0 0 0Õ4‡4‡4‡4‡4‡4‡4o4 0 0 0 0æåÜÝÜÝdQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M1ÇÇ0000ÇÇÇÇÇÇÇÇÔÕ 0 0 0 0 0 0 00000�4‡4‡4‡4‡4‡4Ö4ÔÕÔÕlYuvpp}~XYppp}~Xm{|‘‘‘‘‘yz0ÆÆÆÆÆÆ1111100000Ç0ÇÇÜÝ 0 0 0 0 0 0 000000000000æåäç�p}~ppppppppppppš‰‰Š000000ÆÆÆÆÆ000000Ç00000000ÇÇÇÇ0Ç0ÔÕ 0 0 0 0 0 0 00000Ð1Ñ1Ñ1Ñ1Ò10000ˆ‰˜ppppppppppppppppppš‰‰‰‰Š000ÆÆÇÇ00000000000000Ç00ÜÝÆ1Ç1 0 0 0 0 00040à1á1Ù1Ù1Ù1Ò1000�ppppppppppppppppppppppppp’0000ÇÇÇ0Ç0Ç00000Ç0000111ÔÕÔ× 0 0 0 00000000à1á1á1â1000�ppppppppppppppppppppppppp’011110ÇÇÇ000000000011!1!1)1ÜÝÜÝ 0 0 0 0000000 0 0 0 00000�ppppppppppppppppppppppppp’0(1)1!1!1111100000011!1!1)1*10ÔÕÔÕÕ4‡4‡4‡4‡4‡4‡4‡4‡4Ö4 0 0 0 0 00000Ô0yppppppppppppppppppppppp’000(1)1)1)1!1!1111111111111111!1!1)1*100ÇÜÝÜÝ0000000 0 0 0 0 0 0 0Æ1Ï1Î1Ï1Î1Ï1dQPQppppppppppuvppppp“““’0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000ÇÔÕÔÕ0000000 0 0 0 0 0 0 0Ö5Õ5Ô5Õ5Ô×lYXYuvppppPQPQ}~puvpxÆÆÆ000ÇÇÇ0Ç000000000000000000000ÇÇÇÜÝÜÝÎ1Ï1000000Æ1Ç1Æ1Ç1Æ1Ç1ÜÝÜÝÜ݈2‰2yp}~uvPQXYXYpPQ}~PeÆÇÇÇÇÇÇÇÇÇÇÇ00000000Ç0ÇÇÇÇÔÕÔÕÔ×000000Ö5ÕÔÕÔÕÔÕÔÕÔÕÔ×�ppp}~XYpppppXYppXmÆÆÆÆÇÇÇÇÇÇÇÇ000000000ÇÇÇÇÇÜÝÜÝÜÝÎ1Ï10000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ�uvppppppppppppppp’ÆÆÆÆÇÇÇÇÇÇÇÇÇ0Ç0Ç0Ç0Ç0Ç0Ç0Ç0Ç0ÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ�}~ppppppppppppppx0ÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ�pppppppppppppppp’ÆÆÆÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÔÕÔÕÔÕÔ5×50000ÔÕÔÕÔÕÔÕÔÕÔÕÔÕ�pppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÜÝÜÝÜÝÜÝ0000ÜÝÜÝÜÝÜÝÜÝÜÝÜÝ�pppppppppppppppp’ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ \ 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 7bcef3b0b..f431118c1 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -1,5 +1,5 @@
Route104: @ 84826CC
- .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 f285f28ee..c6335b13f 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -1,5 +1,5 @@
Route104_MrBrineysHouse: @ 8483D70
- .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 @@
-ã±²ã便ä빺ëì ÆÇìó2Á2Â2!2ó2!2!2ô2¨2Î2Ï2ô2³6´6)2)2)2)2)2)2)2)2)2)2³6)2)2)2)2)2)2NO)2)2)2!2)2)2)2)2)2)2VWD2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file
diff --git a/data/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 ceac3651f..e23012fb4 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -1,5 +1,5 @@
Route104_PrettyPetalFlowerShop: @ 8483D8C
- .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 9728190a1..50f1b7b08 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -1,5 +1,5 @@
Route104_Prototype: @ 8485AF8
- .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 ac5604d72..61217a576 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -1,5 +1,5 @@
Route104_PrototypePrettyPetalFlowerShop: @ 8485B14
- .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 de48be1a5..f7538b723 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -1,5 +1,5 @@
Route105: @ 84826E8
- .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 c4bd8286c..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 5ee6a3071..93f4bd835 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,5 +1,5 @@
Route106: @ 8482704
- .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 b7e7d7238..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 d6dffda04..a27885664 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,5 +1,5 @@
Route107: @ 8482720
- .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 e0a0c9f42..2c4cea90d 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -1,5 +1,5 @@
Route108: @ 848273C
- .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 138ddc020..000000000
--- a/data/maps/Route108/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ppppppppppppppppPQpp­®1®1®1®1®1®1®1®1®1®1®1®1¯pppppppppppppPQpppppppppppPQppppppppppppppXYp­›1ž1”5ž1ž1^5_5ž1”5^5_5ž1ž1bQppppppppppppXYpppppppppPQXY­®1®1¯pPQpppppppppPc^5_5ž1”5”5n5o5”5ž1n5o5”5”5jYppp­1®1®1®1®1®1®1¯pPQppuvpuvPQXYpPc^5_5bQXY­®1®1¯pPQppXkn5o5ž1ž1ž1^5_5ž1Q3R3S3T3”5·puvPc^5_5ž1”5ž1”5bQXYpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvp½¾¾¾¾£n5o5X7YZ[\7]·p}~Xkn5o5”5ž1”5ž1jYppPQpPQpppppppp½¾¾¿ppXkn5o5jYpp}~pppppp½£ž1`abcde·pppp½£ž1ž1ž1ž1¤¿pppXYpXYppppppppppppppp½¾¾¿pppppppppppp½¾£i3j3k3¤¾¿ppppp½¾¾¾¾¿pppppppppppppppppppppppppppppppppppppppppp½¾¾¾¿pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp­®1®1¯pppppppppppppppPQpppppppppppppppppppp}~ppppppppp­®1®1¯pXY­›1”5ž1œ1¯ppppppppppppppXYpppppppppppppp­®1®1®1¯ppppPQppPQpp½£”5·pppµž1”5ž1ž1·pp­®1®1¯ppppppPQppPQuvppppp­®1®1¯p½£”5ž1·ppuvXYuvXYppp½¾¿uvp½¾¾¾¾¿pPc^5_5bQpppppXYppXY}~uvppPc^5_5bQp½¾¾¿PQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~p½¾¾¿pPQPQXYpppppppppXYp½¾¾¿PQXY}~pppPQppppppXYpp}~pppXYpppppPQpppXYXYppppppppppppppppppXYpppppppXYppppppppppppppppppppppXYppppppp \ No newline at end of file
diff --git a/data/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 532443e1b..c9482cf31 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -1,5 +1,5 @@
Route109: @ 8482758
- .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 62350867e..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 99c905eaa..cec1ace27 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -1,5 +1,5 @@
Route109_SeashoreHouse: @ 8485B30
- .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 5a74c1d6c..d6d394209 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -1,5 +1,5 @@
Route110: @ 8482774
- .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 ac83cb93d..000000000
--- a/data/maps/Route110/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin b/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
index 433849c14..a2d6a37a5 100644
--- a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
@@ -1,5 +1,5 @@
Route110_SeasideCyclingRoadEntrance1: @ 8485C80
- .4byte Route110_SeasideCyclingRoadEntrance1_MapAttributes
+ .4byte Route110_SeasideCyclingRoadEntrance_Layout
.4byte Route110_SeasideCyclingRoadEntrance1_MapEvents
.4byte Route110_SeasideCyclingRoadEntrance1_MapScripts
.4byte 0x0
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin b/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin
deleted file mode 100644
index e9fc770d4..000000000
--- a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ˆˆˆˆˆˆ�ˆ‹ˆˆˆˆˆˆ�����œ•�“�œ����x2p2p2p2p2¨6™2˜2™2™2©6x2p2p2p2€2h2h2h2h2°6¡6 6¡6¡6±6€2h2h2h2\2h2h2h2h2p2Y2Z2Y2Z2p2y2h2h2l2d6h2h2h2a6b6a6b6h2h2t6 \ No newline at end of file
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
index 755b6a5ff..1720a77a2 100644
--- a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
@@ -1,5 +1,5 @@
Route110_SeasideCyclingRoadEntrance2: @ 8485C9C
- .4byte Route110_SeasideCyclingRoadEntrance2_MapAttributes
+ .4byte Route110_SeasideCyclingRoadEntrance_Layout
.4byte Route110_SeasideCyclingRoadEntrance2_MapEvents
.4byte Route110_SeasideCyclingRoadEntrance2_MapScripts
.4byte 0x0
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 b8f569c6a..99a4a694a 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHouseCorridor: @ 8485B84
- .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!2ô2!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2!2)2)2ãä!2)2)2ëì!2)2)2ó2!2ô2!2)2)2!2)2)2)2)2)2!2)2)2)2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2ãä!2)2)2ëì!2)2)2ó2!2ô2!2)2)2)222 \ No newline at end of file
diff --git a/data/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 7f69874d1..0b38de121 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHouseEnd: @ 8485B68
- .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 @@
-íîïãäõö2÷ëì6 26!2ý2þ2ÿ2ó2!2!2!2ô2!2!2!2!2)2)2)2)2)2D2)2)2)2)2)2!2)2)2)2)2NO)2)2)2)2)2!2)2)2)2D2VWD2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file
diff --git a/data/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 f3aa39cc5..842b2f32d 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHouseEntrance: @ 8485B4C
- .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!2¨2Î2Ï2!2)2)2)2D2NOD2)2)2)2)23)2)2)2D2VWD2)2)2)23'7)2)2)2)2)2)2)2)2)2)2"7 333333333333#333332233333 \ No newline at end of file
diff --git a/data/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 ff78e3652..ef5388364 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle1: @ 8485BA0
- .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 2bf5b392c..000000000
--- a/data/maps/Route110_TrickHousePuzzle1/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o233333333334
-w6 #$+$$$+$+$$!222Z2Z2*Z2Z2Z2*Z2*Z2Z2"22222222222222"22222,222,2,22,2222#$$+$$$$$$+%202Z2Z2Z2*Z2Z2Z2Z2Z2Z2*Z22Z22"22222222222222,22(220%22,2220$!2#!2Z2Z22#+$$%Z2Z2*2Z2"22"2Z2*Z2Z2Z222222"22"22222222(22,22,22,22222#$+$+$$$$+$%222Z2Z2"Z2*Z2Z2Z2Z2*Z2Z22222"2Z2222222222222,222222,222#$$$+$$$$+$$%20Z2Z2Z2Z2*Z2Z2Z2Z2*Z2Z2Z22Z22222Z22222Z222222222222222222222 \ No newline at end of file
diff --git a/data/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 25aa8b8dc..d54eb7752 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle2: @ 8485BBC
- .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 cb35a063e..000000000
--- a/data/maps/Route110_TrickHousePuzzle2/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o         
-w6 222222222€22222222‰‚‚ƒ22ˆ22222X22ˆ22222�2‰‚‚ƒ�‚‚’2�‚Š222ˆ22X222222i2‘‚‚‚’2222€222€2222222222ˆ22‰”‚‚‚‚‚‚Š222ˆ22ˆ2222222ˆ222ˆ22ˆ2‰‚Š222ˆ222‘Š2ˆ2ˆX2ˆ2‰‚”Š222ˆ2ˆ2�2ˆ2ˆX22ˆi„iˆ2ˆ222ˆ2ˆ22ˆ222‘‚”‚‚‚’2ˆ22ˆ2222222i22ˆ22‘ƒ2€2�‚‚“‚‚“”Š2222ˆ2222ˆ22ˆ2‘ƒ222ˆ2222�22ˆ222222�2€22222ˆ22�ƒ2222‘‚‚‚‚‚’22222222222222222222 \ No newline at end of file
diff --git a/data/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 9cd8c45be..3bcf40de1 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle3: @ 8485BD8
- .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 ac4f344d9..000000000
--- a/data/maps/Route110_TrickHousePuzzle3/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o         
-w6 &22&22&2X2&22&22-8292-22-22-22-82925@A522M22:225@Aq222q222U222B22X222K2L2829222&8292225S2T2M@A522"@AM22q222222U222"22q222K2L2./8292-22K2L25S2T25675@A5225S2T2q222X222q222U222U22282928292228292&225@AM@A5225@A"22~22U2X22q222q222"22./K2L2&./22-K2L2567:S2T2"67M225S2T2q2q2q2B22"q2q2U222222228292-228292225225@A5225@A522q222q222q222q222q222222222222222222 \ No newline at end of file
diff --git a/data/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 c928f08f3..85df95a1a 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle4: @ 8485BF4
- .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 2dbcf251b..000000000
--- a/data/maps/Route110_TrickHousePuzzle4/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 2222�Š22222€22222222ˆ2222‰’22222�Š2‘ƒ2€2ˆ2222222ˆ2222ˆ2ˆ22‰ƒ222�2222ˆ2‘ƒ2�2�‚ƒ22222ˆ22222222222€22�22222222222ˆ222�‚‚‚‚ƒ22222ˆ22222222222‰‚‚”‚“‚ƒ2222222ˆ2222�2222‰‚ƒ2‰’22€222€22ˆ22ˆ222Œ‚‚‚’2�‹222ˆ222�222222�222Œ‚ƒ22222„222222ˆ222€2222222222�†††�†††„†††††2q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222 \ No newline at end of file
diff --git a/data/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 d8b57d744..2402f4cc5 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle5: @ 8485C10
- .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 470e3eba3..000000000
--- a/data/maps/Route110_TrickHousePuzzle5/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 hh222hhhhhh2222h22222hhhhh2hhh2222222hhh222hh2222222hh22222h2222222h22222222222222222222222222222h2222222h22222hh2222222h22222hh2222222h22222hhh22222hhh222hhhh22222hhh222hhhh22222hhhh2hhhhhh222hhhh222hhhhh222hhh22222hhhhh2hhh2222222hhh222hhh22222hhh22222hhh222hhh22222222222hhhhh22222h22hhhhhhhh22hh \ 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 5864cdd59..946ad91f4 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle6: @ 8485C2C
- .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 45dc20ba1..000000000
--- a/data/maps/Route110_TrickHousePuzzle6/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 ‰ƒ222€222222€22ˆ2222�22€222ˆ22�2222222ˆ2€2Œƒ222222€22�2�2ˆ22222‰‚’222222ˆ22222�22222€22ˆ2„22222�“ƒ2�22ˆ22222222ˆ2222�’2262€2€2ˆ222€2222�‚’2ˆ2�222ˆ22222222ˆ22�Š2‘Š2222222‘Š22ˆ22ˆ222‰‚ƒ22ˆ22�2�”Š2€ˆ2222ˆ222222�2��2€22ˆ22„22222222�22‘ƒ22222222222222222�ƒ2€22222222222222ˆ222222‰ƒ2222‰‚’222222�2222�’2222 \ No newline at end of file
diff --git a/data/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 e9217f7e2..5de9d6400 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle7: @ 8485C48
- .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 68ac73547..000000000
--- a/data/maps/Route110_TrickHousePuzzle7/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 €22€22€222±²22€ˆ‡‡ˆ‡2ˆ‡22°³‰‚‹ˆ22ˆ22Œ‚‚‚‚‚‹‡ˆˆ22�2�”‚Š222ˆ2ˆˆ22©ª2¬2‘‚ƒ2ˆ2ˆ‘‚ƒ¨«€222´22ˆ2ˆ2222‰”‚‚‚‚ƒ2ˆ2ˆ2‰‚‚’2222222ˆ2ˆ2ˆ22222‰‚Š22ˆ2ˆ‡ˆ2‰‚‚Šˆ2‘Š2ˆ‡ˆ�’2ˆ22ˆˆ‡2ˆ2Œ‚‹222ˆ‡2ˆˆ2‰’2�2ˆ¤22‘‚‚’‘‚’2222ˆ222222222222€2ˆ‰‚‚‚‚‚‚“‚‚Š2ˆ2ˆˆ‡2¡¢2ˆ™šˆ2�2ˆ‘‚Š £‰‚’˜›�222ˆ22‘‚Šˆ22œ222€2ˆ2222‘’2€™š€2ˆ2ˆ2222222�˜›‘‚”‚’ \ No newline at end of file
diff --git a/data/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 d9fce791e..750270dea 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -1,5 +1,5 @@
Route110_TrickHousePuzzle8: @ 8485C64
- .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 b59b0f606..000000000
--- a/data/maps/Route110_TrickHousePuzzle8/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-o            
-w6 222622222222226k2k2l6l6l6k2l6l6l6l6l6l6l6l6l6k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2222662266666k262626666666262k262k2l6k2k2k2k2l6l6k2k2k2k2k2k22k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k22k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6l6l6k2l6k2k2k2l6k2k2k2k2226662622262222226622622222222 \ 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 804a36387..89feae870 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -1,5 +1,5 @@
Route111: @ 8482790
- .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 4ce11a8a9..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 8de668c4b..c2c055af6 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -1,5 +1,5 @@
Route111_OldLadysRestStop: @ 8483DC4
- .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 86a766b6d..4cf6ca023 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -1,5 +1,5 @@
Route111_WinstrateFamilysHouse: @ 8483DA8
- .4byte Route111_WinstrateFamilysHouse_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 e0411ce05..397c0060a 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -1,5 +1,5 @@
Route112: @ 84827AC
- .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 ef3fd5f10..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 6caefade9..72667053d 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -1,5 +1,5 @@
Route112_CableCarStation: @ 8483DE0
- .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 a8c19f49d..87d56215e 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -1,5 +1,5 @@
Route113: @ 84827C8
- .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 609690de2..000000000
--- a/data/maps/Route113/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index 49c0005b0..e9424580a 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -1,5 +1,5 @@
Route113_GlassWorkshop: @ 8485CB8
- .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 5b9db262a..cda0036b3 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -1,5 +1,5 @@
Route114: @ 84827E4
- .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 3bad45e04..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 277c0c0df..efe6a1b76 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -1,5 +1,5 @@
Route114_FossilManiacsHouse: @ 8483E18
- .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 @@
-±²íîﹺõö÷6Á2Â2!2ý2þ233®¯@2!2)2)2)2)277¶2·2Ö2!2NOD2)2Ö2Ö2)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 169b0b7a4..c20e1b2d3 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -1,5 +1,5 @@
Route114_FossilManiacsTunnel: @ 8483E34
- .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 61838bff2..000000000
--- a/data/maps/Route114_FossilManiacsTunnel/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-w2whiiiiiijw2w2w2whxhiiGijrw2wwwphxhiOjrzjwww2pphx33rzjrwwwppp33ý2zjrrwwwppp¯6y233rrrwwwppp3y2y2Ç6rrrwwwppp3y2y2ý2rrrwwwpp-2Åy2y2ý2rrrwwwp-2¸p3y2¿6rrrwwww2¸pp3y2ý2rrrwwww2ppp3y2Æ6,rrwwww2ppp¯6ý2r·6rzjw2ww2ppp3ý2r3zjrw2ww2ppp3ý2r3y6rrw2ww2ppp3ý2r3y6rrw2whxp-2Åý2r3y6rrw2wpý2pý2p 3r77rrw2wpÇ6pý2p 3zj3rzjwpý2p¿6p 33r3r3rwpý2pý2p3ý2r3r7rwpý2pý2p3¿6r3zjrhxý2p7p3ý2r77rrpy6ý2phx3ý2zj3rrpy6ý2pp3333r3rrpy6ý2pp3±2²2ý2r3rr \ 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 ba4cccfd5..9a5763394 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -1,5 +1,5 @@
Route114_LanettesHouse: @ 8483E50
- .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 4d135e0b6..97156442e 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -1,5 +1,5 @@
Route115: @ 8482800
- .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 64a58e691..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 27009ad3f..919dffa6f 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -1,5 +1,5 @@
Route116: @ 848281C
- .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 a6e9d8843..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 489c5a8b9..ac319327f 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -1,5 +1,5 @@
Route116_TunnelersRestHouse: @ 8483E6C
- .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 @@
-ã±²¾¿ä빺ÆÇìó2Á2Â2!2!2!2!2Î2Ï2ô2!2)2)2)2)2)2)2)2)2)2Y2NO)2)2)2)2NOD2!2VWD2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/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 d92b96e30..897d37afb 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -1,5 +1,5 @@
Route117: @ 8482838
- .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 bdeda9cd4..000000000
--- a/data/maps/Route117/map.bin
+++ /dev/null
@@ -1,10 +0,0 @@
-ÆÇÆÆÆÆÆÆÆÆÆÆÆÆÆÆ5670 2 000Ð0Ñ0Ñ0Ò000 0 0
-200000000ÇÇÇÇÆÆÆÇ00 0 00000°±±±±±²Æºh4s4q0u4i0j4000 2 0Ð0Ñ0Ñ0Ò040 0 0 0 00000000ÆÇÇÇÆÆÆ 0 0 0 0 0 0 00000000¸¡¡¡¡¡Â²ˆp4{4|4}4q0r440 0 00Ð0Ñ0Ù0Ú0 0000 0 0
-0000000ÇÇÇÇÇÇÇ8IIIIII:0000000¸¡¡¡¡¡¡Â²ˆp4q0q0t4y4z40 0 00È0Ñ0Ò0 0 200 2004000ÆÇÇÇÇÇÇ@2 22
-222B000000
-2¸¡¡¡¡¡¡¡ºˆx4y4y4z400 00 04Ø0Ù0Ú0000 20 000000ÇÇÇÇÇ@222 22
-2B00000000000Ì¡¡¡º�‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘0‘ !"‘‘‘‘‘‘20@2222 22B000000000
-2¸¡¡¡º02000000000000000000000000000IIIIIIIHI0000IJ0111111100000Ì¡º200011111111111111100000000002202020200000000 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202011111111!1"1000000000011111!1!1!1!1*10ÖÕÔÕÔÕÔ×(1)1!1!1!11110000022020202 !!!!!!!!1"100°±² 20000(1)1!1!1!1!1!1!1*10Î1óòóòóòóòÏ10(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100¸¡Â²200000(1)1!1!1!1"100ÖÕÔÕÔÕÔÕÔ×00 1!1*1000000020202000000000000000¸¡¡Â±²000000(1!1!1"100ÜÝäåäåäòóç0 1"100000000II@@@@II8II000II:0 0 0¸¡¡¡¡º0200000 1!1!110ÔÕK1L5L5L5M1ÔÕ001!1"1000000ÆÆ00ÆÇÆÆ00@22 22
-222B 0 0 0¸¡¡¡¡Â±²0 0 0 00(1!1!1"10æç11111äç00 1!1*1000ÆÆÆÆÆ0ÇÆÆÆÆÆÆ@222 22
-22B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 00 1!1!1100000000001!1"100ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ@2222 22
-2B 0 0 0¸¡¡¡¡¡¡º 0 0 0 0 0 0(1!1!1!11111111111!1!1*100ÆÆÆÆÆÆÆÆÆÆH0IIIIIIJ@@@¸------º%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*100ÆÆÆÆÆÆÆÆÇÇÇ00000000000000ÆÆÆ0ÆÆÆÆÆÆ0ÆÆ%0%0 0 0 00000000000000000ÆÆÆÆÆÆÆÆÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆÆÆÆ0ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ%0%0%000ÆÆÆÆÆÆÆÆÆÆÆ00ÆÆÆÆÆÇÇÇÇÇ \ No newline at end of file
diff --git a/data/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 1ace346b5..f690fa432 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -1,5 +1,5 @@
Route117_PokemonDayCare: @ 8483E88
- .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 5567df47f..3bf779b27 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -1,5 +1,5 @@
Route118: @ 8482854
- .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 dfd8a293d..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 17d13f572..cb61c3a38 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -1,5 +1,5 @@
Route119: @ 8482870
- .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 1126455a2..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 86f968efc..754b0c245 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -1,5 +1,5 @@
Route119_House: @ 8485D28
- .4byte Route119_House_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 1f555389a..fac499e3f 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -1,5 +1,5 @@
Route119_WeatherInstitute_1F: @ 8485CF0
- .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,-,-g�‘g„…†lmv2kj2z2z2k4545j2˜2™2z2Œ2�2Ž2‡tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R2€2w2R2R2€2w2R2R2Š‹R2R2R2Š‹R2U2�2fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z2€2R2R2R2€2z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]R2R2R2R2R2R2R2R2 \ No newline at end of file
diff --git a/data/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 048ccbf77..69a351082 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,5 +1,5 @@
Route119_WeatherInstitute_2F: @ 8485D0C
- .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_g�‘gk,-,-,-,-,-g„6ƒ†6gj2˜2™2z2k4545454545j2Œ2z2Ž2z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2Š‹i2i2i2Š‹i2i2i2i2i2r2i2i2i2€2w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2�r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2Š‹i2i2i2Š‹i2i2i2i2i2r2\i2i2kr2i2i2i2i2i2i2i2i2i2i2i2i2i2i2 \ No newline at end of file
diff --git a/data/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 ab7022f9c..9b8d641d9 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -1,5 +1,5 @@
Route120: @ 848288C
- .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 599e6014d..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 5347f6d3d..4a05c76fe 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -1,5 +1,5 @@
Route121: @ 84828A8
- .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 cfee98f2a..000000000
--- a/data/maps/Route121/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÆÆÆÆurÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕXÔÕÔÕÔÕÔÕ01112ÔÕ0Z6urÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÆÆÆÆurÜÝÜÝÜÝÜÝäåäåÜÝÜÝÜÝÜÝXæåäåäåäç01112æç0ZuræåæåæåäåÜÝÜÝæåæåæåæåæåÜÝÜÝÜÝÜÝÜÝÜÝÆÆurÔÕÔÕÔÕÔÕs6L5L5u6ÔÕÔÕÔÕÔÕX0000000001112000Zur00000000ÔÕÔÕ0000000000ÔÕÔÕÔÕÔÕÔÕÔÕ00urÜÝÜÝÜÝÜÝ{211}2æ5åäåäåäç5X000000008999:000Zur00000000æåäç0000000000æåäåäåäåäåäå||||}rÔÕÔÕÔÕÔÕ 0 0 0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQR‘‘‘‘‘Dæ5åäåäåäç5 0 0 0 000000 0 0 0000000Î1Ï10BD-EC0tyy}r00000000 0 0 0 0 0000000000 0 0 0 00Z0000000000000000000000000000 0 0 0 0 000000Ö×000000r00tz000000000 0 0 0 0 0 0 000000 0 0 0 0 0 0Z0000000000000000000000000000 0 0 0 0 000000ÜÝÎ1Ï100000r&'rPQQQQR00PQQR00PQR00PQQQQQQQQR000000000001111111100000000 0 0 0 0 0 0 00000ÔÕÔ×t¯0Ï0yyz00r 0 0000000000Z0000Z00X0 0 00 0 0 00Z00000000011!1!1)1)1)1)1)1*10 0 0 0PQQQQQQQQQQQR00æåäçr0000000r 0 0 0PQQQQR0PR0000Z00X0 0 0 0 0 0 00Z0000Î1Ï1111!1!1!1*100000 0 0 0 0 0 0 0 0 0 0 00t|||||¯0Ï0||||z0000000r 0 0 0 0 0 0 00000Z 0 000Z0000 0 0 0 0 0 00000Î1Ï1Ö5Õ5)1)1)1)1)1*100Î1Ï1Î1Ç1Æ1Ç1Æ1Ç1 0 0 0 0t|||}t‘‘‘‘¯0Ï0‘‘‘‘‘yyy y¯0Ï0zPQQQQQQQQQQR 0 0 00Z00000000000000Ö5Õ5ä5å500000000ÖÕÔÕÔÕÔ×t|||}t‘‘‘z000000000000 0 0 0 0 0000000000000 0 0 0 0 00ZPQQQQQQQQR0000æ5å5t|00000000æ5åäç5äåäç5ut ‘‘z00000tyy¯0Ï0yy‰0000 0 0 0 0 0 0 0000000000 0 0 0 0 00Z011111100000t|||}€yyyðñyyy||||||||}r00000t|||}]^0^0^0_{||||‰ 0 0 0 0 0 0 00000000 0 0 0 0 0PQR0Õ2Ý6Ý6Ý6Ý6å200000u€‰‰‰˜PPPÖ×PPPt©©©©©©©©}t||||}€‰‰�]^0^0^0^0_€‰‰‰�{||||||||||||||||||||||||||||||||||}�p1p1p1p1Î1Ï1Pæ5ç5t||}q0q0q0q0q0q0t©©}€‰‰‰‰˜pPe]^0^0^0^0_dQppš‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰˜p1p1p1p1Ö×Pt|}t©©||||||}€‰‰˜ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1æ5ç5t}q0q0u€‰‰‰‰‰‰‰‰˜ppppppppPQ’e^0^0^0^0g�pXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}�pppppppppppppppppXYš‰‰‰‰‰‰˜pppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1 \ No newline at end of file
diff --git a/data/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 3ce3d22e7..56a07a3fa 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -1,5 +1,5 @@
Route121_SafariZoneEntrance: @ 8483EA4
- .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 @@
-ˆˆˆˆˆˆˆˆˆ�ˆˆ]ˆˆ‹ˆˆ������œ��•�œ��“��x2p2p2p2p2p2¨Ô2˜2™2™2©e2x2p2p2p2p2€2h2h2h2h2h2°¡ ¡¡±€2h2È2h2h2º2\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h2º2d6h2h2h2h2ababh2h2h2h2h2h2h2€2h2h2h2Ã2Ã2\2h2h2h2ÐÑdh2h2h2Ðx2€2h2h2h2Ѐ2€2h2h2h2ÐÒ2€2h2h2h2ÑÑ\2h2h2h2q2Ó2d6h2h2t6 \ 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 f4856b8ab..591501de1 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -1,5 +1,5 @@
Route122: @ 84828C4
- .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 ff3ab332f..7d7a4590f 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -1,5 +1,5 @@
Route123: @ 84828E0
- .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 e1ab62bd7..000000000
--- a/data/maps/Route123/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-ÆÆÆÇÆÇÆÆÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÆÆÇÆÆÆÇÇÇÆÆÆÆÆÇÆÇÇÇÆÇÆÇÆÇÇ�ppppppppppppppppppppp’E00G�pppppppppppppppppÆÆÆÆÇÆÇÇÆ@000000000ÇÇÇÇÇ@ÇÇÇÇÇÇÇÇÇÆÆÇÇÇ00hiiiiiiiiiiiijÇÇÇÇÆ 0 0 0 0ÇÆ 00 0 0þà4K1L5L5L5M1ÇÇÆÇÆÇÆÇÇÆ�p““pppppppppppppppppp’E00G�pppppppppppppppppÆÆÆÇÆÇÆÆÇ@AIIIIIIII90@ÇÇÇÇÇÇÇÇÇÇÇ00000pqqqqqqqqqqqqrÇÇÇÆ0 0 0 0 0 0 0ÇÆ 0 0 0 0…011111ÇÇÇÆÇÆÇÆÆÆ00ÇÇ“ppppppppppppppppp’E00G�pppppppppppppppppÆÆÆÆÇÆÇÇÆ@Bs6u60s6u60s6u6@00 0 0
-00@ÇÇÇÇÇÇÇ000000à40x y yyy‰qqqqqrÇÇÇ00 0 0 0 0 0 0Æ 0 0 0 0…000000ÇÆÇÆÇÆÆÆÆÇÆÆÇÇ“pppppppppppppppp’E00G�pppppppppppppppppÆÆÆÇÆÇÆÆÇ@B{2}20{2}20{2}2@00@ÇÇÇÇÇÇǰ±±±±±±²000000þ00 0 0x‰qqqqrÇÇÇ000 0 0 0 0 0 0 0 0 0 0 0…0000000ÆÇÇÇÇÇÇÇ“ppppppppppppppp’E00G�pppppppppppppppppÆÆÆÆÆÆÇÆ@Bs6u60s6u60s6u6@0 0@ÇÇÇÇǸ¡¡¡¡¡¡º000000…0 0 0 0 0xyy wÆÆÇÕ4‡4‡4‡4‡4‡4Ö40 0 0000 0 0…0000 0 000000000ÆÆÇÆÆÇÇÇÇ““ppppppppppppp’E00G�pppppppppppppppppÆÆÆÇÆÇ0@B{2}20{2}20{2}2@0 !"0@Ç00¸¡¡¡¡¡¡º000000… 0 0 0 0 0Õ4o00ÆÆÆ0000000Æ 0000000…000 0 0 0 0 0ÇÇÇÇ0ÇÇÇÇÇÇÇÇÆÆÆ““ppppppppppp’E00G�pppppppppppppp“““ÇÆÆÆ000@3II0000II2400000@0þà4000¸¡¡¡¡¡¡º000000… 0 0 0 0 0 0…000ÇÇ0000000ÆÆ000000000 0 0 0 0 0 0 0ÇÆÇÇ0ÇÇÇÇÇÇÇÇÆÆÆÆÆ“pppppppppp’E00G�pppppppppppp““ÇÇÇÇ00000@0000000000000000@00…0000¸¡¡¡¡¡¡º000000%0%0 0 0 0 0…000Ç00000000ÆÆ0à400000ÆÆ%0 0 0 0 0 0 0ÇÇÇ0ÇÇÇÇÇÇÇÇÇÇÇÇÆÆ““pppppppp’E00G�ppppppppp“““ÇÆÇÇÇ00000000@Ç000000000Ð1Ò1000@00…000000000000000à4000ÆÆ%0 0 0 0…000Õ4‡4‡4‡4‡4Ö40 0 0 0ÆÆÆ00000ÆÆÆÆ%0 0 0 0 0 0 0ÇÇÇ0ÇÇÇÆÆÆÆ“““““ppp’E00G�pp“““““““ÆÇÆÇÆÇÆÇ000000000@0000000000Ø1Ú1000@00…00000000000000000ÆÆÆÆÆ 0 00…0Æ00000000Æ%0 0 0ÆÆ0000ÆÆÆÆ%0 0 0 0 0 0ÇÇ0000000000ÇÇÇÇÇÆÆÇÆÇÇÇ>4>4>40000>4>4>4ÇÆÇÆÇÆÇÆÆÆÆÆÆÇÇ000000000HIIIIIIIIII0Ø1Ú10II200�‡4‡4ÇÇÇ0Õ4‡4‡4‡4‡4‡4o4000ÆÆÆÆÆÆ000ÆÆ00000000ÆÆ 0 0 0 0Õ4‡‡‡ÖÆÆÆÆ000 0 0 00ÇÇÇ0ÇÇÇÆÇÆÇÆÇÆÇ0à40001100à40ÇÆÇÇ000000000040000000000Ø1Ú1000000000ÇÇÇ000000…ÇÇÇÇÆÆÆÆ0000Æ0000000ÆÆÆ%0 0 0 0 0000000000000000000 0 0 0ÇÇÇ0ÇÇÇÇÇÆ000001!1"100000ÆÆÆ0000000000ÇÇÇÇÇ00000000000000000Ø1Ú10000000000000000…ÆÆÆÇÇÇ0000Õ4‡4‡4‡4‡4‡4Ö4ÆÆÆÆÆ%0%0 0 000000000þ00à400000000 0 0 0 0 00ÆÆÆÆK1L5L5L5M100111!1!1*1000000ÇÇÇÆÆÆÆÆÆÆÆÇÇÆÆ00Ð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Ò100…0ÆÆÆÆÕ4‡4‡4‡4‡4‡4o0000000ÆÆÆÆ 0000011110…11111000000 0 0 0 0 0 0 000001111111!1!1!1!1*100000000000ÇÇÆÆÇÆÆ0à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â100…000000000…0111111100þ0111!1!1)1*10…(1)1)1!1!11111à40 0 0 0 0 0 0 00011111111111!1!1!1)1)1*100à400ÆÆÆÆÆ00000000000ÇÇÆÇÇÆÇÇ0000000000000000000000000000000000…0011111111000…0(1)1)1)1)1!1!1111110…0(1)1)1)1*1000…000(1)1)1)1)1*10%0%0%0 0 0 0 0 000(1)1)1)1)1)1)1)1)1)1)1)1)1*1000000ÇÇÇÆÆÆÆ0ÆÆÆÆÆÆÆÆ0ÆÇÆÇÆÇÆÇÇÇÇ@4I0IIIIIIIIIII@4@4IIIII0@4ÆÆÆÆ00000…00(1)1)1)1)1)1)1*1000000000(1)1)1)1)1)1*10…0000000à40000000000ÆÆÆÆ%0%0%0%0 000000000à400000000000ÇÆÇÆÆÆÆÆÆ0ÇÇÇÆÇÆÇÆÆÇÆÇ0000000000000ÇÇ000000ÆÇÆÆÆÆÆÆ00Ç000000à4000000ÆÆ00000000à40000000000000ÆÆ000ÆÆÇÆÆÆÇÆÆÆÆÆ00à4000000000000ÆÆÆÆÆÇÆÇÆÆÆÆÆÆÆ0000000000ÇÇÆÇÆÇÆÇÇÆÇÆÇÆÆÇÆÇÆÆÆÆÆÆÆÆÆÆ0ÆÆÆÇÆÇÆÇÇÆÇÇÇÇ0ÇÇÇ000000ÇÆÆÆÆÆÆÆÆÆÆ000000000ÇÇÇ000ÇÇÇÆÆÆÇÆÇÆÇÆÇÆÇÆÇÆÆÆÇÆÇ00000000ÆÆÇÆÇÇÆÇÆÇÆÇÆÇÆÇÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ \ No newline at end of file
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index f086368ad..f1466f9e7 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -1,5 +1,5 @@
Route123_BerryMastersHouse: @ 8485CD4
- .4byte Route123_BerryMastersHouse_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 e4c690104..811fb3ec7 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -1,5 +1,5 @@
Route124: @ 84828FC
- .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 acd4a65fb..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 d277004eb..a7501cddc 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -1,5 +1,5 @@
Route124_DivingTreasureHuntersHouse: @ 8485D44
- .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 �2–2—2‰2Š2$2$2$2$2$2˜9252626262626272#2#292=á2H6I6â>?#2#292=á2P6Q6â>?#2#292E2F2F2F2F2F2G#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file
diff --git a/data/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 09afc815f..4e67b3cb6 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -1,5 +1,5 @@
Route125: @ 8482918
- .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 078f2713d..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 f87efc723..13e741159 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -1,5 +1,5 @@
Route126: @ 8482934
- .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 070f9996f..fa3ee0200 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -1,5 +1,5 @@
Route127: @ 8482950
- .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 fa44f9960..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 01d1a46ba..08acd71f2 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -1,5 +1,5 @@
Route128: @ 848296C
- .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 4e5b177df..53abdbebe 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -1,5 +1,5 @@
Route129: @ 8482988
- .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 f4e1f3292..47b4b613c 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,5 +1,5 @@
Route130: @ 84829A4
- .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{{{{{{vpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr´qkllmq´vppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppu´qk´qquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{´qklllmq´vppppuv‚‰q{|||}qt„}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqk¾klm¾mq´vppp}~p‚y‰qqqty„ppu{{vpp‚y„ppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„pXYpp}~ppppppXYpppppppppppppppppppppPQppp}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppPQpppppppu{´q´{vpppppppppppppppuvu{´qq|pppXYppppppppuvppppy„ppppppppppXYppppppppXYpppppuv‚‰qqqq´vpppppppppppppp}~zqqqt„ppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~p‚yyyyy„uvppppppu{{vpuvp‚yyy„uvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{´km´v}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuv‚yy„ppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppzt„ppppppp}~pppppppppppppppppppppppp}~PQ‚yy‰qqt„p}~ppppppppppppppppppppppppp}~pp‚„ppppppppppppppppppppppppppppppppppppXYppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{´qqq´vpuv´qq|ppppppppppppppppppppppppppuv‚y„}~pppppppppppppppppppppppppppppu{{´qqqqqq´v}~qqt„pPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvppp‚‰qqqqqqqqq´vpyy„uvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq´{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq´vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq´vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{´qkm´vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q´v}~pu{{´klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/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 44a8921ba..b13a344fc 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -1,5 +1,5 @@
Route131: @ 84829C0
- .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 096d6e116..000000000
--- a/data/maps/Route131/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqqqqqqqqqt||}ut©|}€˜ppVOOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqqqqt||}qqt}u€‰‰˜pppVOOOOOOOOOOOOOOOOOVppppppppppppppppp||||||||}qqqt|}t}�pppppppVOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqt©©©|||}qt}€˜pppppppVOOOOOOOOOOOOOOOVppppppppppppppppppqqt||}qqqt©©©|}€˜ppppppppVOOOOOOOOOOOOOOOVpppppppppppppppppp||}qt©|||}€‰‰‰‰˜ppuvppppppVOOOOOOOOOOOOOOVpppppppppppppppppp©©©|}€‰‰‰‰˜uvpu{vp}~ppppppVOOOOOOOOOOOOOVppppppppppppppppppp€‰Z[‰˜ppppp}~pzq|ppppppppppVOOOOOOOOOOOOVpppppppPQpppppppppp˜pXYppppuvpppp‚y„pppppppuvpVOOOOOOOOOOOOVppuvu{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pVOOOOOOOOOOOVpuv}~zq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vVOOOOOOOOOOVp}~pp‚y„PQ}~ppppppppPQpp‚y„ppuvPQpppPQ}~pPQppzq|VOOOOOOOOOVpuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp‚y„pVOOOOOOOOVu´|pppuvpppu´qq´vpppppppppppXYppppp}~pppXYppppppuvpVOOOOOOVpzq|ppp}~PQp‚yyyy„PQppppppppppppppppppppuvppppppp}~uvVVVVVVuv‚y„pppppXYuvppPQpXYu{pppppppppppppppppp}~u{vpppppp}~ppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq´{vppppuvppuvXYpppppppu{vpppppPQppuv‚ypppppppppppppppppppp‚yyy„pppp}~uv}~pppppppu{´q|pppppXYpp}~ppppppppppppppppppppppppppppppppp}~pppppppPQzqqq|ppppppPQpppPQppppppppppppppppppppppppppppppppppppppppXY‚yyy„ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu´q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~‚yy„pppppppppppppppppppppppppppppppppppppppppppppppppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz´vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp‚‰´v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ‚y{{{{tppp‚y„p}~uvp‚y„pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq´{tppppuvp}~ppuvpppppppzqq´{vppp}~uvpppu{{vppXYp}~puvpppllllmq´{{{t}~pppuv}~ppu{{vp‚‰qqq´vpppp}~ppu´qq´{{vu{{{v}~pppqqqq¿llmqq´{tppp}~ppu{´qq|uv‚yyyy„ppppppPQ‚yyy‰qq´´qqt„pppppqqqqqqq¿mqqqutppppppzqqqt„}~ppppppppppppXYpppp‚y‰qqqt„ppppPQqqqqqqqq¿llmuu{tppuv‚yyy„ppppppppppppppppppppppp‚yyy„pppppXYqqqqqqqqqqq¿¿¿l¿tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/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 df2aadbfa..b4fe2bc0d 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -1,5 +1,5 @@
Route132: @ 84829DC
- .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 3250c0429..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 30a69f94d..e8bc66e6f 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -1,5 +1,5 @@
Route133: @ 84829F8
- .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 1d4e74f73..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}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQŒŒŒcccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2WccccƒƒƒcXYŒŒcccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2ž1ž1ž1_ccccPQƒƒccccccccccccccccccccccccccccc^ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1_ccccccc}~­®1®1®1®1®1®1®1®1®1®1›1^WWWW_OgccccXYcŒŒŒŒŒcccccccccccƒƒƒƒƒƒccccccccfGGNž1ž1ž1ž1ž1ž1ž1ž1ž1_ccccVF2F2F2F2›1ž1ž1ž1^WWWWWWW´ßßtyo_ccccccŒŒŒŒccccccccccccccccccƒƒƒƒƒƒƒƒcccccfGGNž1ž1ž1ž1ž1ž1_cccc^^W_ž1ž1ž1ž1ž1fßßßßßßßtyyož1ž1_ccccŒŒŒŒcccccccccccccccVF2F2F2WcccccƒƒƒƒƒƒcccccfGNž1ž1ž1ž1_cccV>2fß¾_ž1ž1^W¾ßtyyyyyož1ž1ž1OGgccŒŒŒcccccccccccccccccc^ž1ž1ž1?2F2F2WcccccƒƒƒƒƒƒƒcccfGGGGgccc^^¾ßß¿WW¾tyyož1ž1ž1ž1ž1ž1ž1OGgccŒŒŒcccccccccccccƒƒƒƒcccfNž1ž1ž1ž1ž1?2F2F2WcccccƒƒƒƒƒƒƒccccccccV>2fßßßßßßß�ž1ž1ž1ž1ž1ž1ž1OGGgccŒŒŒcccu{{{{{{{{{{{{tƒƒƒƒccfNž1ž1ž1ž1ž1ž1ž1?2F2F2Wcccccƒƒƒƒƒƒcccccc^ž1fßßtyyyyož1OGGGGGgccŒŒŒŒŒcu{{´ßßßßßßßßßßßß´{{tƒƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1?2F2F2Wcccccƒƒƒƒƒcccc^ž1nyyož1ž1ž1ž1ž1ž1_cccccŒŒŒŒŒcccu´ßßßtyyyyyyyyyy‰ßßß´{tƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1?2F2F2Wccccccccccc^ž1ž1ž1ž1ž1ž1ž1OGGGgccŒŒŒŒŒcccu{{´ßtyy’$1$1$1$1$1$1$1$1$1$1�yyy‰ß|ƒƒccfNž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1_cccccccccccfGNž1ž1ž1ž1Ogccccccccccccu{´tyyy’$1Ž1¦1¦1¦1¦1�1$1$1Ž1¦1¦1¦1�1$1$1$1ˆß´tccccfGGGGGGGGGGGGGgcƒƒƒcccccccccfGGGGgcccccccccccccztyo¦1¦1¦1¦1¦1§1¤¾¾£¥1¦1¦1§1¤¾£¥1¦1¦1¦1ny‰´tcccccccccccccccccccPQƒƒƒcccccccccccccccccccccccccc}~½¾¾¾¾¾¾¾¿pp½¾¾¾¾¿p½¾¾¾¾¾¿}y~cccccccccccccccccccXYcƒƒƒccccccccccccccccccccccccccppppppppppppppppppppppppppccccccccccccccccccccccccccƒƒƒƒcccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccccPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{´ßßßßßßßßßß´tPQXYccXYcPQPQXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYpppppu´ßtyyyyy‰ßtyyyyy~XYcccccccXYXYppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{´ßtož1ž1”ž1ž1n‰Šž1ž1”ž1ž1?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{´tyyož1ž1ž1ž1”ž1ž1nož1ž1ž1ž1ž1ž1?2WccpppppppppppPQXYO1O1O1O1O1ž1_cccccccccuv}~llllcccccccccccppu´ßßtož1ž1ž1ž1ž1^_ž1ž1ž1ž1ž1ž1”^_ž1ž1ž1_cppppppppppppXYO1O1O1O1O1O1O1ž1_ccccccccc}~llllccccccccccccccc}yyyož1ž1”ž1ž1ž1nož1ž1ž1ž1ž1ž1ž1fg^_ž1_ccpppppppppppPQO1O1O1O1O1O1O1ž1_cccccccccclllccccccccccccccccccccc^ž1ž1ž1ž1^_ž1ž1ž1ž1ž1ž1ž1ž1ž1nofgž1_cccppppppppppXYO1O1O1O1O1O1O1ž1_ccccccccccccccccccccccccccccccccccfGNž1ž1fgž1”ž1ž1ž1ž1ž1ž1ž1ž1ž1nož1_cccccppppppƒccPQO1O1O1O1O1O1ž1_cccccccccccccccccccccccccccccccccccc^ž1ž1nož1ž1ž1ž1OGGGNž1ž1ž1ž1OgcccccccppPQƒccXYPQO1O1O1O1ž1_cccccccccc\\\cccccccccccccccccccccccfNž1ž1ž1ž1ž1OGgcccfGGGGgccccccccccXYƒƒƒccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfNž1ž1ž1OgccccccccccccccccccccccccƒƒƒƒccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQƒƒƒƒccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYppƒƒƒƒccuvccccccccccuvpp}~XYccccccPQccccPQpppppPQuvccccccccccpppuvppPQuv}~ppppppppppPQPQ}~ccccccuvPQ}~ppppuvccccccXYuvPQXYpppppXY}~PQccccppPQuvp}~PQXY}~PQppuvppppPQXYXYppPQPQuv}~XYpppppp}~uvuvPQuv}~XYpPQuvPQuvppXYPQuvuvXY}~PQpXYppppXYuv}~PQuvXYppppppXYXY}~pppppppppppp}~}~XY}~pppppXY}~XY}~ppppXY}~}~ppppXYppppppppp}~ppXY}~pppppp \ No newline at end of file
diff --git a/data/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 9730f5036..20f6dd90a 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -1,5 +1,5 @@
Route134: @ 8482A14
- .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 7b78a2d3c..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 9698b81de..adce7ef75 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -1,5 +1,5 @@
RustboroCity: @ 848250C
- .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 06736e47e..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 e7b936a19..5423772bf 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -1,5 +1,5 @@
RustboroCity_CuttersHouse: @ 8483478
- .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 @@
-yzfg8898x88�‚no@@A@€VW‰3Š3v3w3+3+3+3+3ˆ3^3_3+3{3|3|3}3,3,3,3,3,3,3+3ƒ3>2>2…3,3,3,3j7k7E3+3ƒ3>2>2…3,3,3D3r7s7E3+3‹3Œ3Œ3�3,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3 \ No newline at end of file
diff --git a/data/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 68b72454f..9e270b9fc 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_DevonCorp_1F: @ 8483344
- .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 09f86a742..000000000
--- a/data/maps/RustboroCity_DevonCorp_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-šˆ‰ˆˆ‰ˆ›šŠ‹3Œ›˜ö‘��‘ö™˜’“”™˜þ�3�3�3�3þ™˜�3�3�3™ˆ‰ †�3�3�3‡3€¡ˆˆ �3€3€3¡‰ˆ�‘�Žœœœ�„3�����3€3€3�‘��3�3�3�3ƒ3ƒ3ƒ3ƒ3…3�3�3�3�3�3€3€3�3�3�3�3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3�3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3�3€3€3€3€322€3€3€3€3€3€3€3€3€3€3€3€3 \ No newline at end of file
diff --git a/data/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 5e4dc392b..f3954aed0 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_DevonCorp_2F: @ 8483360
- .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 @@
-šŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆŠ‹Œ‰ˆ› ’“”�‘�‘�‘�‘�•–—‘�¡��3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3��3�3€3€3€3€3£3¤3€3€3£3¤3€3€3£3¤3€3€3�3�3�7¥7¦7€3€3«7¬7€3€3«7¬7€3€3«7¬7€3€3€3�3§3­7®7€3€3§3�7€3€3§3€3€3€3§3€3€3€3€3�3€3§3§3€3€3£3¤3€3€3£3¤3€3€3£3¤3€3€3€3�3€3€3€3€3€3«7¬7€3€3«7¬7€3€3«7¬7€3€3€3�3€3€3€3€3€3§3€3€3€3§3€3€3€3§3€3€3€3€3 \ No newline at end of file
diff --git a/data/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 54ae910d3..c0bbdebd1 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_DevonCorp_3F: @ 848337C
- .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 5a55ee4ab..000000000
--- a/data/maps/RustboroCity_DevonCorp_3F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ˆŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ�•–—�‘�‘IJK‘�‘�‘�‘��3�3�3�3�3�3�3�3Q3R3S3�3�3�3�3�3�3�3�3�3€3€3€3€3€€3¸3¹3¹3¹3º3€3€3€3¸3º3€€3�3Ý2€3€3€3HC€ÀÁÁÁ€3€3€3ÀÂÿB€3�3å€3€3€3PC€»¼¼¼½€3€3€3»½C€3�3Ý2€3€3€¨C€ÃÄÄÄÅ€3€3€3ÃÅ©C€�3å€3€3€3€€3¾3Æ3Æ3Æ3¿3€3€3€3¾3¿3€€3�3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3 \ No newline at end of file
diff --git a/data/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 ede158338..4f424b853 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat1_1F: @ 8483424
- .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+3ˆ3^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,3ƒ3á2H6I6â2…3+3p7q7E3,3,3,3,3ƒ3>2P6Q6â2…3F3G3,3,3,3,3,3,3‹3Œ3Œ3Œ3Œ3�3N7O7,3,3,3,3LM,3,3,3,3,3,3 \ No newline at end of file
diff --git a/data/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 c1a83cdbb..49e5c1481 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat1_2F: @ 8483440
- .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 936907d32..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~77Ž7E3,3{|||},3,3+3,3†7‡7�7E3,3ƒ:2!7/3…,3,3+3G3G3,3,3,3,3ƒ„3¶ý3…,3,3+3O7O7,3,3,3,3‹ŒŒŒ�,3,3 \ No newline at end of file
diff --git a/data/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 14d40b97a..4080980a0 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat2_1F: @ 84834B0
- .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 989069c30..d4ad99dbc 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat2_2F: @ 84834CC
- .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 d531fcf98..90918421f 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Flat2_3F: @ 84834E8
- .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 4b49e1077..8aef6fe28 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Gym: @ 8483398
- .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 4451674a7..000000000
--- a/data/maps/RustboroCity_Gym/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- '226 2
-2 2 6222226222622722222222222222222222222#/22 !!!!!!"#22()))))"#2272022,2.22 "#222#/2 "/2 "#22212(*2 "#2()*222-242%"#222.222(!!"#2 "/2272()"#2 $5222322 "+2()*/2(*/2(*227222272227222222222222222&/22222&/222272220027222 \ No newline at end of file
diff --git a/data/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 49445724b..c921d3a5e 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -1,5 +1,5 @@
RustboroCity_House1: @ 848345C
- .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~77Ž7E3,3ƒ3>2>2…3,3+3,3D3†7‡7�7,3,3‹3Œ3Œ3�3,3F3,3,3,3,3,3,3,3,3,3,3,3G3N7,3,3,3,3LM,3,3,3,3,3O7 \ No newline at end of file
diff --git a/data/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 ec04d74d9..6f4d6c02d 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -1,5 +1,5 @@
RustboroCity_House2: @ 8483494
- .4byte RustboroCity_House2_MapAttributes
+ .4byte RustboroCity_House_Layouts
.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 @@
-yz89888819fg�‚IA@@JKAno‰3Š3Q3+3+3+3R3S363+3v3w3+3,3,3{3|3|3|3|3}3,3,3,3+3,3,3ƒ3á2H^â2…3,3,3,3+3,3,3ƒ3á2PQâ2…3,3,3,3+3,3,3‹3Œ3Œ3Œ3Œ3�3,3,3,3F3,3,3,3,3,3,3,3,3,3,3G3N,3,3,3,3LM,3,3,3,3O \ No newline at end of file
diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc
index 9ffe65113..73b5d4a0b 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -1,5 +1,5 @@
RustboroCity_House3: @ 8483504
- .4byte RustboroCity_House3_MapAttributes
+ .4byte RustboroCity_House_Layouts
.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 be134394a..cb82a6500 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -1,5 +1,5 @@
RustboroCity_Mart: @ 8483408
- .4byte RustboroCity_Mart_MapAttributes
+ .4byte Mart_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 fb88549f7..3db96f00d 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_PokemonCenter_1F: @ 84833D0
- .4byte RustboroCity_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 0acf68eaa..74f264702 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
RustboroCity_PokemonCenter_2F: @ 84833EC
- .4byte RustboroCity_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 a3d257cfb..3d68afc48 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -1,5 +1,5 @@
RustboroCity_PokemonSchool: @ 84833B4
- .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 0ce8c9e12..d4f1fdad5 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -1,5 +1,5 @@
RusturfTunnel: @ 8483F30
- .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 606d682ba..046eedc85 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -1,5 +1,5 @@
SSTidalCorridor: @ 8484F0C
- .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 @@
-¹¸¹¸¹¸¹¸¹¸¹¸¹¸¹¸¹ÁÀÁÀÁÀÁÀÁÀÁÀÁÀÁÀÁ»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º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2011111111112¼2º2º2¼2º2%#$"#$"#$"#&¼2º2º2¼2º2-+6{*+6{*+6{*+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 \ 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 c1f883c84..3e2f5bacb 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,5 +1,5 @@
SSTidalLowerDeck: @ 8484F28
- .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 @@
-©©©©©©©©©©©©©©©±±èê±±àê±±ëìí±±±2èê22èê2ëìí2222 2ðòî2 2ðòî2 2óôõî2 2 2 22 2ç2ç2ö2 2ç2ç2ö2 2ç2ç2ç2ö2 2 2 22à2á2â2à2á2â2 2ã2å2 2ã2ä2å2 2 2 22ëìíèéêî2èêî2ëìíî2 2 22óôõðñòî2ðòî2óôõî2 2 22ç2ç2ç2ç2ç2ç2ö2ç2ç2ö2ç2ç2ç2ö2 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2à2â22à2á2â2à2á2â2 2à2â2 2ã2å2 2 2èê2èéêèéêî2ðòî2óõî2 2ã6å6ðñòðñòî2ç2ç2ö2ç2ç2ö2 2óõ \ No newline at end of file
diff --git a/data/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 09bfb8652..c5f0aaa00 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -1,5 +1,5 @@
SSTidalRooms: @ 8484F44
- .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@k•c–mE@k•c–mE@k•c–''@k•c–mE7>Hs�—žuMHs�—žuMHs�—ž////�—žuM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2™š;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282¡¢828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr™6š6;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz¡¢828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282? \ No newline at end of file
diff --git a/data/maps/SafariZone_North/border.bin b/data/maps/SafariZone_North/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/SafariZone_North/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÔÕÜÝ \ No newline at end of file
diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc
index ce05b1eea..d7ad06ffa 100644
--- a/data/maps/SafariZone_North/header.inc
+++ b/data/maps/SafariZone_North/header.inc
@@ -1,5 +1,5 @@
SafariZone_North: @ 8485158
- .4byte SafariZone_North_MapAttributes
+ .4byte SafariZone_North_Layout
.4byte SafariZone_North_MapEvents
.4byte SafariZone_North_MapScripts
.4byte SafariZone_North_MapConnections
diff --git a/data/maps/SafariZone_North/map.bin b/data/maps/SafariZone_North/map.bin
deleted file mode 100644
index 4f5296815..000000000
--- a/data/maps/SafariZone_North/map.bin
+++ /dev/null
Binary files differ
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 e5efff7b6..58685eafe 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -1,5 +1,5 @@
SafariZone_Northeast: @ 848528C
- .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 9a8803a6a..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 810826106..81718dc65 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -1,5 +1,5 @@
SafariZone_Northwest: @ 848513C
- .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 591de9fc1..92488b12d 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -1,5 +1,5 @@
SafariZone_RestHouse: @ 8485270
- .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#242è6ê6<2#2#2#2#292#242ð6ò6<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/maps/SafariZone_South/border.bin b/data/maps/SafariZone_South/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/SafariZone_South/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÔÕÜÝ \ No newline at end of file
diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc
index 58239408f..3ffd068c2 100644
--- a/data/maps/SafariZone_South/header.inc
+++ b/data/maps/SafariZone_South/header.inc
@@ -1,5 +1,5 @@
SafariZone_South: @ 8485190
- .4byte SafariZone_South_MapAttributes
+ .4byte SafariZone_South_Layout
.4byte SafariZone_South_MapEvents
.4byte SafariZone_South_MapScripts
.4byte SafariZone_South_MapConnections
diff --git a/data/maps/SafariZone_South/map.bin b/data/maps/SafariZone_South/map.bin
deleted file mode 100644
index 50497b503..000000000
--- a/data/maps/SafariZone_South/map.bin
+++ /dev/null
Binary files differ
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 56e8aa094..438d3ea7f 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -1,5 +1,5 @@
SafariZone_Southeast: @ 84852A8
- .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 a778b8797..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 3eaf59e98..5cff316ae 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -1,5 +1,5 @@
SafariZone_Southwest: @ 8485174
- .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 e9b0a7b7e..543f83ebb 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,5 +1,5 @@
ScorchedSlab: @ 84846BC
- .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 @@
-222222222222222222222222222222222‰‘‘‘‘‘�Šppppp��‰’ppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppppppˆŠpppƒpppˆGG^^‹Œ„^^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 be05d04fa..3e26232dc 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Entrance: @ 84841B4
- .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 f41e6e77d..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$1Ž1¦1¦1¦1�1$1$1$1$1$1
-ñ $1$1$1Ž1¦1§1ž1ž1ž1¥1¦1�1$1$1$1
-ñ $1$1Ž1§1ž1ž1ž1ž1ž1ž1ž1¥1�1$1$1
-ñ $1Ž1§1ž1¤¾¾¾¾¾£ž1¥1�1$1
-ñ Ž1§1ž1¤¿ppppp½£ž1�1$1
-ñ Ÿ1ž1¤¿ppppppp½£¥1�1
-ñ §1ž1·pppppppppµž1�1
-ñ ž1ž1·pppppppppµž1�1
-ñô�§ž1·ppVVVVpppµ¯—óóñññ�§·pV””””Vp˜��ñññññññ��™V””””V˜�ñññññññññññ��������ññññññ \ 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 094095d7e..29a75081f 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room1: @ 84841D0
- .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 @@
-ññññññññññññññññññññññëùùþÿùùùùùùìñ2ñ2ñ2ññññòñë3ì22222øìñ2ñ2ññññòñò222ð222222øìñ2ññññòñò222øù2ì2222ðñ2ññññòñòí22222øì222ðñ2ññññòñôêï622222øì22øìññññòññò÷6222222ð222ðññññòññôéééééê2ð222øìñññòëùùìññññò2ð222íðñññòò22øùùùùú2øì222øìññòò2222222222ð222íðññòò22èé6é6é6é6ê2íð2222ðññòò22ðñ6ñ6ñ6ñ6ò22ð22<22ðññòò2èó6ñ6ñ6ñ6ñ6ò22ðåæçóññòò2ðñ6ñ6ëùùú22ððññññññòò2øùùú22222ððññññññòò2222222èééôðññññññòò2222222ðñññðññññññòôåæçééééóñññðññññññóééééééééééééóññññ \ No newline at end of file
diff --git a/data/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 ebbfc58bc..749b4b9ee 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room2: @ 84841EC
- .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 72a064870..000000000
--- a/data/maps/SeafloorCavern_Room2/map.bin
+++ /dev/null
@@ -1,7 +0,0 @@
-ññëùþÿìëþÿÿìñññññ ë3ìøúë3ìøìññññ ò222øùùú22øì
-ññññ ò2222222222ð
-ñññëò2èê2èê2èê2ð
-ñññ ëú2øú2ðò2øú2ð
-ñññ ò22222øú2222ð
-ñññ ò222222222èéé
-ñññ òf2èéééåæçéééñññ ò22øùìñññééñññññ ò2222ðéééñññññññóéåæçéóóñññññññññ \ No newline at end of file
diff --git a/data/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 56dd1c14b..4ef0565be 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room3: @ 8484208
- .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 01d18c73c..000000000
--- a/data/maps/SeafloorCavern_Room3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ñ6ñ6ñ6ñ6ëùùþÿùùìñ6ñ6ñ6ñ6ñ6ñ6ñ6òëùù3ùìðñ6ñ6ñ6ñ6ñ6ñ6ëúò22222ðìñ6ñ6ñ6ñ6ñ6òñ6ò22222ìùìñ6ñ6ñ6òëú222222ìñ6ðñ6ñ6ñ6òò22222222ìðñ6ñ6ñ6òò222èéê222ððñ6ñ6ñ6òò222ðñ6ò222ððëùùò222ðñ6ò222ððòëùùú222ðñ6ò222ððòò222222øùú222ððòò222222222222ððòò222222222222ððòòQQQM22222222ððòò22222èåæçéééôðòò22222ðééééééôôôéåæçéôôñ6ñ6ñ6ñ6ñ6ñ6ñ6 \ No newline at end of file
diff --git a/data/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 1f710ac3a..0edd39d4a 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room4: @ 8484224
- .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 @@
-ëùùþÿùùùùùùþÿùùìòëù3ìññññë3ìñ6ðòò2222ðññññò222ðñ6ðòò2222ðññññò222ðñ6ðòòLQQMøùùùùú222ðñ6ðòò2222222292222øìðòò22222222922222ððòò22222èééôê2222ððòò2222èðñ6ñ6ñ6òê222ððòò2222ðøþÿúò222ððòò2222øù3ùú222ððòò22222922222222ððòôéê2229222222èéôðòññôééééêLQQQMðññðôéñññññò22222ðññðññôéñññò22222ðññðññññôéñôåæçééôññðññññññòññññññññéôññññññôééééééééôññ \ No newline at end of file
diff --git a/data/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 8f9edd756..013f447dc 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room5: @ 8484240
- .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 @@
-ñëùþÿùùùùùìñññññññññòë3ùùùùìðññ‰‘‘‘�ññòò2222222ððññŠ“““ˆññòò2222222ððññŠ“““ˆññóóéééê222ððññó󂓈ñ‰‘�ñññòê22ðøùùù슓ˆñŠ“ˆñëùúò22øùùùìðóóóñóóóñòëùú222222ððñññññëùùúò22222222ðøùùùìñòëùùú222èéê22øùùùìðñòò22222èðñòê22222ððñòò22222ððñòò22222ððñòò22èéêððñòò22222ððñòò22ðòððñóóéåæçéóóñòò2èóòðøùìññññ‰‘‘�ñòò2øùùúøùìðñññ‰’““ˆñòò2222222ððñ‰‘’“““ˆñòò2222222ððñŠ““““€óñóóéééåæçéóóñó‚“€óóñññññññññññññññóóóñññ \ No newline at end of file
diff --git a/data/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 e1aab7b08..9bbb14463 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room6: @ 848425C
- .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 452263326..000000000
--- a/data/maps/SeafloorCavern_Room6/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-����‰Š�����������������Žz���‘2’����������������Žxzzy2y2y2y2€‰‰‰‰‰‰‰‰‰‰‰‰‰‰�xxzzy2y2y2y2�pŒ‹‹‹‹‹‹‹‹‹‹‹‹’xxzzy2y2y2y2�pŒpppppppppppƒ’xxzzy2y2y2y2�pŒpppÃvvvÅpppƒ’xxzz€‰‰‰˜pŒppu�~~~—wppƒ’xxzz�pppppŒpp}€ˆ‰Š‚ppƒ’xxzz�pp„„„Œpp…††‘††‡ppƒ’xxzz�pƒpppŒpppppƒpppp„ƒ’xxzz�pƒpppŒp„„„„ƒppppƒƒ’xxzz�pƒpppŒpƒpppppŒ‹‹pƒ’xxzz�pƒpŒ‹p„ƒŒ‹‹‹‹‹ppƒp’xxzz�pƒpŒpŒppŒpppppppƒp’xxzz�pƒpŒpŒpp„„„Œppppƒp’xxzz�pƒpŒpŒpppppŒppppƒp’xxzz�pƒpŒpŒpppp„p„„„„ƒp’xxzz�pƒpŒpŒppppƒ„„„„ƒpp’xxzz�pƒpŒp„„„„„ƒppppppp’xxzz�pƒ‹‹ppƒpppƒpppppÃvvvvzz�pppppÜo2o2o2›vÅpÃvv~~~~vvvvvvvvvz~2–2~2x~vvv~~~~~~~~~~~~~~~”˜™š“~~~~~~~~~~ \ No newline at end of file
diff --git a/data/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 fd0b49c93..d4b0db267 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room7: @ 8484278
- .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 7fa1d903d..000000000
--- a/data/maps/SeafloorCavern_Room7/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-����ˆ‰Š���������������Žz����‘2’�����Ž~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2€‰‰‰�€��������Žxzz€‰‰‰‰˜pppš‰‰‰‰‰‰‰‰�xxzz�ppppppppppppppppp’xxzz�pŒ‹‹‹‹‹‹‹‹‹‹‹‹‹‹p’xxzz�pŒpppppppppppppƒp’xxzz�pŒŒ„„„„„„„„„„„„ƒp’xxzz�pŒŒppppŒppppppppp’xxzz�ppŒpppp„„„„„„„„Œp’xxzz�ppŒppppppppppppŒp’xxzz�ŒpŒpp‹‹‹‹‹‹‹‹‹pŒp’xxzz�ŒpŒppŒ‹ppppppƒpŒp’xxzz�ŒpŒppŒƒppppppƒpŒp’xxzz�Œp„„„Œƒ‹‹‹‹‹‹p„Œp’xxzz�ŒppppŒpppppppƒpŒp’xxzz�ŒppppŒpppppppƒpŒp’xxzz�Œ‹‹‹‹‹‹‹‹‹pppƒ‹‹‹’xxz“6œ6q2ypppppppƒpppƒppp’xxzy6z6y2�pppppppƒpppƒppp’xxzy6z6y2q2q2q2q2q2yppƒpppƒppp’xxz�6‚6y2y2y2y2y2y2�ppƒpppƒppp’xxzzy2•2y2y2sy2t�pp„pppƒppp’xx””˜™š“““““vvvvvvvvvv“““ \ No newline at end of file
diff --git a/data/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 a5ecc196a..903e25a14 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room8: @ 8484294
- .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 @@
-ññññññññññññëùùþÿùù6ìññòñë3ìñðññòëú222øìðññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò22222ððññòò2LQM2ððññòò22222ððññòò22222ððññóóéåæçéôôñ \ 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 4df3870e6..0d43deb23 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -1,5 +1,5 @@
SeafloorCavern_Room9: @ 84842B0
- .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 @@
-ëùùùùùùùùùùùùùìññññññññññññòëùùùùùùùùùùùìðññññññññññññòòõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ðøùùìñññññññññòôéõ2õ2õ2õ2õ2õ2õ2õ2õ2øùùìðñññññññññòññòõ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ððñññññññññôéêôåæçéõ2õ2õ2õ2õ2õ2õ2ððñññññññññññòñññññòõ2õ2õ2õ2õ2õ2õ2ððñññññññññññôééêññòëùù2ùùìðøìñññññññññññññòññòòõ2õ2õ2õ2õ2ððñðñññññññññññññòññòòõ2õ2õ2õ2õ2ððñøìññññññññññññòññòòõ2õ2õ2õ2õ2ðøìñðññññññññññññòñëúòëù2ùìðñðñðññññññññññññòñòëúòõ2õ2õ2ððñðñøìññññññññññëúñòòëúõ2õ2õ2ðøìøìñðññññññññññòññòòòõ2õ2õ2õ2øìðñðñøìññññññëùùúñëúòòõ2õ2õ2õ2õ2ððñðññðññññññòññññòëúò2ðøìðññðñññññùúñëùùúòëú222øìððññðññññññññòñññòò222ðððññðñññññëùùúñëùúò22222ðððññðñññññòññññòññò22222ððøùìøùùùùùòññëùúññò2ððññðññññññòñëúññëùú222ðøùìøùùùùùìúñòññëú222øùìøùùùùùìðùùúññò  222øùùùùìñððñëùùùú 222   ðñðøñò 2222222 ðñøùñò2222222222ðñññëú 2222222    #øùùìò 222    #ðò2222 #  ðò2222      ðò2222 #    ðò2222 ‰‘‘� ðò222 # ‰’OO�� ðò222‰‘’OOOO�‘�ðò222ŠpNOOOONpˆðò222ŠppNNNNppˆðò22222‰’ppppppppˆðò22222 Špppppppppˆðò22222222#2s2lppppppppˆðóóó222222222#2lpppppjs2s2$2ðñññóé22222222#2s2s2s2s2s2$2222ðñññóééé2222222222222ôôôñññññññññóééé222222ééôññññññññññññññññóééééééóññññññ \ No newline at end of file
diff --git a/data/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 87b73cfa1..4a26587bc 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -1,5 +1,5 @@
SealedChamber_InnerRoom: @ 84846A0
- .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 @@
-ñëùùùùùùùùùùùùùùùùùìññòëùùùùùùùùùùùùùùùìðñëúòëùùùùìñññëùùùùìðøìòëúò2222ðñññò2222ðøìðòòëú2222ø777ú2222øìððòòò222222222222222ðððòòò22èéê22222èéê22ðððòòò22ðñò22222ðñò22ðððòòò22ø7ú22222ø7ú22ðððòòò222222222222222ðððòòò222222222222222ðððòòòèéê222222222èéêðððòòòðñò222222222ðñòðððòòòø7ú222222222ø7úðððòòò222222222222222ðððòòò222222222222222ðððòòò22èéê22222èéê22ðððòòò22ðñò22222ðñò22ðððòòôê2ø7ú22222ø7ú2èóððòôò2222222222222ðóðôòôéééééåæçéééééóðóñòôéééééééééééééééóðññôéééééééééééééééééóñ \ No newline at end of file
diff --git a/data/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 fc55dd8d2..fd5fe39f3 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -1,5 +1,5 @@
SealedChamber_OuterRoom: @ 8484684
- .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   
-22225552555222222222222222222222222€‰‰‰�2222222222�VVV’2222222222�VGV’22222$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 8914ffdc5..4e987702c 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave1: @ 8484AC8
- .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 e36e3dc8e..ed22bbb04 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave2: @ 8484B70
- .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 a1cbd4c33..412d1f4af 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave3: @ 8484C18
- .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 4fb353150..542df3954 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_BlueCave4: @ 8484CC0
- .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 57f27c823..aceddbfda 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave1: @ 8484AAC
- .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 3c8bf24d7..de95374ba 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave2: @ 8484B54
- .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 78ebb6fd8..8535b1e89 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave3: @ 8484BFC
- .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 4d92c301c..d73f38257 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_BrownCave4: @ 8484CA4
- .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 8e730661d..1cb6c4f5e 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave1: @ 8484A90
- .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 b86e69ecf..744e8b24e 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave2: @ 8484B38
- .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 9d4f26d36..c153e74c6 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave3: @ 8484BE0
- .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 163780567..be475a7ad 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_RedCave4: @ 8484C88
- .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 8f5fd7198..6ab9f9d94 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub1: @ 8484B1C
- .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 77b3ae833..760781e47 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub2: @ 8484BC4
- .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 7fb14ec94..cef2a4597 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub3: @ 8484C6C
- .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 10a4d4ca4..12fa26c3c 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,5 +1,5 @@
SecretBase_Shrub4: @ 8484D14
- .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 157173fbb..c5b5a2aed 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree1: @ 8484B00
- .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 6708af92b..ddea5c0bc 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree2: @ 8484BA8
- .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 fd0c56856..630dbb6e3 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree3: @ 8484C50
- .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 c2f0b3350..bc6f84664 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -1,5 +1,5 @@
SecretBase_Tree4: @ 8484CF8
- .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 77a446dbd..9a6ae5438 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave1: @ 8484AE4
- .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 ae9200fc1..da1949abe 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave2: @ 8484B8C
- .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 d63751987..8bfeff0f5 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave3: @ 8484C34
- .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 1a5c43da5..baf6b7d89 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -1,5 +1,5 @@
SecretBase_YellowCave4: @ 8484CDC
- .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 5694fead4..2f3f34b43 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_HighTideEntranceRoom: @ 8484438
- .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 @@
-      22˜2™2™2™2™2™2™2™2™2™2™2š2´´´´´´´22822222 2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¢2|“““““““z22822222 2¡2¡2¡2©2©2©2©2©2©2©2ª2|“ppppp“z22@QQQQQ 2¡2¡2¢2´´´´2´´µ“ppppp“z22222222 2¡2¡2¢2|“““““““““ppppp“z22222222 2¡2¡2¢2|“ppppppppppppp“³´2´´´22¨2©2©2ª2|“ppppppppppppp“““““““z22´´´µ“ppppppppppppppppppp“z22|“““““ppppppppppppppppppp“z22|“ppppppppppppppppppppppp“z22|“ppppppppppppppppppppppp“z22|“pppppppppppp­®1®1®1®1®1®1®1®1®1®1¦2C22]C]CUCUCUCUC^“ppppppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£22BBBBBB|“ppppppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1m#222BBBBB|“pppppp½¾¾¾¾£ž1ž1ž1ž1ž1£222BBB´2µ“pppppppppppµž1ž1ž1ž1ž1£    BBB|““““pppppppppppµž1ž1ž1ž1ž1£BBB|“ppppppppppppppµž1ž1ž1mn#  BBB|“ppppppppppppppµž1ž1ž1£BBB’¦2¯pppppppppppppµž1ž1ž1£BBB¥ž1œ1®1®1®1®1®1®1®1®1®1®1®1®1®1›1ž1ž1ž1£  BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£   BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB#BnBnBnBnBnBnBož1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBBBBBBBBB¥ž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ž1u2ž1ž1ž1ž1ž1£        " 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 a6fd687b2..673bc6bec 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_HighTideInnerRoom: @ 8484454
- .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 @@
-BB¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬BBBBBBB¥¤¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾££BB22222BBBBB»B»B“ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó”ó½B½BBB22222BBBBBÃBÃB›ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�óœóÅBÅBBBBBBBB¥·ppppppppppppppppppppppppµ£BBBBBBBBBB¥·ppppppppppppppppppppppppµ£BBBBBBBBBB[32¥·ppppppppppppppppppppppppµ£BBB22¥·ppp­®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1®1›1£RRRRR[SRBBB22¥·pppµž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£RRRRRRBBB22¥·pppµmnRnRnRnRnRnRnRnRnRnRnRož1ž1ž1ž1ž1ž1ž1ž1«¬2¬¬¬¬BBB2­·pppµ£R[S  B B B B B B B"#R Rož1ž1¤¾¾¾¾¾¾¾¾¾££BBB¥¤¾¿pppµ£RRBBBBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ£RRBBBBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ£RRBBBBRR¥ž1ž1·pppppppppµ£BBB¥·pppppµ«¬¬¬BBBBRR¥ž1ž1œ1®1®1®1®1®1®1®1®1®1›1£BBB¥·ppppp½¾£ž1ž1ž1£BBBBRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£BBB¥·ppppppp½¾¾££BBBBRR¥ž1ž1ž1ž1ž1ž1mnRnRnRnRnRnR#RBBB¥·ppppppppppµ£BBBBRR¥ž1ž1ž1ž1ž1ž1£RRRRR[SRBBB»B»B“ó•ó•ó•ó•ó•ó•ó•ó•ó•ó•ó”ó½B½BBBBBRR¥ž1ž1ž1ž1ž1ž1£RRRRRRRBBBÃBÃB›ó�ó�ó�ó�ó�ó�ó�ó�ó�ó�óœóÅBÅBBBBB¥ž1ž1ž1ž1ž1ž1£RRRRRRR¥·ppppppppppµ£B2­ž1ž1ž1ž1ž1ž1«¬RRRR¬¬­œ1®1®1¯pppppppµ£BBBBBB¥¤¾¾¾¾¾£ž1ž1ž1ž1£RRRR#RnRnRnRnRnRo·pppppppµ£BBBBBB¥·ppppp½¾¾¾££RRRRRRRRRR¥·ppppp­®1›1£BBBBBB¥·pppppppppµ£RRRRRRR­·pppppµmn#     "¥·pppppppppµ£RRRRRRR¥ž1ž1ž1œ1®1®1®1®1®1›1£   ¥·pppppppppµ£RRRRRRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£¥·pppppppppµ£RRRRRRR¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£     "¥œ1®1®1®1®1®1®1®1®1®1›1£RRRRRRR#RnRnRnRnRnRnRnRnRnRnR#R¥ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1ž1£RRRRRRRRRRRRRRRRRRR##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 b109f1f4b..c742d2b8c 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideEntranceRoom: @ 84843C8
- .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 @@
-      22˜2™2™2™2™2™2™2™2™2™2™2š222822222 2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¢2   22822222 2¡2¡2¡2©2©2©2©2©2©2©2ª2222@QQQQQ 2¡2¡2¢2222222222222 2¡2¡2¢2˜2š2222222222 2¡2¡2¢222222i¡2¡2š2222¨2©2©2ª22222222¨2¡2¡2¢22222222222¨2©2ª222222222222222¨2¡2¡2¡2š222222222222222222¨2©2©2ª2222222222222           22#     
-2˜2™2š2 ›2œ2œ2œ2œ2œ2œ2œ2œ2œ2�222#B B B B B B
-˜2¡2¡2¢2 2¡2¡2¡2¡2¡2¡2¡2¡2¡2¢222BBBBBB 2¡2¡2¢2¨2©2©2©2©2¡2¡2¡2¡2¡2p#222BBBBBB 2¡2¡2¢22 2¡2¡2¡2¢2222BBBB¨2¡2¡2¡2h2 2¡2¡2¡2¢2   #BBB2¨2¡2¡2¡2¡2¡2ª22 2¡2¡2¡2¢2BBB22¨2©2©2©2ª222 2¡2¡2p # #BBB222222222222 2¡2¢2BBB#            # 2¡2¢2BBB#2 2›2œ2œ2œ2œ2œ2œ2œ2œ2œ2œ2œ2œ2œ2ž2¡2¢2 #BBB22 2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2  #BBB2˜2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2¡2BBB2 2¡2¡2¡2¡2¡2¡2¡2¡2¡2Ž1¦1¦1�1¡2¡2¡2¢2BBB#B B B B B B Bq¡2¡2¡2Ž1§1ž1ž1¥1�1¡2¡2¢2BBBBBBBBBB¡2¡2¡2Ÿ1ž1ž1ž1ž1�1¡2¡2¢2#         "¡2¡2Ž1§1ž1ž1ž1ž1¥1�1¡2¢2¡2¡2Ÿ1ž1ž1ž1u2ž1ž1�1¡2¢2#       "#     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 6a34db69e..6571068ce 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideIceRoom: @ 84847D4
- .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 @@
-{‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰|���‚{‰‰‰‰‰‰‰‰‰‰‰‰|�€���‚‚�3�3�3�3~�3�3~�3�3�3�3€�€���‚‚�3}�3�3�3�3�3�3�3�3�3}€�€���‚‚�3�3�3�3�3�3�3�3�3}�3~€�€���‚‚�3�3�3�3�2�3�3�3�3�3�3�3ˆ|€���‚‚�3�3�3�3�3~�3�3�3�3�3�3�3€€���‚‚�3�3Ž3�3xyCyCyCz�3�3~}€€���‚‚�3�3Ž3xƒC�C�C�C‚…3…3…3…3€ˆ‰‰|‚‚�3�3…3€�C�C�C�C‚w‡‡ˆ‰w|€‚‚�3xyCƒC�C�C�C�C‚…3‡3‡3…3…3…33€€‚‚�3€�C�C�C�C�C�C‚Œ3�3�3Ž3…3…3…3€€‚‚�3€�C�C�C~�C�C‚Œ3�3�3‡3‡3‡3‡3€€‚‚�3ˆc‰|�C�C�C‚Œ3�3�3�3�3�3�3€€‚‚�3�2�3�3€�C�C�C‚Œ3�3�3~�3�3�3€€‚‚�3�3�3}€�C�C�CƒCz�3�3�3�3�3�3€€‚‚}�3�3�3€�C�C�C�CƒCyCz…3…3…3…3€€‚‚�3�3~�3€�C�C~�C�C}‚…3…3…3…3€€ƒƒz�3…3…3€�C}�C�C�C�CƒCz…3…3…3€€��‚z…3…3ˆ‰|�C�C�C�C�C‚�3�3�3€€��‚‚‡3‡3‡3‡3€�C�C�C�C�C‚�3�3�3€€��‚‚�3�3�3�3ˆ‰|�C�C�C‚�3�3�3€€{‰Š‚�3}�3}Œ3�3€�C�C�C‚�3�3�3€€‚{‰Š}�3�3Ž3‡3�3ˆ‰‰‰Š�3�3�3€€‚‚�3�3�3�3�3�3�3�3�3�3�3Ž3…3…3…3…3€€‚‚�3�3�3�3�3�3�2�3�3�3�3Ž3…3…3…3…3€€‚‚�3�3~�2�3�3�3�3}�3�2�3Ž3…3…3…3€€ƒƒyyz�3�3~�3�3�3�3�3�3�3Ž3…3…3€€����ƒyyyyyz�3�3�3�3Ž3…3…3€€����������ƒyyyyyyyƒƒ \ No newline at end of file
diff --git a/data/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 cf40979a5..b6de02c7d 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideInnerRoom: @ 84843E4
- .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 @@
-BBBBBBBBBBB22222BBBBB»B»B»B¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò½B½B½BBB22222BBBBBÃBÃBÃBÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÄòÅBÅBÅBBBBBBBBRRRRRRRRRRRRRRRRRRRRRRRRBBBBBBBBBBRRRRRRRRRRRRRRRRRRRRRZSRRBBBBBBBBBB[32RRRRRRRRRRRRRRRRRRRRRRRRBBB22RRR 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2#2RRRRR[SRBBB22RRR222222222222222222222RRRRRRRBBB22RRR  R R R R R R R R R R R"22222222BBB2RRRR[S  B B B B B B B"#R R"222BBBRRRRRBBBBBBBRR222BBBRRRRRRRBBBBBBBRR222222222BBBRRRRRRRBBBBRR22#       #BBBRRRRRBBBBRR22#2 2 2 2 2 2 2 2 2 2#2BBB   BBBBRR2222222222222BBB2222BBBBRR222222  R R R R R R#RBBB22222222BBBBRR222222RRRRR[SRBBB»B»B»B»B¼ò¼ò¼ò¼ò¼ò¼ò¼ò¼ò½B½B½B½BBBBBRR222222RRRRRRRBBBÃBÃBÃBÃBÄòÄòÄòÄòÄòÄòÄòÄòÅBÅBÅBÅBBBBBRR222222RRRRRRR22222222B222222RRRRR#   
-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 abc2554de..719a92c3e 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideLowerRoom: @ 848441C
- .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 aff87bf3d..74d0ec94f 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -1,5 +1,5 @@
ShoalCave_LowTideStairsRoom: @ 8484400
- .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 d5be84526..54d003c27 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -1,5 +1,5 @@
SingleBattleColosseum: @ 8484D30
- .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_€�2‚2L2M2ƒ2„2„2…2M2N2‚2†2‡ŒŠ2U2T2U2U2b2c2U2U2V2U2‹2�ŒŠ2U2`2U2U2d2e2U2U2a2U2‹2�ŒŠ2U2T2U2U2f2g2U2U2V2U2‹2�ˆ‰2U2\2]2]2]2]2]2]2^2U2Ž2�!2!2 \ No newline at end of file
diff --git a/data/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 4ec895011..3a47df473 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_1F: @ 8484764
- .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//¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2@AAAAB½2½2½2½2½2½2AAAAAA½2½2½2½2½2AAAAAA½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2"2#2½2½2½2½2½2 \ 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 acdc054e4..a1cc8fb8f 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_2F: @ 8484780
- .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 21ac1c545..81ac3046d 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_3F: @ 848479C
- .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/¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2@AAAAB½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ 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 977442c27..10a68ddc2 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_4F: @ 84847B8
- .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 1df2963b5..bb38a2d5d 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -1,5 +1,5 @@
SkyPillar_5F: @ 84847F0
- .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//¾2¾2¾2¾2¾26¾2¾2¾26¾2¾2¾2¾2½2½26½2½2½2½2½26½2½2½2½2½2½2½2½28999999:6½2½26½2½2@AAAAAAB6½2½2½26½2AAAAAAAA½2½26½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2AAAAAAAA½26½2½2½2½2AAAAAAAA6½2½2½2½2IMMMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½26½2½26½2½2½2½2½2½2½2½2½2½2½2 \ 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 b6b697d46..8031521e9 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -1,5 +1,5 @@
SkyPillar_Entrance: @ 848472C
- .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 49c5c14e1..38bb57bae 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -1,5 +1,5 @@
SkyPillar_Outside: @ 8484748
- .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 01b78d554..000000000
--- a/data/maps/SkyPillar_Outside/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ppppppppppr·6 ¡¢£¤·6·6·6t5pppppppppppppppr·6·6!1 ¢¢¢¤»â!1·6·6·6tppppppppppr·6·6!1!1!1 ¡¢£¤º6»6!1!1!1!1ustppppppprs!1!1!1â!1 ¢¢¢¤º6º6»6!1â!1uqutppppprss!1!1!1!1!1¨©Â«¬º6º6¼»6!1!1uquuypppxsss!1!1!1âⰱʳ´¼º6º6º6»6!1uquu�ppp’ss{‰!1â$1$1¦2¹2º2º2º2º2¼¼ºº»6uquu�ppp’ssqsâ$1$1$1$1¦2¹2º2º2º2º2º2¼ººut}u�ppp’s{‰s$1$1$1$1$1$1¦2¹2º2º2º2º2º2¼t}uqu�ppp’{‰ss$1$1$1$1$1$1$1¦2µ¥¥¸¼º2uququ�pppš�ss{‰$1$1$1$1$1$1€¾qqu¸º2uququ�pppp’ssqs$1$1$1$1$1€sqqquŠº2uqut}�pppp’s{‰{‰$1$1$1$1ˆ{|d|}Šº2ut}uq�ppPQ’{‰{‰{‰$1$1$1�©©§0©©’t}ut}€˜ppXYš�{‰{‰{‰$1$1$1$1$1$1â4$1$1ut}u€˜ppppppš�{‰{‰s$1$1$1$1$1$1$1$1t}ut}�ppPQppppš�sqs{‰$1$1$1â4$1t|}quu€˜ppXYppppPesq{‰{‰â4$1$1t}qt|}u�pPQppppppXm{‰q{‰{|||}qt}t|}�pXYppppPQpš�{‰q{©©Ÿ©©|}qu€‰˜pppppppXYppš�{|©©©§0©©©©|}�ppppppppppPQppš‰‰�$1$1$1$1$1€‰Z[˜ppppppppppXYppppp’$1$1$1$1$1�pXYu{{{tp \ No newline at end of file
diff --git a/data/maps/SkyPillar_Top/border.bin b/data/maps/SkyPillar_Top/border.bin
deleted file mode 100644
index e9d1c658c..000000000
--- a/data/maps/SkyPillar_Top/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÁÁÁÁ \ No newline at end of file
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index 97fb4edf4..3836ab067 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -1,5 +1,5 @@
SkyPillar_Top: @ 848480C
- .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 d87f50f30..000000000
--- a/data/maps/SkyPillar_Top/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁd2d2d2­6d2d2d2­6d2d2d2­6­6­6­6­6­6­6d2d2d2­6d2d2d2­6d26664274242426427742742777427424277674242742424274274274277666427777774242424242767424242777766767666424277766767666642427774242424277777426427764242424242424264277777642427774277427424242426742427426742427774242424242424242424267667774242426642424242424242424242426426642''''''''''m�2ž2n';<='''''''''//////////j�2ž2k/CL2E/////////5252525252525252525252525252525252676774242424242424242426427777677677424242424242424274276[[[[[[[[[[[[[[[[[[[[[[[[[[[¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢ \ 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 0ff430ff2..7ac123723 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -1,5 +1,5 @@
SlateportCity: @ 84824D4
- .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 163beb4e8..000000000
--- a/data/maps/SlateportCity/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
index 4245201fb..4c8c94753 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
@@ -1,5 +1,5 @@
SlateportCity_BattleTentBattleRoom: @ 848314C
- .4byte SlateportCity_BattleTentBattleRoom_MapAttributes
+ .4byte BattleTentBattleRoom_Layout
.4byte SlateportCity_BattleTentBattleRoom_MapEvents
.4byte SlateportCity_BattleTentBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc
index f399ab26d..7ea7cca9e 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/header.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc
@@ -1,5 +1,5 @@
SlateportCity_BattleTentCorridor: @ 8483130
- .4byte SlateportCity_BattleTentCorridor_MapAttributes
+ .4byte BattleTentCorridor_Layout
.4byte SlateportCity_BattleTentCorridor_MapEvents
.4byte SlateportCity_BattleTentCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc
index 4a654fd25..1a809a567 100644
--- a/data/maps/SlateportCity_BattleTentLobby/header.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/header.inc
@@ -1,5 +1,5 @@
SlateportCity_BattleTentLobby: @ 8483114
- .4byte SlateportCity_BattleTentLobby_MapAttributes
+ .4byte BattleTentLobby_Layout
.4byte SlateportCity_BattleTentLobby_MapEvents
.4byte SlateportCity_BattleTentLobby_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 ca013f6f2..7f214b54c 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -1,5 +1,5 @@
SlateportCity_Harbor: @ 84831D8
- .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[3UVVVVVVVFÞ7ß7VVVV222222222%222%222%22`Ú7Û7Ø7Ù7±6*622222222222222222`Ü7Ý7Ü7Ý7Ø7Ù722222222222222222`*6*6*6*6Ú7Û7222222222222222`(6(6(6(6Ü7Ý7 \ No newline at end of file
diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc
index a5cf37a59..4f7bc3f98 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -1,5 +1,5 @@
SlateportCity_House1: @ 8483168
- .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 1c1ed9f6a..12389ed44 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,5 +1,5 @@
SlateportCity_House2: @ 84831F4
- .4byte SlateportCity_House2_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 8b0bd21a3..e13692bba 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -1,5 +1,5 @@
SlateportCity_Mart: @ 8483248
- .4byte SlateportCity_Mart_MapAttributes
+ .4byte Mart_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 b5be36774..4b0224075 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_OceanicMuseum_1F: @ 84831A0
- .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 6d9439419..7d4272d09 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_OceanicMuseum_2F: @ 84831BC
- .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 c19ff9c4b..8d1e8cc17 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_PokemonCenter_1F: @ 8483210
- .4byte SlateportCity_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 345e8632a..7bf64b603 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_PokemonCenter_2F: @ 848322C
- .4byte SlateportCity_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 70d0dc41c..87a6c0c5b 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -1,5 +1,5 @@
SlateportCity_PokemonFanClub: @ 8483184
- .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 effff6653..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 f30894e60..c04b411f1 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_SternsShipyard_1F: @ 84830DC
- .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! #!$!"!!"¶22·22
-)28292:2)22)2)2)2)2)2)2)2)2222222  2 2 2 2 2 2 2 2&2)2)2)2)22A2B22222?ÕÖ×ÐÑÒÓ)2)2)2'IJ2222
-G$[\3456 )2)2)2''2222   O)2cd;<=>2)2)2)2/7A2B222)2)2k2l2CDEF)2)2)2)2)2)2IJ2222 )2)2)2)2K2LMN2)2)2)2)2)2)22222222)2)2)253)2UV)2)2)2)2)2)2)2A2B222222)2)2(2_2(2*2*253)2)2)2)2)22IJ22222)2(2_2(2(2(2_2)2)2)2'222222
-'2(2W(2(2(2W)2)2)2'''222222
-/'(2(2(2(2(2)2)2)2//7222222
-77/)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file
diff --git a/data/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 c409b3df7..e3b36f4ed 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -1,5 +1,5 @@
SlateportCity_SternsShipyard_2F: @ 84830F8
- .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 @@
-ÃÄÅ!!ËÌÍ!$#! !!$! !!22¶22·2222222222222222222222  22  22@2B2A2B2222222222HJIJ2222PQQQQQQR222222222`cd;<=>�2A2B2@2B22222`klCDEF�2IJHJ2222`))KLMN�222222222`)5)UV)�2A2B2@2B22222`(W2(**5�2IJHJ222`(W2(((W2�222222222hi—iii—j222222222222%2%2222222222222222222222 \ No newline at end of file
diff --git a/data/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 cb8f65244..74469da7c 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -1,5 +1,5 @@
SootopolisCity: @ 848257C
- .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 ff03ebc3b..000000000
--- a/data/maps/SootopolisCity/map.bin
+++ /dev/null
@@ -1,12 +0,0 @@
-ÙÙÙÙÙÙÙÚÙÙÓáááâÚÙ2ÚÙ2Ù2ÙÙÙÙÙÓáá9áááááÔàÔàÔÙ2Ù2Ù2Ù2Ù2àááááááá9áÔÙ2Ù2Ù2Ù2Ù2ÙÙÙÙÓááâÙÙÚÙÓááâÓâÙ2Ù2Óáá9áâÓKLMÔàÔàÔàááááááááááááà9ááÔÙ2ÙÓááâÙÓáá9âÙÚÙ2Ù2Ù2ÚÙ2Ù2Ù2ÚÓáâ 
-  ØÙ2àÔàááááÔÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2 
- ÔØÙ2áâÙÙÓáâÙáâÓááâÙ2Ù2Ù2ÚÚ 
- Ù2Ù2%7'ØÙ2Ù2àÔÙ2Ù2Ù2Ù2àáKLMÙ2Ù2Ù2Ù2 
- ØàáÙÙÓáâÙÓá 
- UÙÚÓáááááâÚÙ2Ù2-?/àÔÙ2Ù2àÔ@AAAB ZÔÙ2Ù2Ù2àáÔááâÙÙÓâÙ2#$_ÓâÚÙ2Ù2Ù2Ù2Ù2Ù2Ú Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáÔÙ2àáÔÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2Ù2 Ù2Ù2ØÙÓKLMâÙ2Ù2+,_ÚÓâÙ2Ù2ÓáD2E2âÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2Ù2Ù2Ø@AAAAAAABÙ2àÓâ @AAFÙ2G\ÚÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2@AFÙ2Ù2GAAABàÔÙ2Ù2àááááD2áÔàááááááááÔÙ2Ù2âÙ%6'Ù2ÓábD2cáâÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÓábD2E2cááááÔàááááÔÙ2Ù2Ù2Ù2àááááá9ááÔØÙ2Ù2ÙÙ->/Ù2ÚÙ2ÓD2áááâÙ2Ù2Ù2ÚÓáááááááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáááÔÙàááD2ááááááÔØàáÔAAAAABÚÙ2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2ÓááááááááááááD2E2áááÔàÔÙÙÓD2áááááÔ 
- ØàáÔàááááááâÓâÓáááááD2E2âÚÓáâÓáááááááááááD2E2ááÔØÙ2ØÙÙÚÙ2Ù2Ù2Ù2Ù2Ù2ØØÙ2Ù2ØÙ2Ù2Ù2ÓááááâÓâÙ2Ù2Ù2Ù2Ù2Ù2Ù2ÓâÚÓáâÙ2ÓáááááááááD2E2ÔÙ2ØàÔàááâ6Ù2Ù2Ù2Ù2Ù2Ù2Ø ØÙ2Ù2àáááâÙ2Óáááâ82Ù2ÓáááD2E2âÙ2ÚÚÓááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔàÔàááá9ááÔÙ2Ù2Ù2àÔÙ2Ù2àáÔÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÓáâÙ2Ù2Ù2Ù2Ù2Ù2ÓâÚÚ@AFÙ2Ù2GAAAAAAAABàÔàáááÔØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2àáÔÙ2ÓááâÙ2ÚT 
- BÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÚÚÙ2ÓbD2E2cáQR[RSáÔÙ2Ù2àáÔTA 
- ØØÙ2Ù2Ù2Ù2ØÙ282Ù2Ù2Ù2Ù2àÙ2;Ù2Ù2Ù2Ù2Ú^#$Ù2Ù2Ù2ÓáD2E2âÙ2ÚÚÙ2ÚÙ2Ù2Ù2Ù2Ó á!2á"ÔàááÔÙ2Ø^Ù2#$ØØÙ2Ù2Ù2Ù2àáááÔ2Ù2Ù2Ù2Ú^+,Ù2Ù2Ù2ÚÓD2E2ááâÚÙ2ÚÙ2Ù2Ù2Ù2Ú()2)2)2*óÙ2Ù2Ù2àÔØ^Ù2+,ØàÔÙ2Ù2Ù2Ù2 
- à 
- ÓKLM^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÓânÙ2Ù2oÚ0q0q0q02óÙ2Ù2Ù2Ù2ØØ^Ù2Ù2Ù2Ù2ØÙ2àD2E2áÔ Ù2Ú ^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÚÓbD2E2cýq0€6q0€6q0ûáÔÙ2Ù2ØØ^Ù2Ù2Ù2Ù2àááD2E2ÔØ%7'Ù2Ú%7']AAABÙ2Ù2ÚÚÙ2Ù2ÓáD2âÚÚq0q0q0q0q0q0€6q0€6q0q0q0ûáÔØØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØàááÔ-?/Ù2AABÚ-?/Ù2ÓáááD2E2âÚÙ2Ù2ÚÓD2áâÚq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØØ]ABÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2àáááÔáááâÓáááâÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2Ù2ÚÚÙ2Ù2Ù2Úq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØàáááD2E2áKLMÔàááÔÙ2Ù2Ù2Ù2àÙÙÓáâÙ2ÓáKLMáD2E2áâÓáâÚÙ2Ù2Ù2Úq0q0t||||||||||‰ÎàáÔTBÙ2Ù2Ù2 ØÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2áKLÙ2Ù2ÚTYZBÙ2Ù2ÓáâÓáâÓD2E2Íty}ñ±±±±±±±ÄsÖáÔØ^Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2Ù2 Ù2Ù2Ú^Ù2Ù2Ù2ÚÓáâÙ2Ù2Úq0q0t}ñÀyyyyyyyyº{y‰óØ^Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2Ù2Ù2%6'Ù2Ù2Ú^Ù2Ù2Ù2ÚÚk6l6l6m6Úq0q0uÃÀyyyyyyyyyy±ÄsóØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔ Ù2ØÙ2Ù2Ù2Ù2->/Ù2Ù2Ú^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚ0123Úq0q0u¸yyyyyyyyyyyyyºsóØ]AABÙ2Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2AAAABÓâ]AAAABÓâÚ89:;Úq0q0u¸yyy‚ƒƒƒƒ„yyyyºsóà{|}~ÔÙ2Ù2Ù2Ù2ØÙ2Ù2ØÙ2Ù2Ù2Ù2ÓááâÓááááááâÓâABwÚq0q0u¸yyËŠ‹‹‹‹ŒÌyyyºsóTPQRSØÙ2Ù2Ù2Ù2àáD2ÔÙ2Ù2àÔÙ2Ù2ÓâÙ2ÓáâÙ2Ù2Ù2ÓáááâÙ2Ù2Ù2Ù2Ù2Úq0q0u¸yyº¸¹º³»¼¸yyyºsó^XYZ[ØÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2ÚÙ2Ù2ÚÙ2Ù2Ù2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Óýq0q0u¸yyºÀÁÂÅÃĸyyyºsó^abvàáD2E2ÔÙ2Ù2Ù2àááÔàÔÓâÙ2Ù2ÚÓáKLMâÙ2Ù2Ù2Ù2Ù2ÓD2E2ýq0q0q0u¸yËÓ0È1É1ÊÍËÌ1Ô0Ìyyºsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àááÔÙ2Ù2Ù2ØÙ2ØâÙ2Ù2ÓâÚTYZBÙ2Ù2Ù2Ù2Óýq0q0q0q0q0q0u¸yº000000010¸yyºsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2222à9áÔØÙ2ØÙ2Ù2Ù2ÚÙ2Ú^Ù2Ù2Ù2Ù2Óýq0q0q0q0q0q0t}¸yº00000010¸yyºsó]BÙ2Ù2@AFÙ2Ù2 222ØØÙ2ØÙ2ÓáâÓâ^Ù2Ù2Ù2Ù2Úq0tÞßD2E2yzÃÀyº00000000¸yyºsûááD2E2áÔNÙ2Ù2 
- ØØÙ2ØÓâÙ2Ù2ÚÙ2^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Úq0rÖ×0000¸yyº00000000¸yyº{yyyD2E2‰óNÙ2Ù2ØàÔØâÓááâÙ2]BÙ2Ù2Ù2Ù2Óáýq0ræç0000¸yy±±±±±±±±Àyy²04000póNÙ2Ù2Ù2Ù2Ù2ØÙ2ØØÙ2ÚÙ2Ù2Óáááááááýtyyz0°±±±±Àyyyyyyyyyyyyyyyº00000póV@AAAAAABàÔØàÓâÙ2ÓýqtyÞßÞßyz0000¸yyyyyyyyyyyyyyyyyyyyº00000pûáááááááÔÙÙØàÔÚÙÙ2Úqqr0Ö×Ö×000000¸yyyyyyyyyyyyyyyyyyyy±²000xyyyy‰qqqóÙÙØÙØÚÙÙ2Úqqr0æåÜÝ000000¸yyyyyyyyyyyyyyyyyyyyyyº00000000xÞ߉ûÔÙàÔØÚÙÙ2Úqqr000ÔÕ000000¸yyyyyyyyyyyyyyyyyyyyyyº000000000Ö×pqóÙÙØØÚÙÙ2Úqqr000æç000000¸yyyyyyyyyyyyyyyyyyyyyy±±²0000Î1Ï1ÜÝpqûÔÙØØÚÙÙ2Úqqr0000000Î1Ï100¸yyyyyyyyyyyyyyyyyyyyyyyyyº0000ÖÕÔÕpqqóÙØØÜÒÙ2ìíqr0000000Ö×00¸yyyyyyyyyyyyyyyyyyyyyyyyyº0000ÜÝÜÝpqqóÙØØÙÚÙÙÜí¿iiij000Üݰ±Àyyyyyyyyyyyyyyyyyyyyyyyyy±±±²ÔÕÔÕpqqóÙØØÙÜÑÑÒÜìììí¿ij0ÔÕ¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyºæåäçpëìÛÙØØÙÙÙÙÜÑÑÒÙÜìír0æç¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy˜`ii0i0i0¾0óÙÐÑÛÛÙÙÙÙÙÙÙÜÑÒÙÚ¿iij¸yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy qqqqëìÛÐØÙÙÙÑÑÑÒÙÙÙÙÙÚÙÜìíqr¸yyyyyyyyyyyyyyyyyyyyyyyy˜iiiiiiqëììÛÙÙØØÙÙÙÙÙÙÜÑÒÙÙÙÜÑÑÒÜír¸yyyyyyyyyyyyyyyyyyyyyyyy qqqqqqqóÙÙÙÐÑÛØÙÙÙÙÙÙÙÙÚÙÙÙÙÙÙÚÙÚr¸yyyyyyyyy…†††‡yyyyyy˜iiiiqqqqëììÛÙÙÙØÙÙØÙÙÙÙÙÙÙÙÜÑÒÙÙÙÙÜÒÚr¸yyyyyyy…†�ŽŽŽ�†‡yyyy qqqqqqqëÛÐÑÑÑÑÑÛÐÑÛÙÙÙÙÙÙÙÙÙÙÚÙÙÙÙÙÚÚr¸yyyyyy…�ŽŽŽŽŽŽŽ�‡yyy qqqqqëìÛÙØÙÙÙÙÐÑÛÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÙÙÚÚiiiišyy…�ŽŽŽŽŽŽŽŽŽ�‡˜iiqqëììÛÙÙÙØÐÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÙÙÚÚqqqqiiiiiiiiiiiiiiiiiqqqqóÙÐÑÑÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÚÜíqqqqqqqqqqqqqqqqqqqqqëììÛÙØÐÑÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÚÙÜìììììììììììììììììììììÛÙÐÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÜÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÛÙÙÙØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙ \ No newline at end of file
diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/maps/SootopolisCity_Gym_1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SootopolisCity_Gym_1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index b17a271d8..4200a7ed8 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_Gym_1F: @ 8483A28
- .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 dd52448c9..000000000
--- a/data/maps/SootopolisCity_Gym_1F/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/maps/SootopolisCity_Gym_B1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SootopolisCity_Gym_B1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 5473a347b..6265830e9 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_Gym_B1F: @ 8483A44
- .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 58410408f..000000000
--- a/data/maps/SootopolisCity_Gym_B1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-%&&&&&&&&&&&&&&&'-%             '/-]2222222222222^/-]2222222222222^/-]2222222222222^/5]2222222222222^7&57&..-%        '/..-]222222222^/-]222222222^/&&5]222222222^7&&&&&5=7&&&....-.%  './....-]222^/&&&&5]222^7&&&&&&&&&&]222^&&&&&&...%&&&&&&'...-%      '/-]222222^/-]2222222^/-]2222222^/-]2222222^/ \ No newline at end of file
diff --git a/data/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 8359334d0..2551aedc1 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House1: @ 8483AB4
- .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 @@
-ððñððñð0ÍøùøøùøÕ2ÿ3ÿ3ÿ3ÿ3ÿ3ÿ3µ2ÿ3þ3Ý2ó7ô7Þ2þ3þ3ÿ3þ3Ý2û7ü7Þ2þ3þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file
diff --git a/data/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 3cd04937a..24e7a778a 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House2: @ 8483AD0
- .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 @@
-ðÈÉððòðð”vwÍøúø”œ6Ø2Ù2Õ2ÿ3ÿ3ÿ3œ6ÿ3þ3þ3Ý2ó7ô7Þ2þ3ÿ3þ3þ3þ3û7ü7Þ2þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file
diff --git a/data/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 c3ee80da0..97ae23fb7 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House3: @ 8483AEC
- .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 @@
-ðððòòððð½»¼úúø’“Å6Ã2Ä2ÿ3ÿ3ÿ3š2›2ÿ3þ3þ3þ3þ3þ3þ3þ3Ý7Þ7Þ2þ3þ3þ3þ3þ3å7ß7þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc
index 9d610b9a1..d39499132 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House4: @ 8483B08
- .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 29157d4df..d6de286cf 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House5: @ 8483B24
- .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 c05d23e64..36460f147 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House6: @ 8483B40
- .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 3f02bdcc5..383ab24b5 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_House7: @ 8483B5C
- .4byte SootopolisCity_House7_MapAttributes
+ .4byte SootopolisCity_House1_Layout
.4byte SootopolisCity_House7_MapEvents
.4byte SootopolisCity_House7_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin b/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
index 0ceade178..792b5ae31 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_LotadAndSeedotHouse: @ 8483B78
- .4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes
+ .4byte SootopolisCity_LotadAndSeedotHouse_Layout
.4byte SootopolisCity_LotadAndSeedotHouse_MapEvents
.4byte SootopolisCity_LotadAndSeedotHouse_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin
deleted file mode 100644
index ffeea7269..000000000
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÈÉXX®¯`øø`””Ø2Ù2ÿ3ÿ3ÿ3ÿ3œ6œ6ÿ3þ3þ3ó7ô7þ3þ3þ3ÿ3þ3Ý2û7ü7Þ2þ3þ3ÿ3þ3þ3þ3þ3þ3þ3þ3ÿ3þ3þ3 þ3þ3þ3 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc
index 3b4aaa171..ac4ae5ea0 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_Mart: @ 8483A98
- .4byte SootopolisCity_Mart_MapAttributes
+ .4byte Mart_Layout
.4byte SootopolisCity_Mart_MapEvents
.4byte SootopolisCity_Mart_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin b/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
index 72e09b813..2e5ea1f84 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_MysteryEventsHouse_1F: @ 8483B94
- .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes
+ .4byte SootopolisCity_MysteryEventsHouse_1F_Layout
.4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents
.4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin
deleted file mode 100644
index a9b17a746..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-89:' @AB /6666-7$%655555555556555555655555565555555555655 555555 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
index d4497b3e9..c3ffec414 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0
- .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes
+ .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout
.4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents
.4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts
.4byte 0x0
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin
deleted file mode 100644
index 558e1584e..000000000
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-        6666666666655555555555655 !!!!"555655())))*5556550111125555555555555#5555555555 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index 28fdf23bd..83485cbf1 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_PokemonCenter_1F: @ 8483A60
- .4byte SootopolisCity_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 97000d2b7..ba2bb5c0d 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
SootopolisCity_PokemonCenter_2F: @ 8483A7C
- .4byte SootopolisCity_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 700a6cf00..d0d35fea1 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -1,5 +1,5 @@
SouthernIsland_Exterior: @ 8485238
- .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 @@
-qssÆ4Æ4ÆÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40uuuu�qssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4t}uuu�qssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4uquuu�qssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4uquuu�qssÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ477Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4ut}uu�qss4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ433Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ44uuquu�‰ss04Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ44334Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ4t}ut}u�ss{|‰Æ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40004Æ4Æ4444444Æ4uquut}�s{‰qsÆ4Æ4Æ4Æ4Æ4Æ4Æ4Æ40000440000004ut}uu€˜{‰sqs4Æ4Æ4Æ4Æ4Æ4Æ4Æ40000000Æ4Æ4Æ4000uuquu�p‰s{‰s044Æ4Æ4Æ4Æ4Æ4Æ400000Æ4Æ4Æ4Æ4400uuquu�ps{‰s{À6Î4‰4Æ4Æ4Æ4Æ4Æ4Æ400044444t¯0Ï0zuquu�p{‰s{‰44p044Æ4Æ4Æ4Æ4Æ4Æ44tÀ6À6À6À6z000ut}u�p�ssq{|‰{||‰444444tz4444t¯0Ï0yzuqu�p’ssqqq{Î4Î4‰{À6À6À6|||}tyyyyz0000ut}�p’s{|||‰44x‰444t‘‘‘z0000000t|}u€˜p’sqqqq{||‰xyyyz0000000000t}qt}�pp’{||‰qqqqs0000000000t||||}t|}€˜ppš‰‰�{||‰q{|||||¯0Ï0|||}t©©©©}€‰˜ppppppš‰‰�{|©©©©©]^0^0_©©©}€‰‰‰‰˜pppppppppppš‰‰‰‰‰‰‰]^0^0_Ÿ‰‰‰˜ppppppppppppppppppppUV0V0V0…2^0^0_qpppppppppppppppppppppppp]^0^0^0^0^0^0_qppppppppppppppppppppppppSTTV3W3TTUqpppppppppppppppppppppppp[\\\\\\]qppppppppppppppppppppppppqqqqqqqqqpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/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 a7b9f14a0..1a080af1e 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -1,5 +1,5 @@
SouthernIsland_Interior: @ 8485254
- .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 @@
-ÜÝÔÕÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÔÕÜÔÕÜÝÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕÜÝÔæåÔÕÜÝÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÔÕäÎÏæåÔÕÜÝÜÝÜÝÜÝÜÝÜÝÜÝÜÝÔÕäòÏÔ×ÎÏæåÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕäòÏÔÕÜÝÔ×ÎÏæåÜÝäåäåäåäòóçäòÏÔÕÜÝÔÕÜÝÔ×ÎÏÔÕ0000000ÔÕÎÏÔÕÜÝÔÕÜÝÔÕÜÝÔÕäç0000000æåÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00000000000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00È0É0Ê00È0É0Ê000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ð0Ñ0Ú00Ø0Ñ0Ò000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00Ð0Ò00Á60Ð0Ò000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ð0Ò0000Ð0Ò000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕ00Ð0Ñ0É0É0É0Ñ0Ò000ÔÕÜÝÔÕÜÝÔÕÜÝÔÕÜÝ00Ø0Ñ0Ñ0Ñ0Ñ0Ñ0Ú000ÜÝÔÕÜÝÔÕÜÝÔÕÜÝÔÕÎ1Ï10Ø0Ù0Ù0Ù0Ú00ÎÏÔÕÜÝÔÕÜÝÔÕÜÝÔÕäåÔ×0000000ÖÕäåÔÕÜÝÔÕÜÝÔÕäòÏ1ÎóòÏ1Î1Ï100Î1Ï1ÜÝÎÏæåÔÕÜÝÔÕäòÏ1ÔÕÔÕÔÕÔ×22ÖÕÔÕÔ×ÎÏæåÔÕäòÏ1ÔÕÜÝÜÝÜÝÜÝÐÒÜÝÜÝÜÝÔ×ÎÏæåÏ1ÔÕÜÝÖÕÔÕÔÕÔÕØÚÔÕÔÕÔÕÜÝÔ×ÎÏÕÜÝÖÕÜÝÜÝÜÝÜÝØÚÜÝÜÝÜÝÔÕÜÝÔ×ÝÖÕÜÝÖÕÔÕÔÕÔÕØÚÔÕÔÕÔÕÜÝÔÕÜÝÕÜÝÖÕÜÝÜÝÜÝÜÝØÚÜÝÜÝÜÝÔÕÜÝÔÕ \ No newline at end of file
diff --git a/data/maps/TerraCave_End/border.bin b/data/maps/TerraCave_End/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/TerraCave_End/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ññññ \ No newline at end of file
diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc
index 419388afa..900f5930f 100644
--- a/data/maps/TerraCave_End/header.inc
+++ b/data/maps/TerraCave_End/header.inc
@@ -1,5 +1,5 @@
TerraCave_End: @ 8484A3C
- .4byte TerraCave_End_MapAttributes
+ .4byte TerraCave_End_Layout
.4byte TerraCave_End_MapEvents
.4byte TerraCave_End_MapScripts
.4byte 0x0
diff --git a/data/maps/TerraCave_End/map.bin b/data/maps/TerraCave_End/map.bin
deleted file mode 100644
index 93121190d..000000000
--- a/data/maps/TerraCave_End/map.bin
+++ /dev/null
@@ -1,9 +0,0 @@
-ññññññññëùùùùùùùùìñññññññññññññññññ ëùùùìñññ
-ñññññññññññëùùùùù õ2õ2õ2
-ñññ
-ñññññññññññ ëùùùùùõ2õ2õ2ùùì
-ñññññññññññ  õ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ð
-ñññññññññññ ôåæçéõ2õ2õ2õ2õ2õ2õ2ð
-ñññññññññññééééñ õ2õ2õ2õ2õ2õ2õ2ð
-ñññññññññññññññ ñ õ2õ2õ2õ2õ2õ2õ2ðùùùìññññññëùùùùëõ2õ2õ2õ2õ2õ2õ2
-ññññøùùùùìñ ëùùùùúùùùùùùìññðñ ò222222  "ðññðñ ò2222222222ðññðñ ò22222222   #øùìðñ ò222222  #       "ððñ ò22222 ##ððñ ò22222ððñ ò2222 ##ððñ ò2222efgððñ ò222 #esdrfgððñ ò222efsdd_drfgððñ ò222qdd__d_ddpððñ ò222qd_d____dpððñ ò2222es_d__d_d_pððñ ò2222qdd___d_ddpððñ ò2222#2#2bdd_d_d_dpððñ ò222222#2b_d_d_`a3a3#2ððñ ò2222222222#2a3a3a3a3a3#2    ððñ ò       "2222222222ððñ óóóóóóóóóóóóóóóóóóóóóóóóðñóóóóóóóóóóóóóóóóóóóóóóóóóó \ No newline at end of file
diff --git a/data/maps/TerraCave_Entrance/border.bin b/data/maps/TerraCave_Entrance/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/TerraCave_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ññññ \ No newline at end of file
diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc
index f0e4df143..02c5edb91 100644
--- a/data/maps/TerraCave_Entrance/header.inc
+++ b/data/maps/TerraCave_Entrance/header.inc
@@ -1,5 +1,5 @@
TerraCave_Entrance: @ 8484A20
- .4byte TerraCave_Entrance_MapAttributes
+ .4byte TerraCave_Entrance_Layout
.4byte TerraCave_Entrance_MapEvents
.4byte TerraCave_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/TerraCave_Entrance/map.bin b/data/maps/TerraCave_Entrance/map.bin
deleted file mode 100644
index a8108c2ca..000000000
--- a/data/maps/TerraCave_Entrance/map.bin
+++ /dev/null
@@ -1,33 +0,0 @@
-ññññ ññññññëùþÿùìññññññ ñññëùùë3ì
-ññññññ ñññ ëùùõ2õ2õ2
-
-ññññññ ñëù õ2õ2õ2õ2õ2õ2
-
-ñññññëñ ëùõ2õ2óõ2
-
-ñññññ ëù õ2õ2õ2õ2
-ñ õ2
-
-ññññë ëùõ2õ2õ2õ2
-ñ õ2
-
-ññññ ë õ2õ2õ2õ2õ2õ2
-ñ õ2
-
-ññëù ëõ2õ2óóóóñ õ2
-
-ññ ëù õ2õ2óñëùùùõ2
-
-ññ  ëùõ2õ2
-ññ õ2õ2õ2õ2õ2
-
-ññ   õ2õ2õ2õ2
-ñëõ2õ2õ2õ2õ2
-
-ññ   õ2õ2õ2õ2
-ëõ2õ2õ2õ2õ2õ2
-ùì   õ2õ2õ2õ2õ2õ2õ2õ2õ2ùì
-   õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2
- õ2õ2õ2ð
-   õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ð
- ô�õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ôó ññ�õ2õ2õ2õ2õ2õ2õ2ôôôôôññ ñññô�õ2öõ2õ2ôñññññññ ñññññôåæçôôññññññññ \ No newline at end of file
diff --git a/data/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 757b3f0a4..55afa79f3 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -1,5 +1,5 @@
TradeCenter: @ 8484D4C
- .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/TrainerHill_1F/border.bin b/data/maps/TrainerHill_1F/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/TrainerHill_1F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc
index 7c6a4ea0e..e5fd3b576 100644
--- a/data/maps/TrainerHill_1F/header.inc
+++ b/data/maps/TrainerHill_1F/header.inc
@@ -1,5 +1,5 @@
TrainerHill_1F: @ 84857E8
- .4byte TrainerHill_1F_MapAttributes
+ .4byte TrainerHill_1F_Layout
.4byte TrainerHill_1F_MapEvents
.4byte TrainerHill_1F_MapScripts
.4byte 0x0
diff --git a/data/maps/TrainerHill_1F/map.bin b/data/maps/TrainerHill_1F/map.bin
deleted file mode 100644
index d72e84a5c..000000000
--- a/data/maps/TrainerHill_1F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-'  2/(282929292/(8292929212;2;2;2
-12;2;2;212;2;2;2       12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_2F/border.bin b/data/maps/TrainerHill_2F/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/TrainerHill_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc
index d9a6d6204..712c99cec 100644
--- a/data/maps/TrainerHill_2F/header.inc
+++ b/data/maps/TrainerHill_2F/header.inc
@@ -1,5 +1,5 @@
TrainerHill_2F: @ 8485804
- .4byte TrainerHill_2F_MapAttributes
+ .4byte TrainerHill_2F_Layout
.4byte TrainerHill_2F_MapEvents
.4byte TrainerHill_2F_MapScripts
.4byte 0x0
diff --git a/data/maps/TrainerHill_2F/map.bin b/data/maps/TrainerHill_2F/map.bin
deleted file mode 100644
index 8b78fd0b4..000000000
--- a/data/maps/TrainerHill_2F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-'  2/(282929292/(8292929212;2;2;2
-12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_3F/border.bin b/data/maps/TrainerHill_3F/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/TrainerHill_3F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc
index c88a11d6d..92bbd40a1 100644
--- a/data/maps/TrainerHill_3F/header.inc
+++ b/data/maps/TrainerHill_3F/header.inc
@@ -1,5 +1,5 @@
TrainerHill_3F: @ 8485820
- .4byte TrainerHill_3F_MapAttributes
+ .4byte TrainerHill_3F_Layout
.4byte TrainerHill_3F_MapEvents
.4byte TrainerHill_3F_MapScripts
.4byte 0x0
diff --git a/data/maps/TrainerHill_3F/map.bin b/data/maps/TrainerHill_3F/map.bin
deleted file mode 100644
index 5280752f4..000000000
--- a/data/maps/TrainerHill_3F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-'  2/(282929292/(8292929212;2;2;2
-12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_4F/border.bin b/data/maps/TrainerHill_4F/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/TrainerHill_4F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc
index 6122362b6..5de769778 100644
--- a/data/maps/TrainerHill_4F/header.inc
+++ b/data/maps/TrainerHill_4F/header.inc
@@ -1,5 +1,5 @@
TrainerHill_4F: @ 848583C
- .4byte TrainerHill_4F_MapAttributes
+ .4byte TrainerHill_4F_Layout
.4byte TrainerHill_4F_MapEvents
.4byte TrainerHill_4F_MapScripts
.4byte 0x0
diff --git a/data/maps/TrainerHill_4F/map.bin b/data/maps/TrainerHill_4F/map.bin
deleted file mode 100644
index 3a285b7f8..000000000
--- a/data/maps/TrainerHill_4F/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-'  2/(282929292/(8292929212;2;2;2
-12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc
index 9d1227640..13912579d 100644
--- a/data/maps/TrainerHill_Elevator/header.inc
+++ b/data/maps/TrainerHill_Elevator/header.inc
@@ -1,5 +1,5 @@
TrainerHill_Elevator: @ 8485ADC
- .4byte TrainerHill_Elevator_MapAttributes
+ .4byte BattleElevator_Layout
.4byte TrainerHill_Elevator_MapEvents
.4byte TrainerHill_Elevator_MapScripts
.4byte 0x0
diff --git a/data/maps/TrainerHill_Entrance/border.bin b/data/maps/TrainerHill_Entrance/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/TrainerHill_Entrance/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc
index eae0676da..f37950d98 100644
--- a/data/maps/TrainerHill_Entrance/header.inc
+++ b/data/maps/TrainerHill_Entrance/header.inc
@@ -1,5 +1,5 @@
TrainerHill_Entrance: @ 84857CC
- .4byte TrainerHill_Entrance_MapAttributes
+ .4byte TrainerHill_Entrance_Layout
.4byte TrainerHill_Entrance_MapEvents
.4byte TrainerHill_Entrance_MapScripts
.4byte 0x0
diff --git a/data/maps/TrainerHill_Entrance/map.bin b/data/maps/TrainerHill_Entrance/map.bin
deleted file mode 100644
index fc00c0a5f..000000000
--- a/data/maps/TrainerHill_Entrance/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- !:;7<!'()BC3D)/(8335333/(O3N313M3L3/(K73J/(937393/(7373R73/&!!!ST"P373Q3*!!!#$%UV73)))+,-.   33I73H33 33533A3534
-393353353353@3130353353353353373031303130313031303130313031303130313631303130313031303130313031303130313037333313031303130313031303133331363   0313031303130313031303   03730313031303130313000313031303130313 \ No newline at end of file
diff --git a/data/maps/TrainerHill_Roof/border.bin b/data/maps/TrainerHill_Roof/border.bin
deleted file mode 100644
index 064786e8c..000000000
--- a/data/maps/TrainerHill_Roof/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc
index 3754fc21a..3527f447f 100644
--- a/data/maps/TrainerHill_Roof/header.inc
+++ b/data/maps/TrainerHill_Roof/header.inc
@@ -1,5 +1,5 @@
TrainerHill_Roof: @ 8485858
- .4byte TrainerHill_Roof_MapAttributes
+ .4byte TrainerHill_Roof_Layout
.4byte TrainerHill_Roof_MapEvents
.4byte TrainerHill_Roof_MapScripts
.4byte 0x0
diff --git a/data/maps/TrainerHill_Roof/map.bin b/data/maps/TrainerHill_Roof/map.bin
deleted file mode 100644
index 815ec1067..000000000
--- a/data/maps/TrainerHill_Roof/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-€€€€€€€XYajjZggd\]€€€€€€€€€€€€€€`ajjjZgggde€€€€€€€…………………hijjjZggglm…………………gggggg¿pqrijZglstu¿ggggggkkkkkkÅxyz^_bvw{|}ÅkkkkkkkkkkkkÅk3�‚3fg[~ƒ„k3ÅkkkkkkÎkÎkkkÅk3k3k3n3oc†‡3k3k3k3ÅkkkÎkÎÏkÏkkkÅk3k3k3k3k3k3k3k3k3k3k3ÅkkkÏkÏkkkkkkÅk3k3k3k3k3k3k3k3k3k3k3ÅkkkkkkkkkkkkÆk3k3k3k3k3k3k3k3k3k3k3Ækkkkkk������”•3k3¾3¾3¾3¾3¾3¾3¾3k3¨3©¦¦¦¦¦¦À—————ˆ“”¶ÇÇÇÇÇ·©ª¥®®®®®ÁŸŸŸŸŸ�‘’“”•k¨©ª«¬­ŸŸŸŸŸÃŸŸŸŸŸ˜™š›œ�ް±²³´µŸŸŸŸŸÃŸ§§§Ÿ˜¸¹‹Œ�– ¡¢¼½µŸ§§§ŸÃŸ¯¯¯Ÿ˜ÈÉʉ€žW¤ËÌ͵Ÿ¯¯¯ŸÃ \ 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 2c7de8477..d63ca8815 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -1,5 +1,5 @@
Underwater1: @ 8482A30
- .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 @@
-22„„„„„„„„„„„„„„„„„„„„„„2222€2©2©2�2©2©2�2�2�2�2�2�2�2�2�2©2©2�2�2�2©2©2…„„„„„22„„„„2222€2©2�2�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°222€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‚22222€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Ž„„„„„„„„„22�©2©2Ž��2�2…��2�2©2©2©2©2©2©2‚22222�©2©2…��2�2�2ކ�2�2�2©2©2©2©2©2‚22222��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�2Ž��2�2�2©2©2©2©2©2©2©2�2�2�2�2�2�2©2©2©2©2Ž��2�2�2�2�2Ž#|~�2�2©2�2�2�2©2©2©2�2�2�2�2©2©2©2©2©2Ž#~�2�2�2©2Ž#||~�2�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‚22222�©2©2Ž#~©2©2©2‚22222�©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�2�2�2©2©2©2�2�2�2�2�2�2Ž�©2�2ކ�2�2�2�2©2©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�2�2�2�2�2Ž2222��2©2©2Ž��2�2�2�2�2‰2‰2�2�2©2©2�2�2�2�2Ž2222��2©2©2Ž22��2�2�2�2‚222€2©2©2©2©2©2�2�2Ž# 22
-"�©2©2}"2222��2�2�2�2‚222€2©2�2�2©2©2�2�2Ž�y2y2Ž�©2©2Ž22°22��2�2�2�2�2y2y2©2�2�2�2©2©2�2�2Ž�©2©2Ž22†©2©2Ž# 22
-""~�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Ž2222€2©2©2Ž22��2�2�2�2�2�2�2�2�2�2�2�2Ž��2�2�2Ž# 22
-|||"2222��2�2�2�2�2�2�2�2�2�2�2�2Ž��2�2�2Ž#  "2222"~�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�2…„22†©2©2©2©2©2©2©2©2�2�2�2�2�2�2�2…2222�©2©2©2©2©2}||~�2�2�2�2�2�2�2�2Ž2222�©2©2©2©2}"��2�2�2�2�2�2�2�2Ž# 22
-"†©2©2©2©2Ž"~�2�2�2�2©2�2�2Ž#  "22�©2©2©2©2}""|~����}"2222�©2©2©2}""|||||2222�©2©2©2Ž22°22�©2©2©2…# 22
-"�©2©2©2©2Ž#  "�©2©2©2©2…22"~©2©2©2©2Ž2222"~©2©2©2Ž222222„„„„„„„"~©2©2Ž�z222
-"2222€2©2©2�2�2�2�2…„„�©2©2Ž�©2y2y2Ž2222€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…„„„22��2�2…2°222�©2©2©2©2©2©2©2‚22222��2�2�2Ž2222#|~©2©2©2©2©2‚22222��2�2�2Ž# 22
-"||||||# 22
-"��2�2�2Ž#  "#  "�©2�2�2Ž�©2©2�2ކ©2©2}"22ˆ2©2©2Ž2222ˆ2‰2Ž2222
- "# 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 1f29f52f9..a2754c69e 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -1,5 +1,5 @@
Underwater2: @ 8482A4C
- .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 @@
-†©2Š222ˆ2ކ‰2‰2…†�2�2�2�2�2�2©2‚22222Ž�‚222€2©2©2©2�2�2�2�2�2�2�2©2‚22222Ž�‚222€2©2©2©2©2�2�2�2�2�2�2©2©2z222x2Ž#~6y2y2©2©2}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222
-    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 222222222222222222222222°2222222222222222222222222
-    22222222222222222222222222222222
-" #  222/2222°222 22222222222222°2222�±2±2±2Ž "#/#   "# 22222
-"222222222222222222�©2©2©2Ž##     " "2222222222222222222�©2©2©2Ž/ "222222
-  2222222222�©2©2©2Ž22222
-  22222222�¨2¨2¨2Ž222222/  2222222�222/2222222222222/#  22222# 222222222222222222222222
-"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
-"2222222222222222222222222222222222222222222222222# 22222222222222222
-   2222222222222222222222222222222222222222
-   "#     22222222222222222222222222222222222
- " /#           22222222222222/2222222222
-"/ " #/#  22222222/222°2222222222
- " " "# /#/# 22222222°22222222222
- " "/ "#/#/# 2222222222222222222
-" "/ "#/## 2222222222
-"222222
-" " "#/#/# 22222# 2°22/2222222 "/ "### 22222#/222222222
-" "##22222222222222 " "#/# 2222222222222## 2222## 2
-"22222
-  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222
- 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222
-"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222
-"## 2222222/222222
-" "22222222222222/222222222/222°222
-"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222
-"#/# 22222222222222efg2222222222/ "„„„„##   222222222222222222mno222222222222222†©2‰2‰2©2… #  222222222222222222222222222222222222222222
-" "†©2Š222ˆ2©2Ž /#  222222222222222222222222222222222222222
-"„†©2‚22222€2Ž##    22222222222222222222222222222222
-  " "�6©2©2©2‚22222€2Ž/# 222222222222222222222222222222
-"/�6�2©2©2©2z222x2©2Ž##  2222222222222222222222222
-  " "�6�2�2}~©2y2y2©2} #   22222222222222222222
- "�6�2�2Ž |||| ##   222222222222222
- "/ "�6�2�2Ž/#  2222222
-     "�6�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Ž ||||   \ 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 108251489..8329304a8 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -1,5 +1,5 @@
Underwater3: @ 8482A68
- .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 fc5c331a5..000000000
--- a/data/maps/Underwater3/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-66666666666666666666666666666666666666666666666666666666666666&666666666666„.„„6666666666666�©2©2©2©2Ž;2;266666666666666�©2©2©2©2Ž;2;2;2;266666666666†©2‰2‰2©2…@2C2C2A26666666666�©2Š222ˆ2©2Ž<2P2Q2:266666666666�‚22222€2Ž<2T2R:266666666666�‚22222€2Ž<2T2R:2666666666666�©2z222x2©2Ž@2G2T2R2:266666666666@2A2�©2©2y2y2©2}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#3242¸2L2R2:26666666666  ?2W2]2Q2:2## 42Ó2L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;2„„42T2R28 "666666666  ?2W2]2Q2:2@2C2A2†‰2‰2…###!a6`"  666666666?2W2S2U2:2?2S2:2†Š222ˆ2…###" "666666666?2W2S2U2B2A2?2S2:2�‚22222€2Ž 66666666?2W2S2U2S2:2?2S2B2A2�‚22222€2Ž "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A2�©2y2y2©2Ž "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:2�©2©2©2©2Ž##666666666?2W2P2Q2U2:2?2S2:2?2¸2S2:2#~©2©2©2Ž666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~©2©2Ž&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~©2…„„.„# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2�©2©2©2©2©2©2Ž#  666666666@2Ä2B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~©2©2©2©2}##"666666666@2Ä2Ó2Ó2:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2Ó2¸2Ó2B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2Ó2Ð2Ñ2S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:2„„66666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232†©2©2…6666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  †©2‰2‰2©2…66666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  �©2Š222ˆ2©2Ž66 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"†‚22222€2Ž66666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  †©2‚22222€2Ž66666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232�©2©2©2z222x2©2Ž66666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  �©2©2©2©2y2y2©2}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  †‰2‰2©2©2©2©2©2Ž6666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<2Ð2_2U2:2?2S2S22232  †Š222ˆ2©2©2©2}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "�‚22222€2©2}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S2Ð2_2U22232?2S22232 "�‚22222€2©2Ž66666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x2©2}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """�©2y2y2©2©2Ž6666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~©2©2}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #6�©2©2Ž666666666##1T2R28 " >2>2I242W2Y2L2V2V2R2S2U2S22232 "#6#~}|666666669T2R28 ">2>2>2?2Y2O2T2V2V2R2M2K22232"   "�Ž66666666#6##9T2R28# >2>2?2S2W2T2V2V2R2U2S2:2>2 "  #6##6666666669T2R28#>2>2I242W2T2V2V2R2U2S2:2" "  666666669T2R28>2>2>2?2W2Y2L2V2R2U2S2:2 " "666666#6669T2R28## >2>2?2Y2O2T2V2R2U22232 " "#6666666666##)) ## >2I242W2T2V2R2U2:2>2#666666666#  >2>2?2W2T2J2K2U2:2"#666666#6666# " "### >2?2W2T2R2S2U2:2 "  666666666# ">2?2W2T2R2S2U2:2 "#6#666666666 "##>2?2W2T2R2S2U2:2 " "#666#6666666#">2?2W2T2R2¸2U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z2Ñ2U2:26666666#66 ">2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2#6666666666>2?2W2T2V2R2U2:2#6#6#6#6 \ No newline at end of file
diff --git a/data/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 38885bcb7..f4f3e8c4b 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -1,5 +1,5 @@
Underwater4: @ 8482A84
- .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`" @2D2¸2B2C2A26666666 6666666<2Ó2¸2:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 1Ó2:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file
diff --git a/data/maps/Underwater5/border.bin b/data/maps/Underwater5/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater5/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc
index f46d3d677..043a6997e 100644
--- a/data/maps/Underwater5/header.inc
+++ b/data/maps/Underwater5/header.inc
@@ -1,5 +1,5 @@
Underwater5: @ 8482AA0
- .4byte Underwater5_MapAttributes
+ .4byte Underwater5_Layout
.4byte Underwater5_MapEvents
.4byte Underwater5_MapScripts
.4byte Underwater5_MapConnections
diff --git a/data/maps/Underwater5/map.bin b/data/maps/Underwater5/map.bin
deleted file mode 100644
index 902f0dbdc..000000000
--- a/data/maps/Underwater5/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„„&„„„„„ „„„.„„„ �©2©2©2©2©2©2©2Ž #�©2©2©2}#~©2Ž #�©2©2©2Ž�©2ކ©2©2}#�©2Ž "†©2©2}#†©2ކ©2©2©2ކ©2©2ކ©2©2©2}#†©2©2©2Ž„„†©2©2©2}#�©2©2©2©2ކ©2©2©2©2©2}#†©2©2}"##†©2‰2‰2©2©2}#„†©2©2©2Ž�©2Š222ˆ2©2…„†©2©2©2}"#„„†‚22222€2©2©2©2©2©2©2Ž#�©2©2‚22222€2©2©2©2©2}"# """#„„�©2©2©2z222x2©2©2©2}"# ""†©2©2…�©2©2©2©2y2y2©2©2©2©2Ž ""†©2‰2‰2©2…############�©2Š222ˆ2©2Ž ""&†‚22222€2Ž„„.„„„„„†©2‚22222€2Ž#�©2©2©2©2©2©2©2©2©2©2©2z222x2©2Ž�©2©2©2©2©2©2©2©2©2©2©2©2y2y2©2}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file
diff --git a/data/maps/Underwater6/border.bin b/data/maps/Underwater6/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater6/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc
index cf6ab9141..1be09d6a1 100644
--- a/data/maps/Underwater6/header.inc
+++ b/data/maps/Underwater6/header.inc
@@ -1,5 +1,5 @@
Underwater6: @ 8482ABC
- .4byte Underwater6_MapAttributes
+ .4byte Underwater6_Layout
.4byte Underwater6_MapEvents
.4byte Underwater6_MapScripts
.4byte Underwater6_MapConnections
diff --git a/data/maps/Underwater6/map.bin b/data/maps/Underwater6/map.bin
deleted file mode 100644
index 92bd56031..000000000
--- a/data/maps/Underwater6/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-&/„„.�©2©2©2Ž/�©2©2©2Ž�©2©2©2Ž�©2©2©2…�©2©2©2©2Ž/„†©2©2©2©2ކ©2©2©2©2}##†©2©2©2©2©2Ž„†©2©2©2©2}##�©2©2©2©2©2©2Ž�©2©2©2©2©2©2Ž�©2©2©2©2}##�©2©2©2©2Ž/#~©2©2©2Ž�©2©2©2Ž#~©2©2Ž#�©2©2…„�©2©2©2©2Ž�©2©2©2©2Ž�©2©2©2©2Ž�©2©2©2©2…„„„�©2©2©2©2©2©2©2©2Ž�©2©2©2‰2‰2©2©2©2Ž#~©2Š222ˆ2©2©2Ž/###�‚22222€2©2Ž�‚22222€2©2…„„„�©2z222x2©2©2©2©2©2©2Ž�©2©2y2y2©2©2©2©2©2©2©2Ž�©2©2©2©2©2©2©2©2©2©2©2Ž####"""##########"""""""""""""""                                # ##   †©2‰2‰2©2©2Ž �©2Š222ˆ2©2Ž �‚22222€2Ž ## ##�‚22222€2Ž   #~z222x2©2Ž #~y2y2©2©2Ž#~©2©2©2Ž ~©2©2Ž ~©2ކ©2Ž  #�©2©2©2Ž   �©2©2©2Ž �©2}## &�©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/Underwater7/border.bin b/data/maps/Underwater7/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater7/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc
index 0a55ab00b..4ededa296 100644
--- a/data/maps/Underwater7/header.inc
+++ b/data/maps/Underwater7/header.inc
@@ -1,5 +1,5 @@
Underwater7: @ 8482AD8
- .4byte Underwater7_MapAttributes
+ .4byte Underwater7_Layout
.4byte Underwater7_MapEvents
.4byte Underwater7_MapScripts
.4byte Underwater7_MapConnections
diff --git a/data/maps/Underwater7/map.bin b/data/maps/Underwater7/map.bin
deleted file mode 100644
index 660f585ae..000000000
--- a/data/maps/Underwater7/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-9<?WTVVVVVVV9<?WTVVVVVVV„„„„„„9<?WTVVVVVVV„„„„9<?WTVVVVVVV„9<?WTVVVVVVV„„„„„„„„„„„9<?WTVVVVVVV„9<?WTVVVVVVV9<?WTVVVVVVV„„„„„„„„„„„„„†9<?WTVVVVVVV„„„„„&„„„„9<?WTVVVVVVV„„„„„„„.„„9<?WTVVVVVVV„„„„„„†©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV�©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV„†©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV�©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV�©2©2‰2‰2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2ކ†9<?WTVVVVVVV�©2Š222ˆ2©2©2©2©2©2©2©2©2©2©2©2©2©2}#„„„„„„9<?WTVVVVVVV�‚22222€2©2©2©2©2©2©2©2©2©2©2}"#�©2©2‰2‰2©2©2Ž9<?WTVVVVVVV�‚22222€2©2©2©2©2©2©2©2©2©2©2Ž�©2Š222ˆ2©2Ž9<?WTVVVVVVV�©2z222x2©2©2}#########�‚22222€2Ž9<?WTVVVVVVV�©2©2y2y2©2©2©2ކ�‚22222€2Ž9<?WTVVVVVVV#########�©2z222x2©2Ž9<?WTVVVVVVV�©2©2y2y2©2©2Ž9<?WTVVVVVVV #†�©2©2©2©2©2©2Ž9<?WTVVVVVVV †�©2©2©2©2©2©2Ž9<?WTVVVVVVV#†�©2©2©2©2©2©2Ž9<?WTVVVVVVV†�©2}~©2©2©2…„9<?WTVVVVVVV††©2…†©2©2©2©2©2…9<?WTVVVVVVV#†�©2©2©2©2©2}~©2©2©2Ž9<?WTVVVVVVV "&†�©2©2©2©2©2…†©2©2©2Ž9<?WTVVVVVVV#„„.„„„†©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV #�©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV�©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2©2Ž9<?WTVVVVVVV   ##""""""""""""""""""9<?WTVVVVVVV 9<?WTVVVVVVV "# # 9<?WTVVVVVVV# #9<?WTVVVVVVV## # ##9<?WTVVVVVVV# ##9<?WTVVVVVVV9<?WTVVVVVVV \ No newline at end of file
diff --git a/data/maps/Underwater_MarineCave/border.bin b/data/maps/Underwater_MarineCave/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/Underwater_MarineCave/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc
index 6dee9d77a..54bffb710 100644
--- a/data/maps/Underwater_MarineCave/header.inc
+++ b/data/maps/Underwater_MarineCave/header.inc
@@ -1,5 +1,5 @@
Underwater_MarineCave: @ 84849CC
- .4byte Underwater_MarineCave_MapAttributes
+ .4byte Underwater_MarineCave_Layout
.4byte Underwater_MarineCave_MapEvents
.4byte Underwater_MarineCave_MapScripts
.4byte 0x0
diff --git a/data/maps/Underwater_MarineCave/map.bin b/data/maps/Underwater_MarineCave/map.bin
deleted file mode 100644
index 1904f4757..000000000
--- a/data/maps/Underwater_MarineCave/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-(((((((2$(2"""""+,-""""" \ 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 c00017cec..f08f506a1 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -1,5 +1,5 @@
Underwater_Route134: @ 848464C
- .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 e10d30013..6415ac787 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -1,5 +1,5 @@
Underwater_SeafloorCavern: @ 8484198
- .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 @@
-äåæçà6á6â6ã6(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_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 54362aea4..a72666d12 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -1,5 +1,5 @@
Underwater_SealedChamber: @ 8484668
- .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 @@
-efgmnoÀ2Ã2Ã2Á2À2Ä2Ð2Ñ2º2¼2Ð2Ü2Ò2º2¼2Ô2Ö2Ò2º2¼2Ô2Ö2Ò2º2¼2Ô2Ö2Ò2º2¾2¼2Ô2Ö2Ò2º2¾2¼2Ô2Ö2Ò2º2À2Ä2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2º2¾2¼2Ó2Ô2Ö2Ò2Â2Á2¼2Ó2Ô2Ö2Ò2Ó2º2¼2Ó2Ô2Ö2Ú2Ñ2º2¼2Ó2Ô2Ö2Ö2Ò2º2³2´2Ë2Ì2Ö2Ò2Â2Á2  ¼2Ó2Ô2Ö2Ò2Ó2º2#¼2Ó2Ô2Ö2Ú2Ñ2º2³2´2Ô2Ö2Ö2Ò2º2¾2¼2Ô2Ö2Ö2Ò2º2  ¼2Ô2Ö2Ö2Ò2º2¼2Ë2Ì2Ö2Ò2º2#³2´2Ô2Ö2Ò2Â2Á2  ¼2Ô2Ö2Ú2Ñ2º2¼2Ù2Ì2Ö2Ò2º2#É2´2Ô2Ö2Ò2Â2Á2  ¼2Ô2Ö2Ò2Ó2º2¼2Ô2Ö2Ú2Ñ2º2¼2Ù2Ì2Ö2Ò2º2¼2Ó2Ô2Ö2Ò2º2#É2´2Ô2Ö2Ò2º2  ¼2Ô2Ö2Ò2º2¼2Ô2Ê2Ë2º2¼2Ë2Ë2Ó2º2¼2Ó2Ó2Ó2º2¼2Ó2Ó2Ó2Â2Ã2Ã2Á2À2Ã2Ä2Ó2Ó2Ó2Ó2Ó2Ó2Â2Ã2Á2À2Ã2Ä2Ó2     Ó2Ó2º2¼2Ó2Ó2²2´2Ó2Â2Á2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2¼2Ó2Ó2º2p¼2Ó2Ó2º2¼2Ó2Ó2Â2Ã2Ã2C2C2C2Ã2Ã2Ä2Ó2Ó2º2³2´2Ó2Ó2Ó2Ó2S2S2S2Ó2Ó2Ó2²2³2³2# ¼2Ó2Ó2Ó2Ó2S2S2S2Ó2Ó2Ó2º2 "#            " \ 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 af57b3c8d..ef9ee1612 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -1,5 +1,5 @@
Underwater_SootopolisCity: @ 8483F4C
- .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/UnionRoom/border.bin b/data/maps/UnionRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/UnionRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
index d0b38c071..b79ae81a2 100644
--- a/data/maps/UnionRoom/header.inc
+++ b/data/maps/UnionRoom/header.inc
@@ -1,5 +1,5 @@
UnionRoom: @ 8485120
- .4byte UnionRoom_MapAttributes
+ .4byte UnionRoom_Layout
.4byte UnionRoom_MapEvents
.4byte UnionRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/UnionRoom/map.bin b/data/maps/UnionRoom/map.bin
deleted file mode 100644
index cb1b009c3..000000000
--- a/data/maps/UnionRoom/map.bin
+++ /dev/null
@@ -1,11 +0,0 @@
-(   #
-
-
-
-
-
-
-
-
-
-0222222222222222222222222222222222222222222222222222222222222222222222222222222222 2!2"2222222222222222222222222222222222222 222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_08417FC4/border.bin b/data/maps/UnknownMap_08417FC4/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/UnknownMap_08417FC4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08417FC4/map.bin b/data/maps/UnknownMap_08417FC4/map.bin
deleted file mode 100644
index 17a14a8d5..000000000
--- a/data/maps/UnknownMap_08417FC4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…Ó0000000000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 000000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000000 0 0 0 0 0 0 0 000Ô0†ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp…s00Æ000 0 0 0 0 0 0 0 0 0 000r†pppppppppppppppppppppppppppppppppppppppppppppppppppppppp…0000ÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp…0000ÆÆÆÆ00 0 0 0 0 0 0 0 0 0 0 0 0000Ô0†ppppPQppppppppppppppppppppppr´qkllmq´vppppuvppppPQprs000ÆÆÆÆÆ000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppu´qk´qquqq|uvpp}~pu{vXYrss000ÆÆ0000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{´qklllmq´vppppuv‚‰q{|||}qt„}~pppppzq|­}sss0000000000ÆÆ4Æ400 0 0 0 0 01110uuu~¯p}~pzqqqk¾klm¾mq´vppp}~p‚y‰qqqty„ppu{{vpp‚y„µfsss00000000000ÆÆÆ4Æ4Æ4Æ400 0 0 00000uuug·ppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|puvppµfsss00000000000ÆÆ4Æ4Æ4Æ4Æ4Æ40 000000uuug·uv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„p}~ppµfss{|||‰00000000Æ4Æ4Æ4Æ4Æ4Æ4Æ400t|||}uug·}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQppppµfs{©©©‰s0000000004Æ4Æ4Æ4Æ4Æ4Æ400ut©©©}ug·ppppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppuvµf{©©©‰ss0000000000Æ4Æ4Æ4Æ44400uut©©©}g·ppppXYppppppppuvppppy„ppppppppppXYpppppppp}~µn‘‘‘‰ss{|||‰0000004444t|||}uut‘‘‘o·puvppppppppppp}~ppppppppppppppppppppppppuvppµ�1$1$1$1ˆs{©©©‰{||‰0000t||}t©©©}ur$1$1$1Ÿ1·p}~pppppuvppppppppppppuvpppppppppppppppp}~ppµ¥1¦1�1$1ˆ{©©©‰{©©‰{|22|}t©©}t©©©}r$1$1$1Ÿ1·pppppppp}~pppppppppppp}~u{vpppppppuvppppppppµž1ž1�1$1�‘‘‘‰{©©‰{©©22©©}t©©}t‘‘‘’$1$1$1Ÿ1·ppppppppppppppppppppuvppzt„ppppppp}~ppppppppµž1ž1�1$1$1$1"10x‘‘‰{©©©22©©©}t‘‘z00 1$1$1$1Ž1§1·pppppppppppppppppppp}~pp‚„pppppppppppppppppp½¾£¥1¦1�1$1"10000x‘‘‘‘22‘‘‘‘z00000 1$1$1Ž1§1¤¿ppppppppppppppppppppppppppppppppppppppppppppppµž1ž1�1$1$1100000000000000000001$1$1Ž1§1ž1·pppppppppppppppppppppppppppppppppppppppppppppppµž1ž1�1$1$1!11000000000000000011$1$1Ž1§1ž1¤¿pppppppppppppppppppppppppppppppppppppppppppppppµž1ž1¥1�1$1$1!11100000000000111$1$1$1$1Ÿ1ž1ž1·ppppppppppppppppppppppppppppppppppppppppppppppppµž1ž1ž1�1$1$1$1$1"100000000011$1$1$1$1$1$1Ž1§1ž1ž1·pppppppppppppppppppppppppppppppppppppppppppppppp½¾£ž1¥1¦1�1$1$1$1111111111$1$1$1$1$1$1$1$1Ÿ1ž1¤¾¿pppppppppPQpppppppuvppppppppppppppppppppppppppppppµž1ž1ž1�1$1$1$1$1$1$1$1$1$1$1$1$1$1$1Ž1¦1¦1¦1¦1¦1§1ž1·ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp½£ž1ž1¥1¦1�1$1$1$1$1$1$1$1$1$1$1$1$1Ÿ1ž1ž1ž1¤¾¾¾¿ppppppppXYpppr{´qqq´vpuv´qq|pppppppppppppppppppppppppµž1ž1ž1ž1¥1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1¦1§1ž1ž1¤¿ppppppppppppppu{{´qqqqqq´v}~qqt„pPQpppppppppppppppppppppp½¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¿ppppppppppuvppp‚‰qqqqqqqqq´vpyy„uvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq´{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq´vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq´vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{´qkm´vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q´v}~pu{{´klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08428450/border.bin b/data/maps/UnknownMap_08428450/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_08428450/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_08428450/map.bin b/data/maps/UnknownMap_08428450/map.bin
deleted file mode 100644
index ca93fa0e2..000000000
--- a/data/maps/UnknownMap_08428450/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_084294C4/border.bin b/data/maps/UnknownMap_084294C4/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_084294C4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_084294C4/map.bin b/data/maps/UnknownMap_084294C4/map.bin
deleted file mode 100644
index 37f05b971..000000000
--- a/data/maps/UnknownMap_084294C4/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_084294E8/border.bin b/data/maps/UnknownMap_084294E8/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_084294E8/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_084294E8/map.bin b/data/maps/UnknownMap_084294E8/map.bin
deleted file mode 100644
index ca93fa0e2..000000000
--- a/data/maps/UnknownMap_084294E8/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E6C0/border.bin b/data/maps/UnknownMap_0843E6C0/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E6C0/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E6C0/map.bin b/data/maps/UnknownMap_0843E6C0/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E6C0/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E6E4/border.bin b/data/maps/UnknownMap_0843E6E4/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E6E4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E6E4/map.bin b/data/maps/UnknownMap_0843E6E4/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E6E4/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E708/border.bin b/data/maps/UnknownMap_0843E708/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E708/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E708/map.bin b/data/maps/UnknownMap_0843E708/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E708/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E72C/border.bin b/data/maps/UnknownMap_0843E72C/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E72C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E72C/map.bin b/data/maps/UnknownMap_0843E72C/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E72C/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E750/border.bin b/data/maps/UnknownMap_0843E750/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E750/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E750/map.bin b/data/maps/UnknownMap_0843E750/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E750/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E774/border.bin b/data/maps/UnknownMap_0843E774/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E774/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E774/map.bin b/data/maps/UnknownMap_0843E774/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E774/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E798/border.bin b/data/maps/UnknownMap_0843E798/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E798/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E798/map.bin b/data/maps/UnknownMap_0843E798/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E798/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E7BC/border.bin b/data/maps/UnknownMap_0843E7BC/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E7BC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E7BC/map.bin b/data/maps/UnknownMap_0843E7BC/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E7BC/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E7E0/border.bin b/data/maps/UnknownMap_0843E7E0/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E7E0/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E7E0/map.bin b/data/maps/UnknownMap_0843E7E0/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E7E0/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E804/border.bin b/data/maps/UnknownMap_0843E804/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E804/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E804/map.bin b/data/maps/UnknownMap_0843E804/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E804/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E828/border.bin b/data/maps/UnknownMap_0843E828/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E828/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E828/map.bin b/data/maps/UnknownMap_0843E828/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E828/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E84C/border.bin b/data/maps/UnknownMap_0843E84C/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E84C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E84C/map.bin b/data/maps/UnknownMap_0843E84C/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E84C/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E870/border.bin b/data/maps/UnknownMap_0843E870/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E870/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E870/map.bin b/data/maps/UnknownMap_0843E870/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E870/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0843E894/border.bin b/data/maps/UnknownMap_0843E894/border.bin
deleted file mode 100644
index b15c94f96..000000000
--- a/data/maps/UnknownMap_0843E894/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E894/map.bin b/data/maps/UnknownMap_0843E894/map.bin
deleted file mode 100644
index 22a47d94e..000000000
--- a/data/maps/UnknownMap_0843E894/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_08447028/border.bin b/data/maps/UnknownMap_08447028/border.bin
deleted file mode 100644
index 9e4b3fb7a..000000000
--- a/data/maps/UnknownMap_08447028/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_08447028/map.bin b/data/maps/UnknownMap_08447028/map.bin
deleted file mode 100644
index 028da0526..000000000
--- a/data/maps/UnknownMap_08447028/map.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 ò ò ò ò662222222222222222222222222òòòòòò ò ò ò òòòò ò ò
-ò2266662òòòòBBBBòò2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'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_0845A394/border.bin b/data/maps/UnknownMap_0845A394/border.bin
deleted file mode 100644
index f1629c020..000000000
--- a/data/maps/UnknownMap_0845A394/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-3333 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845A394/map.bin b/data/maps/UnknownMap_0845A394/map.bin
deleted file mode 100644
index fd294d9b6..000000000
--- a/data/maps/UnknownMap_0845A394/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_0845D470/border.bin b/data/maps/UnknownMap_0845D470/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/UnknownMap_0845D470/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845D470/map.bin b/data/maps/UnknownMap_0845D470/map.bin
deleted file mode 100644
index cd136de41..000000000
--- a/data/maps/UnknownMap_0845D470/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqqqqqqqqqt||}ut©|}€˜pppš�{‰qs{‰$1â4$1$1$1$1â4$1$1uuqu�pppppppppppppqqqqqqqqt||}qqt}u€‰‰˜pppppš�{‰{‰s$1$1$1$1$1$1$1$1t}ut}�ppppppppppppp||||||||}qqqt|}t}�pppppppppš�sqs{‰$1$1$1â4$1t|}quu€˜pppppppppppppqqqqqt©©©|||}qt}€˜pppppppppPesq{‰{‰â4$1$1t}qt|}u�ppppppppppppppqqt||}qqqt©©©|}€˜ppppppppppXm{‰q{‰{|||}qt}t|}�pppppppppppppp||}qt©|||}€‰‰‰‰˜ppuvpppppPQpš�{‰q{©©Ÿ©©|}qu€‰˜pppppppppppppp©©©|}€‰‰‰‰˜uvpu{vp}~pppppXYppš�{|©©©§0©©©©|}�pppppppppppppppp€‰Z[‰˜ppppp}~pzq|pppppppppPQppš‰‰�$1$1$1$1$1€‰Z[˜ppppPQpppppppppp˜pXYppppuvpppp‚y„pppppppuvXYppppp’$1$1$1$1$1�pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pppppppš‰‰‰‰‰˜puv‚y‰q|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~pp‚y„PQ}~ppppppppPQpp‚y„ppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYpp‚y„}~ppuvpppppu´|ppppppppu´qq´vpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|pppppppp‚yyyy„PQppppppppppppppppppppuvpppppppppppppppppuv‚y„pppppppuvppPQpXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq´{vppppuvppuvXYpppppppu{vpppppPQppuv‚ypppppppppppppppppppp‚yyy„pppp}~uv}~pppppppu{´q|pppppXYpp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|ppppppPQpppPQppppppppppppppppppppppp}~ppppppppppppppppp‚yyy„ppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvu´q|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~‚yy„pppppppppppppppppppppppppppppppppppppppppppppppppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppz´vpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvpp‚‰´v}~pppppppppppPQ}~pppppppuv}~ppppppppPQ‚y{{{{tppp‚y„p}~uvp‚y„pppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq´{tppppuvp}~ppuvpppppppzqq´{vppp}~uvpppu{{vppXYp}~puvpppllllmq´{{{t}~pppuv}~ppu{{vp‚‰qqq´vpppp}~ppu´qq´{{vu{{{v}~pppqqqq¿llmqq´{tppp}~ppu{´qq|uv‚yyyy„ppppppPQ‚yyy‰qq´´qqt„pppppqqqqqqq¿mqqqutppppppzqqqt„}~ppppppppppppXYpppp‚y‰qqqt„ppppPQqqqqqqqq¿llmuu{tppuv‚yyy„ppppppppppppppppppppppp‚yyy„pppppXYqqqqqqqqqqq¿¿¿l¿tp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845ECB4/border.bin b/data/maps/UnknownMap_0845ECB4/border.bin
deleted file mode 100644
index f0eabd248..000000000
--- a/data/maps/UnknownMap_0845ECB4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ññññ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845ECB4/map.bin b/data/maps/UnknownMap_0845ECB4/map.bin
deleted file mode 100644
index ec344933f..000000000
--- a/data/maps/UnknownMap_0845ECB4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ëùùùùùùùùùùùùùìññññññññññññòëùùùùùùùùùùùìðññññññññññññòòõ2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ðøùùìñññññññññòôéõ2õ2õ2õ2õ2õ2õ2õ2õ2øùùìðñññññññññòññòõ2ö2õ2õ2õ2õ2õ2õ2õ2õ2õ2õ2ððñññññññññôéêôåæçéõ2õ2õ2õ2õ2õ2õ2ððñññññññññññòñññññòõ2õ2õ2õ2õ2õ2õ2ððñññññññññññôééêññòëùù2ùùìðøìñññññññññññññòññòòõ2õ2õ2õ2õ2ððñðñññññññññññññòññòòõ2õ2õ2õ2õ2ððñøìññññññññññññòññòòõ2õ2õ2õ2õ2ðøìñðññññññññññññòñëúòëù2ùìðñðñðññññññññññññòñòëúòõ2õ2õ2ððñðñøìññññññññññëúñòòëúõ2õ2õ2ðøìøìñðññññññññññòññòòòõ2õ2õ2õ2øìðñðñøìññññññëùùúñëúòòõ2õ2õ2õ2õ2ððñðññðññññññòññññòëúò2ðøìðññðñññññùúñëùùúòëú222øìððññðññññññññòñññòò222ðððññðñññññëùùúñëùúò22222ðððññðñññññòññññòññò22222ððøùìøùùùùùòññëùúññò2ððññðññññññòñëúññëùú222ðøùìøùùùùùìúñòññëú222øùìøùùùùùìðùùúññò  222øùùùùìñððñëùùùú 222   ðñðøñò 2222222 ðñøùñò2222222222ðñññëú 2222222    #øùùìò 222    #ðò2222 #  ðò2222     ðò2222 #    ðò2222 efg  ðò222 # esdrfg ðò222efsd_ddrfgðò222qdd_d__ddpðò222qd______dpðò22222es_d____d_pðò22222 qdd______dpðò22222222#2#2bdd_d_d_dpðóóó222222222#2b_d_d_`a3a3#2ðñññóé22222222#2a3a3a3a3a3#2222ðñññóééé2222222222222ôôôñññññññññóééé222222ééôññññññññññññññññóééééééóññññññ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08469200/border.bin b/data/maps/UnknownMap_08469200/border.bin
deleted file mode 100644
index c07869a9f..000000000
--- a/data/maps/UnknownMap_08469200/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÙÙÙÙ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08469200/map.bin b/data/maps/UnknownMap_08469200/map.bin
deleted file mode 100644
index 67085fd37..000000000
--- a/data/maps/UnknownMap_08469200/map.bin
+++ /dev/null
@@ -1,12 +0,0 @@
-ÙÙÙÙÙÙÙÚÙÙÓáááâÚÙ2ÚÙ2Ù2ÙÙÙÙÙÓáá9áááááÔàÔàÔÙ2Ù2Ù2Ù2Ù2àááááááá9áÔÙ2Ù2Ù2Ù2Ù2ÙÙÙÙÓááâÙÙÚÙÓááâÓâÙ2Ù2Óáá9áâÓKLMÔàÔàÔàááááááááááááà9ááÔÙ2ÙÓááâÙÓáá9âÙÚÙ2Ù2Ù2ÚÙ2Ù2Ù2ÚÓáâ 
-  ØÙ2àÔàááááÔÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2 
- ÔØÙ2áâÙÙÓáâÙáâÓááâÙ2Ù2Ù2ÚÚ 
- Ù2Ù2%7'ØÙ2Ù2àÔÙ2Ù2Ù2Ù2àáKLMÙ2Ù2Ù2Ù2 
- ØàáÙÙÓáâÙÓá 
- UÙÚÓáááááâÚÙ2Ù2-?/àÔÙ2Ù2àÔ@AAAB ZÔÙ2Ù2Ù2àáÔááâÙÙÓâÙ2#$_ÓâÚÙ2Ù2Ù2Ù2Ù2Ù2Ú Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáÔÙ2àáÔÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2Ù2 Ù2Ù2ØÙÓKLMâÙ2Ù2+,_ÚÓâÙ2Ù2ÓáD2E2âÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2Ù2Ù2Ø@AAAAAAABÙ2àÓâ @AAFÙ2G\ÚÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2@AFÙ2Ù2GAAABàÔÙ2Ù2àááááD2áÔàááááááááÔÙ2Ù2âÙ%6'Ù2ÓábD2cáâÚÙ2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÓábD2E2cááááÔàááááÔÙ2Ù2Ù2Ù2àááááá9ááÔØÙ2Ù2ÙÙ->/Ù2ÚÙ2ÓD2áááâÙ2Ù2Ù2ÚÓáááááááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àáááÔÙàááD2ááááááÔØàáÔAAAAABÚÙ2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2ÓááááááááááááD2E2áááÔàÔÙÙÓD2áááááÔ 
- ØàáÔàááááááâÓâÓáááááD2E2âÚÓáâÓáááááááááááD2E2ááÔØÙ2ØÙÙÚÙ2Ù2Ù2Ù2Ù2Ù2ØØÙ2Ù2ØÙ2Ù2Ù2ÓááááâÓâÙ2Ù2Ù2Ù2Ù2Ù2Ù2ÓâÚÓáâÙ2ÓáááááááááD2E2ÔÙ2ØàÔàááâ6Ù2Ù2Ù2Ù2Ù2Ù2Ø ØÙ2Ù2àáááâÙ2Óáááâ82Ù2ÓáááD2E2âÙ2ÚÚÓááâÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔàÔàááá9ááÔÙ2Ù2Ù2àÔÙ2Ù2àáÔÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÓáâÙ2Ù2Ù2Ù2Ù2Ù2ÓâÚÚ@AFÙ2Ù2GAAAAAAAABàÔàáááÔØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2àáÔÙ2ÓááâÙ2ÚT 
- BÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2ÚÚÙ2ÓbD2E2cáQR[RSáÔÙ2Ù2àáÔTA 
- ØØÙ2Ù2Ù2Ù2ØÙ282Ù2Ù2Ù2Ù2àÙ2;Ù2Ù2Ù2Ù2Ú^#$Ù2Ù2Ù2ÓáD2E2âÙ2ÚÚÙ2ÚÙ2Ù2Ù2Ù2Ó á!2á"ÔàááÔÙ2Ø^Ù2#$ØØÙ2Ù2Ù2Ù2àáááÔ2Ù2Ù2Ù2Ú^+,Ù2Ù2Ù2ÚÓD2E2ááâÚÙ2ÚÙ2Ù2Ù2Ù2Ú()2)2)2*óÙ2Ù2Ù2àÔØ^Ù2+,ØàÔÙ2Ù2Ù2Ù2 
- à 
- ÓKLM^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÓânÙ2Ù2oÚ0q0q0q02óÙ2Ù2Ù2Ù2ØØ^Ù2Ù2Ù2Ù2ØÙ2àD2E2áÔ Ù2Ú ^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚÙ2Ù2Ù2Ù2Ù2ÚÚÓbD2E2cýq0€6q0€6q0ûáÔÙ2Ù2ØØ^Ù2Ù2Ù2Ù2àááD2E2ÔØ%7'Ù2Ú%7']AAABÙ2Ù2ÚÚÙ2Ù2ÓáD2âÚÚq0q0q0q0q0q0€6q0€6q0q0q0ûáÔØØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2ØàááÔ-?/Ù2AABÚ-?/Ù2ÓáááD2E2âÚÙ2Ù2ÚÓD2áâÚq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØØ]ABÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2àáááÔáááâÓáááâÙ2Ù2Ù2Ù2Ù2Ù2ÚÙ2Ù2ÚÚÙ2Ù2Ù2Úq0q0q0q0q0q0q0q0q0q0q0q0q0q0ÎØàáááD2E2áKLMÔàááÔÙ2Ù2Ù2Ù2àÙÙÓáâÙ2ÓáKLMáD2E2áâÓáâÚÙ2Ù2Ù2Úq0q0t||||||||||‰ÎàáÔTBÙ2Ù2Ù2 ØÙ2Ù2Ù2àÔÙ2Ù2Ù2Ù2áKLÙ2Ù2ÚTYZBÙ2Ù2ÓáâÓáâÓD2E2Íty}’““““““““”sÖáÔØ^Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2ØÙ2Ù2Ù2Ù2Ù2 Ù2Ù2Ú^Ù2Ù2Ù2ÚÓáâÙ2Ù2Úq0q0t}’“¢��������œ{y‰óØ^Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2Ù2Ù2%6'Ù2Ù2Ú^Ù2Ù2Ù2ÚÚk6l6l6m6Úq0q0u’¢����������¤“”sóØ^Ù2Ù2Ù2Ù2Ù2Ù2Ù2àÔ Ù2ØÙ2Ù2Ù2Ù2->/Ù2Ù2Ú^Ù2Ù2Ù2Ù2Ù2Ù2ÚÚ0123Úq0q0uš�������������œsóØ]AABÙ2Ù2Ù2Ù2Ù2ØÙ2àÔÙ2Ù2AAAABÓâ]AAAABÓâÚ89:;Úq0q0uš���˜™™™™ ����œsóà{|}~ÔÙ2Ù2Ù2Ù2ØÙ2Ù2ØÙ2Ù2Ù2Ù2ÓááâÓááááááâÓâABwÚq0q0uš��œŠ‹‹‹‹Œš���œsóTPQRSØÙ2Ù2Ù2Ù2àáD2ÔÙ2Ù2àÔÙ2Ù2ÓâÙ2ÓáâÙ2Ù2Ù2ÓáááâÙ2Ù2Ù2Ù2Ù2Úq0q0uš��œ¸¹º³»¼š���œsó^XYZ[ØÙ2Ù2Ù2Ù2Ù2Ù2Ù2ØÙ2Ù2Ù2ØÙ2Ù2ÚÙ2Ù2ÚÙ2Ù2Ù2Ù2Ù2ÚÙ2Ù2Ù2Ù2Ù2Ù2Ù2Ù2Óýq0q0uš��œÀÁÂÅÃÄš���œsó^abvàáD2E2ÔÙ2Ù2Ù2àááÔàÔÓâÙ2Ù2ÚÓáKLMâÙ2Ù2Ù2Ù2Ù2ÓD2E2ýq0q0q0uš�œÓ0È1É1ÊÍËÌ1Ô0š��œsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2àááÔÙ2Ù2Ù2ØÙ2ØâÙ2Ù2ÓâÚTYZBÙ2Ù2Ù2Ù2Óýq0q0q0q0q0q0uš�œ000000010š��œsó^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Ù2222à9áÔØÙ2ØÙ2Ù2Ù2ÚÙ2Ú^Ù2Ù2Ù2Ù2Óýq0q0q0q0q0q0t}š�œ00000010š��œsó]BÙ2Ù2@AFÙ2Ù2 222ØØÙ2ØÙ2ÓáâÓâ^Ù2Ù2Ù2Ù2Úq0tÞßD2E2yz’¢�œ00000000š��œsûááD2E2áÔNÙ2Ù2 
- ØØÙ2ØÓâÙ2Ù2ÚÙ2^Ù2Ù2Ù2Ù2Ù2Ù2Ù2Úq0rÖ×0000š��œ00000000š��œ{yyyD2E2‰óNÙ2Ù2ØàÔØâÓááâÙ2]BÙ2Ù2Ù2Ù2Óáýq0ræç0000š��¤““““““““¢��¤”04000póNÙ2Ù2Ù2Ù2Ù2ØÙ2ØØÙ2ÚÙ2Ù2Óáááááááýtyyz0’““““¢���������������œ00000póV@AAAAAABàÔØàÓâÙ2ÓýqtyÞßÞßyz0000š��������������������œ00000pûáááááááÔÙÙØàÔÚÙÙ2Úqqr0Ö×Ö×000000š��������������������¤“”000xyyyy‰qqqóÙÙØÙØÚÙÙ2Úqqr0æåÜÝ000000š����������������������œ00000000xÞ߉ûÔÙàÔØÚÙÙ2Úqqr000ÔÕ000000š����������������������œ000000000Ö×pqóÙÙØØÚÙÙ2Úqqr000æç000000š��������´µ¶·�°±²³�����¤““”0000Î1Ï1ÜÝpqûÔÙØØÚÙÙ2Úqqr0000000Î1Ï100š��������¼½¾¿�¸¹º»��������œ0000ÖÕÔÕpqqóÙØØÜÒÙ2ìíqr0000000Ö×00š��������ÄÅÆÇ�ÀÁÂÃ��������œ0000ÜÝÜÝpqqóÙØØÙÚÙÙÜí¿iiij000ÜÝ’“¢�������������������������¤“““”ÔÕÔÕpqqóÙØØÙÜÑÑÒÜìììí¿ij0ÔÕš�������������������������������œæåäçpëìÛÙØØÙÙÙÙÜÑÑÒÙÜìír0æçš������������������������������î©i0i0i0i0¾0óÙÐÑÛÛÙÙÙÙÙÙÙÜÑÒÙÚ¿iijš�������������������������������qqqqëìÛÐØÙÙÙÑÑÑÒÙÙÙÙÙÚÙÜìíqrš������������������������¨¨¨©qëììÛÙÙØØÙÙÙÙÙÙÜÑÒÙÙÙÜÑÑÒÜírš�������������������������qqqqqqqóÙÙÙÐÑÛØÙÙÙÙÙÙÙÙÚÙÙÙÙÙÙÚÙÚrš���������¥¦¦¦§������¨©qqqqëììÛÙÙÙØÙÙØÙÙÙÙÙÙÙÙÜÑÒÙÙÙÙÜÒÚrš�������¥¦­‘‘‘¯¦§�����qqqqqqqëÛÐÑÑÑÑÑÛÐÑÛÙÙÙÙÙÙÙÙÙÙÚÙÙÙÙÙÚÚrš������¥­‘‘‘‘‘‘‘¯§����qqqqqëìÛÙØÙÙÙÙÐÑÛÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÙÙÚÚ©¨¨¨ï��¥­‘‘‘‘‘‘‘‘‘¯§î¨©qqëììÛÙÙÙØÐÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÙÙÚÚqqqq©¨¨ªªªªªªªªªªªªª©qqqqóÙÐÑÑÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÜÑÒÙÚÜíqqqqqqqqqqqqqqqqqqqqqëììÛÙØÐÑÑÑÑÛÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÚÙÜìììììììììììììììììììììÛÙÐÑÑÛØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÚÙÜÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÛÙÙÙØÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙÙ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084693AC/border.bin b/data/maps/UnknownMap_084693AC/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/UnknownMap_084693AC/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_084693AC/map.bin b/data/maps/UnknownMap_084693AC/map.bin
deleted file mode 100644
index a179d8997..000000000
--- a/data/maps/UnknownMap_084693AC/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_08470BD8/border.bin b/data/maps/UnknownMap_08470BD8/border.bin
deleted file mode 100644
index 4531975c7..000000000
--- a/data/maps/UnknownMap_08470BD8/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_08470BD8/map.bin b/data/maps/UnknownMap_08470BD8/map.bin
deleted file mode 100644
index 0f7bbb958..000000000
--- a/data/maps/UnknownMap_08470BD8/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_08480DAC/border.bin b/data/maps/UnknownMap_08480DAC/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_08480DAC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_08480DAC/map.bin b/data/maps/UnknownMap_08480DAC/map.bin
deleted file mode 100644
index d1277f280..000000000
--- a/data/maps/UnknownMap_08480DAC/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_08480F54/border.bin b/data/maps/UnknownMap_08480F54/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_08480F54/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_08480F54/map.bin b/data/maps/UnknownMap_08480F54/map.bin
deleted file mode 100644
index f0d9c299c..000000000
--- a/data/maps/UnknownMap_08480F54/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-''''''''';<=''/////////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAB½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2"2#2½2½2½2½2½2½2 \ No newline at end of file
diff --git a/data/maps/UnknownMap_084810FC/border.bin b/data/maps/UnknownMap_084810FC/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_084810FC/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_084810FC/map.bin b/data/maps/UnknownMap_084810FC/map.bin
deleted file mode 100644
index 908158cf4..000000000
--- a/data/maps/UnknownMap_084810FC/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<='''';<=''//CD2E////CL2E//5252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file
diff --git a/data/maps/UnknownMap_084812A4/border.bin b/data/maps/UnknownMap_084812A4/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_084812A4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_084812A4/map.bin b/data/maps/UnknownMap_084812A4/map.bin
deleted file mode 100644
index d033bc4d2..000000000
--- a/data/maps/UnknownMap_084812A4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<=';<=';<='//CL2E/CD2E/CD2E/¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2¾2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½289999:½2½2½2½2½2½2½2½2@AAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2AAAAAA½2½2½2½2½2½2½2½2IMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0848144C/border.bin b/data/maps/UnknownMap_0848144C/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_0848144C/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_0848144C/map.bin b/data/maps/UnknownMap_0848144C/map.bin
deleted file mode 100644
index eeccae9ae..000000000
--- a/data/maps/UnknownMap_0848144C/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<=';<=';<='//CD2E/CL2E/CL2E/525252525252525265252525252626266642424242424242426262426264242424242424289999:4242424242424242@AAAAB4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242AAAAAA4242424242424242IMMMMJ42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 \ No newline at end of file
diff --git a/data/maps/UnknownMap_084815F4/border.bin b/data/maps/UnknownMap_084815F4/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/UnknownMap_084815F4/border.bin
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/data/maps/UnknownMap_084815F4/map.bin b/data/maps/UnknownMap_084815F4/map.bin
deleted file mode 100644
index 8507a4932..000000000
--- a/data/maps/UnknownMap_084815F4/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-'';<='''';<=''//CL2E////CD2E//¾2¾2¾2¾2¾2¾2¾2¾2¾26¾2¾2¾2¾2½2½2½2½2½2½2½2½26½2½2½2½2½2½2½2½28999999:½2½2½2½2½2½2@AAAAAAB½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2AAAAAAAA½2½2½2½2½2½2IMMMMMMJ½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2½2 \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481B24/border.bin b/data/maps/UnknownMap_08481B24/border.bin
deleted file mode 100644
index e9d1c658c..000000000
--- a/data/maps/UnknownMap_08481B24/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÁÁÁÁ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481B24/map.bin b/data/maps/UnknownMap_08481B24/map.bin
deleted file mode 100644
index 2a47bca91..000000000
--- a/data/maps/UnknownMap_08481B24/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁÁd2d2d2­6d2d2d2­6d2d2d2­6­6­6­6­6­6­6d2d2d2­6d2d2d2­6d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m�2ž2n';<='''''''''//////////j�2ž2k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢¢ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481DBC/border.bin b/data/maps/UnknownMap_08481DBC/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/UnknownMap_08481DBC/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/UnknownMap_08481DBC/map.bin b/data/maps/UnknownMap_08481DBC/map.bin
deleted file mode 100644
index 603f55c93..000000000
--- a/data/maps/UnknownMap_08481DBC/map.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-'
-  +/6666-7$%655555555556555555655555565555555555655 555555 \ 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 4fa500e7e..4c8edd31c 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_29: @ 8484DBC
- .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 38600bb68..46465019e 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_30: @ 8484DD8
- .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 f53d3055b..13e428cfd 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_31: @ 8484DF4
- .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 0e269a53c..8244c3802 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_32: @ 8484E10
- .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 6a8df64c6..b4da8dd48 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_33: @ 8484E2C
- .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 d37b7ceaa..bb1ce881c 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -1,5 +1,5 @@
UnknownMap_25_34: @ 8484E48
- .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/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 49be64155..047ba12ad 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown: @ 8482640
- .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 8ed6ea56b..000000000
--- a/data/maps/VerdanturfTown/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin b/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin
deleted file mode 100644
index 9afd13cdc..000000000
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
index fba5c3764..1eef21301 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_BattleTentBattleRoom: @ 8482E90
- .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes
+ .4byte VerdanturfTown_BattleTentBattleRoom_Layout
.4byte VerdanturfTown_BattleTentBattleRoom_MapEvents
.4byte VerdanturfTown_BattleTentBattleRoom_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin
deleted file mode 100644
index c405aabfc..000000000
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin
+++ /dev/null
Binary files differ
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
index 5d8bccc99..9b8f62260 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_BattleTentCorridor: @ 8482E74
- .4byte VerdanturfTown_BattleTentCorridor_MapAttributes
+ .4byte BattleTentCorridor_Layout
.4byte VerdanturfTown_BattleTentCorridor_MapEvents
.4byte VerdanturfTown_BattleTentCorridor_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
index 6b998c218..4d1e0ca9e 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_BattleTentLobby: @ 8482E58
- .4byte VerdanturfTown_BattleTentLobby_MapAttributes
+ .4byte BattleTentLobby_Layout
.4byte VerdanturfTown_BattleTentLobby_MapEvents
.4byte VerdanturfTown_BattleTentLobby_MapScripts
.4byte 0x0
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index 6666d264d..51f3dadbd 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_FriendshipRatersHouse: @ 8482F1C
- .4byte VerdanturfTown_FriendshipRatersHouse_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 a1e99f984..e6571b7f0 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_House: @ 8482F38
- .4byte VerdanturfTown_House_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 3b5c3cce5..6f69b3aac 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_Mart: @ 8482EAC
- .4byte VerdanturfTown_Mart_MapAttributes
+ .4byte Mart_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 d6fc48171..b6c5177ce 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_PokemonCenter_1F: @ 8482EC8
- .4byte VerdanturfTown_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 fa99aeaa4..ee657d77b 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_PokemonCenter_2F: @ 8482EE4
- .4byte VerdanturfTown_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 a1e4e49aa..cb727234e 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -1,5 +1,5 @@
VerdanturfTown_WandasHouse: @ 8482F00
- .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 8bd8286b5..35ff7bd3b 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -1,5 +1,5 @@
VictoryRoad_1F: @ 8484374
- .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#BBBBBB»B»B¼B¼B½B½BBBB»B»B¼ò¼ò¼ò¼ò¼ò½B¼B B B B B"BBBBBBÃBÃBÄBÄBÅBÅBBBBÃBÃBÄòÄòÄòÄòÄòÅBÄBBBBBBBB22222BB2222222BB222222222222BB222222222222222222222222222BB22222222222222222222222BB222     
-2222222222222222222222BB»B»B¼B¼ò¼ò¼ò½B¼B B B B"22222222222222222222222BBÃBÃBÄBÄòÄòÄòÅBÄBBBB22     
-2222   
-2222222222  B B B¼B»B¼ò¼ò¼ò¼ò¼B½B¼B B"22L6Q6M6222P6BBBÄBÃBÄòÄòÅòÅòÄBÅBÄBB2222222222222228#2222222222222222222228#
-222222222222222222228222222222222222222     
-2228222222222222222222  B B B"2228#   #22222222BBB»B»B¼ò¼ò¼ò¼B½B¼B B B B"22222222222222#22BBBÃBÃBÄòÄòÄòÄBÅBÄBBBB222222222222222 #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 620dbdc71..b9edeeb17 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -1,5 +1,5 @@
VictoryRoad_B1F: @ 8484390
- .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 c1ea2f657..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 B¼B»B¼ò¼ò½B¼B B B B B
-2fBBBf#"2222BBBBÄBÃBÄòÄòÅBÄBBBBB2BBBBB2222222222222BfBB#    
-2#2222222#"#  "2222222222P2222222222#"2222222  
-22228222# 
-22222 ##       ## 
-228222#  
-22  B B#B #22R222 #B B B B¼B»B¼ò¼ò½B½BBBB222222622#   
-22BBBBÄBÃBÄòÄòÅBÅBBBB2222222222222222222BBB22222222222222 #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 ebafcfd49..b6c80a656 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -1,5 +1,5 @@
VictoryRoad_B2F: @ 84843AC
- .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 24c4f646a..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�{’¹¹¹222222222»³¼¹¹¹222222222¹¹¹€‰�222€Z[‰tuv‰‰‰‰�222222222¹¹¹�{’222�XY{{{{{{{{’22222222222€tuv‰‰‰‰‰˜{š‰‰‰˜{PQ{{{{{{{š‰‰�22222222�{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222¤¤UUUUV{{{{{{{{{TUUUUUUUUUUV{{’  2#2222222#     "¤V{{{TUUUU¤         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B»B»B»B¼ò¼ò¼ò½B½B½BB222222222BB»B»B»B»B¼ò¼ò¼ò»B»B»B B B B B#BBBBBBBÃBÃBÃBÄòÄòÄòÅBÅBÅBB2222BBÃBÃBÃBÃBÄòÄòÄòÃBÃBÃBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222222222222222222222222222222222222262222222222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
deleted file mode 100644
index c3c2a8d31..000000000
--- a/data/maps/_assets.inc
+++ /dev/null
@@ -1,7606 +0,0 @@
- .align 2
-PetalburgCity_MapBorder: @ 83DFE14
- .incbin "data/maps/PetalburgCity/border.bin"
-
- .align 2
-PetalburgCity_MapBlockdata: @ 83DFE1C
- .incbin "data/maps/PetalburgCity/map.bin"
-
- .align 2
-PetalburgCity_MapAttributes: @ 83E0524
- .4byte 0x1e
- .4byte 0x1e
- .4byte PetalburgCity_MapBorder
- .4byte PetalburgCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
- .align 2
-SlateportCity_MapBorder: @ 83E053C
- .incbin "data/maps/SlateportCity/border.bin"
-
- .align 2
-SlateportCity_MapBlockdata: @ 83E0544
- .incbin "data/maps/SlateportCity/map.bin"
-
- .align 2
-SlateportCity_MapAttributes: @ 83E1804
- .4byte 0x28
- .4byte 0x3c
- .4byte SlateportCity_MapBorder
- .4byte SlateportCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Slateport
-
- .align 2
-MauvilleCity_MapBorder: @ 83E181C
- .incbin "data/maps/MauvilleCity/border.bin"
-
- .align 2
-MauvilleCity_MapBlockdata: @ 83E1824
- .incbin "data/maps/MauvilleCity/map.bin"
-
- .align 2
-MauvilleCity_MapAttributes: @ 83E1E64
- .4byte 0x28
- .4byte 0x14
- .4byte MauvilleCity_MapBorder
- .4byte MauvilleCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
- .align 2
-RustboroCity_MapBorder: @ 83E1E7C
- .incbin "data/maps/RustboroCity/border.bin"
-
- .align 2
-RustboroCity_MapBlockdata: @ 83E1E84
- .incbin "data/maps/RustboroCity/map.bin"
-
- .align 2
-RustboroCity_MapAttributes: @ 83E3144
- .4byte 0x28
- .4byte 0x3c
- .4byte RustboroCity_MapBorder
- .4byte RustboroCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-FortreeCity_MapBorder: @ 83E315C
- .incbin "data/maps/FortreeCity/border.bin"
-
- .align 2
-FortreeCity_MapBlockdata: @ 83E3164
- .incbin "data/maps/FortreeCity/map.bin"
-
- .align 2
-FortreeCity_MapAttributes: @ 83E37A4
- .4byte 0x28
- .4byte 0x14
- .4byte FortreeCity_MapBorder
- .4byte FortreeCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fortree
-
- .align 2
-LilycoveCity_MapBorder: @ 83E37BC
- .incbin "data/maps/LilycoveCity/border.bin"
-
- .align 2
-LilycoveCity_MapBlockdata: @ 83E37C4
- .incbin "data/maps/LilycoveCity/map.bin"
-
- .align 2
-LilycoveCity_MapAttributes: @ 83E50C4
- .4byte 0x50
- .4byte 0x28
- .4byte LilycoveCity_MapBorder
- .4byte LilycoveCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-MossdeepCity_MapBorder: @ 83E50DC
- .incbin "data/maps/MossdeepCity/border.bin"
-
- .align 2
-MossdeepCity_MapBlockdata: @ 83E50E4
- .incbin "data/maps/MossdeepCity/map.bin"
-
- .align 2
-MossdeepCity_MapAttributes: @ 83E69E4
- .4byte 0x50
- .4byte 0x28
- .4byte MossdeepCity_MapBorder
- .4byte MossdeepCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
- .align 2
-SootopolisCity_MapBorder: @ 83E69FC
- .incbin "data/maps/SootopolisCity/border.bin"
-
- .align 2
-SootopolisCity_MapBlockdata: @ 83E6A04
- .incbin "data/maps/SootopolisCity/map.bin"
-
- .align 2
-SootopolisCity_MapAttributes: @ 83E8624
- .4byte 0x3c
- .4byte 0x3c
- .4byte SootopolisCity_MapBorder
- .4byte SootopolisCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Sootopolis
-
- .align 2
-EverGrandeCity_MapBorder: @ 83E863C
- .incbin "data/maps/EverGrandeCity/border.bin"
-
- .align 2
-EverGrandeCity_MapBlockdata: @ 83E8644
- .incbin "data/maps/EverGrandeCity/map.bin"
-
- .align 2
-EverGrandeCity_MapAttributes: @ 83E9F44
- .4byte 0x28
- .4byte 0x50
- .4byte EverGrandeCity_MapBorder
- .4byte EverGrandeCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_EverGrande
-
- .align 2
-LittlerootTown_MapBorder: @ 83E9F5C
- .incbin "data/maps/LittlerootTown/border.bin"
-
- .align 2
-LittlerootTown_MapBlockdata: @ 83E9F64
- .incbin "data/maps/LittlerootTown/map.bin"
-
- .align 2
-LittlerootTown_MapAttributes: @ 83EA284
- .4byte 0x14
- .4byte 0x14
- .4byte LittlerootTown_MapBorder
- .4byte LittlerootTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
- .align 2
-OldaleTown_MapBorder: @ 83EA29C
- .incbin "data/maps/OldaleTown/border.bin"
-
- .align 2
-OldaleTown_MapBlockdata: @ 83EA2A4
- .incbin "data/maps/OldaleTown/map.bin"
-
- .align 2
-OldaleTown_MapAttributes: @ 83EA5C4
- .4byte 0x14
- .4byte 0x14
- .4byte OldaleTown_MapBorder
- .4byte OldaleTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
- .align 2
-DewfordTown_MapBorder: @ 83EA5DC
- .incbin "data/maps/DewfordTown/border.bin"
-
- .align 2
-DewfordTown_MapBlockdata: @ 83EA5E4
- .incbin "data/maps/DewfordTown/map.bin"
-
- .align 2
-DewfordTown_MapAttributes: @ 83EA904
- .4byte 0x14
- .4byte 0x14
- .4byte DewfordTown_MapBorder
- .4byte DewfordTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
- .align 2
-LavaridgeTown_MapBorder: @ 83EA91C
- .incbin "data/maps/LavaridgeTown/border.bin"
-
- .align 2
-LavaridgeTown_MapBlockdata: @ 83EA924
- .incbin "data/maps/LavaridgeTown/map.bin"
-
- .align 2
-LavaridgeTown_MapAttributes: @ 83EAC44
- .4byte 0x14
- .4byte 0x14
- .4byte LavaridgeTown_MapBorder
- .4byte LavaridgeTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-FallarborTown_MapBorder: @ 83EAC5C
- .incbin "data/maps/FallarborTown/border.bin"
-
- .align 2
-FallarborTown_MapBlockdata: @ 83EAC64
- .incbin "data/maps/FallarborTown/map.bin"
-
- .align 2
-FallarborTown_MapAttributes: @ 83EAF84
- .4byte 0x14
- .4byte 0x14
- .4byte FallarborTown_MapBorder
- .4byte FallarborTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
- .align 2
-VerdanturfTown_MapBorder: @ 83EAF9C
- .incbin "data/maps/VerdanturfTown/border.bin"
-
- .align 2
-VerdanturfTown_MapBlockdata: @ 83EAFA4
- .incbin "data/maps/VerdanturfTown/map.bin"
-
- .align 2
-VerdanturfTown_MapAttributes: @ 83EB2C4
- .4byte 0x14
- .4byte 0x14
- .4byte VerdanturfTown_MapBorder
- .4byte VerdanturfTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
- .align 2
-PacifidlogTown_MapBorder: @ 83EB2DC
- .incbin "data/maps/PacifidlogTown/border.bin"
-
- .align 2
-PacifidlogTown_MapBlockdata: @ 83EB2E4
- .incbin "data/maps/PacifidlogTown/map.bin"
-
- .align 2
-PacifidlogTown_MapAttributes: @ 83EB924
- .4byte 0x14
- .4byte 0x28
- .4byte PacifidlogTown_MapBorder
- .4byte PacifidlogTown_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-Route101_MapBorder: @ 83EB93C
- .incbin "data/maps/Route101/border.bin"
-
- .align 2
-Route101_MapBlockdata: @ 83EB944
- .incbin "data/maps/Route101/map.bin"
-
- .align 2
-Route101_MapAttributes: @ 83EBC64
- .4byte 0x14
- .4byte 0x14
- .4byte Route101_MapBorder
- .4byte Route101_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
- .align 2
-Route102_MapBorder: @ 83EBC7C
- .incbin "data/maps/Route102/border.bin"
-
- .align 2
-Route102_MapBlockdata: @ 83EBC84
- .incbin "data/maps/Route102/map.bin"
-
- .align 2
-Route102_MapAttributes: @ 83EC454
- .4byte 0x32
- .4byte 0x14
- .4byte Route102_MapBorder
- .4byte Route102_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
- .align 2
-Route103_MapBorder: @ 83EC46C
- .incbin "data/maps/Route103/border.bin"
-
- .align 2
-Route103_MapBlockdata: @ 83EC474
- .incbin "data/maps/Route103/map.bin"
-
- .align 2
-Route103_MapAttributes: @ 83ED234
- .4byte 0x50
- .4byte 0x16
- .4byte Route103_MapBorder
- .4byte Route103_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Petalburg
-
- .align 2
-Route104_MapBorder: @ 83ED24C
- .incbin "data/maps/Route104/border.bin"
-
- .align 2
-Route104_MapBlockdata: @ 83ED254
- .incbin "data/maps/Route104/map.bin"
-
- .align 2
-Route104_MapAttributes: @ 83EEB54
- .4byte 0x28
- .4byte 0x50
- .4byte Route104_MapBorder
- .4byte Route104_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-Route105_MapBorder: @ 83EEB6C
- .incbin "data/maps/Route105/border.bin"
-
- .align 2
-Route105_MapBlockdata: @ 83EEB74
- .incbin "data/maps/Route105/map.bin"
-
- .align 2
-Route105_MapAttributes: @ 83F0474
- .4byte 0x28
- .4byte 0x50
- .4byte Route105_MapBorder
- .4byte Route105_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
- .align 2
-Route106_MapBorder: @ 83F048C
- .incbin "data/maps/Route106/border.bin"
-
- .align 2
-Route106_MapBlockdata: @ 83F0494
- .incbin "data/maps/Route106/map.bin"
-
- .align 2
-Route106_MapAttributes: @ 83F1114
- .4byte 0x50
- .4byte 0x14
- .4byte Route106_MapBorder
- .4byte Route106_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
- .align 2
-Route107_MapBorder: @ 83F112C
- .incbin "data/maps/Route107/border.bin"
-
- .align 2
-Route107_MapBlockdata: @ 83F1134
- .incbin "data/maps/Route107/map.bin"
-
- .align 2
-Route107_MapAttributes: @ 83F1A94
- .4byte 0x3c
- .4byte 0x14
- .4byte Route107_MapBorder
- .4byte Route107_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
- .align 2
-Route108_MapBorder: @ 83F1AAC
- .incbin "data/maps/Route108/border.bin"
-
- .align 2
-Route108_MapBlockdata: @ 83F1AB4
- .incbin "data/maps/Route108/map.bin"
-
- .align 2
-Route108_MapAttributes: @ 83F2414
- .4byte 0x3c
- .4byte 0x14
- .4byte Route108_MapBorder
- .4byte Route108_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Slateport
-
- .align 2
-Route109_MapBorder: @ 83F242C
- .incbin "data/maps/Route109/border.bin"
-
- .align 2
-Route109_MapBlockdata: @ 83F2434
- .incbin "data/maps/Route109/map.bin"
-
- .align 2
-Route109_MapAttributes: @ 83F37E4
- .4byte 0x28
- .4byte 0x3f
- .4byte Route109_MapBorder
- .4byte Route109_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Slateport
-
- .align 2
-Route110_MapBorder: @ 83F37FC
- .incbin "data/maps/Route110/border.bin"
-
- .align 2
-Route110_MapBlockdata: @ 83F3804
- .incbin "data/maps/Route110/map.bin"
-
- .align 2
-Route110_MapAttributes: @ 83F5744
- .4byte 0x28
- .4byte 0x64
- .4byte Route110_MapBorder
- .4byte Route110_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
- .align 2
-Route111_MapBorder: @ 83F575C
- .incbin "data/maps/Route111/border.bin"
-
- .align 2
-Route111_MapBlockdata: @ 83F5764
- .incbin "data/maps/Route111/map.bin"
-
- .align 2
-Route111_MapAttributes: @ 83F8324
- .4byte 0x28
- .4byte 0x8c
- .4byte Route111_MapBorder
- .4byte Route111_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
- .align 2
-Route112_MapBorder: @ 83F833C
- .incbin "data/maps/Route112/border.bin"
-
- .align 2
-Route112_MapBlockdata: @ 83F8344
- .incbin "data/maps/Route112/map.bin"
-
- .align 2
-Route112_MapAttributes: @ 83F9604
- .4byte 0x28
- .4byte 0x3c
- .4byte Route112_MapBorder
- .4byte Route112_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-Route113_MapBorder: @ 83F961C
- .incbin "data/maps/Route113/border.bin"
-
- .align 2
-Route113_MapBlockdata: @ 83F9624
- .incbin "data/maps/Route113/map.bin"
-
- .align 2
-Route113_MapAttributes: @ 83FA5C4
- .4byte 0x64
- .4byte 0x14
- .4byte Route113_MapBorder
- .4byte Route113_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
- .align 2
-Route114_MapBorder: @ 83FA5DC
- .incbin "data/maps/Route114/border.bin"
-
- .align 2
-Route114_MapBlockdata: @ 83FA5E4
- .incbin "data/maps/Route114/map.bin"
-
- .align 2
-Route114_MapAttributes: @ 83FBEE4
- .4byte 0x28
- .4byte 0x50
- .4byte Route114_MapBorder
- .4byte Route114_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
- .align 2
-Route115_MapBorder: @ 83FBEFC
- .incbin "data/maps/Route115/border.bin"
-
- .align 2
-Route115_MapBlockdata: @ 83FBF04
- .incbin "data/maps/Route115/map.bin"
-
- .align 2
-Route115_MapAttributes: @ 83FD804
- .4byte 0x28
- .4byte 0x50
- .4byte Route115_MapBorder
- .4byte Route115_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
- .align 2
-Route116_MapBorder: @ 83FD81C
- .incbin "data/maps/Route116/border.bin"
-
- .align 2
-Route116_MapBlockdata: @ 83FD824
- .incbin "data/maps/Route116/map.bin"
-
- .align 2
-Route116_MapAttributes: @ 83FE7C4
- .4byte 0x64
- .4byte 0x14
- .4byte Route116_MapBorder
- .4byte Route116_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-Route117_MapBorder: @ 83FE7DC
- .incbin "data/maps/Route117/border.bin"
-
- .align 2
-Route117_MapBlockdata: @ 83FE7E4
- .incbin "data/maps/Route117/map.bin"
-
- .align 2
-Route117_MapAttributes: @ 83FF144
- .4byte 0x3c
- .4byte 0x14
- .4byte Route117_MapBorder
- .4byte Route117_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
- .align 2
-Route118_MapBorder: @ 83FF15C
- .incbin "data/maps/Route118/border.bin"
-
- .align 2
-Route118_MapBlockdata: @ 83FF164
- .incbin "data/maps/Route118/map.bin"
-
- .align 2
-Route118_MapAttributes: @ 83FFDE4
- .4byte 0x50
- .4byte 0x14
- .4byte Route118_MapBorder
- .4byte Route118_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
- .align 2
-Route119_MapBorder: @ 83FFDFC
- .incbin "data/maps/Route119/border.bin"
-
- .align 2
-Route119_MapBlockdata: @ 83FFE04
- .incbin "data/maps/Route119/map.bin"
-
- .align 2
-Route119_MapAttributes: @ 84029C4
- .4byte 0x28
- .4byte 0x8c
- .4byte Route119_MapBorder
- .4byte Route119_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fortree
-
- .align 2
-Route120_MapBorder: @ 84029DC
- .incbin "data/maps/Route120/border.bin"
-
- .align 2
-Route120_MapBlockdata: @ 84029E4
- .incbin "data/maps/Route120/map.bin"
-
- .align 2
-Route120_MapAttributes: @ 8404924
- .4byte 0x28
- .4byte 0x64
- .4byte Route120_MapBorder
- .4byte Route120_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fortree
-
- .align 2
-Route121_MapBorder: @ 840493C
- .incbin "data/maps/Route121/border.bin"
-
- .align 2
-Route121_MapBlockdata: @ 8404944
- .incbin "data/maps/Route121/map.bin"
-
- .align 2
-Route121_MapAttributes: @ 84055C4
- .4byte 0x50
- .4byte 0x14
- .4byte Route121_MapBorder
- .4byte Route121_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-Route122_MapBorder: @ 84055DC
- .incbin "data/maps/Route122/border.bin"
-
- .align 2
-Route122_MapBlockdata: @ 84055E4
- .incbin "data/maps/Route122/map.bin"
-
- .align 2
-Route122_MapAttributes: @ 8406264
- .4byte 0x28
- .4byte 0x28
- .4byte Route122_MapBorder
- .4byte Route122_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-Route123_MapBorder: @ 840627C
- .incbin "data/maps/Route123/border.bin"
-
- .align 2
-Route123_MapBlockdata: @ 8406284
- .incbin "data/maps/Route123/map.bin"
-
- .align 2
-Route123_MapAttributes: @ 8407864
- .4byte 0x8c
- .4byte 0x14
- .4byte Route123_MapBorder
- .4byte Route123_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-Route124_MapBorder: @ 840787C
- .incbin "data/maps/Route124/border.bin"
-
- .align 2
-Route124_MapBlockdata: @ 8407884
- .incbin "data/maps/Route124/map.bin"
-
- .align 2
-Route124_MapAttributes: @ 840AA84
- .4byte 0x50
- .4byte 0x50
- .4byte Route124_MapBorder
- .4byte Route124_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
- .align 2
-Route125_MapBorder: @ 840AA9C
- .incbin "data/maps/Route125/border.bin"
-
- .align 2
-Route125_MapBlockdata: @ 840AAA4
- .incbin "data/maps/Route125/map.bin"
-
- .align 2
-Route125_MapAttributes: @ 840C3A4
- .4byte 0x50
- .4byte 0x28
- .4byte Route125_MapBorder
- .4byte Route125_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
- .align 2
-Route126_MapBorder: @ 840C3BC
- .incbin "data/maps/Route126/border.bin"
-
- .align 2
-Route126_MapBlockdata: @ 840C3C4
- .incbin "data/maps/Route126/map.bin"
-
- .align 2
-Route126_MapAttributes: @ 840F5C4
- .4byte 0x50
- .4byte 0x50
- .4byte Route126_MapBorder
- .4byte Route126_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
- .align 2
-Route127_MapBorder: @ 840F5DC
- .incbin "data/maps/Route127/border.bin"
-
- .align 2
-Route127_MapBlockdata: @ 840F5E4
- .incbin "data/maps/Route127/map.bin"
-
- .align 2
-Route127_MapAttributes: @ 84127E4
- .4byte 0x50
- .4byte 0x50
- .4byte Route127_MapBorder
- .4byte Route127_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
- .align 2
-Route128_MapBorder: @ 84127FC
- .incbin "data/maps/Route128/border.bin"
-
- .align 2
-Route128_MapBlockdata: @ 8412804
- .incbin "data/maps/Route128/map.bin"
-
- .align 2
-Route128_MapAttributes: @ 8414D84
- .4byte 0x78
- .4byte 0x28
- .4byte Route128_MapBorder
- .4byte Route128_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
- .align 2
-Route129_MapBorder: @ 8414D9C
- .incbin "data/maps/Route129/border.bin"
-
- .align 2
-Route129_MapBlockdata: @ 8414DA4
- .incbin "data/maps/Route129/map.bin"
-
- .align 2
-Route129_MapAttributes: @ 84166A4
- .4byte 0x50
- .4byte 0x28
- .4byte Route129_MapBorder
- .4byte Route129_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Mossdeep
-
- .align 2
-UnknownMapBorder_08417FC4: @ 84166BC
- .incbin "data/maps/UnknownMap_08417FC4/border.bin"
-
- .align 2
-UnknownMapBlockdata_08417FC4: @ 84166C4
- .incbin "data/maps/UnknownMap_08417FC4/map.bin"
-
- .align 2
-UnknownMapAttributes_08417FC4: @ 8417FC4
- .4byte 0x50
- .4byte 0x28
- .4byte UnknownMapBorder_08417FC4
- .4byte UnknownMapBlockdata_08417FC4
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-Route131_MapBorder: @ 8417FDC
- .incbin "data/maps/Route131/border.bin"
-
- .align 2
-Route131_MapBlockdata: @ 8417FE4
- .incbin "data/maps/Route131/map.bin"
-
- .align 2
-Route131_MapAttributes: @ 84192A4
- .4byte 0x3c
- .4byte 0x28
- .4byte Route131_MapBorder
- .4byte Route131_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-Route132_MapBorder: @ 84192BC
- .incbin "data/maps/Route132/border.bin"
-
- .align 2
-Route132_MapBlockdata: @ 84192C4
- .incbin "data/maps/Route132/map.bin"
-
- .align 2
-Route132_MapAttributes: @ 841ABC4
- .4byte 0x50
- .4byte 0x28
- .4byte Route132_MapBorder
- .4byte Route132_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-Route133_MapBorder: @ 841ABDC
- .incbin "data/maps/Route133/border.bin"
-
- .align 2
-Route133_MapBlockdata: @ 841ABE4
- .incbin "data/maps/Route133/map.bin"
-
- .align 2
-Route133_MapAttributes: @ 841C4E4
- .4byte 0x50
- .4byte 0x28
- .4byte Route133_MapBorder
- .4byte Route133_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-Route134_MapBorder: @ 841C4FC
- .incbin "data/maps/Route134/border.bin"
-
- .align 2
-Route134_MapBlockdata: @ 841C504
- .incbin "data/maps/Route134/map.bin"
-
- .align 2
-Route134_MapAttributes: @ 841DE04
- .4byte 0x50
- .4byte 0x28
- .4byte Route134_MapBorder
- .4byte Route134_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-Underwater2_MapBorder: @ 841DE1C
- .incbin "data/maps/Underwater2/border.bin"
-
- .align 2
-Underwater2_MapBlockdata: @ 841DE24
- .incbin "data/maps/Underwater2/map.bin"
-
- .align 2
-Underwater2_MapAttributes: @ 8421024
- .4byte 0x50
- .4byte 0x50
- .4byte Underwater2_MapBorder
- .4byte Underwater2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-Underwater3_MapBorder: @ 842103C
- .incbin "data/maps/Underwater3/border.bin"
-
- .align 2
-Underwater3_MapBlockdata: @ 8421044
- .incbin "data/maps/Underwater3/map.bin"
-
- .align 2
-Underwater3_MapAttributes: @ 8424244
- .4byte 0x50
- .4byte 0x50
- .4byte Underwater3_MapBorder
- .4byte Underwater3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-Underwater4_MapBorder: @ 842425C
- .incbin "data/maps/Underwater4/border.bin"
-
- .align 2
-Underwater4_MapBlockdata: @ 8424264
- .incbin "data/maps/Underwater4/map.bin"
-
- .align 2
-Underwater4_MapAttributes: @ 84267E4
- .4byte 0x78
- .4byte 0x28
- .4byte Underwater4_MapBorder
- .4byte Underwater4_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-LittlerootTown_BrendansHouse_1F_MapBorder: @ 84267FC
- .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin"
-
- .align 2
-LittlerootTown_BrendansHouse_1F_MapBlockdata: @ 8426804
- .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin"
-
- .align 2
-LittlerootTown_BrendansHouse_1F_MapAttributes: @ 84268CC
- .4byte 0xb
- .4byte 0x9
- .4byte LittlerootTown_BrendansHouse_1F_MapBorder
- .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
- .align 2
-LittlerootTown_BrendansHouse_2F_MapBorder: @ 84268E4
- .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin"
-
- .align 2
-LittlerootTown_BrendansHouse_2F_MapBlockdata: @ 84268EC
- .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin"
-
- .align 2
-LittlerootTown_BrendansHouse_2F_MapAttributes: @ 842697C
- .4byte 0x9
- .4byte 0x8
- .4byte LittlerootTown_BrendansHouse_2F_MapBorder
- .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
- .align 2
-LittlerootTown_MaysHouse_1F_MapBorder: @ 8426994
- .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin"
-
- .align 2
-LittlerootTown_MaysHouse_1F_MapBlockdata: @ 842699C
- .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin"
-
- .align 2
-LittlerootTown_MaysHouse_1F_MapAttributes: @ 8426A64
- .4byte 0xb
- .4byte 0x9
- .4byte LittlerootTown_MaysHouse_1F_MapBorder
- .4byte LittlerootTown_MaysHouse_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
- .align 2
-LittlerootTown_MaysHouse_2F_MapBorder: @ 8426A7C
- .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin"
-
- .align 2
-LittlerootTown_MaysHouse_2F_MapBlockdata: @ 8426A84
- .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin"
-
- .align 2
-LittlerootTown_MaysHouse_2F_MapAttributes: @ 8426B14
- .4byte 0x9
- .4byte 0x8
- .4byte LittlerootTown_MaysHouse_2F_MapBorder
- .4byte LittlerootTown_MaysHouse_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BrendansMaysHouse
-
- .align 2
-LittlerootTown_ProfessorBirchsLab_MapBorder: @ 8426B2C
- .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin"
-
- .align 2
-LittlerootTown_ProfessorBirchsLab_MapBlockdata: @ 8426B34
- .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin"
-
- .align 2
-LittlerootTown_ProfessorBirchsLab_MapAttributes: @ 8426C88
- .4byte 0xd
- .4byte 0xd
- .4byte LittlerootTown_ProfessorBirchsLab_MapBorder
- .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
- .align 2
-OldaleTown_House1_MapBorder: @ 8426CA0
- .incbin "data/maps/OldaleTown_House1/border.bin"
-
- .align 2
-OldaleTown_House1_MapBlockdata: @ 8426CA8
- .incbin "data/maps/OldaleTown_House1/map.bin"
-
- .align 2
-FallarborTown_House1_MapAttributes: @ 8426D5C
-LilycoveCity_House1_MapAttributes: @ 8426D5C
-LilycoveCity_House4_MapAttributes: @ 8426D5C
-MauvilleCity_House2_MapAttributes: @ 8426D5C
-MossdeepCity_House2_MapAttributes: @ 8426D5C
-OldaleTown_House1_MapAttributes: @ 8426D5C
-PetalburgCity_House1_MapAttributes: @ 8426D5C
-Route119_House_MapAttributes: @ 8426D5C
-VerdanturfTown_House_MapAttributes: @ 8426D5C
- .4byte 0xa
- .4byte 0x9
- .4byte OldaleTown_House1_MapBorder
- .4byte OldaleTown_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-OldaleTown_House2_MapBorder: @ 8426D74
- .incbin "data/maps/OldaleTown_House2/border.bin"
-
- .align 2
-OldaleTown_House2_MapBlockdata: @ 8426D7C
- .incbin "data/maps/OldaleTown_House2/map.bin"
-
- .align 2
-FallarborTown_House2_MapAttributes: @ 8426E2C
-LilycoveCity_House3_MapAttributes: @ 8426E2C
-LilycoveCity_MoveDeletersHouse_MapAttributes: @ 8426E2C
-MauvilleCity_House1_MapAttributes: @ 8426E2C
-MossdeepCity_House1_MapAttributes: @ 8426E2C
-MossdeepCity_House3_MapAttributes: @ 8426E2C
-OldaleTown_House2_MapAttributes: @ 8426E2C
-PetalburgCity_WallysHouse_MapAttributes: @ 8426E2C
-Route111_WinstrateFamilysHouse_MapAttributes: @ 8426E2C
-Route123_BerryMastersHouse_MapAttributes: @ 8426E2C
-SlateportCity_House2_MapAttributes: @ 8426E2C
-VerdanturfTown_FriendshipRatersHouse_MapAttributes: @ 8426E2C
- .4byte 0xb
- .4byte 0x8
- .4byte OldaleTown_House2_MapBorder
- .4byte OldaleTown_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-OldaleTown_PokemonCenter_1F_MapBorder: @ 8426E44
- .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin"
-
- .align 2
-OldaleTown_PokemonCenter_1F_MapBlockdata: @ 8426E4C
- .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin"
-
- .align 2
-BattleFrontier_PokemonCenter_1F_MapAttributes: @ 8426F48
-DewfordTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-EverGrandeCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-FallarborTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-FortreeCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-LilycoveCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-MauvilleCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-MossdeepCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-OldaleTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-PacifidlogTown_PokemonCenter_1F_MapAttributes: @ 8426F48
-PetalburgCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-RustboroCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-SlateportCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-SootopolisCity_PokemonCenter_1F_MapAttributes: @ 8426F48
-VerdanturfTown_PokemonCenter_1F_MapAttributes: @ 8426F48
- .4byte 0xe
- .4byte 0x9
- .4byte OldaleTown_PokemonCenter_1F_MapBorder
- .4byte OldaleTown_PokemonCenter_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
- .align 2
-OldaleTown_PokemonCenter_2F_MapBorder: @ 8426F60
- .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin"
-
- .align 2
-OldaleTown_PokemonCenter_2F_MapBlockdata: @ 8426F68
- .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin"
-
- .align 2
-BattleFrontier_PokemonCenter_2F_MapAttributes: @ 8427080
-DewfordTown_PokemonCenter_2F_MapAttributes: @ 8427080
-EverGrandeCity_PokemonCenter_2F_MapAttributes: @ 8427080
-EverGrandeCity_PokemonLeague_2F_MapAttributes: @ 8427080
-FallarborTown_PokemonCenter_2F_MapAttributes: @ 8427080
-FortreeCity_PokemonCenter_2F_MapAttributes: @ 8427080
-LavaridgeTown_PokemonCenter_2F_MapAttributes: @ 8427080
-LilycoveCity_PokemonCenter_2F_MapAttributes: @ 8427080
-MauvilleCity_PokemonCenter_2F_MapAttributes: @ 8427080
-MossdeepCity_PokemonCenter_2F_MapAttributes: @ 8427080
-OldaleTown_PokemonCenter_2F_MapAttributes: @ 8427080
-PacifidlogTown_PokemonCenter_2F_MapAttributes: @ 8427080
-PetalburgCity_PokemonCenter_2F_MapAttributes: @ 8427080
-RustboroCity_PokemonCenter_2F_MapAttributes: @ 8427080
-SlateportCity_PokemonCenter_2F_MapAttributes: @ 8427080
-SootopolisCity_PokemonCenter_2F_MapAttributes: @ 8427080
-VerdanturfTown_PokemonCenter_2F_MapAttributes: @ 8427080
- .4byte 0xe
- .4byte 0xa
- .4byte OldaleTown_PokemonCenter_2F_MapBorder
- .4byte OldaleTown_PokemonCenter_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
- .align 2
-OldaleTown_Mart_MapBorder: @ 8427098
- .incbin "data/maps/OldaleTown_Mart/border.bin"
-
- .align 2
-OldaleTown_Mart_MapBlockdata: @ 84270A0
- .incbin "data/maps/OldaleTown_Mart/map.bin"
-
- .align 2
-BattleFrontier_Mart_MapAttributes: @ 8427150
-FallarborTown_Mart_MapAttributes: @ 8427150
-FortreeCity_Mart_MapAttributes: @ 8427150
-LavaridgeTown_Mart_MapAttributes: @ 8427150
-LilycoveCity_UnusedMart_MapAttributes: @ 8427150
-MauvilleCity_Mart_MapAttributes: @ 8427150
-MossdeepCity_Mart_MapAttributes: @ 8427150
-OldaleTown_Mart_MapAttributes: @ 8427150
-PetalburgCity_Mart_MapAttributes: @ 8427150
-RustboroCity_Mart_MapAttributes: @ 8427150
-SlateportCity_Mart_MapAttributes: @ 8427150
-SootopolisCity_Mart_MapAttributes: @ 8427150
-VerdanturfTown_Mart_MapAttributes: @ 8427150
- .4byte 0xb
- .4byte 0x8
- .4byte OldaleTown_Mart_MapBorder
- .4byte OldaleTown_Mart_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-DewfordTown_House1_MapBorder: @ 8427168
- .incbin "data/maps/DewfordTown_House1/border.bin"
-
- .align 2
-DewfordTown_House1_MapBlockdata: @ 8427170
- .incbin "data/maps/DewfordTown_House1/map.bin"
-
- .align 2
-DewfordTown_House1_MapAttributes: @ 8427210
-LavaridgeTown_House_MapAttributes: @ 8427210
-Route111_OldLadysRestStop_MapAttributes: @ 8427210
- .4byte 0xa
- .4byte 0x8
- .4byte DewfordTown_House1_MapBorder
- .4byte DewfordTown_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-DewfordTown_Gym_MapBorder: @ 8427228
- .incbin "data/maps/DewfordTown_Gym/border.bin"
-
- .align 2
-DewfordTown_Gym_MapBlockdata: @ 8427230
- .incbin "data/maps/DewfordTown_Gym/map.bin"
-
- .align 2
-DewfordTown_Gym_MapAttributes: @ 8427620
- .4byte 0x12
- .4byte 0x1c
- .4byte DewfordTown_Gym_MapBorder
- .4byte DewfordTown_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_DewfordGym
-
- .align 2
-DewfordTown_Hall_MapBorder: @ 8427638
- .incbin "data/maps/DewfordTown_Hall/border.bin"
-
- .align 2
-DewfordTown_Hall_MapBlockdata: @ 8427640
- .incbin "data/maps/DewfordTown_Hall/map.bin"
-
- .align 2
-DewfordTown_Hall_MapAttributes: @ 8427774
- .4byte 0x11
- .4byte 0x9
- .4byte DewfordTown_Hall_MapBorder
- .4byte DewfordTown_Hall_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-DewfordTown_House2_MapBorder: @ 842778C
- .incbin "data/maps/DewfordTown_House2/border.bin"
-
- .align 2
-DewfordTown_House2_MapBlockdata: @ 8427794
- .incbin "data/maps/DewfordTown_House2/map.bin"
-
- .align 2
-DewfordTown_House2_MapAttributes: @ 8427848
-Route113_GlassWorkshop_MapAttributes: @ 8427848
- .4byte 0xa
- .4byte 0x9
- .4byte DewfordTown_House2_MapBorder
- .4byte DewfordTown_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-LavaridgeTown_HerbShop_MapBorder: @ 8427860
- .incbin "data/maps/LavaridgeTown_HerbShop/border.bin"
-
- .align 2
-LavaridgeTown_HerbShop_MapBlockdata: @ 8427868
- .incbin "data/maps/LavaridgeTown_HerbShop/map.bin"
-
- .align 2
-LavaridgeTown_HerbShop_MapAttributes: @ 8427918
- .4byte 0xb
- .4byte 0x8
- .4byte LavaridgeTown_HerbShop_MapBorder
- .4byte LavaridgeTown_HerbShop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-LavaridgeTown_Gym_1F_MapBorder: @ 8427930
- .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin"
-
- .align 2
-LavaridgeTown_Gym_1F_MapBlockdata: @ 8427938
- .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin"
-
- .align 2
-LavaridgeTown_Gym_1F_MapAttributes: @ 8427BC0
- .4byte 0x11
- .4byte 0x13
- .4byte LavaridgeTown_Gym_1F_MapBorder
- .4byte LavaridgeTown_Gym_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LavaridgeGym
-
- .align 2
-LavaridgeTown_Gym_B1F_MapBorder: @ 8427BD8
- .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin"
-
- .align 2
-LavaridgeTown_Gym_B1F_MapBlockdata: @ 8427BE0
- .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin"
-
- .align 2
-LavaridgeTown_Gym_B1F_MapAttributes: @ 8427E68
- .4byte 0x11
- .4byte 0x13
- .4byte LavaridgeTown_Gym_B1F_MapBorder
- .4byte LavaridgeTown_Gym_B1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LavaridgeGym
-
- .align 2
-LavaridgeTown_PokemonCenter_1F_MapBorder: @ 8427E80
- .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin"
-
- .align 2
-LavaridgeTown_PokemonCenter_1F_MapBlockdata: @ 8427E88
- .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin"
-
- .align 2
-LavaridgeTown_PokemonCenter_1F_MapAttributes: @ 8427F84
- .4byte 0xe
- .4byte 0x9
- .4byte LavaridgeTown_PokemonCenter_1F_MapBorder
- .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
- .align 2
-FallarborTown_LeftoverRSContestLobby_MapBorder: @ 8427F9C
- .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/border.bin"
-
- .align 2
-FallarborTown_LeftoverRSContestLobby_MapBlockdata: @ 8427FA4
- .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/map.bin"
-
- .align 2
-FallarborTown_LeftoverRSContestLobby_MapAttributes: @ 8428078
- .4byte 0xf
- .4byte 0x7
- .4byte FallarborTown_LeftoverRSContestLobby_MapBorder
- .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-FallarborTown_LeftoverRSContestHall_MapBorder: @ 8428090
- .incbin "data/maps/FallarborTown_LeftoverRSContestHall/border.bin"
-
- .align 2
-FallarborTown_LeftoverRSContestHall_MapBlockdata: @ 8428098
- .incbin "data/maps/FallarborTown_LeftoverRSContestHall/map.bin"
-
- .align 2
-FallarborTown_LeftoverRSContestHall_MapAttributes: @ 842838C
- .4byte 0x15
- .4byte 0x12
- .4byte FallarborTown_LeftoverRSContestHall_MapBorder
- .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-LilycoveCity_House2_MapBorder: @ 84283A4
- .incbin "data/maps/LilycoveCity_House2/border.bin"
-
- .align 2
-LilycoveCity_House2_MapBlockdata: @ 84283AC
- .incbin "data/maps/LilycoveCity_House2/map.bin"
-
- .align 2
-LilycoveCity_House2_MapAttributes: @ 842842C
- .4byte 0x8
- .4byte 0x8
- .4byte LilycoveCity_House2_MapBorder
- .4byte LilycoveCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-UnknownMapBorder_08428450: @ 8428444
- .incbin "data/maps/UnknownMap_08428450/border.bin"
-
- .align 2
-UnknownMapBlockdata_08428450: @ 842844C
- .incbin "data/maps/UnknownMap_08428450/map.bin"
-
- .align 2
-UnknownMapAttributes_08428450: @ 8428450
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_08428450
- .4byte UnknownMapBlockdata_08428450
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-VerdanturfTown_WandasHouse_MapBorder: @ 8428468
- .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin"
-
- .align 2
-VerdanturfTown_WandasHouse_MapBlockdata: @ 8428470
- .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin"
-
- .align 2
-VerdanturfTown_WandasHouse_MapAttributes: @ 8428580
- .4byte 0x11
- .4byte 0x8
- .4byte VerdanturfTown_WandasHouse_MapBorder
- .4byte VerdanturfTown_WandasHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-PacifidlogTown_House1_MapBorder: @ 8428598
- .incbin "data/maps/PacifidlogTown_House1/border.bin"
-
- .align 2
-PacifidlogTown_House1_MapBlockdata: @ 84285A0
- .incbin "data/maps/PacifidlogTown_House1/map.bin"
-
- .align 2
-PacifidlogTown_House1_MapAttributes: @ 8428654
-PacifidlogTown_House3_MapAttributes: @ 8428654
-PacifidlogTown_House5_MapAttributes: @ 8428654
- .4byte 0xa
- .4byte 0x9
- .4byte PacifidlogTown_House1_MapBorder
- .4byte PacifidlogTown_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-PacifidlogTown_House2_MapBorder: @ 842866C
- .incbin "data/maps/PacifidlogTown_House2/border.bin"
-
- .align 2
-PacifidlogTown_House2_MapBlockdata: @ 8428674
- .incbin "data/maps/PacifidlogTown_House2/map.bin"
-
- .align 2
-PacifidlogTown_House2_MapAttributes: @ 8428728
-PacifidlogTown_House4_MapAttributes: @ 8428728
- .4byte 0xa
- .4byte 0x9
- .4byte PacifidlogTown_House2_MapBorder
- .4byte PacifidlogTown_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-PetalburgCity_Gym_MapBorder: @ 8428740
- .incbin "data/maps/PetalburgCity_Gym/border.bin"
-
- .align 2
-PetalburgCity_Gym_MapBlockdata: @ 8428748
- .incbin "data/maps/PetalburgCity_Gym/map.bin"
-
- .align 2
-PetalburgCity_Gym_MapAttributes: @ 8428F28
- .4byte 0x9
- .4byte 0x70
- .4byte PetalburgCity_Gym_MapBorder
- .4byte PetalburgCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PetalburgGym
-
- .align 2
-PetalburgCity_House2_MapBorder: @ 8428F40
- .incbin "data/maps/PetalburgCity_House2/border.bin"
-
- .align 2
-PetalburgCity_House2_MapBlockdata: @ 8428F48
- .incbin "data/maps/PetalburgCity_House2/map.bin"
-
- .align 2
-MossdeepCity_House4_MapAttributes: @ 8428FE8
-PetalburgCity_House2_MapAttributes: @ 8428FE8
-SlateportCity_House1_MapAttributes: @ 8428FE8
- .4byte 0xa
- .4byte 0x8
- .4byte PetalburgCity_House2_MapBorder
- .4byte PetalburgCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-SlateportCity_SternsShipyard_1F_MapBorder: @ 8429000
- .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin"
-
- .align 2
-SlateportCity_SternsShipyard_1F_MapBlockdata: @ 8429008
- .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin"
-
- .align 2
-SlateportCity_SternsShipyard_1F_MapAttributes: @ 8429280
- .4byte 0x15
- .4byte 0xf
- .4byte SlateportCity_SternsShipyard_1F_MapBorder
- .4byte SlateportCity_SternsShipyard_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-SlateportCity_SternsShipyard_2F_MapBorder: @ 8429298
- .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin"
-
- .align 2
-SlateportCity_SternsShipyard_2F_MapBlockdata: @ 84292A0
- .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin"
-
- .align 2
-SlateportCity_SternsShipyard_2F_MapAttributes: @ 84294A0
- .4byte 0x11
- .4byte 0xf
- .4byte SlateportCity_SternsShipyard_2F_MapBorder
- .4byte SlateportCity_SternsShipyard_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-UnknownMapBorder_084294C4: @ 84294B8
- .incbin "data/maps/UnknownMap_084294C4/border.bin"
-
- .align 2
-UnknownMapBlockdata_084294C4: @ 84294C0
- .incbin "data/maps/UnknownMap_084294C4/map.bin"
-
- .align 2
-UnknownMapAttributes_084294C4: @ 84294C4
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_084294C4
- .4byte UnknownMapBlockdata_084294C4
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-UnknownMapBorder_084294E8: @ 84294DC
- .incbin "data/maps/UnknownMap_084294E8/border.bin"
-
- .align 2
-UnknownMapBlockdata_084294E8: @ 84294E4
- .incbin "data/maps/UnknownMap_084294E8/map.bin"
-
- .align 2
-UnknownMapAttributes_084294E8: @ 84294E8
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_084294E8
- .4byte UnknownMapBlockdata_084294E8
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-SlateportCity_PokemonFanClub_MapBorder: @ 8429500
- .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin"
-
- .align 2
-SlateportCity_PokemonFanClub_MapBlockdata: @ 8429508
- .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin"
-
- .align 2
-SlateportCity_PokemonFanClub_MapAttributes: @ 842963C
- .4byte 0xe
- .4byte 0xb
- .4byte SlateportCity_PokemonFanClub_MapBorder
- .4byte SlateportCity_PokemonFanClub_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonFanClub
-
- .align 2
-SlateportCity_OceanicMuseum_1F_MapBorder: @ 8429654
- .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin"
-
- .align 2
-SlateportCity_OceanicMuseum_1F_MapBlockdata: @ 842965C
- .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin"
-
- .align 2
-SlateportCity_OceanicMuseum_1F_MapAttributes: @ 84297C4
- .4byte 0x14
- .4byte 0x9
- .4byte SlateportCity_OceanicMuseum_1F_MapBorder
- .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_OceanicMuseum
-
- .align 2
-SlateportCity_OceanicMuseum_2F_MapBorder: @ 84297DC
- .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin"
-
- .align 2
-SlateportCity_OceanicMuseum_2F_MapBlockdata: @ 84297E4
- .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin"
-
- .align 2
-SlateportCity_OceanicMuseum_2F_MapAttributes: @ 842994C
- .4byte 0x14
- .4byte 0x9
- .4byte SlateportCity_OceanicMuseum_2F_MapBorder
- .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_OceanicMuseum
-
- .align 2
-SlateportCity_Harbor_MapBorder: @ 8429964
- .incbin "data/maps/SlateportCity_Harbor/border.bin"
-
- .align 2
-SlateportCity_Harbor_MapBlockdata: @ 842996C
- .incbin "data/maps/SlateportCity_Harbor/map.bin"
-
- .align 2
-LilycoveCity_Harbor_MapAttributes: @ 8429C3C
-SlateportCity_Harbor_MapAttributes: @ 8429C3C
- .4byte 0x18
- .4byte 0xf
- .4byte SlateportCity_Harbor_MapBorder
- .4byte SlateportCity_Harbor_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MauvilleCity_Gym_MapBorder: @ 8429C54
- .incbin "data/maps/MauvilleCity_Gym/border.bin"
-
- .align 2
-MauvilleCity_Gym_MapBlockdata: @ 8429C5C
- .incbin "data/maps/MauvilleCity_Gym/map.bin"
-
- .align 2
-MauvilleCity_Gym_MapAttributes: @ 8429E00
- .4byte 0xa
- .4byte 0x15
- .4byte MauvilleCity_Gym_MapBorder
- .4byte MauvilleCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MauvilleGym
-
- .align 2
-MauvilleCity_BikeShop_MapBorder: @ 8429E18
- .incbin "data/maps/MauvilleCity_BikeShop/border.bin"
-
- .align 2
-MauvilleCity_BikeShop_MapBlockdata: @ 8429E20
- .incbin "data/maps/MauvilleCity_BikeShop/map.bin"
-
- .align 2
-MauvilleCity_BikeShop_MapAttributes: @ 8429EF8
- .4byte 0xc
- .4byte 0x9
- .4byte MauvilleCity_BikeShop_MapBorder
- .4byte MauvilleCity_BikeShop_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BikeShop
-
- .align 2
-MauvilleCity_GameCorner_MapBorder: @ 8429F10
- .incbin "data/maps/MauvilleCity_GameCorner/border.bin"
-
- .align 2
-MauvilleCity_GameCorner_MapBlockdata: @ 8429F18
- .incbin "data/maps/MauvilleCity_GameCorner/map.bin"
-
- .align 2
-MauvilleCity_GameCorner_MapAttributes: @ 842A0FC
- .4byte 0x16
- .4byte 0xb
- .4byte MauvilleCity_GameCorner_MapBorder
- .4byte MauvilleCity_GameCorner_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MauvilleGameCorner
-
- .align 2
-RustboroCity_DevonCorp_1F_MapBorder: @ 842A114
- .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin"
-
- .align 2
-RustboroCity_DevonCorp_1F_MapBlockdata: @ 842A11C
- .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin"
-
- .align 2
-RustboroCity_DevonCorp_1F_MapAttributes: @ 842A274
- .4byte 0x13
- .4byte 0x9
- .4byte RustboroCity_DevonCorp_1F_MapBorder
- .4byte RustboroCity_DevonCorp_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Facility
-
- .align 2
-RustboroCity_DevonCorp_2F_MapBorder: @ 842A28C
- .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin"
-
- .align 2
-RustboroCity_DevonCorp_2F_MapBlockdata: @ 842A294
- .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin"
-
- .align 2
-RustboroCity_DevonCorp_2F_MapAttributes: @ 842A3EC
- .4byte 0x13
- .4byte 0x9
- .4byte RustboroCity_DevonCorp_2F_MapBorder
- .4byte RustboroCity_DevonCorp_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-RustboroCity_Gym_MapBorder: @ 842A404
- .incbin "data/maps/RustboroCity_Gym/border.bin"
-
- .align 2
-RustboroCity_Gym_MapBlockdata: @ 842A40C
- .incbin "data/maps/RustboroCity_Gym/map.bin"
-
- .align 2
-RustboroCity_Gym_MapAttributes: @ 842A5C4
- .4byte 0xb
- .4byte 0x14
- .4byte RustboroCity_Gym_MapBorder
- .4byte RustboroCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_RustboroGym
-
- .align 2
-RustboroCity_PokemonSchool_MapBorder: @ 842A5DC
- .incbin "data/maps/RustboroCity_PokemonSchool/border.bin"
-
- .align 2
-RustboroCity_PokemonSchool_MapBlockdata: @ 842A5E4
- .incbin "data/maps/RustboroCity_PokemonSchool/map.bin"
-
- .align 2
-RustboroCity_PokemonSchool_MapAttributes: @ 842A6EC
- .4byte 0xc
- .4byte 0xb
- .4byte RustboroCity_PokemonSchool_MapBorder
- .4byte RustboroCity_PokemonSchool_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonSchool
-
- .align 2
-RustboroCity_House2_MapBorder: @ 842A704
- .incbin "data/maps/RustboroCity_House2/border.bin"
-
- .align 2
-RustboroCity_House2_MapBlockdata: @ 842A70C
- .incbin "data/maps/RustboroCity_House2/map.bin"
-
- .align 2
-RustboroCity_House2_MapAttributes: @ 842A7E4
-RustboroCity_House3_MapAttributes: @ 842A7E4
- .4byte 0xc
- .4byte 0x9
- .4byte RustboroCity_House2_MapBorder
- .4byte RustboroCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-RustboroCity_House1_MapBorder: @ 842A7FC
- .incbin "data/maps/RustboroCity_House1/border.bin"
-
- .align 2
-RustboroCity_House1_MapBlockdata: @ 842A804
- .incbin "data/maps/RustboroCity_House1/map.bin"
-
- .align 2
-RustboroCity_House1_MapAttributes: @ 842A8D4
- .4byte 0xd
- .4byte 0x8
- .4byte RustboroCity_House1_MapBorder
- .4byte RustboroCity_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-RustboroCity_CuttersHouse_MapBorder: @ 842A8EC
- .incbin "data/maps/RustboroCity_CuttersHouse/border.bin"
-
- .align 2
-RustboroCity_CuttersHouse_MapBlockdata: @ 842A8F4
- .incbin "data/maps/RustboroCity_CuttersHouse/map.bin"
-
- .align 2
-RustboroCity_CuttersHouse_MapAttributes: @ 842A9BC
- .4byte 0xb
- .4byte 0x9
- .4byte RustboroCity_CuttersHouse_MapBorder
- .4byte RustboroCity_CuttersHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-FortreeCity_House1_MapBorder: @ 842A9D4
- .incbin "data/maps/FortreeCity_House1/border.bin"
-
- .align 2
-FortreeCity_House1_MapBlockdata: @ 842A9DC
- .incbin "data/maps/FortreeCity_House1/map.bin"
-
- .align 2
-FortreeCity_House1_MapAttributes: @ 842AA3C
-FortreeCity_House3_MapAttributes: @ 842AA3C
-FortreeCity_House5_MapAttributes: @ 842AA3C
- .4byte 0x8
- .4byte 0x6
- .4byte FortreeCity_House1_MapBorder
- .4byte FortreeCity_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-FortreeCity_Gym_MapBorder: @ 842AA54
- .incbin "data/maps/FortreeCity_Gym/border.bin"
-
- .align 2
-FortreeCity_Gym_MapBlockdata: @ 842AA5C
- .incbin "data/maps/FortreeCity_Gym/map.bin"
-
- .align 2
-FortreeCity_Gym_MapAttributes: @ 842AE44
- .4byte 0x14
- .4byte 0x19
- .4byte FortreeCity_Gym_MapBorder
- .4byte FortreeCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_FortreeGym
-
- .align 2
-FortreeCity_House2_MapBorder: @ 842AE5C
- .incbin "data/maps/FortreeCity_House2/border.bin"
-
- .align 2
-FortreeCity_House2_MapBlockdata: @ 842AE64
- .incbin "data/maps/FortreeCity_House2/map.bin"
-
- .align 2
-FortreeCity_House2_MapAttributes: @ 842AEC4
-FortreeCity_House4_MapAttributes: @ 842AEC4
- .4byte 0x8
- .4byte 0x6
- .4byte FortreeCity_House2_MapBorder
- .4byte FortreeCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route104_MrBrineysHouse_MapBorder: @ 842AEDC
- .incbin "data/maps/Route104_MrBrineysHouse/border.bin"
-
- .align 2
-Route104_MrBrineysHouse_MapBlockdata: @ 842AEE4
- .incbin "data/maps/Route104_MrBrineysHouse/map.bin"
-
- .align 2
-Route104_MrBrineysHouse_MapAttributes: @ 842AFBC
- .4byte 0xc
- .4byte 0x9
- .4byte Route104_MrBrineysHouse_MapBorder
- .4byte Route104_MrBrineysHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-LilycoveCity_LilycoveMuseum_1F_MapBorder: @ 842AFD4
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin"
-
- .align 2
-LilycoveCity_LilycoveMuseum_1F_MapBlockdata: @ 842AFDC
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin"
-
- .align 2
-LilycoveCity_LilycoveMuseum_1F_MapAttributes: @ 842B228
- .4byte 0x15
- .4byte 0xe
- .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
- .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LilycoveMuseum
-
- .align 2
-LilycoveCity_LilycoveMuseum_2F_MapBorder: @ 842B240
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin"
-
- .align 2
-LilycoveCity_LilycoveMuseum_2F_MapBlockdata: @ 842B248
- .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin"
-
- .align 2
-LilycoveCity_LilycoveMuseum_2F_MapAttributes: @ 842B484
- .4byte 0x16
- .4byte 0xd
- .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
- .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_LilycoveMuseum
-
- .align 2
-LilycoveCity_ContestLobby_MapBorder: @ 842B49C
- .incbin "data/maps/LilycoveCity_ContestLobby/border.bin"
-
- .align 2
-LilycoveCity_ContestLobby_MapBlockdata: @ 842B4A4
- .incbin "data/maps/LilycoveCity_ContestLobby/map.bin"
-
- .align 2
-LilycoveCity_ContestLobby_MapAttributes: @ 842B78C
- .4byte 0x1f
- .4byte 0xc
- .4byte LilycoveCity_ContestLobby_MapBorder
- .4byte LilycoveCity_ContestLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-LilycoveCity_ContestHall_MapBorder: @ 842B7A4
- .incbin "data/maps/LilycoveCity_ContestHall/border.bin"
-
- .align 2
-LilycoveCity_ContestHall_MapBlockdata: @ 842B7AC
- .incbin "data/maps/LilycoveCity_ContestHall/map.bin"
-
- .align 2
-LilycoveCity_ContestHall_MapAttributes: @ 842C4D4
- .4byte 0x33
- .4byte 0x21
- .4byte LilycoveCity_ContestHall_MapBorder
- .4byte LilycoveCity_ContestHall_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-LilycoveCity_PokemonTrainerFanClub_MapBorder: @ 842C4EC
- .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin"
-
- .align 2
-LilycoveCity_PokemonTrainerFanClub_MapBlockdata: @ 842C4F4
- .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin"
-
- .align 2
-LilycoveCity_PokemonTrainerFanClub_MapAttributes: @ 842C644
- .4byte 0xc
- .4byte 0xe
- .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
- .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-MossdeepCity_Gym_MapBorder: @ 842C65C
- .incbin "data/maps/MossdeepCity_Gym/border.bin"
-
- .align 2
-MossdeepCity_Gym_MapBlockdata: @ 842C664
- .incbin "data/maps/MossdeepCity_Gym/map.bin"
-
- .align 2
-MossdeepCity_Gym_MapAttributes: @ 842CDB4
- .4byte 0x1a
- .4byte 0x24
- .4byte MossdeepCity_Gym_MapBorder
- .4byte MossdeepCity_Gym_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MossdeepGym
-
- .align 2
-SootopolisCity_Gym_1F_MapBorder: @ 842CDCC
- .incbin "data/maps/SootopolisCity_Gym_1F/border.bin"
-
- .align 2
-SootopolisCity_Gym_1F_MapBlockdata: @ 842CDD4
- .incbin "data/maps/SootopolisCity_Gym_1F/map.bin"
-
- .align 2
-SootopolisCity_Gym_1F_MapAttributes: @ 842D148
- .4byte 0x11
- .4byte 0x1a
- .4byte SootopolisCity_Gym_1F_MapBorder
- .4byte SootopolisCity_Gym_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_SootopolisGym
-
- .align 2
-SootopolisCity_Gym_B1F_MapBorder: @ 842D160
- .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin"
-
- .align 2
-SootopolisCity_Gym_B1F_MapBlockdata: @ 842D168
- .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin"
-
- .align 2
-SootopolisCity_Gym_B1F_MapAttributes: @ 842D4DC
- .4byte 0x11
- .4byte 0x1a
- .4byte SootopolisCity_Gym_B1F_MapBorder
- .4byte SootopolisCity_Gym_B1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_SootopolisGym
-
- .align 2
-EverGrandeCity_SidneysRoom_MapBorder: @ 842D4F4
- .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin"
-
- .align 2
-EverGrandeCity_SidneysRoom_MapBlockdata: @ 842D4FC
- .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin"
-
- .align 2
-EverGrandeCity_SidneysRoom_MapAttributes: @ 842D668
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_SidneysRoom_MapBorder
- .4byte EverGrandeCity_SidneysRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
- .align 2
-EverGrandeCity_PhoebesRoom_MapBorder: @ 842D680
- .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin"
-
- .align 2
-EverGrandeCity_PhoebesRoom_MapBlockdata: @ 842D688
- .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin"
-
- .align 2
-EverGrandeCity_PhoebesRoom_MapAttributes: @ 842D7F4
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_PhoebesRoom_MapBorder
- .4byte EverGrandeCity_PhoebesRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
- .align 2
-EverGrandeCity_GlaciasRoom_MapBorder: @ 842D80C
- .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin"
-
- .align 2
-EverGrandeCity_GlaciasRoom_MapBlockdata: @ 842D814
- .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin"
-
- .align 2
-EverGrandeCity_GlaciasRoom_MapAttributes: @ 842D980
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_GlaciasRoom_MapBorder
- .4byte EverGrandeCity_GlaciasRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
- .align 2
-EverGrandeCity_DrakesRoom_MapBorder: @ 842D998
- .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin"
-
- .align 2
-EverGrandeCity_DrakesRoom_MapBlockdata: @ 842D9A0
- .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin"
-
- .align 2
-EverGrandeCity_DrakesRoom_MapAttributes: @ 842DB0C
- .4byte 0xd
- .4byte 0xe
- .4byte EverGrandeCity_DrakesRoom_MapBorder
- .4byte EverGrandeCity_DrakesRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
- .align 2
-EverGrandeCity_ChampionsRoom_MapBorder: @ 842DB24
- .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin"
-
- .align 2
-EverGrandeCity_ChampionsRoom_MapBlockdata: @ 842DB2C
- .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin"
-
- .align 2
-EverGrandeCity_ChampionsRoom_MapAttributes: @ 842DC80
- .4byte 0xd
- .4byte 0xd
- .4byte EverGrandeCity_ChampionsRoom_MapBorder
- .4byte EverGrandeCity_ChampionsRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
- .align 2
-EverGrandeCity_Hall1_MapBorder: @ 842DC98
- .incbin "data/maps/EverGrandeCity_Hall1/border.bin"
-
- .align 2
-EverGrandeCity_Hall1_MapBlockdata: @ 842DCA0
- .incbin "data/maps/EverGrandeCity_Hall1/map.bin"
-
- .align 2
-EverGrandeCity_Hall1_MapAttributes: @ 842DDC0
-EverGrandeCity_Hall2_MapAttributes: @ 842DDC0
-EverGrandeCity_Hall3_MapAttributes: @ 842DDC0
-EverGrandeCity_Hall5_MapAttributes: @ 842DDC0
- .4byte 0xb
- .4byte 0xd
- .4byte EverGrandeCity_Hall1_MapBorder
- .4byte EverGrandeCity_Hall1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
- .align 2
-Route104_PrettyPetalFlowerShop_MapBorder: @ 842DDD8
- .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin"
-
- .align 2
-Route104_PrettyPetalFlowerShop_MapBlockdata: @ 842DDE0
- .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin"
-
- .align 2
-Route104_PrettyPetalFlowerShop_MapAttributes: @ 842DEF0
-Route104_PrototypePrettyPetalFlowerShop_MapAttributes: @ 842DEF0
- .4byte 0xf
- .4byte 0x9
- .4byte Route104_PrettyPetalFlowerShop_MapBorder
- .4byte Route104_PrettyPetalFlowerShop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PrettyPetalFlowerShop
-
- .align 2
-Route112_CableCarStation_MapBorder: @ 842DF08
- .incbin "data/maps/Route112_CableCarStation/border.bin"
-
- .align 2
-Route112_CableCarStation_MapBlockdata: @ 842DF10
- .incbin "data/maps/Route112_CableCarStation/map.bin"
-
- .align 2
-MtChimney_CableCarStation_MapAttributes: @ 842E048
-Route112_CableCarStation_MapAttributes: @ 842E048
- .4byte 0xd
- .4byte 0xc
- .4byte Route112_CableCarStation_MapBorder
- .4byte Route112_CableCarStation_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-Route114_FossilManiacsHouse_MapBorder: @ 842E060
- .incbin "data/maps/Route114_FossilManiacsHouse/border.bin"
-
- .align 2
-Route114_FossilManiacsHouse_MapBlockdata: @ 842E068
- .incbin "data/maps/Route114_FossilManiacsHouse/map.bin"
-
- .align 2
-Route114_FossilManiacsHouse_MapAttributes: @ 842E108
- .4byte 0xa
- .4byte 0x8
- .4byte Route114_FossilManiacsHouse_MapBorder
- .4byte Route114_FossilManiacsHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route114_FossilManiacsTunnel_MapBorder: @ 842E120
- .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin"
-
- .align 2
-Route114_FossilManiacsTunnel_MapBlockdata: @ 842E128
- .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin"
-
- .align 2
-Route114_FossilManiacsTunnel_MapAttributes: @ 842E3CC
- .4byte 0xd
- .4byte 0x1a
- .4byte Route114_FossilManiacsTunnel_MapBorder
- .4byte Route114_FossilManiacsTunnel_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fallarbor
-
- .align 2
-Route114_LanettesHouse_MapBorder: @ 842E3E4
- .incbin "data/maps/Route114_LanettesHouse/border.bin"
-
- .align 2
-Route114_LanettesHouse_MapBlockdata: @ 842E3EC
- .incbin "data/maps/Route114_LanettesHouse/map.bin"
-
- .align 2
-Route114_LanettesHouse_MapAttributes: @ 842E49C
- .4byte 0xb
- .4byte 0x8
- .4byte Route114_LanettesHouse_MapBorder
- .4byte Route114_LanettesHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
- .align 2
-Route116_TunnelersRestHouse_MapBorder: @ 842E4B4
- .incbin "data/maps/Route116_TunnelersRestHouse/border.bin"
-
- .align 2
-Route116_TunnelersRestHouse_MapBlockdata: @ 842E4BC
- .incbin "data/maps/Route116_TunnelersRestHouse/map.bin"
-
- .align 2
-Route116_TunnelersRestHouse_MapAttributes: @ 842E570
- .4byte 0xa
- .4byte 0x9
- .4byte Route116_TunnelersRestHouse_MapBorder
- .4byte Route116_TunnelersRestHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route117_PokemonDayCare_MapBorder: @ 842E588
- .incbin "data/maps/Route117_PokemonDayCare/border.bin"
-
- .align 2
-Route117_PokemonDayCare_MapBlockdata: @ 842E590
- .incbin "data/maps/Route117_PokemonDayCare/map.bin"
-
- .align 2
-Route117_PokemonDayCare_MapAttributes: @ 842E668
- .4byte 0xc
- .4byte 0x9
- .4byte Route117_PokemonDayCare_MapBorder
- .4byte Route117_PokemonDayCare_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonDayCare
-
- .align 2
-Route121_SafariZoneEntrance_MapBorder: @ 842E680
- .incbin "data/maps/Route121_SafariZoneEntrance/border.bin"
-
- .align 2
-Route121_SafariZoneEntrance_MapBlockdata: @ 842E688
- .incbin "data/maps/Route121_SafariZoneEntrance/map.bin"
-
- .align 2
-Route121_SafariZoneEntrance_MapAttributes: @ 842E880
- .4byte 0x12
- .4byte 0xe
- .4byte Route121_SafariZoneEntrance_MapBorder
- .4byte Route121_SafariZoneEntrance_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-MeteorFalls_1F_1R_MapBorder: @ 842E898
- .incbin "data/maps/MeteorFalls_1F_1R/border.bin"
-
- .align 2
-MeteorFalls_1F_1R_MapBlockdata: @ 842E8A0
- .incbin "data/maps/MeteorFalls_1F_1R/map.bin"
-
- .align 2
-MeteorFalls_1F_1R_MapAttributes: @ 842F278
- .4byte 0x1e
- .4byte 0x2a
- .4byte MeteorFalls_1F_1R_MapBorder
- .4byte MeteorFalls_1F_1R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
- .align 2
-MeteorFalls_1F_2R_MapBorder: @ 842F290
- .incbin "data/maps/MeteorFalls_1F_2R/border.bin"
-
- .align 2
-MeteorFalls_1F_2R_MapBlockdata: @ 842F298
- .incbin "data/maps/MeteorFalls_1F_2R/map.bin"
-
- .align 2
-MeteorFalls_1F_2R_MapAttributes: @ 842FA18
- .4byte 0x1e
- .4byte 0x20
- .4byte MeteorFalls_1F_2R_MapBorder
- .4byte MeteorFalls_1F_2R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
- .align 2
-MeteorFalls_B1F_1R_MapBorder: @ 842FA30
- .incbin "data/maps/MeteorFalls_B1F_1R/border.bin"
-
- .align 2
-MeteorFalls_B1F_1R_MapBlockdata: @ 842FA38
- .incbin "data/maps/MeteorFalls_B1F_1R/map.bin"
-
- .align 2
-MeteorFalls_B1F_1R_MapAttributes: @ 84302D4
- .4byte 0x1d
- .4byte 0x26
- .4byte MeteorFalls_B1F_1R_MapBorder
- .4byte MeteorFalls_B1F_1R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
- .align 2
-MeteorFalls_B1F_2R_MapBorder: @ 84302EC
- .incbin "data/maps/MeteorFalls_B1F_2R/border.bin"
-
- .align 2
-MeteorFalls_B1F_2R_MapBlockdata: @ 84302F4
- .incbin "data/maps/MeteorFalls_B1F_2R/map.bin"
-
- .align 2
-MeteorFalls_B1F_2R_MapAttributes: @ 8430480
- .4byte 0xb
- .4byte 0x12
- .4byte MeteorFalls_B1F_2R_MapBorder
- .4byte MeteorFalls_B1F_2R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
- .align 2
-RusturfTunnel_MapBorder: @ 8430498
- .incbin "data/maps/RusturfTunnel/border.bin"
-
- .align 2
-RusturfTunnel_MapBlockdata: @ 84304A0
- .incbin "data/maps/RusturfTunnel/map.bin"
-
- .align 2
-RusturfTunnel_MapAttributes: @ 8430B60
- .4byte 0x24
- .4byte 0x18
- .4byte RusturfTunnel_MapBorder
- .4byte RusturfTunnel_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_RusturfTunnel
-
- .align 2
-Underwater_SootopolisCity_MapBorder: @ 8430B78
- .incbin "data/maps/Underwater_SootopolisCity/border.bin"
-
- .align 2
-Underwater_SootopolisCity_MapBlockdata: @ 8430B80
- .incbin "data/maps/Underwater_SootopolisCity/map.bin"
-
- .align 2
-Underwater_SootopolisCity_MapAttributes: @ 8430D10
- .4byte 0x14
- .4byte 0xa
- .4byte Underwater_SootopolisCity_MapBorder
- .4byte Underwater_SootopolisCity_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-DesertRuins_MapBorder: @ 8430D28
- .incbin "data/maps/DesertRuins/border.bin"
-
- .align 2
-DesertRuins_MapBlockdata: @ 8430D30
- .incbin "data/maps/DesertRuins/map.bin"
-
- .align 2
-DesertRuins_MapAttributes: @ 8431194
- .4byte 0x11
- .4byte 0x21
- .4byte DesertRuins_MapBorder
- .4byte DesertRuins_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-GraniteCave_1F_MapBorder: @ 84311AC
- .incbin "data/maps/GraniteCave_1F/border.bin"
-
- .align 2
-GraniteCave_1F_MapBlockdata: @ 84311B4
- .incbin "data/maps/GraniteCave_1F/map.bin"
-
- .align 2
-GraniteCave_1F_MapAttributes: @ 84316A0
- .4byte 0x2a
- .4byte 0xf
- .4byte GraniteCave_1F_MapBorder
- .4byte GraniteCave_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-GraniteCave_B1F_MapBorder: @ 84316B8
- .incbin "data/maps/GraniteCave_B1F/border.bin"
-
- .align 2
-GraniteCave_B1F_MapBlockdata: @ 84316C0
- .incbin "data/maps/GraniteCave_B1F/map.bin"
-
- .align 2
-GraniteCave_B1F_MapAttributes: @ 8431D40
- .4byte 0x20
- .4byte 0x1a
- .4byte GraniteCave_B1F_MapBorder
- .4byte GraniteCave_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-GraniteCave_B2F_MapBorder: @ 8431D58
- .incbin "data/maps/GraniteCave_B2F/border.bin"
-
- .align 2
-GraniteCave_B2F_MapBlockdata: @ 8431D60
- .incbin "data/maps/GraniteCave_B2F/map.bin"
-
- .align 2
-GraniteCave_B2F_MapAttributes: @ 84323E0
- .4byte 0x20
- .4byte 0x1a
- .4byte GraniteCave_B2F_MapBorder
- .4byte GraniteCave_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-PetalburgWoods_MapBorder: @ 84323F8
- .incbin "data/maps/PetalburgWoods/border.bin"
-
- .align 2
-PetalburgWoods_MapBlockdata: @ 8432400
- .incbin "data/maps/PetalburgWoods/map.bin"
-
- .align 2
-PetalburgWoods_MapAttributes: @ 8433480
- .4byte 0x30
- .4byte 0x2c
- .4byte PetalburgWoods_MapBorder
- .4byte PetalburgWoods_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-MtChimney_MapBorder: @ 8433498
- .incbin "data/maps/MtChimney/border.bin"
-
- .align 2
-MtChimney_MapBlockdata: @ 84334A0
- .incbin "data/maps/MtChimney/map.bin"
-
- .align 2
-MtChimney_MapAttributes: @ 8434350
- .4byte 0x28
- .4byte 0x2f
- .4byte MtChimney_MapBorder
- .4byte MtChimney_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MtPyre_1F_MapBorder: @ 8434368
- .incbin "data/maps/MtPyre_1F/border.bin"
-
- .align 2
-MtPyre_1F_MapBlockdata: @ 8434370
- .incbin "data/maps/MtPyre_1F/map.bin"
-
- .align 2
-MtPyre_1F_MapAttributes: @ 84346B4
- .4byte 0x16
- .4byte 0x13
- .4byte MtPyre_1F_MapBorder
- .4byte MtPyre_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MtPyre_2F_MapBorder: @ 84346CC
- .incbin "data/maps/MtPyre_2F/border.bin"
-
- .align 2
-MtPyre_2F_MapBlockdata: @ 84346D4
- .incbin "data/maps/MtPyre_2F/map.bin"
-
- .align 2
-MtPyre_2F_MapAttributes: @ 8434828
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_2F_MapBorder
- .4byte MtPyre_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MtPyre_3F_MapBorder: @ 8434840
- .incbin "data/maps/MtPyre_3F/border.bin"
-
- .align 2
-MtPyre_3F_MapBlockdata: @ 8434848
- .incbin "data/maps/MtPyre_3F/map.bin"
-
- .align 2
-MtPyre_3F_MapAttributes: @ 843499C
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_3F_MapBorder
- .4byte MtPyre_3F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MtPyre_4F_MapBorder: @ 84349B4
- .incbin "data/maps/MtPyre_4F/border.bin"
-
- .align 2
-MtPyre_4F_MapBlockdata: @ 84349BC
- .incbin "data/maps/MtPyre_4F/map.bin"
-
- .align 2
-MtPyre_4F_MapAttributes: @ 8434B10
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_4F_MapBorder
- .4byte MtPyre_4F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MtPyre_5F_MapBorder: @ 8434B28
- .incbin "data/maps/MtPyre_5F/border.bin"
-
- .align 2
-MtPyre_5F_MapBlockdata: @ 8434B30
- .incbin "data/maps/MtPyre_5F/map.bin"
-
- .align 2
-MtPyre_5F_MapAttributes: @ 8434C84
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_5F_MapBorder
- .4byte MtPyre_5F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MtPyre_6F_MapBorder: @ 8434C9C
- .incbin "data/maps/MtPyre_6F/border.bin"
-
- .align 2
-MtPyre_6F_MapBlockdata: @ 8434CA4
- .incbin "data/maps/MtPyre_6F/map.bin"
-
- .align 2
-MtPyre_6F_MapAttributes: @ 8434DF8
- .4byte 0xd
- .4byte 0xd
- .4byte MtPyre_6F_MapBorder
- .4byte MtPyre_6F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-AquaHideout_1F_MapBorder: @ 8434E10
- .incbin "data/maps/AquaHideout_1F/border.bin"
-
- .align 2
-AquaHideout_1F_MapBlockdata: @ 8434E18
- .incbin "data/maps/AquaHideout_1F/map.bin"
-
- .align 2
-AquaHideout_1F_MapAttributes: @ 84354A8
- .4byte 0x1c
- .4byte 0x1e
- .4byte AquaHideout_1F_MapBorder
- .4byte AquaHideout_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-AquaHideout_B1F_MapBorder: @ 84354C0
- .incbin "data/maps/AquaHideout_B1F/border.bin"
-
- .align 2
-AquaHideout_B1F_MapBlockdata: @ 84354C8
- .incbin "data/maps/AquaHideout_B1F/map.bin"
-
- .align 2
-AquaHideout_B1F_MapAttributes: @ 8435E58
- .4byte 0x33
- .4byte 0x18
- .4byte AquaHideout_B1F_MapBorder
- .4byte AquaHideout_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-AquaHideout_B2F_MapBorder: @ 8435E70
- .incbin "data/maps/AquaHideout_B2F/border.bin"
-
- .align 2
-AquaHideout_B2F_MapBlockdata: @ 8435E78
- .incbin "data/maps/AquaHideout_B2F/map.bin"
-
- .align 2
-AquaHideout_B2F_MapAttributes: @ 84364D8
- .4byte 0x22
- .4byte 0x18
- .4byte AquaHideout_B2F_MapBorder
- .4byte AquaHideout_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-Underwater_SeafloorCavern_MapBorder: @ 84364F0
- .incbin "data/maps/Underwater_SeafloorCavern/border.bin"
-
- .align 2
-Underwater_SeafloorCavern_MapBlockdata: @ 84364F8
- .incbin "data/maps/Underwater_SeafloorCavern/map.bin"
-
- .align 2
-Underwater_SeafloorCavern_MapAttributes: @ 84365F4
- .4byte 0xe
- .4byte 0x9
- .4byte Underwater_SeafloorCavern_MapBorder
- .4byte Underwater_SeafloorCavern_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-SeafloorCavern_Entrance_MapBorder: @ 843660C
- .incbin "data/maps/SeafloorCavern_Entrance/border.bin"
-
- .align 2
-SeafloorCavern_Entrance_MapBlockdata: @ 8436614
- .incbin "data/maps/SeafloorCavern_Entrance/map.bin"
-
- .align 2
-SeafloorCavern_Entrance_MapAttributes: @ 8436934
- .4byte 0x14
- .4byte 0x14
- .4byte SeafloorCavern_Entrance_MapBorder
- .4byte SeafloorCavern_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SeafloorCavern_Room1_MapBorder: @ 843694C
- .incbin "data/maps/SeafloorCavern_Room1/border.bin"
-
- .align 2
-SeafloorCavern_Room1_MapBlockdata: @ 8436954
- .incbin "data/maps/SeafloorCavern_Room1/map.bin"
-
- .align 2
-SeafloorCavern_Room1_MapAttributes: @ 8436C9C
- .4byte 0x14
- .4byte 0x15
- .4byte SeafloorCavern_Room1_MapBorder
- .4byte SeafloorCavern_Room1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SeafloorCavern_Room2_MapBorder: @ 8436CB4
- .incbin "data/maps/SeafloorCavern_Room2/border.bin"
-
- .align 2
-SeafloorCavern_Room2_MapBlockdata: @ 8436CBC
- .incbin "data/maps/SeafloorCavern_Room2/map.bin"
-
- .align 2
-SeafloorCavern_Room2_MapAttributes: @ 8436E6C
- .4byte 0x12
- .4byte 0xc
- .4byte SeafloorCavern_Room2_MapBorder
- .4byte SeafloorCavern_Room2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SeafloorCavern_Room3_MapBorder: @ 8436E84
- .incbin "data/maps/SeafloorCavern_Room3/border.bin"
-
- .align 2
-SeafloorCavern_Room3_MapBlockdata: @ 8436E8C
- .incbin "data/maps/SeafloorCavern_Room3/map.bin"
-
- .align 2
-SeafloorCavern_Room3_MapAttributes: @ 84370AC
- .4byte 0x10
- .4byte 0x11
- .4byte SeafloorCavern_Room3_MapBorder
- .4byte SeafloorCavern_Room3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SeafloorCavern_Room4_MapBorder: @ 84370C4
- .incbin "data/maps/SeafloorCavern_Room4/border.bin"
-
- .align 2
-SeafloorCavern_Room4_MapBlockdata: @ 84370CC
- .incbin "data/maps/SeafloorCavern_Room4/map.bin"
-
- .align 2
-SeafloorCavern_Room4_MapAttributes: @ 8437378
- .4byte 0x12
- .4byte 0x13
- .4byte SeafloorCavern_Room4_MapBorder
- .4byte SeafloorCavern_Room4_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SeafloorCavern_Room5_MapBorder: @ 8437390
- .incbin "data/maps/SeafloorCavern_Room5/border.bin"
-
- .align 2
-SeafloorCavern_Room5_MapBlockdata: @ 8437398
- .incbin "data/maps/SeafloorCavern_Room5/map.bin"
-
- .align 2
-SeafloorCavern_Room5_MapAttributes: @ 84376B8
- .4byte 0x14
- .4byte 0x14
- .4byte SeafloorCavern_Room5_MapBorder
- .4byte SeafloorCavern_Room5_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SeafloorCavern_Room6_MapBorder: @ 84376D0
- .incbin "data/maps/SeafloorCavern_Room6/border.bin"
-
- .align 2
-SeafloorCavern_Room6_MapBlockdata: @ 84376D8
- .incbin "data/maps/SeafloorCavern_Room6/map.bin"
-
- .align 2
-SeafloorCavern_Room6_MapAttributes: @ 8437B28
- .4byte 0x18
- .4byte 0x17
- .4byte SeafloorCavern_Room6_MapBorder
- .4byte SeafloorCavern_Room6_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SeafloorCavern_Room7_MapBorder: @ 8437B40
- .incbin "data/maps/SeafloorCavern_Room7/border.bin"
-
- .align 2
-SeafloorCavern_Room7_MapBlockdata: @ 8437B48
- .incbin "data/maps/SeafloorCavern_Room7/map.bin"
-
- .align 2
-SeafloorCavern_Room7_MapAttributes: @ 8437FC8
- .4byte 0x17
- .4byte 0x19
- .4byte SeafloorCavern_Room7_MapBorder
- .4byte SeafloorCavern_Room7_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SeafloorCavern_Room8_MapBorder: @ 8437FE0
- .incbin "data/maps/SeafloorCavern_Room8/border.bin"
-
- .align 2
-SeafloorCavern_Room8_MapBlockdata: @ 8437FE8
- .incbin "data/maps/SeafloorCavern_Room8/map.bin"
-
- .align 2
-SeafloorCavern_Room8_MapAttributes: @ 843811C
- .4byte 0xb
- .4byte 0xe
- .4byte SeafloorCavern_Room8_MapBorder
- .4byte SeafloorCavern_Room8_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SeafloorCavern_Room9_MapBorder: @ 8438134
- .incbin "data/maps/SeafloorCavern_Room9/border.bin"
-
- .align 2
-SeafloorCavern_Room9_MapBlockdata: @ 843813C
- .incbin "data/maps/SeafloorCavern_Room9/map.bin"
-
- .align 2
-SeafloorCavern_Room9_MapAttributes: @ 8438AF0
- .4byte 0x1b
- .4byte 0x2e
- .4byte SeafloorCavern_Room9_MapBorder
- .4byte SeafloorCavern_Room9_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-CaveOfOrigin_Entrance_MapBorder: @ 8438B08
- .incbin "data/maps/CaveOfOrigin_Entrance/border.bin"
-
- .align 2
-CaveOfOrigin_Entrance_MapBlockdata: @ 8438B10
- .incbin "data/maps/CaveOfOrigin_Entrance/map.bin"
-
- .align 2
-CaveOfOrigin_Entrance_MapAttributes: @ 8438EEC
- .4byte 0x13
- .4byte 0x1a
- .4byte CaveOfOrigin_Entrance_MapBorder
- .4byte CaveOfOrigin_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-CaveOfOrigin_1F_MapBorder: @ 8438F04
- .incbin "data/maps/CaveOfOrigin_1F/border.bin"
-
- .align 2
-CaveOfOrigin_1F_MapBlockdata: @ 8438F0C
- .incbin "data/maps/CaveOfOrigin_1F/map.bin"
-
- .align 2
-CaveOfOrigin_1F_MapAttributes: @ 8439330
- .4byte 0x17
- .4byte 0x17
- .4byte CaveOfOrigin_1F_MapBorder
- .4byte CaveOfOrigin_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap1_MapBorder: @ 8439348
- .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin"
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata: @ 8439350
- .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin"
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes: @ 8439774
- .4byte 0x17
- .4byte 0x17
- .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder
- .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap2_MapBorder: @ 843978C
- .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin"
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata: @ 8439794
- .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin"
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes: @ 8439B08
- .4byte 0x15
- .4byte 0x15
- .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder
- .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap3_MapBorder: @ 8439B20
- .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin"
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata: @ 8439B28
- .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin"
-
- .align 2
-CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes: @ 8439E48
- .4byte 0x13
- .4byte 0x15
- .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder
- .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-CaveOfOrigin_B1F_MapBorder: @ 8439E60
- .incbin "data/maps/CaveOfOrigin_B1F/border.bin"
-
- .align 2
-CaveOfOrigin_B1F_MapBlockdata: @ 8439E68
- .incbin "data/maps/CaveOfOrigin_B1F/map.bin"
-
- .align 2
-CaveOfOrigin_B1F_MapAttributes: @ 843A13C
- .4byte 0x13
- .4byte 0x13
- .4byte CaveOfOrigin_B1F_MapBorder
- .4byte CaveOfOrigin_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-VictoryRoad_1F_MapBorder: @ 843A154
- .incbin "data/maps/VictoryRoad_1F/border.bin"
-
- .align 2
-VictoryRoad_1F_MapBlockdata: @ 843A15C
- .incbin "data/maps/VictoryRoad_1F/map.bin"
-
- .align 2
-VictoryRoad_1F_MapAttributes: @ 843B188
- .4byte 0x2e
- .4byte 0x2d
- .4byte VictoryRoad_1F_MapBorder
- .4byte VictoryRoad_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-ShoalCave_LowTideEntranceRoom_MapBorder: @ 843B1A0
- .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin"
-
- .align 2
-ShoalCave_LowTideEntranceRoom_MapBlockdata: @ 843B1A8
- .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideEntranceRoom_MapAttributes: @ 843BB3C
- .4byte 0x23
- .4byte 0x23
- .4byte ShoalCave_LowTideEntranceRoom_MapBorder
- .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-ShoalCave_LowTideInnerRoom_MapBorder: @ 843BB54
- .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin"
-
- .align 2
-ShoalCave_LowTideInnerRoom_MapBlockdata: @ 843BB5C
- .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideInnerRoom_MapAttributes: @ 843C904
- .4byte 0x2e
- .4byte 0x26
- .4byte ShoalCave_LowTideInnerRoom_MapBorder
- .4byte ShoalCave_LowTideInnerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-ShoalCave_LowTideStairsRoom_MapBorder: @ 843C91C
- .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin"
-
- .align 2
-ShoalCave_LowTideStairsRoom_MapBlockdata: @ 843C924
- .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideStairsRoom_MapAttributes: @ 843CB9C
- .4byte 0x15
- .4byte 0xf
- .4byte ShoalCave_LowTideStairsRoom_MapBorder
- .4byte ShoalCave_LowTideStairsRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-ShoalCave_LowTideLowerRoom_MapBorder: @ 843CBB4
- .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin"
-
- .align 2
-ShoalCave_LowTideLowerRoom_MapBlockdata: @ 843CBBC
- .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideLowerRoom_MapAttributes: @ 843CF20
- .4byte 0x1f
- .4byte 0xe
- .4byte ShoalCave_LowTideLowerRoom_MapBorder
- .4byte ShoalCave_LowTideLowerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-ShoalCave_HighTideEntranceRoom_MapBorder: @ 843CF38
- .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin"
-
- .align 2
-ShoalCave_HighTideEntranceRoom_MapBlockdata: @ 843CF40
- .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin"
-
- .align 2
-ShoalCave_HighTideEntranceRoom_MapAttributes: @ 843D8D4
- .4byte 0x23
- .4byte 0x23
- .4byte ShoalCave_HighTideEntranceRoom_MapBorder
- .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-ShoalCave_HighTideInnerRoom_MapBorder: @ 843D8EC
- .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin"
-
- .align 2
-ShoalCave_HighTideInnerRoom_MapBlockdata: @ 843D8F4
- .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin"
-
- .align 2
-ShoalCave_HighTideInnerRoom_MapAttributes: @ 843E69C
- .4byte 0x2e
- .4byte 0x26
- .4byte ShoalCave_HighTideInnerRoom_MapBorder
- .4byte ShoalCave_HighTideInnerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E6C0: @ 843E6B4
- .incbin "data/maps/UnknownMap_0843E6C0/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E6C0: @ 843E6BC
- .incbin "data/maps/UnknownMap_0843E6C0/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E6C0: @ 843E6C0
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E6C0
- .4byte UnknownMapBlockdata_0843E6C0
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E6E4: @ 843E6D8
- .incbin "data/maps/UnknownMap_0843E6E4/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E6E4: @ 843E6E0
- .incbin "data/maps/UnknownMap_0843E6E4/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E6E4: @ 843E6E4
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E6E4
- .4byte UnknownMapBlockdata_0843E6E4
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E708: @ 843E6FC
- .incbin "data/maps/UnknownMap_0843E708/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E708: @ 843E704
- .incbin "data/maps/UnknownMap_0843E708/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E708: @ 843E708
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E708
- .4byte UnknownMapBlockdata_0843E708
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E72C: @ 843E720
- .incbin "data/maps/UnknownMap_0843E72C/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E72C: @ 843E728
- .incbin "data/maps/UnknownMap_0843E72C/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E72C: @ 843E72C
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E72C
- .4byte UnknownMapBlockdata_0843E72C
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E750: @ 843E744
- .incbin "data/maps/UnknownMap_0843E750/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E750: @ 843E74C
- .incbin "data/maps/UnknownMap_0843E750/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E750: @ 843E750
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E750
- .4byte UnknownMapBlockdata_0843E750
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E774: @ 843E768
- .incbin "data/maps/UnknownMap_0843E774/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E774: @ 843E770
- .incbin "data/maps/UnknownMap_0843E774/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E774: @ 843E774
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E774
- .4byte UnknownMapBlockdata_0843E774
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E798: @ 843E78C
- .incbin "data/maps/UnknownMap_0843E798/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E798: @ 843E794
- .incbin "data/maps/UnknownMap_0843E798/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E798: @ 843E798
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E798
- .4byte UnknownMapBlockdata_0843E798
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E7BC: @ 843E7B0
- .incbin "data/maps/UnknownMap_0843E7BC/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E7BC: @ 843E7B8
- .incbin "data/maps/UnknownMap_0843E7BC/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E7BC: @ 843E7BC
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E7BC
- .4byte UnknownMapBlockdata_0843E7BC
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E7E0: @ 843E7D4
- .incbin "data/maps/UnknownMap_0843E7E0/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E7E0: @ 843E7DC
- .incbin "data/maps/UnknownMap_0843E7E0/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E7E0: @ 843E7E0
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E7E0
- .4byte UnknownMapBlockdata_0843E7E0
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E804: @ 843E7F8
- .incbin "data/maps/UnknownMap_0843E804/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E804: @ 843E800
- .incbin "data/maps/UnknownMap_0843E804/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E804: @ 843E804
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E804
- .4byte UnknownMapBlockdata_0843E804
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E828: @ 843E81C
- .incbin "data/maps/UnknownMap_0843E828/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E828: @ 843E824
- .incbin "data/maps/UnknownMap_0843E828/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E828: @ 843E828
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E828
- .4byte UnknownMapBlockdata_0843E828
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E84C: @ 843E840
- .incbin "data/maps/UnknownMap_0843E84C/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E84C: @ 843E848
- .incbin "data/maps/UnknownMap_0843E84C/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E84C: @ 843E84C
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E84C
- .4byte UnknownMapBlockdata_0843E84C
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0843E870: @ 843E864
- .incbin "data/maps/UnknownMap_0843E870/border.bin"
-
- .align 2
-UnknownMapBlockdata_0843E870: @ 843E86C
- .incbin "data/maps/UnknownMap_0843E870/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E870: @ 843E870
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E870
- .4byte UnknownMapBlockdata_0843E870
- .4byte gTileset_General
- .4byte gTileset_Cave
-
-UnknownMapBorder_0843E894: @ 843E888
- .incbin "data/maps/UnknownMap_0843E894/border.bin"
-
-UnknownMapBlockdata_0843E894: @ 843E890
- .incbin "data/maps/UnknownMap_0843E894/map.bin"
-
- .align 2
-UnknownMapAttributes_0843E894: @ 843E894
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_0843E894
- .4byte UnknownMapBlockdata_0843E894
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-NewMauville_Entrance_MapBorder: @ 843E8AC
- .incbin "data/maps/NewMauville_Entrance/border.bin"
-
- .align 2
-NewMauville_Entrance_MapBlockdata: @ 843E8B4
- .incbin "data/maps/NewMauville_Entrance/map.bin"
-
- .align 2
-NewMauville_Entrance_MapAttributes: @ 843E958
- .4byte 0x9
- .4byte 0x9
- .4byte NewMauville_Entrance_MapBorder
- .4byte NewMauville_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-NewMauville_Inside_MapBorder: @ 843E970
- .incbin "data/maps/NewMauville_Inside/border.bin"
-
- .align 2
-NewMauville_Inside_MapBlockdata: @ 843E978
- .incbin "data/maps/NewMauville_Inside/map.bin"
-
- .align 2
-NewMauville_Inside_MapAttributes: @ 843F69C
- .4byte 0x29
- .4byte 0x29
- .4byte NewMauville_Inside_MapBorder
- .4byte NewMauville_Inside_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BikeShop
-
- .align 2
-AbandonedShip_Deck_MapBorder: @ 843F6B4
- .incbin "data/maps/AbandonedShip_Deck/border.bin"
-
- .align 2
-AbandonedShip_Deck_MapBlockdata: @ 843F6BC
- .incbin "data/maps/AbandonedShip_Deck/map.bin"
-
- .align 2
-AbandonedShip_Deck_MapAttributes: @ 843FA84
- .4byte 0x17
- .4byte 0x15
- .4byte AbandonedShip_Deck_MapBorder
- .4byte AbandonedShip_Deck_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-AbandonedShip_Corridors_1F_MapBorder: @ 843FA9C
- .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin"
-
- .align 2
-AbandonedShip_Corridors_1F_MapBlockdata: @ 843FAA4
- .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin"
-
- .align 2
-AbandonedShip_Corridors_1F_MapAttributes: @ 843FC54
- .4byte 0x12
- .4byte 0xc
- .4byte AbandonedShip_Corridors_1F_MapBorder
- .4byte AbandonedShip_Corridors_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_Rooms_1F_MapBorder: @ 843FC6C
- .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin"
-
- .align 2
-AbandonedShip_Rooms_1F_MapBlockdata: @ 843FC74
- .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms_1F_MapAttributes: @ 843FED8
- .4byte 0x12
- .4byte 0x11
- .4byte AbandonedShip_Rooms_1F_MapBorder
- .4byte AbandonedShip_Rooms_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_Corridors_B1F_MapBorder: @ 843FEF0
- .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin"
-
- .align 2
-AbandonedShip_Corridors_B1F_MapBlockdata: @ 843FEF8
- .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin"
-
- .align 2
-AbandonedShip_Corridors_B1F_MapAttributes: @ 843FFFC
- .4byte 0xd
- .4byte 0xa
- .4byte AbandonedShip_Corridors_B1F_MapBorder
- .4byte AbandonedShip_Corridors_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_Rooms_B1F_MapBorder: @ 8440014
- .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin"
-
- .align 2
-AbandonedShip_Rooms_B1F_MapBlockdata: @ 844001C
- .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms_B1F_MapAttributes: @ 84401CC
- .4byte 0x1b
- .4byte 0x8
- .4byte AbandonedShip_Rooms_B1F_MapBorder
- .4byte AbandonedShip_Rooms_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_Rooms2_B1F_MapBorder: @ 84401E4
- .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin"
-
- .align 2
-AbandonedShip_Rooms2_B1F_MapBlockdata: @ 84401EC
- .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms2_B1F_MapAttributes: @ 844030C
- .4byte 0x12
- .4byte 0x8
- .4byte AbandonedShip_Rooms2_B1F_MapBorder
- .4byte AbandonedShip_Rooms2_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_Underwater1_MapBorder: @ 8440324
- .incbin "data/maps/AbandonedShip_Underwater1/border.bin"
-
- .align 2
-AbandonedShip_Underwater1_MapBlockdata: @ 844032C
- .incbin "data/maps/AbandonedShip_Underwater1/map.bin"
-
- .align 2
-AbandonedShip_Underwater1_MapAttributes: @ 84403AC
- .4byte 0x8
- .4byte 0x8
- .4byte AbandonedShip_Underwater1_MapBorder
- .4byte AbandonedShip_Underwater1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_Room_B1F_MapBorder: @ 84403C4
- .incbin "data/maps/AbandonedShip_Room_B1F/border.bin"
-
- .align 2
-AbandonedShip_Room_B1F_MapBlockdata: @ 84403CC
- .incbin "data/maps/AbandonedShip_Room_B1F/map.bin"
-
- .align 2
-AbandonedShip_Room_B1F_MapAttributes: @ 844045C
- .4byte 0x9
- .4byte 0x8
- .4byte AbandonedShip_Room_B1F_MapBorder
- .4byte AbandonedShip_Room_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_Rooms2_1F_MapBorder: @ 8440474
- .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin"
-
- .align 2
-AbandonedShip_Rooms2_1F_MapBlockdata: @ 844047C
- .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin"
-
- .align 2
-AbandonedShip_Rooms2_1F_MapAttributes: @ 84405B0
- .4byte 0x9
- .4byte 0x11
- .4byte AbandonedShip_Rooms2_1F_MapBorder
- .4byte AbandonedShip_Rooms2_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-AbandonedShip_CaptainsOffice_MapBorder: @ 84405C8
- .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin"
-
- .align 2
-AbandonedShip_CaptainsOffice_MapBlockdata: @ 84405D0
- .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin"
-
- .align 2
-AbandonedShip_CaptainsOffice_MapAttributes: @ 8440650
- .4byte 0x9
- .4byte 0x7
- .4byte AbandonedShip_CaptainsOffice_MapBorder
- .4byte AbandonedShip_CaptainsOffice_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-AbandonedShip_Underwater2_MapBorder: @ 8440668
- .incbin "data/maps/AbandonedShip_Underwater2/border.bin"
-
- .align 2
-AbandonedShip_Underwater2_MapBlockdata: @ 8440670
- .incbin "data/maps/AbandonedShip_Underwater2/map.bin"
-
- .align 2
-AbandonedShip_Underwater2_MapAttributes: @ 8440798
- .4byte 0x15
- .4byte 0x7
- .4byte AbandonedShip_Underwater2_MapBorder
- .4byte AbandonedShip_Underwater2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-SecretBase_RedCave1_MapBorder: @ 84407B0
- .incbin "data/maps/SecretBase_RedCave1/border.bin"
-
- .align 2
-SecretBase_RedCave1_MapBlockdata: @ 84407B8
- .incbin "data/maps/SecretBase_RedCave1/map.bin"
-
- .align 2
-SecretBase_RedCave1_MapAttributes: @ 8440880
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_RedCave1_MapBorder
- .4byte SecretBase_RedCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
- .align 2
-SecretBase_BrownCave1_MapBorder: @ 8440898
- .incbin "data/maps/SecretBase_BrownCave1/border.bin"
-
- .align 2
-SecretBase_BrownCave1_MapBlockdata: @ 84408A0
- .incbin "data/maps/SecretBase_BrownCave1/map.bin"
-
- .align 2
-SecretBase_BrownCave1_MapAttributes: @ 8440968
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_BrownCave1_MapBorder
- .4byte SecretBase_BrownCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
- .align 2
-SecretBase_BlueCave1_MapBorder: @ 8440980
- .incbin "data/maps/SecretBase_BlueCave1/border.bin"
-
- .align 2
-SecretBase_BlueCave1_MapBlockdata: @ 8440988
- .incbin "data/maps/SecretBase_BlueCave1/map.bin"
-
- .align 2
-SecretBase_BlueCave1_MapAttributes: @ 8440A50
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_BlueCave1_MapBorder
- .4byte SecretBase_BlueCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
- .align 2
-SecretBase_YellowCave1_MapBorder: @ 8440A68
- .incbin "data/maps/SecretBase_YellowCave1/border.bin"
-
- .align 2
-SecretBase_YellowCave1_MapBlockdata: @ 8440A70
- .incbin "data/maps/SecretBase_YellowCave1/map.bin"
-
- .align 2
-SecretBase_YellowCave1_MapAttributes: @ 8440B38
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_YellowCave1_MapBorder
- .4byte SecretBase_YellowCave1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
- .align 2
-SecretBase_Tree1_MapBorder: @ 8440B50
- .incbin "data/maps/SecretBase_Tree1/border.bin"
-
- .align 2
-SecretBase_Tree1_MapBlockdata: @ 8440B58
- .incbin "data/maps/SecretBase_Tree1/map.bin"
-
- .align 2
-SecretBase_Tree1_MapAttributes: @ 8440C20
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_Tree1_MapBorder
- .4byte SecretBase_Tree1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
- .align 2
-SecretBase_Shrub1_MapBorder: @ 8440C38
- .incbin "data/maps/SecretBase_Shrub1/border.bin"
-
- .align 2
-SecretBase_Shrub1_MapBlockdata: @ 8440C40
- .incbin "data/maps/SecretBase_Shrub1/map.bin"
-
- .align 2
-SecretBase_Shrub1_MapAttributes: @ 8440D08
- .4byte 0xb
- .4byte 0x9
- .4byte SecretBase_Shrub1_MapBorder
- .4byte SecretBase_Shrub1_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
- .align 2
-SecretBase_RedCave2_MapBorder: @ 8440D20
- .incbin "data/maps/SecretBase_RedCave2/border.bin"
-
- .align 2
-SecretBase_RedCave2_MapBlockdata: @ 8440D28
- .incbin "data/maps/SecretBase_RedCave2/map.bin"
-
- .align 2
-SecretBase_RedCave2_MapAttributes: @ 8440E08
- .4byte 0x7
- .4byte 0x10
- .4byte SecretBase_RedCave2_MapBorder
- .4byte SecretBase_RedCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
- .align 2
-SecretBase_BrownCave2_MapBorder: @ 8440E20
- .incbin "data/maps/SecretBase_BrownCave2/border.bin"
-
- .align 2
-SecretBase_BrownCave2_MapBlockdata: @ 8440E28
- .incbin "data/maps/SecretBase_BrownCave2/map.bin"
-
- .align 2
-SecretBase_BrownCave2_MapAttributes: @ 8440F24
- .4byte 0xe
- .4byte 0x9
- .4byte SecretBase_BrownCave2_MapBorder
- .4byte SecretBase_BrownCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
- .align 2
-SecretBase_BlueCave2_MapBorder: @ 8440F3C
- .incbin "data/maps/SecretBase_BlueCave2/border.bin"
-
- .align 2
-SecretBase_BlueCave2_MapBlockdata: @ 8440F44
- .incbin "data/maps/SecretBase_BlueCave2/map.bin"
-
- .align 2
-SecretBase_BlueCave2_MapAttributes: @ 8441018
- .4byte 0xf
- .4byte 0x7
- .4byte SecretBase_BlueCave2_MapBorder
- .4byte SecretBase_BlueCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
- .align 2
-SecretBase_YellowCave2_MapBorder: @ 8441030
- .incbin "data/maps/SecretBase_YellowCave2/border.bin"
-
- .align 2
-SecretBase_YellowCave2_MapBlockdata: @ 8441038
- .incbin "data/maps/SecretBase_YellowCave2/map.bin"
-
- .align 2
-SecretBase_YellowCave2_MapAttributes: @ 8441134
- .4byte 0xe
- .4byte 0x9
- .4byte SecretBase_YellowCave2_MapBorder
- .4byte SecretBase_YellowCave2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
- .align 2
-SecretBase_Tree2_MapBorder: @ 844114C
- .incbin "data/maps/SecretBase_Tree2/border.bin"
-
- .align 2
-SecretBase_Tree2_MapBlockdata: @ 8441154
- .incbin "data/maps/SecretBase_Tree2/map.bin"
-
- .align 2
-SecretBase_Tree2_MapAttributes: @ 8441234
- .4byte 0x7
- .4byte 0x10
- .4byte SecretBase_Tree2_MapBorder
- .4byte SecretBase_Tree2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
- .align 2
-SecretBase_Shrub2_MapBorder: @ 844124C
- .incbin "data/maps/SecretBase_Shrub2/border.bin"
-
- .align 2
-SecretBase_Shrub2_MapBlockdata: @ 8441254
- .incbin "data/maps/SecretBase_Shrub2/map.bin"
-
- .align 2
-SecretBase_Shrub2_MapAttributes: @ 8441328
- .4byte 0xf
- .4byte 0x7
- .4byte SecretBase_Shrub2_MapBorder
- .4byte SecretBase_Shrub2_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
- .align 2
-SecretBase_RedCave3_MapBorder: @ 8441340
- .incbin "data/maps/SecretBase_RedCave3/border.bin"
-
- .align 2
-SecretBase_RedCave3_MapBlockdata: @ 8441348
- .incbin "data/maps/SecretBase_RedCave3/map.bin"
-
- .align 2
-SecretBase_RedCave3_MapAttributes: @ 8441438
- .4byte 0xf
- .4byte 0x8
- .4byte SecretBase_RedCave3_MapBorder
- .4byte SecretBase_RedCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
- .align 2
-SecretBase_BrownCave3_MapBorder: @ 8441450
- .incbin "data/maps/SecretBase_BrownCave3/border.bin"
-
- .align 2
-SecretBase_BrownCave3_MapBlockdata: @ 8441458
- .incbin "data/maps/SecretBase_BrownCave3/map.bin"
-
- .align 2
-SecretBase_BrownCave3_MapAttributes: @ 84415A4
- .4byte 0xf
- .4byte 0xb
- .4byte SecretBase_BrownCave3_MapBorder
- .4byte SecretBase_BrownCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
- .align 2
-SecretBase_BlueCave3_MapBorder: @ 84415BC
- .incbin "data/maps/SecretBase_BlueCave3/border.bin"
-
- .align 2
-SecretBase_BlueCave3_MapBlockdata: @ 84415C4
- .incbin "data/maps/SecretBase_BlueCave3/map.bin"
-
- .align 2
-SecretBase_BlueCave3_MapAttributes: @ 8441718
- .4byte 0xa
- .4byte 0x11
- .4byte SecretBase_BlueCave3_MapBorder
- .4byte SecretBase_BlueCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
- .align 2
-SecretBase_YellowCave3_MapBorder: @ 8441730
- .incbin "data/maps/SecretBase_YellowCave3/border.bin"
-
- .align 2
-SecretBase_YellowCave3_MapBlockdata: @ 8441738
- .incbin "data/maps/SecretBase_YellowCave3/map.bin"
-
- .align 2
-SecretBase_YellowCave3_MapAttributes: @ 8441840
- .4byte 0xc
- .4byte 0xb
- .4byte SecretBase_YellowCave3_MapBorder
- .4byte SecretBase_YellowCave3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
- .align 2
-SecretBase_Tree3_MapBorder: @ 8441858
- .incbin "data/maps/SecretBase_Tree3/border.bin"
-
- .align 2
-SecretBase_Tree3_MapBlockdata: @ 8441860
- .incbin "data/maps/SecretBase_Tree3/map.bin"
-
- .align 2
-SecretBase_Tree3_MapAttributes: @ 8441970
- .4byte 0x11
- .4byte 0x8
- .4byte SecretBase_Tree3_MapBorder
- .4byte SecretBase_Tree3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
- .align 2
-SecretBase_Shrub3_MapBorder: @ 8441988
- .incbin "data/maps/SecretBase_Shrub3/border.bin"
-
- .align 2
-SecretBase_Shrub3_MapBlockdata: @ 8441990
- .incbin "data/maps/SecretBase_Shrub3/map.bin"
-
- .align 2
-SecretBase_Shrub3_MapAttributes: @ 8441AB0
- .4byte 0xd
- .4byte 0xb
- .4byte SecretBase_Shrub3_MapBorder
- .4byte SecretBase_Shrub3_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
- .align 2
-SecretBase_RedCave4_MapBorder: @ 8441AC8
- .incbin "data/maps/SecretBase_RedCave4/border.bin"
-
- .align 2
-SecretBase_RedCave4_MapBlockdata: @ 8441AD0
- .incbin "data/maps/SecretBase_RedCave4/map.bin"
-
- .align 2
-SecretBase_RedCave4_MapAttributes: @ 8441BE0
- .4byte 0x9
- .4byte 0xf
- .4byte SecretBase_RedCave4_MapBorder
- .4byte SecretBase_RedCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseRedCave
-
- .align 2
-SecretBase_BrownCave4_MapBorder: @ 8441BF8
- .incbin "data/maps/SecretBase_BrownCave4/border.bin"
-
- .align 2
-SecretBase_BrownCave4_MapBlockdata: @ 8441C00
- .incbin "data/maps/SecretBase_BrownCave4/map.bin"
-
- .align 2
-SecretBase_BrownCave4_MapAttributes: @ 8441D50
- .4byte 0xe
- .4byte 0xc
- .4byte SecretBase_BrownCave4_MapBorder
- .4byte SecretBase_BrownCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBrownCave
-
- .align 2
-SecretBase_BlueCave4_MapBorder: @ 8441D68
- .incbin "data/maps/SecretBase_BlueCave4/border.bin"
-
- .align 2
-SecretBase_BlueCave4_MapBlockdata: @ 8441D70
- .incbin "data/maps/SecretBase_BlueCave4/map.bin"
-
- .align 2
-SecretBase_BlueCave4_MapAttributes: @ 8441EA4
- .4byte 0x9
- .4byte 0x11
- .4byte SecretBase_BlueCave4_MapBorder
- .4byte SecretBase_BlueCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseBlueCave
-
- .align 2
-SecretBase_YellowCave4_MapBorder: @ 8441EBC
- .incbin "data/maps/SecretBase_YellowCave4/border.bin"
-
- .align 2
-SecretBase_YellowCave4_MapBlockdata: @ 8441EC4
- .incbin "data/maps/SecretBase_YellowCave4/map.bin"
-
- .align 2
-SecretBase_YellowCave4_MapAttributes: @ 8442030
- .4byte 0xd
- .4byte 0xe
- .4byte SecretBase_YellowCave4_MapBorder
- .4byte SecretBase_YellowCave4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseYellowCave
-
- .align 2
-SecretBase_Tree4_MapBorder: @ 8442048
- .incbin "data/maps/SecretBase_Tree4/border.bin"
-
- .align 2
-SecretBase_Tree4_MapBlockdata: @ 8442050
- .incbin "data/maps/SecretBase_Tree4/map.bin"
-
- .align 2
-SecretBase_Tree4_MapAttributes: @ 84421D8
- .4byte 0xe
- .4byte 0xe
- .4byte SecretBase_Tree4_MapBorder
- .4byte SecretBase_Tree4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseTree
-
- .align 2
-SecretBase_Shrub4_MapBorder: @ 84421F0
- .incbin "data/maps/SecretBase_Shrub4/border.bin"
-
- .align 2
-SecretBase_Shrub4_MapBlockdata: @ 84421F8
- .incbin "data/maps/SecretBase_Shrub4/map.bin"
-
- .align 2
-SecretBase_Shrub4_MapAttributes: @ 844232C
- .4byte 0xe
- .4byte 0xb
- .4byte SecretBase_Shrub4_MapBorder
- .4byte SecretBase_Shrub4_MapBlockdata
- .4byte gTileset_SecretBase
- .4byte gTileset_SecretBaseShrub
-
- .align 2
-SingleBattleColosseum_MapBorder: @ 8442344
- .incbin "data/maps/SingleBattleColosseum/border.bin"
-
- .align 2
-SingleBattleColosseum_MapBlockdata: @ 844234C
- .incbin "data/maps/SingleBattleColosseum/map.bin"
-
- .align 2
-SingleBattleColosseum_MapAttributes: @ 8442448
- .4byte 0xe
- .4byte 0x9
- .4byte SingleBattleColosseum_MapBorder
- .4byte SingleBattleColosseum_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
- .align 2
-TradeCenter_MapBorder: @ 8442460
- .incbin "data/maps/TradeCenter/border.bin"
-
- .align 2
-TradeCenter_MapBlockdata: @ 8442468
- .incbin "data/maps/TradeCenter/map.bin"
-
- .align 2
-TradeCenter_MapAttributes: @ 8442540
- .4byte 0xc
- .4byte 0x9
- .4byte TradeCenter_MapBorder
- .4byte TradeCenter_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
- .align 2
-RecordCorner_MapBorder: @ 8442558
- .incbin "data/maps/RecordCorner/border.bin"
-
- .align 2
-RecordCorner_MapBlockdata: @ 8442560
- .incbin "data/maps/RecordCorner/map.bin"
-
- .align 2
-RecordCorner_MapAttributes: @ 84426F0
- .4byte 0x14
- .4byte 0xa
- .4byte RecordCorner_MapBorder
- .4byte RecordCorner_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
- .align 2
-DoubleBattleColosseum_MapBorder: @ 8442708
- .incbin "data/maps/DoubleBattleColosseum/border.bin"
-
- .align 2
-DoubleBattleColosseum_MapBlockdata: @ 8442710
- .incbin "data/maps/DoubleBattleColosseum/map.bin"
-
- .align 2
-DoubleBattleColosseum_MapAttributes: @ 844280C
- .4byte 0xe
- .4byte 0x9
- .4byte DoubleBattleColosseum_MapBorder
- .4byte DoubleBattleColosseum_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
- .align 2
-LinkContestRoom1_MapBorder: @ 8442824
- .incbin "data/maps/LinkContestRoom1/border.bin"
-
- .align 2
-LinkContestRoom1_MapBlockdata: @ 844282C
- .incbin "data/maps/LinkContestRoom1/map.bin"
-
- .align 2
-LinkContestRoom1_MapAttributes: @ 8442978
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom1_MapBorder
- .4byte LinkContestRoom1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
- .align 2
-UnknownMap_25_29_MapBorder: @ 8442990
- .incbin "data/maps/UnknownMap_25_29/border.bin"
-
- .align 2
-UnknownMap_25_29_MapBlockdata: @ 8442998
- .incbin "data/maps/UnknownMap_25_29/map.bin"
-
- .align 2
-UnknownMap_25_29_MapAttributes: @ 844299C
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_29_MapBorder
- .4byte UnknownMap_25_29_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-UnknownMap_25_30_MapBorder: @ 84429B4
- .incbin "data/maps/UnknownMap_25_30/border.bin"
-
- .align 2
-UnknownMap_25_30_MapBlockdata: @ 84429BC
- .incbin "data/maps/UnknownMap_25_30/map.bin"
-
- .align 2
-UnknownMap_25_30_MapAttributes: @ 84429C0
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_30_MapBorder
- .4byte UnknownMap_25_30_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-UnknownMap_25_31_MapBorder: @ 84429D8
- .incbin "data/maps/UnknownMap_25_31/border.bin"
-
- .align 2
-UnknownMap_25_31_MapBlockdata: @ 84429E0
- .incbin "data/maps/UnknownMap_25_31/map.bin"
-
- .align 2
-UnknownMap_25_31_MapAttributes: @ 84429E4
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_31_MapBorder
- .4byte UnknownMap_25_31_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-UnknownMap_25_32_MapBorder: @ 84429FC
- .incbin "data/maps/UnknownMap_25_32/border.bin"
-
- .align 2
-UnknownMap_25_32_MapBlockdata: @ 8442A04
- .incbin "data/maps/UnknownMap_25_32/map.bin"
-
- .align 2
-UnknownMap_25_32_MapAttributes: @ 8442A08
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_32_MapBorder
- .4byte UnknownMap_25_32_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-UnknownMap_25_33_MapBorder: @ 8442A20
- .incbin "data/maps/UnknownMap_25_33/border.bin"
-
- .align 2
-UnknownMap_25_33_MapBlockdata: @ 8442A28
- .incbin "data/maps/UnknownMap_25_33/map.bin"
-
- .align 2
-UnknownMap_25_33_MapAttributes: @ 8442A2C
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_33_MapBorder
- .4byte UnknownMap_25_33_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-UnknownMap_25_34_MapBorder: @ 8442A44
- .incbin "data/maps/UnknownMap_25_34/border.bin"
-
- .align 2
-UnknownMap_25_34_MapBlockdata: @ 8442A4C
- .incbin "data/maps/UnknownMap_25_34/map.bin"
-
- .align 2
-UnknownMap_25_34_MapAttributes: @ 8442A50
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMap_25_34_MapBorder
- .4byte UnknownMap_25_34_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Contest
-
- .align 2
-LinkContestRoom2_MapBorder: @ 8442A68
- .incbin "data/maps/LinkContestRoom2/border.bin"
-
- .align 2
-LinkContestRoom2_MapBlockdata: @ 8442A70
- .incbin "data/maps/LinkContestRoom2/map.bin"
-
- .align 2
-LinkContestRoom2_MapAttributes: @ 8442BBC
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom2_MapBorder
- .4byte LinkContestRoom2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
- .align 2
-LinkContestRoom3_MapBorder: @ 8442BD4
- .incbin "data/maps/LinkContestRoom3/border.bin"
-
- .align 2
-LinkContestRoom3_MapBlockdata: @ 8442BDC
- .incbin "data/maps/LinkContestRoom3/map.bin"
-
- .align 2
-LinkContestRoom3_MapAttributes: @ 8442D28
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom3_MapBorder
- .4byte LinkContestRoom3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
- .align 2
-LinkContestRoom4_MapBorder: @ 8442D40
- .incbin "data/maps/LinkContestRoom4/border.bin"
-
- .align 2
-LinkContestRoom4_MapBlockdata: @ 8442D48
- .incbin "data/maps/LinkContestRoom4/map.bin"
-
- .align 2
-LinkContestRoom4_MapAttributes: @ 8442E94
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom4_MapBorder
- .4byte LinkContestRoom4_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
- .align 2
-LinkContestRoom5_MapBorder: @ 8442EAC
- .incbin "data/maps/LinkContestRoom5/border.bin"
-
- .align 2
-LinkContestRoom5_MapBlockdata: @ 8442EB4
- .incbin "data/maps/LinkContestRoom5/map.bin"
-
- .align 2
-LinkContestRoom5_MapAttributes: @ 8443000
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom5_MapBorder
- .4byte LinkContestRoom5_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
- .align 2
-LinkContestRoom6_MapBorder: @ 8443018
- .incbin "data/maps/LinkContestRoom6/border.bin"
-
- .align 2
-LinkContestRoom6_MapBlockdata: @ 8443020
- .incbin "data/maps/LinkContestRoom6/map.bin"
-
- .align 2
-LinkContestRoom6_MapAttributes: @ 844316C
- .4byte 0xf
- .4byte 0xb
- .4byte LinkContestRoom6_MapBorder
- .4byte LinkContestRoom6_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Contest
-
- .align 2
-InsideOfTruck_MapBorder: @ 8443184
- .incbin "data/maps/InsideOfTruck/border.bin"
-
- .align 2
-InsideOfTruck_MapBlockdata: @ 844318C
- .incbin "data/maps/InsideOfTruck/map.bin"
-
- .align 2
-InsideOfTruck_MapAttributes: @ 84431C0
- .4byte 0x5
- .4byte 0x5
- .4byte InsideOfTruck_MapBorder
- .4byte InsideOfTruck_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideOfTruck
-
- .align 2
-SafariZone_Northwest_MapBorder: @ 84431D8
- .incbin "data/maps/SafariZone_Northwest/border.bin"
-
- .align 2
-SafariZone_Northwest_MapBlockdata: @ 84431E0
- .incbin "data/maps/SafariZone_Northwest/map.bin"
-
- .align 2
-SafariZone_Northwest_MapAttributes: @ 8443E60
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Northwest_MapBorder
- .4byte SafariZone_Northwest_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-SafariZone_North_MapBorder: @ 8443E78
- .incbin "data/maps/SafariZone_North/border.bin"
-
- .align 2
-SafariZone_North_MapBlockdata: @ 8443E80
- .incbin "data/maps/SafariZone_North/map.bin"
-
- .align 2
-SafariZone_North_MapAttributes: @ 8444B00
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_North_MapBorder
- .4byte SafariZone_North_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-SafariZone_Southwest_MapBorder: @ 8444B18
- .incbin "data/maps/SafariZone_Southwest/border.bin"
-
- .align 2
-SafariZone_Southwest_MapBlockdata: @ 8444B20
- .incbin "data/maps/SafariZone_Southwest/map.bin"
-
- .align 2
-SafariZone_Southwest_MapAttributes: @ 84457A0
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Southwest_MapBorder
- .4byte SafariZone_Southwest_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-SafariZone_South_MapBorder: @ 84457B8
- .incbin "data/maps/SafariZone_South/border.bin"
-
- .align 2
-SafariZone_South_MapBlockdata: @ 84457C0
- .incbin "data/maps/SafariZone_South/map.bin"
-
- .align 2
-SafariZone_South_MapAttributes: @ 8446440
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_South_MapBorder
- .4byte SafariZone_South_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-UnknownMapBorder_08447028: @ 8446458
- .incbin "data/maps/UnknownMap_08447028/border.bin"
-
- .align 2
-UnknownMapBlockdata_08447028: @ 8446460
- .incbin "data/maps/UnknownMap_08447028/map.bin"
-
- .align 2
-UnknownMapAttributes_08447028: @ 8447028
- .4byte 0x3A
- .4byte 0x1A
- .4byte UnknownMapBorder_08447028
- .4byte UnknownMapBlockdata_08447028
- .4byte gTileset_General
- .4byte 0
-
- .align 2
-Route109_SeashoreHouse_MapBorder: @ 8447040
- .incbin "data/maps/Route109_SeashoreHouse/border.bin"
-
- .align 2
-Route109_SeashoreHouse_MapBlockdata: @ 8447048
- .incbin "data/maps/Route109_SeashoreHouse/map.bin"
-
- .align 2
-Route109_SeashoreHouse_MapAttributes: @ 8447174
- .4byte 0xf
- .4byte 0xa
- .4byte Route109_SeashoreHouse_MapBorder
- .4byte Route109_SeashoreHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_SeashoreHouse
-
- .align 2
-Route110_TrickHouseEntrance_MapBorder: @ 844718C
- .incbin "data/maps/Route110_TrickHouseEntrance/border.bin"
-
- .align 2
-Route110_TrickHouseEntrance_MapBlockdata: @ 8447194
- .incbin "data/maps/Route110_TrickHouseEntrance/map.bin"
-
- .align 2
-Route110_TrickHouseEntrance_MapAttributes: @ 8447254
- .4byte 0xc
- .4byte 0x8
- .4byte Route110_TrickHouseEntrance_MapBorder
- .4byte Route110_TrickHouseEntrance_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route110_TrickHouseEnd_MapBorder: @ 844726C
- .incbin "data/maps/Route110_TrickHouseEnd/border.bin"
-
- .align 2
-Route110_TrickHouseEnd_MapBlockdata: @ 8447274
- .incbin "data/maps/Route110_TrickHouseEnd/map.bin"
-
- .align 2
-Route110_TrickHouseEnd_MapAttributes: @ 8447334
- .4byte 0xc
- .4byte 0x8
- .4byte Route110_TrickHouseEnd_MapBorder
- .4byte Route110_TrickHouseEnd_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route110_TrickHouseCorridor_MapBorder: @ 844734C
- .incbin "data/maps/Route110_TrickHouseCorridor/border.bin"
-
- .align 2
-Route110_TrickHouseCorridor_MapBlockdata: @ 8447354
- .incbin "data/maps/Route110_TrickHouseCorridor/map.bin"
-
- .align 2
-Route110_TrickHouseCorridor_MapAttributes: @ 8447624
- .4byte 0xf
- .4byte 0x18
- .4byte Route110_TrickHouseCorridor_MapBorder
- .4byte Route110_TrickHouseCorridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route110_TrickHousePuzzle1_MapBorder: @ 844763C
- .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle1_MapBlockdata: @ 8447644
- .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle1_MapAttributes: @ 84478D8
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle1_MapBorder
- .4byte Route110_TrickHousePuzzle1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-Route110_TrickHousePuzzle2_MapBorder: @ 84478F0
- .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle2_MapBlockdata: @ 84478F8
- .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle2_MapAttributes: @ 8447B8C
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle2_MapBorder
- .4byte Route110_TrickHousePuzzle2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-Route110_TrickHousePuzzle3_MapBorder: @ 8447BA4
- .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle3_MapBlockdata: @ 8447BAC
- .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle3_MapAttributes: @ 8447E40
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle3_MapBorder
- .4byte Route110_TrickHousePuzzle3_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-Route110_TrickHousePuzzle4_MapBorder: @ 8447E58
- .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle4_MapBlockdata: @ 8447E60
- .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle4_MapAttributes: @ 84480F4
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle4_MapBorder
- .4byte Route110_TrickHousePuzzle4_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-Route110_TrickHousePuzzle5_MapBorder: @ 844810C
- .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle5_MapBlockdata: @ 8448114
- .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle5_MapAttributes: @ 84483A8
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle5_MapBorder
- .4byte Route110_TrickHousePuzzle5_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-Route110_TrickHousePuzzle6_MapBorder: @ 84483C0
- .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle6_MapBlockdata: @ 84483C8
- .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle6_MapAttributes: @ 844865C
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle6_MapBorder
- .4byte Route110_TrickHousePuzzle6_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-Route110_TrickHousePuzzle7_MapBorder: @ 8448674
- .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle7_MapBlockdata: @ 844867C
- .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle7_MapAttributes: @ 8448910
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle7_MapBorder
- .4byte Route110_TrickHousePuzzle7_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-Route110_TrickHousePuzzle8_MapBorder: @ 8448928
- .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin"
-
- .align 2
-Route110_TrickHousePuzzle8_MapBlockdata: @ 8448930
- .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin"
-
- .align 2
-Route110_TrickHousePuzzle8_MapAttributes: @ 8448BC4
- .4byte 0xf
- .4byte 0x16
- .4byte Route110_TrickHousePuzzle8_MapBorder
- .4byte Route110_TrickHousePuzzle8_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrickHousePuzzle
-
- .align 2
-FortreeCity_DecorationShop_MapBorder: @ 8448BDC
- .incbin "data/maps/FortreeCity_DecorationShop/border.bin"
-
- .align 2
-FortreeCity_DecorationShop_MapBlockdata: @ 8448BE4
- .incbin "data/maps/FortreeCity_DecorationShop/map.bin"
-
- .align 2
-FortreeCity_DecorationShop_MapAttributes: @ 8448C44
- .4byte 0x8
- .4byte 0x6
- .4byte FortreeCity_DecorationShop_MapBorder
- .4byte FortreeCity_DecorationShop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route110_SeasideCyclingRoadEntrance1_MapBorder: @ 8448C5C
- .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin"
-
- .align 2
-Route110_SeasideCyclingRoadEntrance1_MapBlockdata: @ 8448C64
- .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin"
-
- .align 2
-Route110_SeasideCyclingRoadEntrance1_MapAttributes: @ 8448D18
-Route110_SeasideCyclingRoadEntrance2_MapAttributes: @ 8448D18
- .4byte 0xf
- .4byte 0x6
- .4byte Route110_SeasideCyclingRoadEntrance1_MapBorder
- .4byte Route110_SeasideCyclingRoadEntrance1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-LilycoveCity_DepartmentStore_1F_MapBorder: @ 8448D30
- .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_1F_MapBlockdata: @ 8448D38
- .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_1F_MapAttributes: @ 8448E58
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_1F_MapBorder
- .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-LilycoveCity_DepartmentStore_2F_MapBorder: @ 8448E70
- .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_2F_MapBlockdata: @ 8448E78
- .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_2F_MapAttributes: @ 8448F98
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_2F_MapBorder
- .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-LilycoveCity_DepartmentStore_3F_MapBorder: @ 8448FB0
- .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_3F_MapBlockdata: @ 8448FB8
- .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_3F_MapAttributes: @ 84490D8
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_3F_MapBorder
- .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-LilycoveCity_DepartmentStore_4F_MapBorder: @ 84490F0
- .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_4F_MapBlockdata: @ 84490F8
- .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_4F_MapAttributes: @ 8449218
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_4F_MapBorder
- .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-LilycoveCity_DepartmentStore_5F_MapBorder: @ 8449230
- .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_5F_MapBlockdata: @ 8449238
- .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStore_5F_MapAttributes: @ 8449358
- .4byte 0x12
- .4byte 0x8
- .4byte LilycoveCity_DepartmentStore_5F_MapBorder
- .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-LilycoveCity_DepartmentStoreRooftop_MapBorder: @ 8449370
- .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin"
-
- .align 2
-LilycoveCity_DepartmentStoreRooftop_MapBlockdata: @ 8449378
- .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStoreRooftop_MapAttributes: @ 8449528
- .4byte 0x12
- .4byte 0xc
- .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
- .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Shop
-
- .align 2
-Route130_MapBorder: @ 8449540
- .incbin "data/maps/Route130/border.bin"
-
- .align 2
-Route130_MapBlockdata: @ 8449548
- .incbin "data/maps/Route130/map.bin"
-
- .align 2
-Route130_MapAttributes: @ 844AE48
- .4byte 0x50
- .4byte 0x28
- .4byte Route130_MapBorder
- .4byte Route130_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-BattleFrontier_BattleTowerLobby_MapBorder: @ 844AE60
- .incbin "data/maps/BattleFrontier_BattleTowerLobby/border.bin"
-
- .align 2
-BattleFrontier_BattleTowerLobby_MapBlockdata: @ 844AE68
- .incbin "data/maps/BattleFrontier_BattleTowerLobby/map.bin"
-
- .align 2
-BattleFrontier_BattleTowerLobby_MapAttributes: @ 844B05C
- .4byte 0x19
- .4byte 0xa
- .4byte BattleFrontier_BattleTowerLobby_MapBorder
- .4byte BattleFrontier_BattleTowerLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-BattleFrontier_OutsideWest_MapBorder: @ 844B074
- .incbin "data/maps/BattleFrontier_OutsideWest/border.bin"
-
- .align 2
-BattleFrontier_OutsideWest_MapBlockdata: @ 844B07C
- .incbin "data/maps/BattleFrontier_OutsideWest/map.bin"
-
- .align 2
-BattleFrontier_OutsideWest_MapAttributes: @ 844CFFC
- .4byte 0x38
- .4byte 0x48
- .4byte BattleFrontier_OutsideWest_MapBorder
- .4byte BattleFrontier_OutsideWest_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BattleFrontierOutsideWest
-
- .align 2
-BattleFrontier_BattleTowerElevator_MapBorder: @ 844D014
- .incbin "data/maps/BattleFrontier_BattleTowerElevator/border.bin"
-
- .align 2
-BattleFrontier_BattleTowerElevator_MapBlockdata: @ 844D01C
- .incbin "data/maps/BattleFrontier_BattleTowerElevator/map.bin"
-
- .align 2
-BattleFrontier_BattleTowerElevator_MapAttributes: @ 844D064
-TrainerHill_Elevator_MapAttributes: @ 844D064
- .4byte 0x5
- .4byte 0x7
- .4byte BattleFrontier_BattleTowerElevator_MapBorder
- .4byte BattleFrontier_BattleTowerElevator_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-BattleFrontier_BattleTowerCorridor_MapBorder: @ 844D07C
- .incbin "data/maps/BattleFrontier_BattleTowerCorridor/border.bin"
-
- .align 2
-BattleFrontier_BattleTowerCorridor_MapBlockdata: @ 844D084
- .incbin "data/maps/BattleFrontier_BattleTowerCorridor/map.bin"
-
- .align 2
-BattleFrontier_BattleTowerCorridor_MapAttributes: @ 844D130
- .4byte 0x11
- .4byte 0x5
- .4byte BattleFrontier_BattleTowerCorridor_MapBorder
- .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-BattleFrontier_BattleTowerBattleRoom_MapBorder: @ 844D148
- .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattleTowerBattleRoom_MapBlockdata: @ 844D150
- .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattleTowerBattleRoom2_MapAttributes: @ 844D204
-BattleFrontier_BattleTowerBattleRoom_MapAttributes: @ 844D204
- .4byte 0xa
- .4byte 0x9
- .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder
- .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-RustboroCity_DevonCorp_3F_MapBorder: @ 844D21C
- .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin"
-
- .align 2
-RustboroCity_DevonCorp_3F_MapBlockdata: @ 844D224
- .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin"
-
- .align 2
-RustboroCity_DevonCorp_3F_MapAttributes: @ 844D37C
- .4byte 0x13
- .4byte 0x9
- .4byte RustboroCity_DevonCorp_3F_MapBorder
- .4byte RustboroCity_DevonCorp_3F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Facility
-
- .align 2
-EverGrandeCity_PokemonLeague_1F_MapBorder: @ 844D394
- .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/border.bin"
-
- .align 2
-EverGrandeCity_PokemonLeague_1F_MapBlockdata: @ 844D39C
- .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/map.bin"
-
- .align 2
-EverGrandeCity_PokemonLeague_1F_MapAttributes: @ 844D564
- .4byte 0x13
- .4byte 0xc
- .4byte EverGrandeCity_PokemonLeague_1F_MapBorder
- .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_PokemonCenter
-
- .align 2
-Route119_WeatherInstitute_1F_MapBorder: @ 844D57C
- .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin"
-
- .align 2
-Route119_WeatherInstitute_1F_MapBlockdata: @ 844D584
- .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin"
-
- .align 2
-Route119_WeatherInstitute_1F_MapAttributes: @ 844D78C
- .4byte 0x14
- .4byte 0xd
- .4byte Route119_WeatherInstitute_1F_MapBorder
- .4byte Route119_WeatherInstitute_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
- .align 2
-Route119_WeatherInstitute_2F_MapBorder: @ 844D7A4
- .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin"
-
- .align 2
-Route119_WeatherInstitute_2F_MapBlockdata: @ 844D7AC
- .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin"
-
- .align 2
-Route119_WeatherInstitute_2F_MapAttributes: @ 844D964
- .4byte 0x14
- .4byte 0xb
- .4byte Route119_WeatherInstitute_2F_MapBorder
- .4byte Route119_WeatherInstitute_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
- .align 2
-LilycoveCity_DepartmentStoreElevator_MapBorder: @ 844D97C
- .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin"
-
- .align 2
-LilycoveCity_DepartmentStoreElevator_MapBlockdata: @ 844D984
- .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin"
-
- .align 2
-LilycoveCity_DepartmentStoreElevator_MapAttributes: @ 844D9C0
- .4byte 0x5
- .4byte 0x6
- .4byte LilycoveCity_DepartmentStoreElevator_MapBorder
- .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-Underwater1_MapBorder: @ 844D9D8
- .incbin "data/maps/Underwater1/border.bin"
-
- .align 2
-Underwater1_MapBlockdata: @ 844D9E0
- .incbin "data/maps/Underwater1/map.bin"
-
- .align 2
-Underwater1_MapAttributes: @ 8450BE0
- .4byte 0x50
- .4byte 0x50
- .4byte Underwater1_MapBorder
- .4byte Underwater1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-MossdeepCity_SpaceCenter_1F_MapBorder: @ 8450BF8
- .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin"
-
- .align 2
-MossdeepCity_SpaceCenter_1F_MapBlockdata: @ 8450C00
- .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin"
-
- .align 2
-MossdeepCity_SpaceCenter_1F_MapAttributes: @ 8450D40
- .4byte 0x10
- .4byte 0xa
- .4byte MossdeepCity_SpaceCenter_1F_MapBorder
- .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MossdeepCity_SpaceCenter_2F_MapBorder: @ 8450D58
- .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin"
-
- .align 2
-MossdeepCity_SpaceCenter_2F_MapBlockdata: @ 8450D60
- .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin"
-
- .align 2
-MossdeepCity_SpaceCenter_2F_MapAttributes: @ 8450EA0
- .4byte 0x10
- .4byte 0xa
- .4byte MossdeepCity_SpaceCenter_2F_MapBorder
- .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-SSTidalCorridor_MapBorder: @ 8450EB8
- .incbin "data/maps/SSTidalCorridor/border.bin"
-
- .align 2
-SSTidalCorridor_MapBlockdata: @ 8450EC0
- .incbin "data/maps/SSTidalCorridor/map.bin"
-
- .align 2
-SSTidalCorridor_MapAttributes: @ 8451094
- .4byte 0x12
- .4byte 0xd
- .4byte SSTidalCorridor_MapBorder
- .4byte SSTidalCorridor_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-SSTidalLowerDeck_MapBorder: @ 84510AC
- .incbin "data/maps/SSTidalLowerDeck/border.bin"
-
- .align 2
-SSTidalLowerDeck_MapBlockdata: @ 84510B4
- .incbin "data/maps/SSTidalLowerDeck/map.bin"
-
- .align 2
-SSTidalLowerDeck_MapAttributes: @ 8451270
- .4byte 0x11
- .4byte 0xd
- .4byte SSTidalLowerDeck_MapBorder
- .4byte SSTidalLowerDeck_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-SSTidalRooms_MapBorder: @ 8451288
- .incbin "data/maps/SSTidalRooms/border.bin"
-
- .align 2
-SSTidalRooms_MapBlockdata: @ 8451290
- .incbin "data/maps/SSTidalRooms/map.bin"
-
- .align 2
-SSTidalRooms_MapAttributes: @ 84517A0
- .4byte 0x24
- .4byte 0x12
- .4byte SSTidalRooms_MapBorder
- .4byte SSTidalRooms_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-IslandCave_MapBorder: @ 84517B8
- .incbin "data/maps/IslandCave/border.bin"
-
- .align 2
-IslandCave_MapBlockdata: @ 84517C0
- .incbin "data/maps/IslandCave/map.bin"
-
- .align 2
-IslandCave_MapAttributes: @ 8451C24
- .4byte 0x11
- .4byte 0x21
- .4byte IslandCave_MapBorder
- .4byte IslandCave_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-AncientTomb_MapBorder: @ 8451C3C
- .incbin "data/maps/AncientTomb/border.bin"
-
- .align 2
-AncientTomb_MapBlockdata: @ 8451C44
- .incbin "data/maps/AncientTomb/map.bin"
-
- .align 2
-AncientTomb_MapAttributes: @ 84520A8
- .4byte 0x11
- .4byte 0x21
- .4byte AncientTomb_MapBorder
- .4byte AncientTomb_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-Underwater_Route134_MapBorder: @ 84520C0
- .incbin "data/maps/Underwater_Route134/border.bin"
-
- .align 2
-Underwater_Route134_MapBlockdata: @ 84520C8
- .incbin "data/maps/Underwater_Route134/map.bin"
-
- .align 2
-Underwater_Route134_MapAttributes: @ 8452230
- .4byte 0x12
- .4byte 0xa
- .4byte Underwater_Route134_MapBorder
- .4byte Underwater_Route134_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-Underwater_SealedChamber_MapBorder: @ 8452248
- .incbin "data/maps/Underwater_SealedChamber/border.bin"
-
- .align 2
-Underwater_SealedChamber_MapBlockdata: @ 8452250
- .incbin "data/maps/Underwater_SealedChamber/map.bin"
-
- .align 2
-Underwater_SealedChamber_MapAttributes: @ 8452A90
- .4byte 0x16
- .4byte 0x30
- .4byte Underwater_SealedChamber_MapBorder
- .4byte Underwater_SealedChamber_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-SealedChamber_OuterRoom_MapBorder: @ 8452AA8
- .incbin "data/maps/SealedChamber_OuterRoom/border.bin"
-
- .align 2
-SealedChamber_OuterRoom_MapBlockdata: @ 8452AB0
- .incbin "data/maps/SealedChamber_OuterRoom/map.bin"
-
- .align 2
-SealedChamber_OuterRoom_MapAttributes: @ 8452E78
- .4byte 0x15
- .4byte 0x17
- .4byte SealedChamber_OuterRoom_MapBorder
- .4byte SealedChamber_OuterRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-VictoryRoad_B1F_MapBorder: @ 8452E90
- .incbin "data/maps/VictoryRoad_B1F/border.bin"
-
- .align 2
-VictoryRoad_B1F_MapBlockdata: @ 8452E98
- .incbin "data/maps/VictoryRoad_B1F/map.bin"
-
- .align 2
-VictoryRoad_B1F_MapAttributes: @ 84539BC
- .4byte 0x2e
- .4byte 0x1f
- .4byte VictoryRoad_B1F_MapBorder
- .4byte VictoryRoad_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-VictoryRoad_B2F_MapBorder: @ 84539D4
- .incbin "data/maps/VictoryRoad_B2F/border.bin"
-
- .align 2
-VictoryRoad_B2F_MapBlockdata: @ 84539DC
- .incbin "data/maps/VictoryRoad_B2F/map.bin"
-
- .align 2
-VictoryRoad_B2F_MapAttributes: @ 8454500
- .4byte 0x2e
- .4byte 0x1f
- .4byte VictoryRoad_B2F_MapBorder
- .4byte VictoryRoad_B2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-Route104_Prototype_MapBorder: @ 8454518
- .incbin "data/maps/Route104_Prototype/border.bin"
-
- .align 2
-Route104_Prototype_MapBlockdata: @ 8454520
- .incbin "data/maps/Route104_Prototype/map.bin"
-
- .align 2
-Route104_Prototype_MapAttributes: @ 8454524
- .4byte 0x1
- .4byte 0x1
- .4byte Route104_Prototype_MapBorder
- .4byte Route104_Prototype_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-GraniteCave_StevensRoom_MapBorder: @ 845453C
- .incbin "data/maps/GraniteCave_StevensRoom/border.bin"
-
- .align 2
-GraniteCave_StevensRoom_MapBlockdata: @ 8454544
- .incbin "data/maps/GraniteCave_StevensRoom/map.bin"
-
- .align 2
-GraniteCave_StevensRoom_MapAttributes: @ 84546E8
- .4byte 0xf
- .4byte 0xe
- .4byte GraniteCave_StevensRoom_MapBorder
- .4byte GraniteCave_StevensRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-AbandonedShip_HiddenFloorCorridors_MapBorder: @ 8454700
- .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin"
-
- .align 2
-AbandonedShip_HiddenFloorCorridors_MapBlockdata: @ 8454708
- .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin"
-
- .align 2
-AbandonedShip_HiddenFloorCorridors_MapAttributes: @ 8454828
- .4byte 0xd
- .4byte 0xb
- .4byte AbandonedShip_HiddenFloorCorridors_MapBorder
- .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-SouthernIsland_Exterior_MapBorder: @ 8454840
- .incbin "data/maps/SouthernIsland_Exterior/border.bin"
-
- .align 2
-SouthernIsland_Exterior_MapBlockdata: @ 8454848
- .incbin "data/maps/SouthernIsland_Exterior/map.bin"
-
- .align 2
-SouthernIsland_Exterior_MapAttributes: @ 8455004
- .4byte 0x21
- .4byte 0x1e
- .4byte SouthernIsland_Exterior_MapBorder
- .4byte SouthernIsland_Exterior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-SouthernIsland_Interior_MapBorder: @ 845501C
- .incbin "data/maps/SouthernIsland_Interior/border.bin"
-
- .align 2
-SouthernIsland_Interior_MapBlockdata: @ 8455024
- .incbin "data/maps/SouthernIsland_Interior/map.bin"
-
- .align 2
-SouthernIsland_Interior_MapAttributes: @ 8455534
- .4byte 0x1b
- .4byte 0x18
- .4byte SouthernIsland_Interior_MapBorder
- .4byte SouthernIsland_Interior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-JaggedPass_MapBorder: @ 845554C
- .incbin "data/maps/JaggedPass/border.bin"
-
- .align 2
-JaggedPass_MapBlockdata: @ 8455554
- .incbin "data/maps/JaggedPass/map.bin"
-
- .align 2
-JaggedPass_MapAttributes: @ 845601C
- .4byte 0x1e
- .4byte 0x2e
- .4byte JaggedPass_MapBorder
- .4byte JaggedPass_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-FieryPath_MapBorder: @ 8456034
- .incbin "data/maps/FieryPath/border.bin"
-
- .align 2
-FieryPath_MapBlockdata: @ 845603C
- .incbin "data/maps/FieryPath/map.bin"
-
- .align 2
-FieryPath_MapAttributes: @ 8456AA0
- .4byte 0x23
- .4byte 0x26
- .4byte FieryPath_MapBorder
- .4byte FieryPath_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-RustboroCity_Flat2_1F_MapBorder: @ 8456AB8
- .incbin "data/maps/RustboroCity_Flat2_1F/border.bin"
-
- .align 2
-RustboroCity_Flat2_1F_MapBlockdata: @ 8456AC0
- .incbin "data/maps/RustboroCity_Flat2_1F/map.bin"
-
- .align 2
-RustboroCity_Flat2_1F_MapAttributes: @ 8456BBC
- .4byte 0xe
- .4byte 0x9
- .4byte RustboroCity_Flat2_1F_MapBorder
- .4byte RustboroCity_Flat2_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-RustboroCity_Flat2_2F_MapBorder: @ 8456BD4
- .incbin "data/maps/RustboroCity_Flat2_2F/border.bin"
-
- .align 2
-RustboroCity_Flat2_2F_MapBlockdata: @ 8456BDC
- .incbin "data/maps/RustboroCity_Flat2_2F/map.bin"
-
- .align 2
-RustboroCity_Flat2_2F_MapAttributes: @ 8456CD8
- .4byte 0xe
- .4byte 0x9
- .4byte RustboroCity_Flat2_2F_MapBorder
- .4byte RustboroCity_Flat2_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-RustboroCity_Flat2_3F_MapBorder: @ 8456CF0
- .incbin "data/maps/RustboroCity_Flat2_3F/border.bin"
-
- .align 2
-RustboroCity_Flat2_3F_MapBlockdata: @ 8456CF8
- .incbin "data/maps/RustboroCity_Flat2_3F/map.bin"
-
- .align 2
-RustboroCity_Flat2_3F_MapAttributes: @ 8456DF4
- .4byte 0xe
- .4byte 0x9
- .4byte RustboroCity_Flat2_3F_MapBorder
- .4byte RustboroCity_Flat2_3F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-SootopolisCity_LotadAndSeedotHouse_MapBorder: @ 8456E0C
- .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin"
-
- .align 2
-SootopolisCity_LotadAndSeedotHouse_MapBlockdata: @ 8456E14
- .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin"
-
- .align 2
-SootopolisCity_LotadAndSeedotHouse_MapAttributes: @ 8456E84
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder
- .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-EverGrandeCity_HallOfFame_MapBorder: @ 8456E9C
- .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin"
-
- .align 2
-EverGrandeCity_HallOfFame_MapBlockdata: @ 8456EA4
- .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin"
-
- .align 2
-EverGrandeCity_HallOfFame_MapAttributes: @ 84570A4
- .4byte 0xf
- .4byte 0x11
- .4byte EverGrandeCity_HallOfFame_MapBorder
- .4byte EverGrandeCity_HallOfFame_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_CableClub
-
- .align 2
-LilycoveCity_CoveLilyMotel_1F_MapBorder: @ 84570BC
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin"
-
- .align 2
-LilycoveCity_CoveLilyMotel_1F_MapBlockdata: @ 84570C4
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin"
-
- .align 2
-LilycoveCity_CoveLilyMotel_1F_MapAttributes: @ 845719C
- .4byte 0xc
- .4byte 0x9
- .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
- .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-LilycoveCity_CoveLilyMotel_2F_MapBorder: @ 84571B4
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin"
-
- .align 2
-LilycoveCity_CoveLilyMotel_2F_MapBlockdata: @ 84571BC
- .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin"
-
- .align 2
-LilycoveCity_CoveLilyMotel_2F_MapAttributes: @ 8457294
- .4byte 0xc
- .4byte 0x9
- .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
- .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-Route124_DivingTreasureHuntersHouse_MapBorder: @ 84572AC
- .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin"
-
- .align 2
-Route124_DivingTreasureHuntersHouse_MapBlockdata: @ 84572B4
- .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin"
-
- .align 2
-Route124_DivingTreasureHuntersHouse_MapAttributes: @ 8457368
- .4byte 0xa
- .4byte 0x9
- .4byte Route124_DivingTreasureHuntersHouse_MapBorder
- .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-MtPyre_Exterior_MapBorder: @ 8457380
- .incbin "data/maps/MtPyre_Exterior/border.bin"
-
- .align 2
-MtPyre_Exterior_MapBlockdata: @ 8457388
- .incbin "data/maps/MtPyre_Exterior/map.bin"
-
- .align 2
-MtPyre_Exterior_MapAttributes: @ 84582AC
- .4byte 0x26
- .4byte 0x33
- .4byte MtPyre_Exterior_MapBorder
- .4byte MtPyre_Exterior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-MtPyre_Summit_MapBorder: @ 84582C4
- .incbin "data/maps/MtPyre_Summit/border.bin"
-
- .align 2
-MtPyre_Summit_MapBlockdata: @ 84582CC
- .incbin "data/maps/MtPyre_Summit/map.bin"
-
- .align 2
-MtPyre_Summit_MapAttributes: @ 8459140
- .4byte 0x32
- .4byte 0x25
- .4byte MtPyre_Summit_MapBorder
- .4byte MtPyre_Summit_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-SealedChamber_InnerRoom_MapBorder: @ 8459158
- .incbin "data/maps/SealedChamber_InnerRoom/border.bin"
-
- .align 2
-SealedChamber_InnerRoom_MapBlockdata: @ 8459160
- .incbin "data/maps/SealedChamber_InnerRoom/map.bin"
-
- .align 2
-SealedChamber_InnerRoom_MapAttributes: @ 8459528
- .4byte 0x15
- .4byte 0x17
- .4byte SealedChamber_InnerRoom_MapBorder
- .4byte SealedChamber_InnerRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-MossdeepCity_GameCorner_1F_MapBorder: @ 8459540
- .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin"
-
- .align 2
-MossdeepCity_GameCorner_1F_MapBlockdata: @ 8459548
- .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin"
-
- .align 2
-MossdeepCity_GameCorner_1F_MapAttributes: @ 8459638
- .4byte 0xc
- .4byte 0xa
- .4byte MossdeepCity_GameCorner_1F_MapBorder
- .4byte MossdeepCity_GameCorner_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MossdeepGameCorner
-
- .align 2
-MossdeepCity_GameCorner_B1F_MapBorder: @ 8459650
- .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin"
-
- .align 2
-MossdeepCity_GameCorner_B1F_MapBlockdata: @ 8459658
- .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin"
-
- .align 2
-MossdeepCity_GameCorner_B1F_MapAttributes: @ 8459730
- .4byte 0xc
- .4byte 0x9
- .4byte MossdeepCity_GameCorner_B1F_MapBorder
- .4byte MossdeepCity_GameCorner_B1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-SootopolisCity_House1_MapBorder: @ 8459748
- .incbin "data/maps/SootopolisCity_House1/border.bin"
-
- .align 2
-SootopolisCity_House1_MapBlockdata: @ 8459750
- .incbin "data/maps/SootopolisCity_House1/map.bin"
-
- .align 2
-SootopolisCity_House1_MapAttributes: @ 84597C0
-SootopolisCity_House4_MapAttributes: @ 84597C0
-SootopolisCity_House7_MapAttributes: @ 84597C0
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_House1_MapBorder
- .4byte SootopolisCity_House1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-SootopolisCity_House2_MapBorder: @ 84597D8
- .incbin "data/maps/SootopolisCity_House2/border.bin"
-
- .align 2
-SootopolisCity_House2_MapBlockdata: @ 84597E0
- .incbin "data/maps/SootopolisCity_House2/map.bin"
-
- .align 2
-SootopolisCity_House2_MapAttributes: @ 8459850
-SootopolisCity_House5_MapAttributes: @ 8459850
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_House2_MapBorder
- .4byte SootopolisCity_House2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-SootopolisCity_House3_MapBorder: @ 8459868
- .incbin "data/maps/SootopolisCity_House3/border.bin"
-
- .align 2
-SootopolisCity_House3_MapBlockdata: @ 8459870
- .incbin "data/maps/SootopolisCity_House3/map.bin"
-
- .align 2
-SootopolisCity_House3_MapAttributes: @ 84598E0
-SootopolisCity_House6_MapAttributes: @ 84598E0
- .4byte 0x8
- .4byte 0x7
- .4byte SootopolisCity_House3_MapBorder
- .4byte SootopolisCity_House3_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-AbandonedShip_HiddenFloorRooms_MapBorder: @ 84598F8
- .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin"
-
- .align 2
-AbandonedShip_HiddenFloorRooms_MapBlockdata: @ 8459900
- .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin"
-
- .align 2
-AbandonedShip_HiddenFloorRooms_MapAttributes: @ 8459E28
- .4byte 0x2c
- .4byte 0xf
- .4byte AbandonedShip_HiddenFloorRooms_MapBorder
- .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_InsideShip
-
- .align 2
-ScorchedSlab_MapBorder: @ 8459E40
- .incbin "data/maps/ScorchedSlab/border.bin"
-
- .align 2
-ScorchedSlab_MapBlockdata: @ 8459E48
- .incbin "data/maps/ScorchedSlab/map.bin"
-
- .align 2
-ScorchedSlab_MapAttributes: @ 845A0A0
- .4byte 0xf
- .4byte 0x14
- .4byte ScorchedSlab_MapBorder
- .4byte ScorchedSlab_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-UnknownMapBorder_0845A394: @ 845A0B8
- .incbin "data/maps/UnknownMap_0845A394/border.bin"
-
- .align 2
-UnknownMapBlockdata_0845A394: @ 845A0C0
- .incbin "data/maps/UnknownMap_0845A394/map.bin"
-
- .align 2
-UnknownMapAttributes_0845A394: @ 845A394
- .4byte 0x13
- .4byte 0x13
- .4byte UnknownMapBorder_0845A394
- .4byte UnknownMapBlockdata_0845A394
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-RustboroCity_Flat1_1F_MapBorder: @ 845A3AC
- .incbin "data/maps/RustboroCity_Flat1_1F/border.bin"
-
- .align 2
-RustboroCity_Flat1_1F_MapBlockdata: @ 845A3B4
- .incbin "data/maps/RustboroCity_Flat1_1F/map.bin"
-
- .align 2
-RustboroCity_Flat1_1F_MapAttributes: @ 845A494
- .4byte 0xe
- .4byte 0x8
- .4byte RustboroCity_Flat1_1F_MapBorder
- .4byte RustboroCity_Flat1_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-RustboroCity_Flat1_2F_MapBorder: @ 845A4AC
- .incbin "data/maps/RustboroCity_Flat1_2F/border.bin"
-
- .align 2
-RustboroCity_Flat1_2F_MapBlockdata: @ 845A4B4
- .incbin "data/maps/RustboroCity_Flat1_2F/map.bin"
-
- .align 2
-RustboroCity_Flat1_2F_MapAttributes: @ 845A594
- .4byte 0xe
- .4byte 0x8
- .4byte RustboroCity_Flat1_2F_MapBorder
- .4byte RustboroCity_Flat1_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-EverGrandeCity_Hall4_MapBorder: @ 845A5AC
- .incbin "data/maps/EverGrandeCity_Hall4/border.bin"
-
- .align 2
-EverGrandeCity_Hall4_MapBlockdata: @ 845A5B4
- .incbin "data/maps/EverGrandeCity_Hall4/map.bin"
-
- .align 2
-EverGrandeCity_Hall4_MapAttributes: @ 845A8A0
- .4byte 0xb
- .4byte 0x22
- .4byte EverGrandeCity_Hall4_MapBorder
- .4byte EverGrandeCity_Hall4_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_EliteFour
-
- .align 2
-AquaHideout_UnusedRubyMap1_MapBorder: @ 845A8B8
- .incbin "data/maps/AquaHideout_UnusedRubyMap1/border.bin"
-
- .align 2
-AquaHideout_UnusedRubyMap1_MapBlockdata: @ 845A8C0
- .incbin "data/maps/AquaHideout_UnusedRubyMap1/map.bin"
-
- .align 2
-AquaHideout_UnusedRubyMap1_MapAttributes: @ 845AF50
- .4byte 0x1c
- .4byte 0x1e
- .4byte AquaHideout_UnusedRubyMap1_MapBorder
- .4byte AquaHideout_UnusedRubyMap1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-AquaHideout_UnusedRubyMap2_MapBorder: @ 845AF68
- .incbin "data/maps/AquaHideout_UnusedRubyMap2/border.bin"
-
- .align 2
-AquaHideout_UnusedRubyMap2_MapBlockdata: @ 845AF70
- .incbin "data/maps/AquaHideout_UnusedRubyMap2/map.bin"
-
- .align 2
-AquaHideout_UnusedRubyMap2_MapAttributes: @ 845BB10
- .4byte 0x3e
- .4byte 0x18
- .4byte AquaHideout_UnusedRubyMap2_MapBorder
- .4byte AquaHideout_UnusedRubyMap2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-AquaHideout_UnusedRubyMap3_MapBorder: @ 845BB28
- .incbin "data/maps/AquaHideout_UnusedRubyMap3/border.bin"
-
- .align 2
-AquaHideout_UnusedRubyMap3_MapBlockdata: @ 845BB30
- .incbin "data/maps/AquaHideout_UnusedRubyMap3/map.bin"
-
- .align 2
-AquaHideout_UnusedRubyMap3_MapAttributes: @ 845C190
- .4byte 0x22
- .4byte 0x18
- .4byte AquaHideout_UnusedRubyMap3_MapBorder
- .4byte AquaHideout_UnusedRubyMap3_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Facility
-
- .align 2
-UnknownMapBorder_0845D470: @ 845C1A8
- .incbin "data/maps/UnknownMap_0845D470/border.bin"
-
- .align 2
-UnknownMapBlockdata_0845D470: @ 845C1B0
- .incbin "data/maps/UnknownMap_0845D470/map.bin"
-
- .align 2
-UnknownMapAttributes_0845D470: @ 845D470
- .4byte 0x3C
- .4byte 0x28
- .4byte UnknownMapBorder_0845D470
- .4byte UnknownMapBlockdata_0845D470
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SkyPillar_Entrance_MapBorder: @ 845D488
- .incbin "data/maps/SkyPillar_Entrance/border.bin"
-
- .align 2
-SkyPillar_Entrance_MapBlockdata: @ 845D490
- .incbin "data/maps/SkyPillar_Entrance/map.bin"
-
- .align 2
-SkyPillar_Entrance_MapAttributes: @ 845D718
- .4byte 0x12
- .4byte 0x12
- .4byte SkyPillar_Entrance_MapBorder
- .4byte SkyPillar_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SkyPillar_Outside_MapBorder: @ 845D730
- .incbin "data/maps/SkyPillar_Outside/border.bin"
-
- .align 2
-SkyPillar_Outside_MapBlockdata: @ 845D738
- .incbin "data/maps/SkyPillar_Outside/map.bin"
-
- .align 2
-SkyPillar_Outside_MapAttributes: @ 845DC40
- .4byte 0x1c
- .4byte 0x17
- .4byte SkyPillar_Outside_MapBorder
- .4byte SkyPillar_Outside_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SkyPillar_1F_MapBorder: @ 845DC58
- .incbin "data/maps/SkyPillar_1F/border.bin"
-
- .align 2
-SkyPillar_1F_MapBlockdata: @ 845DC60
- .incbin "data/maps/SkyPillar_1F/map.bin"
-
- .align 2
-SkyPillar_1F_MapAttributes: @ 845DDE8
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_1F_MapBorder
- .4byte SkyPillar_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SkyPillar_2F_MapBorder: @ 845DE00
- .incbin "data/maps/SkyPillar_2F/border.bin"
-
- .align 2
-SkyPillar_2F_MapBlockdata: @ 845DE08
- .incbin "data/maps/SkyPillar_2F/map.bin"
-
- .align 2
-SkyPillar_2F_MapAttributes: @ 845DF90
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_2F_MapBorder
- .4byte SkyPillar_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SkyPillar_3F_MapBorder: @ 845DFA8
- .incbin "data/maps/SkyPillar_3F/border.bin"
-
- .align 2
-SkyPillar_3F_MapBlockdata: @ 845DFB0
- .incbin "data/maps/SkyPillar_3F/map.bin"
-
- .align 2
-SkyPillar_3F_MapAttributes: @ 845E138
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_3F_MapBorder
- .4byte SkyPillar_3F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SkyPillar_4F_MapBorder: @ 845E150
- .incbin "data/maps/SkyPillar_4F/border.bin"
-
- .align 2
-SkyPillar_4F_MapBlockdata: @ 845E158
- .incbin "data/maps/SkyPillar_4F/map.bin"
-
- .align 2
-SkyPillar_4F_MapAttributes: @ 845E2E0
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_4F_MapBorder
- .4byte SkyPillar_4F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-UnknownMapBorder_0845ECB4: @ 845E2F8
- .incbin "data/maps/UnknownMap_0845ECB4/border.bin"
-
- .align 2
-UnknownMapBlockdata_0845ECB4: @ 845E300
- .incbin "data/maps/UnknownMap_0845ECB4/map.bin"
-
- .align 2
-UnknownMapAttributes_0845ECB4: @ 845ECB4
- .4byte 0x1B
- .4byte 0x2E
- .4byte UnknownMapBorder_0845ECB4
- .4byte UnknownMapBlockdata_0845ECB4
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-MossdeepCity_StevensHouse_MapBorder: @ 845ECCC
- .incbin "data/maps/MossdeepCity_StevensHouse/border.bin"
-
- .align 2
-MossdeepCity_StevensHouse_MapBlockdata: @ 845ECD4
- .incbin "data/maps/MossdeepCity_StevensHouse/map.bin"
-
- .align 2
-MossdeepCity_StevensHouse_MapAttributes: @ 845ED84
- .4byte 0xb
- .4byte 0x8
- .4byte MossdeepCity_StevensHouse_MapBorder
- .4byte MossdeepCity_StevensHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-ShoalCave_LowTideIceRoom_MapBorder: @ 845ED9C
- .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin"
-
- .align 2
-ShoalCave_LowTideIceRoom_MapBlockdata: @ 845EDA4
- .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin"
-
- .align 2
-ShoalCave_LowTideIceRoom_MapAttributes: @ 845F254
- .4byte 0x14
- .4byte 0x1e
- .4byte ShoalCave_LowTideIceRoom_MapBorder
- .4byte ShoalCave_LowTideIceRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-SafariZone_RestHouse_MapBorder: @ 845F26C
- .incbin "data/maps/SafariZone_RestHouse/border.bin"
-
- .align 2
-SafariZone_RestHouse_MapBlockdata: @ 845F274
- .incbin "data/maps/SafariZone_RestHouse/map.bin"
-
- .align 2
-SafariZone_RestHouse_MapAttributes: @ 845F328
- .4byte 0xa
- .4byte 0x9
- .4byte SafariZone_RestHouse_MapBorder
- .4byte SafariZone_RestHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_GenericBuilding
-
- .align 2
-SkyPillar_5F_MapBorder: @ 845F340
- .incbin "data/maps/SkyPillar_5F/border.bin"
-
- .align 2
-SkyPillar_5F_MapBlockdata: @ 845F348
- .incbin "data/maps/SkyPillar_5F/map.bin"
-
- .align 2
-SkyPillar_5F_MapAttributes: @ 845F4D0
- .4byte 0xe
- .4byte 0xe
- .4byte SkyPillar_5F_MapBorder
- .4byte SkyPillar_5F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SkyPillar_Top_MapBorder: @ 845F4E8
- .incbin "data/maps/SkyPillar_Top/border.bin"
-
- .align 2
-SkyPillar_Top_MapBlockdata: @ 845F4F0
- .incbin "data/maps/SkyPillar_Top/map.bin"
-
- .align 2
-SkyPillar_Top_MapAttributes: @ 845FA00
- .4byte 0x1b
- .4byte 0x18
- .4byte SkyPillar_Top_MapBorder
- .4byte SkyPillar_Top_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-BattleFrontier_BattleDomeLobby_MapBorder: @ 845FA18
- .incbin "data/maps/BattleFrontier_BattleDomeLobby/border.bin"
-
- .align 2
-BattleFrontier_BattleDomeLobby_MapBlockdata: @ 845FA20
- .incbin "data/maps/BattleFrontier_BattleDomeLobby/map.bin"
-
- .align 2
-BattleFrontier_BattleDomeLobby_MapAttributes: @ 845FD30
- .4byte 0x17
- .4byte 0x11
- .4byte BattleFrontier_BattleDomeLobby_MapBorder
- .4byte BattleFrontier_BattleDomeLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleDome
-
- .align 2
-BattleFrontier_BattleDomeCorridor_MapBorder: @ 845FD48
- .incbin "data/maps/BattleFrontier_BattleDomeCorridor/border.bin"
-
- .align 2
-BattleFrontier_BattleDomeCorridor_MapBlockdata: @ 845FD50
- .incbin "data/maps/BattleFrontier_BattleDomeCorridor/map.bin"
-
- .align 2
-BattleFrontier_BattleDomeCorridor_MapAttributes: @ 845FFF0
- .4byte 0x30
- .4byte 0x7
- .4byte BattleFrontier_BattleDomeCorridor_MapBorder
- .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleDome
-
- .align 2
-BattleFrontier_BattleDomePreBattleRoom_MapBorder: @ 8460008
- .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattleDomePreBattleRoom_MapBlockdata: @ 8460010
- .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattleDomePreBattleRoom_MapAttributes: @ 84600A0
- .4byte 0x9
- .4byte 0x8
- .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder
- .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleDome
-
- .align 2
-BattleFrontier_BattleDomeBattleRoom_MapBorder: @ 84600B8
- .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattleDomeBattleRoom_MapBlockdata: @ 84600C0
- .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattleDomeBattleRoom_MapAttributes: @ 8460250
- .4byte 0x14
- .4byte 0xa
- .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder
- .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleDome
-
- .align 2
-MagmaHideout_1F_MapBorder: @ 8460268
- .incbin "data/maps/MagmaHideout_1F/border.bin"
-
- .align 2
-MagmaHideout_1F_MapBlockdata: @ 8460270
- .incbin "data/maps/MagmaHideout_1F/map.bin"
-
- .align 2
-MagmaHideout_1F_MapAttributes: @ 8460D6C
- .4byte 0x25
- .4byte 0x26
- .4byte MagmaHideout_1F_MapBorder
- .4byte MagmaHideout_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MagmaHideout_2F_1R_MapBorder: @ 8460D84
- .incbin "data/maps/MagmaHideout_2F_1R/border.bin"
-
- .align 2
-MagmaHideout_2F_1R_MapBlockdata: @ 8460D8C
- .incbin "data/maps/MagmaHideout_2F_1R/map.bin"
-
- .align 2
-MagmaHideout_2F_1R_MapAttributes: @ 846179C
- .4byte 0x21
- .4byte 0x27
- .4byte MagmaHideout_2F_1R_MapBorder
- .4byte MagmaHideout_2F_1R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MagmaHideout_2F_2R_MapBorder: @ 84617B4
- .incbin "data/maps/MagmaHideout_2F_2R/border.bin"
-
- .align 2
-MagmaHideout_2F_2R_MapBlockdata: @ 84617BC
- .incbin "data/maps/MagmaHideout_2F_2R/map.bin"
-
- .align 2
-MagmaHideout_2F_2R_MapAttributes: @ 8462274
- .4byte 0x31
- .4byte 0x1c
- .4byte MagmaHideout_2F_2R_MapBorder
- .4byte MagmaHideout_2F_2R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MagmaHideout_3F_1R_MapBorder: @ 846228C
- .incbin "data/maps/MagmaHideout_3F_1R/border.bin"
-
- .align 2
-MagmaHideout_3F_1R_MapBlockdata: @ 8462294
- .incbin "data/maps/MagmaHideout_3F_1R/map.bin"
-
- .align 2
-MagmaHideout_3F_1R_MapAttributes: @ 84627D4
- .4byte 0x1c
- .4byte 0x18
- .4byte MagmaHideout_3F_1R_MapBorder
- .4byte MagmaHideout_3F_1R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MagmaHideout_3F_2R_MapBorder: @ 84627EC
- .incbin "data/maps/MagmaHideout_3F_2R/border.bin"
-
- .align 2
-MagmaHideout_3F_2R_MapBlockdata: @ 84627F4
- .incbin "data/maps/MagmaHideout_3F_2R/map.bin"
-
- .align 2
-MagmaHideout_3F_2R_MapAttributes: @ 8462B24
- .4byte 0x18
- .4byte 0x11
- .4byte MagmaHideout_3F_2R_MapBorder
- .4byte MagmaHideout_3F_2R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MagmaHideout_4F_MapBorder: @ 8462B3C
- .incbin "data/maps/MagmaHideout_4F/border.bin"
-
- .align 2
-MagmaHideout_4F_MapBlockdata: @ 8462B44
- .incbin "data/maps/MagmaHideout_4F/map.bin"
-
- .align 2
-MagmaHideout_4F_MapAttributes: @ 846382C
- .4byte 0x3b
- .4byte 0x1c
- .4byte MagmaHideout_4F_MapBorder
- .4byte MagmaHideout_4F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-BattleFrontier_BattlePalaceLobby_MapBorder: @ 8463844
- .incbin "data/maps/BattleFrontier_BattlePalaceLobby/border.bin"
-
- .align 2
-BattleFrontier_BattlePalaceLobby_MapBlockdata: @ 846384C
- .incbin "data/maps/BattleFrontier_BattlePalaceLobby/map.bin"
-
- .align 2
-BattleFrontier_BattlePalaceLobby_MapAttributes: @ 8463AA4
- .4byte 0x19
- .4byte 0xc
- .4byte BattleFrontier_BattlePalaceLobby_MapBorder
- .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePalace
-
- .align 2
-BattleFrontier_BattlePalaceCorridor_MapBorder: @ 8463ABC
- .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/border.bin"
-
- .align 2
-BattleFrontier_BattlePalaceCorridor_MapBlockdata: @ 8463AC4
- .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/map.bin"
-
- .align 2
-BattleFrontier_BattlePalaceCorridor_MapAttributes: @ 8463CA0
- .4byte 0x11
- .4byte 0xe
- .4byte BattleFrontier_BattlePalaceCorridor_MapBorder
- .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BattlePalace
-
- .align 2
-BattleFrontier_BattlePalaceBattleRoom_MapBorder: @ 8463CB8
- .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattlePalaceBattleRoom_MapBlockdata: @ 8463CC0
- .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattlePalaceBattleRoom_MapAttributes: @ 8463DEC
- .4byte 0xf
- .4byte 0xa
- .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder
- .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BattlePalace
-
- .align 2
-BattleFrontier_OutsideEast_MapBorder: @ 8463E04
- .incbin "data/maps/BattleFrontier_OutsideEast/border.bin"
-
- .align 2
-BattleFrontier_OutsideEast_MapBlockdata: @ 8463E0C
- .incbin "data/maps/BattleFrontier_OutsideEast/map.bin"
-
- .align 2
-BattleFrontier_OutsideEast_MapAttributes: @ 846668C
- .4byte 0x48
- .4byte 0x48
- .4byte BattleFrontier_OutsideEast_MapBorder
- .4byte BattleFrontier_OutsideEast_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BattleFrontierOutsideEast
-
- .align 2
-BattleFrontier_BattleFactoryLobby_MapBorder: @ 84666A4
- .incbin "data/maps/BattleFrontier_BattleFactoryLobby/border.bin"
-
- .align 2
-BattleFrontier_BattleFactoryLobby_MapBlockdata: @ 84666AC
- .incbin "data/maps/BattleFrontier_BattleFactoryLobby/map.bin"
-
- .align 2
-BattleFrontier_BattleFactoryLobby_MapAttributes: @ 8466874
- .4byte 0x13
- .4byte 0xc
- .4byte BattleFrontier_BattleFactoryLobby_MapBorder
- .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFactory
-
- .align 2
-BattleFrontier_BattleFactoryPreBattleRoom_MapBorder: @ 846688C
- .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata: @ 8466894
- .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes: @ 8466A70
- .4byte 0x11
- .4byte 0xe
- .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder
- .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFactory
-
- .align 2
-BattleFrontier_BattleFactoryBattleRoom_MapBorder: @ 8466A88
- .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattleFactoryBattleRoom_MapBlockdata: @ 8466A90
- .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattleFactoryBattleRoom_MapAttributes: @ 8466BC8
- .4byte 0xd
- .4byte 0xc
- .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder
- .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFactory
-
- .align 2
-BattleFrontier_BattlePikeLobby_MapBorder: @ 8466BE0
- .incbin "data/maps/BattleFrontier_BattlePikeLobby/border.bin"
-
- .align 2
-BattleFrontier_BattlePikeLobby_MapBlockdata: @ 8466BE8
- .incbin "data/maps/BattleFrontier_BattlePikeLobby/map.bin"
-
- .align 2
-BattleFrontier_BattlePikeLobby_MapAttributes: @ 8466D08
- .4byte 0xb
- .4byte 0xd
- .4byte BattleFrontier_BattlePikeLobby_MapBorder
- .4byte BattleFrontier_BattlePikeLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePike
-
- .align 2
-BattleFrontier_BattlePikeCorridor_MapBorder: @ 8466D20
- .incbin "data/maps/BattleFrontier_BattlePikeCorridor/border.bin"
-
- .align 2
-BattleFrontier_BattlePikeCorridor_MapBlockdata: @ 8466D28
- .incbin "data/maps/BattleFrontier_BattlePikeCorridor/map.bin"
-
- .align 2
-BattleFrontier_BattlePikeCorridor_MapAttributes: @ 8466E08
- .4byte 0xe
- .4byte 0x8
- .4byte BattleFrontier_BattlePikeCorridor_MapBorder
- .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePike
-
- .align 2
-BattleFrontier_BattlePikeThreePathRoom_MapBorder: @ 8466E20
- .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin"
-
- .align 2
-BattleFrontier_BattlePikeThreePathRoom_MapBlockdata: @ 8466E28
- .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin"
-
- .align 2
-BattleFrontier_BattlePikeThreePathRoom_MapAttributes: @ 8466F48
- .4byte 0xd
- .4byte 0xb
- .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder
- .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePike
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom1_MapBorder: @ 8466F60
- .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin"
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom1_MapBlockdata: @ 8466F68
- .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin"
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom1_MapAttributes: @ 8466FF8
- .4byte 0x9
- .4byte 0x8
- .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder
- .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePike
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom2_MapBorder: @ 8467010
- .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin"
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom2_MapBlockdata: @ 8467018
- .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin"
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom2_MapAttributes: @ 8467068
- .4byte 0x5
- .4byte 0x8
- .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder
- .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePike
-
- .align 2
-BattleFrontier_BattleArenaLobby_MapBorder: @ 8467080
- .incbin "data/maps/BattleFrontier_BattleArenaLobby/border.bin"
-
- .align 2
-BattleFrontier_BattleArenaLobby_MapBlockdata: @ 8467088
- .incbin "data/maps/BattleFrontier_BattleArenaLobby/map.bin"
-
- .align 2
-BattleFrontier_BattleArenaLobby_MapAttributes: @ 8467228
- .4byte 0x10
- .4byte 0xd
- .4byte BattleFrontier_BattleArenaLobby_MapBorder
- .4byte BattleFrontier_BattleArenaLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleArena
-
- .align 2
-BattleFrontier_BattleArenaCorridor_MapBorder: @ 8467240
- .incbin "data/maps/BattleFrontier_BattleArenaCorridor/border.bin"
-
- .align 2
-BattleFrontier_BattleArenaCorridor_MapBlockdata: @ 8467248
- .incbin "data/maps/BattleFrontier_BattleArenaCorridor/map.bin"
-
- .align 2
-BattleFrontier_BattleArenaCorridor_MapAttributes: @ 8467440
- .4byte 0x12
- .4byte 0xe
- .4byte BattleFrontier_BattleArenaCorridor_MapBorder
- .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleArena
-
- .align 2
-BattleFrontier_BattleArenaBattleRoom_MapBorder: @ 8467458
- .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattleArenaBattleRoom_MapBlockdata: @ 8467460
- .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattleArenaBattleRoom_MapAttributes: @ 84675C0
- .4byte 0x10
- .4byte 0xb
- .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder
- .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleArena
-
- .align 2
-UnknownMapBorder_08469200: @ 84675D8
- .incbin "data/maps/UnknownMap_08469200/border.bin"
-
- .align 2
-UnknownMapBlockdata_08469200: @ 84675E0
- .incbin "data/maps/UnknownMap_08469200/map.bin"
-
- .align 2
-UnknownMapAttributes_08469200: @ 8469200
- .4byte 0x3C
- .4byte 0x3C
- .4byte UnknownMapBorder_08469200
- .4byte UnknownMapBlockdata_08469200
- .4byte gTileset_General
- .4byte gTileset_Sootopolis
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom3_MapBorder: @ 8469218
- .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin"
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom3_MapBlockdata: @ 8469220
- .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin"
-
- .align 2
-BattleFrontier_BattlePikeRandomRoom3_MapAttributes: @ 8469388
- .4byte 0x9
- .4byte 0x14
- .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder
- .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePike
-
- .align 2
-UnknownMapBorder_084693AC: @ 84693A0
- .incbin "data/maps/UnknownMap_084693AC/border.bin"
-
- .align 2
-UnknownMapBlockdata_084693AC: @ 84693A8
- .incbin "data/maps/UnknownMap_084693AC/map.bin"
-
- .align 2
-UnknownMapAttributes_084693AC: @ 84693AC
- .4byte 0x1
- .4byte 0x1
- .4byte UnknownMapBorder_084693AC
- .4byte UnknownMapBlockdata_084693AC
- .4byte gTileset_Building
- .4byte gTileset_BattlePike
-
- .align 2
-BattleFrontier_BattlePyramidLobby_MapBorder: @ 84693C4
- .incbin "data/maps/BattleFrontier_BattlePyramidLobby/border.bin"
-
- .align 2
-BattleFrontier_BattlePyramidLobby_MapBlockdata: @ 84693CC
- .incbin "data/maps/BattleFrontier_BattlePyramidLobby/map.bin"
-
- .align 2
-BattleFrontier_BattlePyramidLobby_MapAttributes: @ 84695E8
- .4byte 0xf
- .4byte 0x12
- .4byte BattleFrontier_BattlePyramidLobby_MapBorder
- .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattleFrontier_BattlePyramidEmptySquare_MapBorder: @ 8469600
- .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin"
-
- .align 2
-BattleFrontier_BattlePyramidEmptySquare_MapBlockdata: @ 8469608
- .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin"
-
- .align 2
-BattleFrontier_BattlePyramidEmptySquare_MapAttributes: @ 8469688
- .4byte 0x8
- .4byte 0x8
- .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder
- .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare01_MapBorder: @ 84696A0
- .incbin "data/maps/BattlePyramidSquare01/border.bin"
-
- .align 2
-BattlePyramidSquare01_MapBlockdata: @ 84696A8
- .incbin "data/maps/BattlePyramidSquare01/map.bin"
-
- .align 2
-BattlePyramidSquare01_MapAttributes: @ 8469728
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare01_MapBorder
- .4byte BattlePyramidSquare01_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare02_MapBorder: @ 8469740
- .incbin "data/maps/BattlePyramidSquare02/border.bin"
-
- .align 2
-BattlePyramidSquare02_MapBlockdata: @ 8469748
- .incbin "data/maps/BattlePyramidSquare02/map.bin"
-
- .align 2
-BattlePyramidSquare02_MapAttributes: @ 84697C8
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare02_MapBorder
- .4byte BattlePyramidSquare02_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare03_MapBorder: @ 84697E0
- .incbin "data/maps/BattlePyramidSquare03/border.bin"
-
- .align 2
-BattlePyramidSquare03_MapBlockdata: @ 84697E8
- .incbin "data/maps/BattlePyramidSquare03/map.bin"
-
- .align 2
-BattlePyramidSquare03_MapAttributes: @ 8469868
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare03_MapBorder
- .4byte BattlePyramidSquare03_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare04_MapBorder: @ 8469880
- .incbin "data/maps/BattlePyramidSquare04/border.bin"
-
- .align 2
-BattlePyramidSquare04_MapBlockdata: @ 8469888
- .incbin "data/maps/BattlePyramidSquare04/map.bin"
-
- .align 2
-BattlePyramidSquare04_MapAttributes: @ 8469908
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare04_MapBorder
- .4byte BattlePyramidSquare04_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare05_MapBorder: @ 8469920
- .incbin "data/maps/BattlePyramidSquare05/border.bin"
-
- .align 2
-BattlePyramidSquare05_MapBlockdata: @ 8469928
- .incbin "data/maps/BattlePyramidSquare05/map.bin"
-
- .align 2
-BattlePyramidSquare05_MapAttributes: @ 84699A8
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare05_MapBorder
- .4byte BattlePyramidSquare05_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare06_MapBorder: @ 84699C0
- .incbin "data/maps/BattlePyramidSquare06/border.bin"
-
- .align 2
-BattlePyramidSquare06_MapBlockdata: @ 84699C8
- .incbin "data/maps/BattlePyramidSquare06/map.bin"
-
- .align 2
-BattlePyramidSquare06_MapAttributes: @ 8469A48
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare06_MapBorder
- .4byte BattlePyramidSquare06_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare07_MapBorder: @ 8469A60
- .incbin "data/maps/BattlePyramidSquare07/border.bin"
-
- .align 2
-BattlePyramidSquare07_MapBlockdata: @ 8469A68
- .incbin "data/maps/BattlePyramidSquare07/map.bin"
-
- .align 2
-BattlePyramidSquare07_MapAttributes: @ 8469AE8
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare07_MapBorder
- .4byte BattlePyramidSquare07_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare08_MapBorder: @ 8469B00
- .incbin "data/maps/BattlePyramidSquare08/border.bin"
-
- .align 2
-BattlePyramidSquare08_MapBlockdata: @ 8469B08
- .incbin "data/maps/BattlePyramidSquare08/map.bin"
-
- .align 2
-BattlePyramidSquare08_MapAttributes: @ 8469B88
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare08_MapBorder
- .4byte BattlePyramidSquare08_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare09_MapBorder: @ 8469BA0
- .incbin "data/maps/BattlePyramidSquare09/border.bin"
-
- .align 2
-BattlePyramidSquare09_MapBlockdata: @ 8469BA8
- .incbin "data/maps/BattlePyramidSquare09/map.bin"
-
- .align 2
-BattlePyramidSquare09_MapAttributes: @ 8469C28
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare09_MapBorder
- .4byte BattlePyramidSquare09_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare10_MapBorder: @ 8469C40
- .incbin "data/maps/BattlePyramidSquare10/border.bin"
-
- .align 2
-BattlePyramidSquare10_MapBlockdata: @ 8469C48
- .incbin "data/maps/BattlePyramidSquare10/map.bin"
-
- .align 2
-BattlePyramidSquare10_MapAttributes: @ 8469CC8
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare10_MapBorder
- .4byte BattlePyramidSquare10_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare11_MapBorder: @ 8469CE0
- .incbin "data/maps/BattlePyramidSquare11/border.bin"
-
- .align 2
-BattlePyramidSquare11_MapBlockdata: @ 8469CE8
- .incbin "data/maps/BattlePyramidSquare11/map.bin"
-
- .align 2
-BattlePyramidSquare11_MapAttributes: @ 8469D68
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare11_MapBorder
- .4byte BattlePyramidSquare11_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare12_MapBorder: @ 8469D80
- .incbin "data/maps/BattlePyramidSquare12/border.bin"
-
- .align 2
-BattlePyramidSquare12_MapBlockdata: @ 8469D88
- .incbin "data/maps/BattlePyramidSquare12/map.bin"
-
- .align 2
-BattlePyramidSquare12_MapAttributes: @ 8469E08
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare12_MapBorder
- .4byte BattlePyramidSquare12_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare13_MapBorder: @ 8469E20
- .incbin "data/maps/BattlePyramidSquare13/border.bin"
-
- .align 2
-BattlePyramidSquare13_MapBlockdata: @ 8469E28
- .incbin "data/maps/BattlePyramidSquare13/map.bin"
-
- .align 2
-BattlePyramidSquare13_MapAttributes: @ 8469EA8
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare13_MapBorder
- .4byte BattlePyramidSquare13_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare14_MapBorder: @ 8469EC0
- .incbin "data/maps/BattlePyramidSquare14/border.bin"
-
- .align 2
-BattlePyramidSquare14_MapBlockdata: @ 8469EC8
- .incbin "data/maps/BattlePyramidSquare14/map.bin"
-
- .align 2
-BattlePyramidSquare14_MapAttributes: @ 8469F48
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare14_MapBorder
- .4byte BattlePyramidSquare14_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare15_MapBorder: @ 8469F60
- .incbin "data/maps/BattlePyramidSquare15/border.bin"
-
- .align 2
-BattlePyramidSquare15_MapBlockdata: @ 8469F68
- .incbin "data/maps/BattlePyramidSquare15/map.bin"
-
- .align 2
-BattlePyramidSquare15_MapAttributes: @ 8469FE8
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare15_MapBorder
- .4byte BattlePyramidSquare15_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattlePyramidSquare16_MapBorder: @ 846A000
- .incbin "data/maps/BattlePyramidSquare16/border.bin"
-
- .align 2
-BattlePyramidSquare16_MapBlockdata: @ 846A008
- .incbin "data/maps/BattlePyramidSquare16/map.bin"
-
- .align 2
-BattlePyramidSquare16_MapAttributes: @ 846A088
- .4byte 0x8
- .4byte 0x8
- .4byte BattlePyramidSquare16_MapBorder
- .4byte BattlePyramidSquare16_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-BattleFrontier_BattlePyramidTop_MapBorder: @ 846A0A0
- .incbin "data/maps/BattleFrontier_BattlePyramidTop/border.bin"
-
- .align 2
-BattleFrontier_BattlePyramidTop_MapBlockdata: @ 846A0A8
- .incbin "data/maps/BattleFrontier_BattlePyramidTop/map.bin"
-
- .align 2
-BattleFrontier_BattlePyramidTop_MapAttributes: @ 846A6C4
- .4byte 0x22
- .4byte 0x17
- .4byte BattleFrontier_BattlePyramidTop_MapBorder
- .4byte BattleFrontier_BattlePyramidTop_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattlePyramid
-
- .align 2
-MagmaHideout_3F_3R_MapBorder: @ 846A6DC
- .incbin "data/maps/MagmaHideout_3F_3R/border.bin"
-
- .align 2
-MagmaHideout_3F_3R_MapBlockdata: @ 846A6E4
- .incbin "data/maps/MagmaHideout_3F_3R/map.bin"
-
- .align 2
-MagmaHideout_3F_3R_MapAttributes: @ 846AD14
- .4byte 0x21
- .4byte 0x18
- .4byte MagmaHideout_3F_3R_MapBorder
- .4byte MagmaHideout_3F_3R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MagmaHideout_2F_3R_MapBorder: @ 846AD2C
- .incbin "data/maps/MagmaHideout_2F_3R/border.bin"
-
- .align 2
-MagmaHideout_2F_3R_MapBlockdata: @ 846AD34
- .incbin "data/maps/MagmaHideout_2F_3R/map.bin"
-
- .align 2
-MagmaHideout_2F_3R_MapAttributes: @ 846B61C
- .4byte 0x3c
- .4byte 0x13
- .4byte MagmaHideout_2F_3R_MapBorder
- .4byte MagmaHideout_2F_3R_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lavaridge
-
- .align 2
-MirageTower_1F_MapBorder: @ 846B634
- .incbin "data/maps/MirageTower_1F/border.bin"
-
- .align 2
-MirageTower_1F_MapBlockdata: @ 846B63C
- .incbin "data/maps/MirageTower_1F/map.bin"
-
- .align 2
-MirageTower_1F_MapAttributes: @ 846B908
- .4byte 0x15
- .4byte 0x11
- .4byte MirageTower_1F_MapBorder
- .4byte MirageTower_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MirageTower
-
- .align 2
-MirageTower_2F_MapBorder: @ 846B920
- .incbin "data/maps/MirageTower_2F/border.bin"
-
- .align 2
-MirageTower_2F_MapBlockdata: @ 846B928
- .incbin "data/maps/MirageTower_2F/map.bin"
-
- .align 2
-MirageTower_2F_MapAttributes: @ 846BBF4
- .4byte 0x15
- .4byte 0x11
- .4byte MirageTower_2F_MapBorder
- .4byte MirageTower_2F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MirageTower
-
- .align 2
-MirageTower_3F_MapBorder: @ 846BC0C
- .incbin "data/maps/MirageTower_3F/border.bin"
-
- .align 2
-MirageTower_3F_MapBlockdata: @ 846BC14
- .incbin "data/maps/MirageTower_3F/map.bin"
-
- .align 2
-MirageTower_3F_MapAttributes: @ 846BEE0
- .4byte 0x15
- .4byte 0x11
- .4byte MirageTower_3F_MapBorder
- .4byte MirageTower_3F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MirageTower
-
- .align 2
-FallarborTown_BattleTentLobby_MapBorder: @ 846BEF8
- .incbin "data/maps/FallarborTown_BattleTentLobby/border.bin"
-
- .align 2
-FallarborTown_BattleTentLobby_MapBlockdata: @ 846BF00
- .incbin "data/maps/FallarborTown_BattleTentLobby/map.bin"
-
- .align 2
-FallarborTown_BattleTentLobby_MapAttributes: @ 846C004
-SlateportCity_BattleTentLobby_MapAttributes: @ 846C004
-VerdanturfTown_BattleTentLobby_MapAttributes: @ 846C004
- .4byte 0xd
- .4byte 0xa
- .4byte FallarborTown_BattleTentLobby_MapBorder
- .4byte FallarborTown_BattleTentLobby_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTent
-
- .align 2
-FallarborTown_BattleTentCorridor_MapBorder: @ 846C01C
- .incbin "data/maps/FallarborTown_BattleTentCorridor/border.bin"
-
- .align 2
-FallarborTown_BattleTentCorridor_MapBlockdata: @ 846C024
- .incbin "data/maps/FallarborTown_BattleTentCorridor/map.bin"
-
- .align 2
-FallarborTown_BattleTentCorridor_MapAttributes: @ 846C074
-SlateportCity_BattleTentCorridor_MapAttributes: @ 846C074
-VerdanturfTown_BattleTentCorridor_MapAttributes: @ 846C074
- .4byte 0x5
- .4byte 0x8
- .4byte FallarborTown_BattleTentCorridor_MapBorder
- .4byte FallarborTown_BattleTentCorridor_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTent
-
- .align 2
-FallarborTown_BattleTentBattleRoom_MapBorder: @ 846C08C
- .incbin "data/maps/FallarborTown_BattleTentBattleRoom/border.bin"
-
- .align 2
-FallarborTown_BattleTentBattleRoom_MapBlockdata: @ 846C094
- .incbin "data/maps/FallarborTown_BattleTentBattleRoom/map.bin"
-
- .align 2
-FallarborTown_BattleTentBattleRoom_MapAttributes: @ 846C148
-SlateportCity_BattleTentBattleRoom_MapAttributes: @ 846C148
- .4byte 0xa
- .4byte 0x9
- .4byte FallarborTown_BattleTentBattleRoom_MapBorder
- .4byte FallarborTown_BattleTentBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleTent
-
- .align 2
-VerdanturfTown_BattleTentBattleRoom_MapBorder: @ 846C160
- .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin"
-
- .align 2
-VerdanturfTown_BattleTentBattleRoom_MapBlockdata: @ 846C168
- .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin"
-
- .align 2
-VerdanturfTown_BattleTentBattleRoom_MapAttributes: @ 846C254
- .4byte 0xd
- .4byte 0x9
- .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder
- .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BattleTent
-
- .align 2
-MirageTower_4F_MapBorder: @ 846C26C
- .incbin "data/maps/MirageTower_4F/border.bin"
-
- .align 2
-MirageTower_4F_MapBlockdata: @ 846C274
- .incbin "data/maps/MirageTower_4F/map.bin"
-
- .align 2
-MirageTower_4F_MapAttributes: @ 846C378
- .4byte 0xd
- .4byte 0xa
- .4byte MirageTower_4F_MapBorder
- .4byte MirageTower_4F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MirageTower
-
- .align 2
-DesertUnderpass_MapBorder: @ 846C390
- .incbin "data/maps/DesertUnderpass/border.bin"
-
- .align 2
-DesertUnderpass_MapBlockdata: @ 846C398
- .incbin "data/maps/DesertUnderpass/map.bin"
-
- .align 2
-DesertUnderpass_MapAttributes: @ 846DC94
- .4byte 0x8b
- .4byte 0x17
- .4byte DesertUnderpass_MapBorder
- .4byte DesertUnderpass_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-BattleFrontier_BattleTowerMultiBattleRoom_MapBorder: @ 846DCAC
- .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin"
-
- .align 2
-BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata: @ 846DCB4
- .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
-
- .align 2
-BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes: @ 846DF2C
- .4byte 0x15
- .4byte 0xf
- .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder
- .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-BattleFrontier_BattleTowerCorridor2_MapBorder: @ 846DF44
- .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/border.bin"
-
- .align 2
-BattleFrontier_BattleTowerCorridor2_MapBlockdata: @ 846DF4C
- .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/map.bin"
-
- .align 2
-BattleFrontier_BattleTowerCorridor2_MapAttributes: @ 846DFF8
- .4byte 0x11
- .4byte 0x5
- .4byte BattleFrontier_BattleTowerCorridor2_MapBorder
- .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-UnknownMapBorder_08470BD8: @ 846E010
- .incbin "data/maps/UnknownMap_08470BD8/border.bin"
-
- .align 2
-UnknownMapBlockdata_08470BD8: @ 846E018
- .incbin "data/maps/UnknownMap_08470BD8/map.bin"
-
- .align 2
-UnknownMapAttributes_08470BD8: @ 8470BD8
- .4byte 0x28
- .4byte 0x8C
- .4byte UnknownMapBorder_08470BD8
- .4byte UnknownMapBlockdata_08470BD8
- .4byte gTileset_General
- .4byte gTileset_Mauville
-
- .align 2
-UnionRoom_MapBorder: @ 8470BF0
- .incbin "data/maps/UnionRoom/border.bin"
-
- .align 2
-UnionRoom_MapBlockdata: @ 8470BF8
- .incbin "data/maps/UnionRoom/map.bin"
-
- .align 2
-UnionRoom_MapAttributes: @ 8470D60
- .4byte 0xf
- .4byte 0xc
- .4byte UnionRoom_MapBorder
- .4byte UnionRoom_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_UnionRoom
-
- .align 2
-SafariZone_Northeast_MapBorder: @ 8470D78
- .incbin "data/maps/SafariZone_Northeast/border.bin"
-
- .align 2
-SafariZone_Northeast_MapBlockdata: @ 8470D80
- .incbin "data/maps/SafariZone_Northeast/map.bin"
-
- .align 2
-SafariZone_Northeast_MapAttributes: @ 8471A00
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Northeast_MapBorder
- .4byte SafariZone_Northeast_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-SafariZone_Southeast_MapBorder: @ 8471A18
- .incbin "data/maps/SafariZone_Southeast/border.bin"
-
- .align 2
-SafariZone_Southeast_MapBlockdata: @ 8471A20
- .incbin "data/maps/SafariZone_Southeast/map.bin"
-
- .align 2
-SafariZone_Southeast_MapAttributes: @ 84726A0
- .4byte 0x28
- .4byte 0x28
- .4byte SafariZone_Southeast_MapBorder
- .4byte SafariZone_Southeast_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Lilycove
-
- .align 2
-BattleFrontier_RankingHall_MapBorder: @ 84726B8
- .incbin "data/maps/BattleFrontier_RankingHall/border.bin"
-
- .align 2
-BattleFrontier_RankingHall_MapBlockdata: @ 84726C0
- .incbin "data/maps/BattleFrontier_RankingHall/map.bin"
-
- .align 2
-BattleFrontier_RankingHall_MapAttributes: @ 8472CF8
- .4byte 0x35
- .4byte 0xf
- .4byte BattleFrontier_RankingHall_MapBorder
- .4byte BattleFrontier_RankingHall_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontierRankingHall
-
- .align 2
-BattleFrontier_Lounge2_MapBorder: @ 8472D10
- .incbin "data/maps/BattleFrontier_Lounge2/border.bin"
-
- .align 2
-BattleFrontier_Lounge2_MapBlockdata: @ 8472D18
- .incbin "data/maps/BattleFrontier_Lounge2/map.bin"
-
- .align 2
-BattleFrontier_Lounge2_MapAttributes: @ 8472DE8
-BattleFrontier_Lounge5_MapAttributes: @ 8472DE8
- .4byte 0xd
- .4byte 0x8
- .4byte BattleFrontier_Lounge2_MapBorder
- .4byte BattleFrontier_Lounge2_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-BattleFrontier_BattlePointExchangeServiceCorner_MapBorder: @ 8472E00
- .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin"
-
- .align 2
-BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata: @ 8472E08
- .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
-
- .align 2
-BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes: @ 8472F54
- .4byte 0xf
- .4byte 0xb
- .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder
- .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-BattleFrontier_ReceptionGate_MapBorder: @ 8472F6C
- .incbin "data/maps/BattleFrontier_ReceptionGate/border.bin"
-
- .align 2
-BattleFrontier_ReceptionGate_MapBlockdata: @ 8472F74
- .incbin "data/maps/BattleFrontier_ReceptionGate/map.bin"
-
- .align 2
-BattleFrontier_ReceptionGate_MapAttributes: @ 8473070
- .4byte 0x9
- .4byte 0xe
- .4byte BattleFrontier_ReceptionGate_MapBorder
- .4byte BattleFrontier_ReceptionGate_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_BattleFrontier
-
- .align 2
-ArtisanCave_B1F_MapBorder: @ 8473088
- .incbin "data/maps/ArtisanCave_B1F/border.bin"
-
- .align 2
-ArtisanCave_B1F_MapBlockdata: @ 8473090
- .incbin "data/maps/ArtisanCave_B1F/map.bin"
-
- .align 2
-ArtisanCave_B1F_MapAttributes: @ 84743F8
- .4byte 0x2e
- .4byte 0x36
- .4byte ArtisanCave_B1F_MapBorder
- .4byte ArtisanCave_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-ArtisanCave_1F_MapBorder: @ 8474410
- .incbin "data/maps/ArtisanCave_1F/border.bin"
-
- .align 2
-ArtisanCave_1F_MapBlockdata: @ 8474418
- .incbin "data/maps/ArtisanCave_1F/map.bin"
-
- .align 2
-ArtisanCave_1F_MapAttributes: @ 84747B4
- .4byte 0x15
- .4byte 0x16
- .4byte ArtisanCave_1F_MapBorder
- .4byte ArtisanCave_1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-FarawayIsland_Entrance_MapBorder: @ 84747CC
- .incbin "data/maps/FarawayIsland_Entrance/border.bin"
-
- .align 2
-FarawayIsland_Entrance_MapBlockdata: @ 84747D4
- .incbin "data/maps/FarawayIsland_Entrance/map.bin"
-
- .align 2
-FarawayIsland_Entrance_MapAttributes: @ 847540C
- .4byte 0x22
- .4byte 0x2e
- .4byte FarawayIsland_Entrance_MapBorder
- .4byte FarawayIsland_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Rustboro
-
- .align 2
-FarawayIsland_Interior_MapBorder: @ 8475424
- .incbin "data/maps/FarawayIsland_Interior/border.bin"
-
- .align 2
-FarawayIsland_Interior_MapBlockdata: @ 847542C
- .incbin "data/maps/FarawayIsland_Interior/map.bin"
-
- .align 2
-FarawayIsland_Interior_MapAttributes: @ 8475A10
- .4byte 0x1d
- .4byte 0x1a
- .4byte FarawayIsland_Interior_MapBorder
- .4byte FarawayIsland_Interior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Fortree
-
- .align 2
-BirthIsland_Exterior_MapBorder: @ 8475A28
- .incbin "data/maps/BirthIsland_Exterior/border.bin"
-
- .align 2
-BirthIsland_Exterior_MapBlockdata: @ 8475A30
- .incbin "data/maps/BirthIsland_Exterior/map.bin"
-
- .align 2
-BirthIsland_Exterior_MapAttributes: @ 8476138
- .4byte 0x1e
- .4byte 0x1e
- .4byte BirthIsland_Exterior_MapBorder
- .4byte BirthIsland_Exterior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
- .align 2
-BirthIsland_Harbor_MapBorder: @ 8476150
- .incbin "data/maps/BirthIsland_Harbor/border.bin"
-
- .align 2
-BirthIsland_Harbor_MapBlockdata: @ 8476158
- .incbin "data/maps/BirthIsland_Harbor/map.bin"
-
- .align 2
-BirthIsland_Harbor_MapAttributes: @ 8476314
-NavelRock_Harbor_MapAttributes: @ 8476314
- .4byte 0x11
- .4byte 0xd
- .4byte BirthIsland_Harbor_MapBorder
- .4byte BirthIsland_Harbor_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_IslandHarbor
-
- .align 2
-Underwater_MarineCave_MapBorder: @ 847632C
- .incbin "data/maps/Underwater_MarineCave/border.bin"
-
- .align 2
-Underwater_MarineCave_MapBlockdata: @ 8476334
- .incbin "data/maps/Underwater_MarineCave/map.bin"
-
- .align 2
-Underwater_MarineCave_MapAttributes: @ 84764C4
- .4byte 0x14
- .4byte 0xa
- .4byte Underwater_MarineCave_MapBorder
- .4byte Underwater_MarineCave_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-MarineCave_Entrance_MapBorder: @ 84764DC
- .incbin "data/maps/MarineCave_Entrance/border.bin"
-
- .align 2
-MarineCave_Entrance_MapBlockdata: @ 84764E4
- .incbin "data/maps/MarineCave_Entrance/map.bin"
-
- .align 2
-MarineCave_Entrance_MapAttributes: @ 8476804
- .4byte 0x14
- .4byte 0x14
- .4byte MarineCave_Entrance_MapBorder
- .4byte MarineCave_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-TerraCave_Entrance_MapBorder: @ 847681C
- .incbin "data/maps/TerraCave_Entrance/border.bin"
-
- .align 2
-TerraCave_Entrance_MapBlockdata: @ 8476824
- .incbin "data/maps/TerraCave_Entrance/map.bin"
-
- .align 2
-TerraCave_Entrance_MapAttributes: @ 8476B44
- .4byte 0x14
- .4byte 0x14
- .4byte TerraCave_Entrance_MapBorder
- .4byte TerraCave_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-TerraCave_End_MapBorder: @ 8476B5C
- .incbin "data/maps/TerraCave_End/border.bin"
-
- .align 2
-TerraCave_End_MapBlockdata: @ 8476B64
- .incbin "data/maps/TerraCave_End/map.bin"
-
- .align 2
-TerraCave_End_MapAttributes: @ 84771B8
- .4byte 0x1b
- .4byte 0x1e
- .4byte TerraCave_End_MapBorder
- .4byte TerraCave_End_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-Underwater6_MapBorder: @ 84771D0
- .incbin "data/maps/Underwater6/border.bin"
-
- .align 2
-Underwater6_MapBlockdata: @ 84771D8
- .incbin "data/maps/Underwater6/map.bin"
-
- .align 2
-Underwater6_MapAttributes: @ 8478AD8
- .4byte 0x28
- .4byte 0x50
- .4byte Underwater6_MapBorder
- .4byte Underwater6_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-Underwater7_MapBorder: @ 8478AF0
- .incbin "data/maps/Underwater7/border.bin"
-
- .align 2
-Underwater7_MapBlockdata: @ 8478AF8
- .incbin "data/maps/Underwater7/map.bin"
-
- .align 2
-Underwater7_MapAttributes: @ 847A3F8
- .4byte 0x50
- .4byte 0x28
- .4byte Underwater7_MapBorder
- .4byte Underwater7_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-Underwater5_MapBorder: @ 847A410
- .incbin "data/maps/Underwater5/border.bin"
-
- .align 2
-Underwater5_MapBlockdata: @ 847A418
- .incbin "data/maps/Underwater5/map.bin"
-
- .align 2
-Underwater5_MapAttributes: @ 847BD18
- .4byte 0x50
- .4byte 0x28
- .4byte Underwater5_MapBorder
- .4byte Underwater5_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Underwater
-
- .align 2
-MarineCave_End_MapBorder: @ 847BD30
- .incbin "data/maps/MarineCave_End/border.bin"
-
- .align 2
-MarineCave_End_MapBlockdata: @ 847BD38
- .incbin "data/maps/MarineCave_End/map.bin"
-
- .align 2
-MarineCave_End_MapAttributes: @ 847C38C
- .4byte 0x1b
- .4byte 0x1e
- .4byte MarineCave_End_MapBorder
- .4byte MarineCave_End_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-TrainerHill_Entrance_MapBorder: @ 847C3A4
- .incbin "data/maps/TrainerHill_Entrance/border.bin"
-
- .align 2
-TrainerHill_Entrance_MapBlockdata: @ 847C3AC
- .incbin "data/maps/TrainerHill_Entrance/map.bin"
-
- .align 2
-TrainerHill_Entrance_MapAttributes: @ 847C634
- .4byte 0x13
- .4byte 0x11
- .4byte TrainerHill_Entrance_MapBorder
- .4byte TrainerHill_Entrance_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrainerHill
-
- .align 2
-TrainerHill_1F_MapBorder: @ 847C64C
- .incbin "data/maps/TrainerHill_1F/border.bin"
-
- .align 2
-TrainerHill_1F_MapBlockdata: @ 847C654
- .incbin "data/maps/TrainerHill_1F/map.bin"
-
- .align 2
-TrainerHill_1F_MapAttributes: @ 847C8F4
- .4byte 0x10
- .4byte 0x15
- .4byte TrainerHill_1F_MapBorder
- .4byte TrainerHill_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrainerHill
-
- .align 2
-TrainerHill_2F_MapBorder: @ 847C90C
- .incbin "data/maps/TrainerHill_2F/border.bin"
-
- .align 2
-TrainerHill_2F_MapBlockdata: @ 847C914
- .incbin "data/maps/TrainerHill_2F/map.bin"
-
- .align 2
-TrainerHill_2F_MapAttributes: @ 847CBB4
- .4byte 0x10
- .4byte 0x15
- .4byte TrainerHill_2F_MapBorder
- .4byte TrainerHill_2F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrainerHill
-
- .align 2
-TrainerHill_3F_MapBorder: @ 847CBCC
- .incbin "data/maps/TrainerHill_3F/border.bin"
-
- .align 2
-TrainerHill_3F_MapBlockdata: @ 847CBD4
- .incbin "data/maps/TrainerHill_3F/map.bin"
-
- .align 2
-TrainerHill_3F_MapAttributes: @ 847CE74
- .4byte 0x10
- .4byte 0x15
- .4byte TrainerHill_3F_MapBorder
- .4byte TrainerHill_3F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrainerHill
-
- .align 2
-TrainerHill_4F_MapBorder: @ 847CE8C
- .incbin "data/maps/TrainerHill_4F/border.bin"
-
- .align 2
-TrainerHill_4F_MapBlockdata: @ 847CE94
- .incbin "data/maps/TrainerHill_4F/map.bin"
-
- .align 2
-TrainerHill_4F_MapAttributes: @ 847D134
- .4byte 0x10
- .4byte 0x15
- .4byte TrainerHill_4F_MapBorder
- .4byte TrainerHill_4F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrainerHill
-
- .align 2
-TrainerHill_Roof_MapBorder: @ 847D14C
- .incbin "data/maps/TrainerHill_Roof/border.bin"
-
- .align 2
-TrainerHill_Roof_MapBlockdata: @ 847D154
- .incbin "data/maps/TrainerHill_Roof/map.bin"
-
- .align 2
-TrainerHill_Roof_MapAttributes: @ 847D474
- .4byte 0x19
- .4byte 0x10
- .4byte TrainerHill_Roof_MapBorder
- .4byte TrainerHill_Roof_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_TrainerHill
-
- .align 2
-AlteringCave_MapBorder: @ 847D48C
- .incbin "data/maps/AlteringCave/border.bin"
-
- .align 2
-AlteringCave_MapBlockdata: @ 847D494
- .incbin "data/maps/AlteringCave/map.bin"
-
- .align 2
-AlteringCave_MapAttributes: @ 847DA94
- .4byte 0x20
- .4byte 0x18
- .4byte AlteringCave_MapBorder
- .4byte AlteringCave_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Cave
-
- .align 2
-NavelRock_Exterior_MapBorder: @ 847DAAC
- .incbin "data/maps/NavelRock_Exterior/border.bin"
-
- .align 2
-NavelRock_Exterior_MapBlockdata: @ 847DAB4
- .incbin "data/maps/NavelRock_Exterior/map.bin"
-
- .align 2
-NavelRock_Exterior_MapAttributes: @ 847DEA4
- .4byte 0x15
- .4byte 0x18
- .4byte NavelRock_Exterior_MapBorder
- .4byte NavelRock_Exterior_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_Dewford
-
- .align 2
-NavelRock_Entrance_MapBorder: @ 847DEBC
- .incbin "data/maps/NavelRock_Entrance/border.bin"
-
- .align 2
-NavelRock_Entrance_MapBlockdata: @ 847DEC4
- .incbin "data/maps/NavelRock_Entrance/map.bin"
-
- .align 2
-NavelRock_Entrance_MapAttributes: @ 847E404
- .4byte 0x15
- .4byte 0x20
- .4byte NavelRock_Entrance_MapBorder
- .4byte NavelRock_Entrance_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_NavelRock
-
- .align 2
-NavelRock_Top_MapBorder: @ 847E41C
- .incbin "data/maps/NavelRock_Top/border.bin"
-
- .align 2
-NavelRock_Top_MapBlockdata: @ 847E424
- .incbin "data/maps/NavelRock_Top/map.bin"
-
- .align 2
-NavelRock_Top_MapAttributes: @ 847E99C
- .4byte 0x19
- .4byte 0x1c
- .4byte NavelRock_Top_MapBorder
- .4byte NavelRock_Top_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_NavelRock
-
- .align 2
-NavelRock_Bottom_MapBorder: @ 847E9B4
- .incbin "data/maps/NavelRock_Bottom/border.bin"
-
- .align 2
-NavelRock_Bottom_MapBlockdata: @ 847E9BC
- .incbin "data/maps/NavelRock_Bottom/map.bin"
-
- .align 2
-NavelRock_Bottom_MapAttributes: @ 847ED84
- .4byte 0x16
- .4byte 0x16
- .4byte NavelRock_Bottom_MapBorder
- .4byte NavelRock_Bottom_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_NavelRock
-
- .align 2
-NavelRock_Up1_MapBorder: @ 847ED9C
- .incbin "data/maps/NavelRock_Up1/border.bin"
-
- .align 2
-NavelRock_Up1_MapBlockdata: @ 847EDA4
- .incbin "data/maps/NavelRock_Up1/map.bin"
-
- .align 2
-NavelRock_Down01_MapAttributes: @ 847EE34
-NavelRock_Down03_MapAttributes: @ 847EE34
-NavelRock_Down05_MapAttributes: @ 847EE34
-NavelRock_Down07_MapAttributes: @ 847EE34
-NavelRock_Down09_MapAttributes: @ 847EE34
-NavelRock_Down11_MapAttributes: @ 847EE34
-NavelRock_Up1_MapAttributes: @ 847EE34
-NavelRock_Up3_MapAttributes: @ 847EE34
- .4byte 0x9
- .4byte 0x8
- .4byte NavelRock_Up1_MapBorder
- .4byte NavelRock_Up1_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_NavelRock
-
- .align 2
-NavelRock_Up2_MapBorder: @ 847EE4C
- .incbin "data/maps/NavelRock_Up2/border.bin"
-
- .align 2
-NavelRock_Up2_MapBlockdata: @ 847EE54
- .incbin "data/maps/NavelRock_Up2/map.bin"
-
- .align 2
-NavelRock_Down02_MapAttributes: @ 847EEE4
-NavelRock_Down04_MapAttributes: @ 847EEE4
-NavelRock_Down06_MapAttributes: @ 847EEE4
-NavelRock_Down08_MapAttributes: @ 847EEE4
-NavelRock_Down10_MapAttributes: @ 847EEE4
-NavelRock_Up2_MapAttributes: @ 847EEE4
-NavelRock_Up4_MapAttributes: @ 847EEE4
- .4byte 0x9
- .4byte 0x8
- .4byte NavelRock_Up2_MapBorder
- .4byte NavelRock_Up2_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_NavelRock
-
- .align 2
-NavelRock_B1F_MapBorder: @ 847EEFC
- .incbin "data/maps/NavelRock_B1F/border.bin"
-
- .align 2
-NavelRock_B1F_MapBlockdata: @ 847EF04
- .incbin "data/maps/NavelRock_B1F/map.bin"
-
- .align 2
-NavelRock_B1F_MapAttributes: @ 847F100
- .4byte 0x17
- .4byte 0xb
- .4byte NavelRock_B1F_MapBorder
- .4byte NavelRock_B1F_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_NavelRock
-
- .align 2
-NavelRock_Fork_MapBorder: @ 847F118
- .incbin "data/maps/NavelRock_Fork/border.bin"
-
- .align 2
-NavelRock_Fork_MapBlockdata: @ 847F120
- .incbin "data/maps/NavelRock_Fork/map.bin"
-
- .align 2
-NavelRock_Fork_MapAttributes: @ 8480344
- .4byte 0x1b
- .4byte 0x56
- .4byte NavelRock_Fork_MapBorder
- .4byte NavelRock_Fork_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_NavelRock
-
- .align 2
-BattleFrontier_Lounge1_MapBorder: @ 848035C
- .incbin "data/maps/BattleFrontier_Lounge1/border.bin"
-
- .align 2
-BattleFrontier_Lounge1_MapBlockdata: @ 8480364
- .incbin "data/maps/BattleFrontier_Lounge1/map.bin"
-
- .align 2
-BattleFrontier_Lounge1_MapAttributes: @ 8480418
-BattleFrontier_Lounge3_MapAttributes: @ 8480418
-BattleFrontier_Lounge4_MapAttributes: @ 8480418
-BattleFrontier_Lounge6_MapAttributes: @ 8480418
-BattleFrontier_Lounge7_MapAttributes: @ 8480418
-BattleFrontier_Lounge8_MapAttributes: @ 8480418
-BattleFrontier_Lounge9_MapAttributes: @ 8480418
- .4byte 0x9
- .4byte 0xa
- .4byte BattleFrontier_Lounge1_MapBorder
- .4byte BattleFrontier_Lounge1_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-BattleFrontier_ScottsHouse_MapBorder: @ 8480430
- .incbin "data/maps/BattleFrontier_ScottsHouse/border.bin"
-
- .align 2
-BattleFrontier_ScottsHouse_MapBlockdata: @ 8480438
- .incbin "data/maps/BattleFrontier_ScottsHouse/map.bin"
-
- .align 2
-BattleFrontier_ScottsHouse_MapAttributes: @ 8480498
- .4byte 0x6
- .4byte 0x8
- .4byte BattleFrontier_ScottsHouse_MapBorder
- .4byte BattleFrontier_ScottsHouse_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_BattleFrontier
-
- .align 2
-MeteorFalls_StevensCave_MapBorder: @ 84804B0
- .incbin "data/maps/MeteorFalls_StevensCave/border.bin"
-
- .align 2
-MeteorFalls_StevensCave_MapBlockdata: @ 84804B8
- .incbin "data/maps/MeteorFalls_StevensCave/map.bin"
-
- .align 2
-MeteorFalls_StevensCave_MapAttributes: @ 8480C38
- .4byte 0x1e
- .4byte 0x20
- .4byte MeteorFalls_StevensCave_MapBorder
- .4byte MeteorFalls_StevensCave_MapBlockdata
- .4byte gTileset_General
- .4byte gTileset_MeteorFalls
-
- .align 2
-UnknownMapBorder_08480DAC: @ 8480C50
- .incbin "data/maps/UnknownMap_08480DAC/border.bin"
-
- .align 2
-UnknownMapBlockdata_08480DAC: @ 8480C58
- .incbin "data/maps/UnknownMap_08480DAC/map.bin"
-
- .align 2
-UnknownMapAttributes_08480DAC: @ 8480DAC
- .4byte 0xD
- .4byte 0xD
- .4byte UnknownMapBorder_08480DAC
- .4byte UnknownMapBlockdata_08480DAC
- .4byte gTileset_Building
- .4byte gTileset_Lab
-
- .align 2
-UnknownMapBorder_08480F54: @ 8480DC4
- .incbin "data/maps/UnknownMap_08480F54/border.bin"
-
- .align 2
-UnknownMapBlockdata_08480F54: @ 8480DCC
- .incbin "data/maps/UnknownMap_08480F54/map.bin"
-
- .align 2
-UnknownMapAttributes_08480F54: @ 8480F54
- .4byte 0xE
- .4byte 0xE
- .4byte UnknownMapBorder_08480F54
- .4byte UnknownMapBlockdata_08480F54
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-UnknownMapBorder_084810FC: @ 8480F6C
- .incbin "data/maps/UnknownMap_084810FC/border.bin"
-
- .align 2
-UnknownMapBlockdata_084810FC: @ 8480F74
- .incbin "data/maps/UnknownMap_084810FC/map.bin"
-
- .align 2
-UnknownMapAttributes_084810FC: @ 84810FC
- .4byte 0xE
- .4byte 0xE
- .4byte UnknownMapBorder_084810FC
- .4byte UnknownMapBlockdata_084810FC
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-UnknownMapBorder_084812A4: @ 8480F6C
- .incbin "data/maps/UnknownMap_084812A4/border.bin"
-
- .align 2
-UnknownMapBlockdata_084812A4: @ 8480F74
- .incbin "data/maps/UnknownMap_084812A4/map.bin"
-
- .align 2
-UnknownMapAttributes_084812A4: @ 84812A4
- .4byte 0xE
- .4byte 0xE
- .4byte UnknownMapBorder_084812A4
- .4byte UnknownMapBlockdata_084812A4
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-UnknownMapBorder_0848144C: @ 848144C
- .incbin "data/maps/UnknownMap_0848144C/border.bin"
-
- .align 2
-UnknownMapBlockdata_0848144C: @ 848144C
- .incbin "data/maps/UnknownMap_0848144C/map.bin"
-
- .align 2
-UnknownMapAttributes_0848144C: @ 848144C
- .4byte 0xE
- .4byte 0xE
- .4byte UnknownMapBorder_0848144C
- .4byte UnknownMapBlockdata_0848144C
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-UnknownMapBorder_084815F4: @ 848144C
- .incbin "data/maps/UnknownMap_084815F4/border.bin"
-
- .align 2
-UnknownMapBlockdata_084815F4: @ 848144C
- .incbin "data/maps/UnknownMap_084815F4/map.bin"
-
- .align 2
-UnknownMapAttributes_084815F4: @ 84815F4
- .4byte 0xE
- .4byte 0xE
- .4byte UnknownMapBorder_084815F4
- .4byte UnknownMapBlockdata_084815F4
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-UnknownMapBorder_08481B24: @ 848160C
- .incbin "data/maps/UnknownMap_08481B24/border.bin"
-
- .align 2
-UnknownMapBlockdata_08481B24: @ 8481614
- .incbin "data/maps/UnknownMap_08481B24/map.bin"
-
- .align 2
-UnknownMapAttributes_08481B24: @ 8481B24
- .4byte 0x1B
- .4byte 0x18
- .4byte UnknownMapBorder_08481B24
- .4byte UnknownMapBlockdata_08481B24
- .4byte gTileset_General
- .4byte gTileset_Pacifidlog
-
- .align 2
-SootopolisCity_MysteryEventsHouse_1F_MapBorder: @ 8481B3C
- .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin"
-
- .align 2
-SootopolisCity_MysteryEventsHouse_1F_MapBlockdata: @ 8481B44
- .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin"
-
- .align 2
-SootopolisCity_MysteryEventsHouse_1F_MapAttributes: @ 8481BF4
- .4byte 0xb
- .4byte 0x8
- .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder
- .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MysteryEventsHouse
-
- .align 2
-SootopolisCity_MysteryEventsHouse_B1F_MapBorder: @ 8481C0C
- .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin"
-
- .align 2
-SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata: @ 8481C14
- .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
-
- .align 2
-SootopolisCity_MysteryEventsHouse_B1F_MapAttributes: @ 8481CEC
- .4byte 0xc
- .4byte 0x9
- .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder
- .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata
- .4byte gTileset_Building
- .4byte gTileset_MysteryEventsHouse
-
- .align 2
-UnknownMapBorder_08481DBC: @ 8481D04
- .incbin "data/maps/UnknownMap_08481DBC/border.bin"
-
- .align 2
-UnknownMapBlockdata_08481DBC: @ 8481D0C
- .incbin "data/maps/UnknownMap_08481DBC/map.bin"
-
- .align 2
-UnknownMapAttributes_08481DBC: @ 8481DBC
- .4byte 0xB
- .4byte 0x8
- .4byte UnknownMapBorder_08481DBC
- .4byte UnknownMapBlockdata_08481DBC
- .4byte gTileset_Building
- .4byte gTileset_MysteryEventsHouse
diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc
deleted file mode 100644
index ef25ba2b5..000000000
--- a/data/maps/attributes_table.inc
+++ /dev/null
@@ -1,444 +0,0 @@
- .align 2
-gMapAttributes:: @ 8481DD4
- .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 UnknownMapAttributes_08417FC4
- .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 OldaleTown_House1_MapAttributes
- .4byte OldaleTown_House2_MapAttributes
- .4byte OldaleTown_PokemonCenter_1F_MapAttributes
- .4byte OldaleTown_PokemonCenter_2F_MapAttributes
- .4byte OldaleTown_Mart_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_LeftoverRSContestLobby_MapAttributes
- .4byte FallarborTown_LeftoverRSContestHall_MapAttributes
- .4byte LilycoveCity_House2_MapAttributes
- .4byte UnknownMapAttributes_08428450
- .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_084294C4
- .4byte UnknownMapAttributes_084294E8
- .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 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_Hall1_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_UnusedRubySapphireMap1_MapAttributes
- .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes
- .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes
- .4byte CaveOfOrigin_B1F_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_0843E6C0 @ unused maps
- .4byte UnknownMapAttributes_0843E6E4
- .4byte UnknownMapAttributes_0843E708
- .4byte UnknownMapAttributes_0843E72C
- .4byte UnknownMapAttributes_0843E750
- .4byte UnknownMapAttributes_0843E774
- .4byte UnknownMapAttributes_0843E798
- .4byte UnknownMapAttributes_0843E7BC
- .4byte UnknownMapAttributes_0843E7E0
- .4byte UnknownMapAttributes_0843E804
- .4byte UnknownMapAttributes_0843E828
- .4byte UnknownMapAttributes_0843E84C
- .4byte UnknownMapAttributes_0843E870
- .4byte UnknownMapAttributes_0843E894
- .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_North_MapAttributes
- .4byte SafariZone_Southwest_MapAttributes
- .4byte SafariZone_South_MapAttributes
- .4byte UnknownMapAttributes_08447028
- .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_SeasideCyclingRoadEntrance1_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 BattleFrontier_BattleTowerLobby_MapAttributes
- .4byte BattleFrontier_OutsideWest_MapAttributes
- .4byte BattleFrontier_BattleTowerElevator_MapAttributes
- .4byte BattleFrontier_BattleTowerCorridor_MapAttributes
- .4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes
- .4byte RustboroCity_DevonCorp_3F_MapAttributes
- .4byte EverGrandeCity_PokemonLeague_1F_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_LotadAndSeedotHouse_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_0845A394
- .4byte RustboroCity_Flat1_1F_MapAttributes
- .4byte RustboroCity_Flat1_2F_MapAttributes
- .4byte EverGrandeCity_Hall4_MapAttributes
- .4byte AquaHideout_UnusedRubyMap1_MapAttributes
- .4byte AquaHideout_UnusedRubyMap2_MapAttributes
- .4byte AquaHideout_UnusedRubyMap3_MapAttributes
- .4byte UnknownMapAttributes_0845D470
- .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_0845ECB4
- .4byte MossdeepCity_StevensHouse_MapAttributes
- .4byte ShoalCave_LowTideIceRoom_MapAttributes
- .4byte SafariZone_RestHouse_MapAttributes
- .4byte SkyPillar_5F_MapAttributes
- .4byte SkyPillar_Top_MapAttributes
- .4byte BattleFrontier_BattleDomeLobby_MapAttributes
- .4byte BattleFrontier_BattleDomeCorridor_MapAttributes
- .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes
- .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes
- .4byte MagmaHideout_1F_MapAttributes
- .4byte MagmaHideout_2F_1R_MapAttributes
- .4byte MagmaHideout_2F_2R_MapAttributes
- .4byte MagmaHideout_3F_1R_MapAttributes
- .4byte MagmaHideout_3F_2R_MapAttributes
- .4byte MagmaHideout_4F_MapAttributes
- .4byte BattleFrontier_BattlePalaceLobby_MapAttributes
- .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes
- .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes
- .4byte BattleFrontier_OutsideEast_MapAttributes
- .4byte BattleFrontier_BattleFactoryLobby_MapAttributes
- .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes
- .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes
- .4byte BattleFrontier_BattlePikeLobby_MapAttributes
- .4byte BattleFrontier_BattlePikeCorridor_MapAttributes
- .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes
- .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes
- .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes
- .4byte BattleFrontier_BattleArenaLobby_MapAttributes
- .4byte BattleFrontier_BattleArenaCorridor_MapAttributes
- .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes
- .4byte UnknownMapAttributes_08469200
- .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes
- .4byte UnknownMapAttributes_084693AC
- .4byte BattleFrontier_BattlePyramidLobby_MapAttributes
- .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes
- .4byte BattlePyramidSquare01_MapAttributes
- .4byte BattlePyramidSquare02_MapAttributes
- .4byte BattlePyramidSquare03_MapAttributes
- .4byte BattlePyramidSquare04_MapAttributes
- .4byte BattlePyramidSquare05_MapAttributes
- .4byte BattlePyramidSquare06_MapAttributes
- .4byte BattlePyramidSquare07_MapAttributes
- .4byte BattlePyramidSquare08_MapAttributes
- .4byte BattlePyramidSquare09_MapAttributes
- .4byte BattlePyramidSquare10_MapAttributes
- .4byte BattlePyramidSquare11_MapAttributes
- .4byte BattlePyramidSquare12_MapAttributes
- .4byte BattlePyramidSquare13_MapAttributes
- .4byte BattlePyramidSquare14_MapAttributes
- .4byte BattlePyramidSquare15_MapAttributes
- .4byte BattlePyramidSquare16_MapAttributes
- .4byte BattleFrontier_BattlePyramidTop_MapAttributes
- .4byte MagmaHideout_3F_3R_MapAttributes
- .4byte MagmaHideout_2F_3R_MapAttributes
- .4byte MirageTower_1F_MapAttributes
- .4byte MirageTower_2F_MapAttributes
- .4byte MirageTower_3F_MapAttributes
- .4byte FallarborTown_BattleTentLobby_MapAttributes
- .4byte FallarborTown_BattleTentCorridor_MapAttributes
- .4byte FallarborTown_BattleTentBattleRoom_MapAttributes
- .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes
- .4byte MirageTower_4F_MapAttributes
- .4byte DesertUnderpass_MapAttributes
- .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes
- .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes
- .4byte UnknownMapAttributes_08470BD8
- .4byte UnionRoom_MapAttributes
- .4byte SafariZone_Northeast_MapAttributes
- .4byte SafariZone_Southeast_MapAttributes
- .4byte BattleFrontier_RankingHall_MapAttributes
- .4byte BattleFrontier_Lounge2_MapAttributes
- .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes
- .4byte BattleFrontier_ReceptionGate_MapAttributes
- .4byte ArtisanCave_B1F_MapAttributes
- .4byte ArtisanCave_1F_MapAttributes
- .4byte FarawayIsland_Entrance_MapAttributes
- .4byte FarawayIsland_Interior_MapAttributes
- .4byte BirthIsland_Exterior_MapAttributes
- .4byte BirthIsland_Harbor_MapAttributes
- .4byte Underwater_MarineCave_MapAttributes
- .4byte MarineCave_Entrance_MapAttributes
- .4byte TerraCave_Entrance_MapAttributes
- .4byte TerraCave_End_MapAttributes
- .4byte Underwater6_MapAttributes
- .4byte Underwater7_MapAttributes
- .4byte Underwater5_MapAttributes
- .4byte MarineCave_End_MapAttributes
- .4byte TrainerHill_Entrance_MapAttributes
- .4byte TrainerHill_1F_MapAttributes
- .4byte TrainerHill_2F_MapAttributes
- .4byte TrainerHill_3F_MapAttributes
- .4byte TrainerHill_4F_MapAttributes
- .4byte TrainerHill_Roof_MapAttributes
- .4byte AlteringCave_MapAttributes
- .4byte NavelRock_Exterior_MapAttributes
- .4byte NavelRock_Entrance_MapAttributes
- .4byte NavelRock_Top_MapAttributes
- .4byte NavelRock_Bottom_MapAttributes
- .4byte NavelRock_Up1_MapAttributes
- .4byte NavelRock_Up2_MapAttributes
- .4byte NavelRock_B1F_MapAttributes
- .4byte NavelRock_Fork_MapAttributes
- .4byte BattleFrontier_Lounge1_MapAttributes
- .4byte BattleFrontier_ScottsHouse_MapAttributes
- .4byte MeteorFalls_StevensCave_MapAttributes
- .4byte UnknownMapAttributes_08480DAC
- .4byte UnknownMapAttributes_08480F54
- .4byte UnknownMapAttributes_084810FC
- .4byte UnknownMapAttributes_084812A4
- .4byte UnknownMapAttributes_0848144C
- .4byte UnknownMapAttributes_084815F4
- .4byte UnknownMapAttributes_08481B24
- .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes
- .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes
- .4byte UnknownMapAttributes_08481DBC
-
diff --git a/data/maps/_groups.inc b/data/maps/groups.inc
index f7fc7be89..f7fc7be89 100644
--- a/data/maps/_groups.inc
+++ b/data/maps/groups.inc