summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/border.bin1
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/header.inc15
-rw-r--r--data/maps/AbandonedShip_CaptainsOffice/map.binbin0 -> 126 bytes
-rw-r--r--data/maps/AbandonedShip_Corridors_1F/border.bin1
-rw-r--r--data/maps/AbandonedShip_Corridors_1F/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/AbandonedShip_Underwater2/map.bin1
-rw-r--r--data/maps/AlteringCave/border.bin1
-rw-r--r--data/maps/AlteringCave/header.inc15
-rw-r--r--data/maps/AlteringCave/map.bin1
-rw-r--r--data/maps/AncientTomb/border.bin1
-rw-r--r--data/maps/AncientTomb/header.inc15
-rw-r--r--data/maps/AncientTomb/map.binbin0 -> 1122 bytes
-rw-r--r--data/maps/AquaHideout_1F/border.bin1
-rw-r--r--data/maps/AquaHideout_1F/header.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap1/map.binbin0 -> 1680 bytes
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap2/border.bin1
-rw-r--r--data/maps/AquaHideout_UnusedRubyMap2/header.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/ArtisanCave_B1F/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleArenaCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleArenaCorridor/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleArenaCorridor/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleArenaLobby/map.bin3
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattleDomeCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomeCorridor/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleDomeCorridor/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleDomeLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomeLobby/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleDomeLobby/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleDomePreBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleDomePreBattleRoom/map.binbin0 -> 144 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleFactoryBattleRoom/map.binbin0 -> 312 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryLobby/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleFactoryLobby/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePalaceCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceCorridor/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePalaceCorridor/map.binbin0 -> 476 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePalaceLobby/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePalaceLobby/map.bin7
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePikeCorridor/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePikeLobby/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePyramidLobby/map.bin2
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePyramidTop/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor/map.binbin0 -> 170 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleTowerCorridor2/map.binbin0 -> 170 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleTowerElevator/map.bin1
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/map.binbin0 -> 500 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.binbin0 -> 630 bytes
-rw-r--r--data/maps/BattleFrontier_Lounge1/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_Lounge1/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge1/map.bin1
-rw-r--r--data/maps/BattleFrontier_Lounge2/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_Lounge2/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge2/map.bin1
-rw-r--r--data/maps/BattleFrontier_Lounge3/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge4/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge5/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge6/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge7/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge8/header.inc15
-rw-r--r--data/maps/BattleFrontier_Lounge9/header.inc15
-rw-r--r--data/maps/BattleFrontier_Mart/header.inc15
-rw-r--r--data/maps/BattleFrontier_OutsideEast/border.bin1
-rw-r--r--data/maps/BattleFrontier_OutsideEast/connections.inc7
-rw-r--r--data/maps/BattleFrontier_OutsideEast/header.inc15
-rw-r--r--data/maps/BattleFrontier_OutsideEast/map.binbin0 -> 10368 bytes
-rw-r--r--data/maps/BattleFrontier_OutsideWest/border.bin1
-rw-r--r--data/maps/BattleFrontier_OutsideWest/connections.inc7
-rw-r--r--data/maps/BattleFrontier_OutsideWest/header.inc15
-rw-r--r--data/maps/BattleFrontier_OutsideWest/map.binbin0 -> 8064 bytes
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/BattleFrontier_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/BattleFrontier_RankingHall/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_RankingHall/header.inc15
-rw-r--r--data/maps/BattleFrontier_RankingHall/map.bin64
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/header.inc15
-rw-r--r--data/maps/BattleFrontier_ReceptionGate/map.binbin0 -> 252 bytes
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/header.inc15
-rw-r--r--data/maps/BattleFrontier_ScottsHouse/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare01/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare01/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare01/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare02/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare02/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare02/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare03/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare03/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare03/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare04/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare04/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare04/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare05/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare05/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare05/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare06/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare06/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare06/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare07/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare07/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare07/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare08/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare08/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare08/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare09/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare09/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare09/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare10/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare10/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare10/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare11/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare11/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare11/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare12/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare12/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare12/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare13/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare13/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare13/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare14/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare14/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare14/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare15/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare15/header.inc15
-rw-r--r--data/maps/BattlePyramidSquare15/map.bin1
-rw-r--r--data/maps/BattlePyramidSquare16/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattlePyramidSquare16/header.inc15
-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.inc15
-rw-r--r--data/maps/BirthIsland_Exterior/map.binbin0 -> 1800 bytes
-rw-r--r--data/maps/BirthIsland_Harbor/border.bin1
-rw-r--r--data/maps/BirthIsland_Harbor/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin1
-rw-r--r--data/maps/DesertRuins/border.bin1
-rw-r--r--data/maps/DesertRuins/header.inc15
-rw-r--r--data/maps/DesertRuins/map.binbin0 -> 1122 bytes
-rw-r--r--data/maps/DesertUnderpass/border.bin1
-rw-r--r--data/maps/DesertUnderpass/header.inc15
-rw-r--r--data/maps/DesertUnderpass/map.bin1
-rw-r--r--data/maps/DewfordTown/border.bin1
-rw-r--r--data/maps/DewfordTown/connections.inc8
-rw-r--r--data/maps/DewfordTown/header.inc15
-rw-r--r--data/maps/DewfordTown/map.bin2
-rw-r--r--data/maps/DewfordTown_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/DewfordTown_Gym/header.inc15
-rw-r--r--data/maps/DewfordTown_Gym/map.binbin0 -> 1008 bytes
-rw-r--r--data/maps/DewfordTown_Hall/border.bin1
-rw-r--r--data/maps/DewfordTown_Hall/header.inc15
-rw-r--r--data/maps/DewfordTown_Hall/map.binbin0 -> 306 bytes
-rw-r--r--data/maps/DewfordTown_House1/border.bin1
-rw-r--r--data/maps/DewfordTown_House1/header.inc15
-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.inc15
-rw-r--r--data/maps/DewfordTown_House2/map.bin1
-rw-r--r--data/maps/DewfordTown_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/DewfordTown_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/DoubleBattleColosseum/border.bin1
-rw-r--r--data/maps/DoubleBattleColosseum/header.inc15
-rw-r--r--data/maps/DoubleBattleColosseum/map.bin1
-rw-r--r--data/maps/EverGrandeCity/border.bin1
-rw-r--r--data/maps/EverGrandeCity/connections.inc7
-rw-r--r--data/maps/EverGrandeCity/header.inc15
-rw-r--r--data/maps/EverGrandeCity/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/header.inc15
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/map.binbin0 -> 338 bytes
-rw-r--r--data/maps/EverGrandeCity_DrakesRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_DrakesRoom/header.inc15
-rw-r--r--data/maps/EverGrandeCity_DrakesRoom/map.bin2
-rw-r--r--data/maps/EverGrandeCity_GlaciasRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_GlaciasRoom/header.inc15
-rw-r--r--data/maps/EverGrandeCity_GlaciasRoom/map.bin2
-rw-r--r--data/maps/EverGrandeCity_Hall1/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_Hall1/header.inc15
-rw-r--r--data/maps/EverGrandeCity_Hall1/map.bin1
-rw-r--r--data/maps/EverGrandeCity_Hall2/header.inc15
-rw-r--r--data/maps/EverGrandeCity_Hall3/header.inc15
-rw-r--r--data/maps/EverGrandeCity_Hall4/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_Hall4/header.inc15
-rw-r--r--data/maps/EverGrandeCity_Hall4/map.bin1
-rw-r--r--data/maps/EverGrandeCity_Hall5/header.inc15
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/header.inc15
-rw-r--r--data/maps/EverGrandeCity_HallOfFame/map.bin1
-rw-r--r--data/maps/EverGrandeCity_PhoebesRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_PhoebesRoom/header.inc15
-rw-r--r--data/maps/EverGrandeCity_PhoebesRoom/map.bin2
-rw-r--r--data/maps/EverGrandeCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/EverGrandeCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_1F/border.bin1
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_1F/header.inc15
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_1F/map.bin2
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague_2F/header.inc15
-rw-r--r--data/maps/EverGrandeCity_SidneysRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/EverGrandeCity_SidneysRoom/header.inc15
-rw-r--r--data/maps/EverGrandeCity_SidneysRoom/map.bin2
-rw-r--r--data/maps/FallarborTown/border.bin1
-rw-r--r--data/maps/FallarborTown/connections.inc8
-rw-r--r--data/maps/FallarborTown/header.inc15
-rw-r--r--data/maps/FallarborTown/map.bin1
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/header.inc15
-rw-r--r--data/maps/FallarborTown_BattleTentBattleRoom/map.binbin0 -> 180 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentCorridor/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentCorridor/header.inc15
-rw-r--r--data/maps/FallarborTown_BattleTentCorridor/map.bin1
-rw-r--r--data/maps/FallarborTown_BattleTentLobby/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/FallarborTown_BattleTentLobby/header.inc15
-rw-r--r--data/maps/FallarborTown_BattleTentLobby/map.bin2
-rw-r--r--data/maps/FallarborTown_House1/header.inc15
-rw-r--r--data/maps/FallarborTown_House2/header.inc15
-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.inc15
-rw-r--r--data/maps/FallarborTown_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/FallarborTown_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/FarawayIsland_Entrance/border.bin1
-rw-r--r--data/maps/FarawayIsland_Entrance/header.inc15
-rw-r--r--data/maps/FarawayIsland_Entrance/map.binbin0 -> 3128 bytes
-rw-r--r--data/maps/FarawayIsland_Interior/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/FarawayIsland_Interior/header.inc15
-rw-r--r--data/maps/FarawayIsland_Interior/map.binbin0 -> 1508 bytes
-rw-r--r--data/maps/FieryPath/border.bin1
-rw-r--r--data/maps/FieryPath/header.inc15
-rw-r--r--data/maps/FieryPath/map.bin10
-rw-r--r--data/maps/FortreeCity/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/FortreeCity/connections.inc8
-rw-r--r--data/maps/FortreeCity/header.inc15
-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.inc15
-rw-r--r--data/maps/FortreeCity_DecorationShop/map.bin1
-rw-r--r--data/maps/FortreeCity_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/FortreeCity_Gym/header.inc15
-rw-r--r--data/maps/FortreeCity_Gym/map.binbin0 -> 1000 bytes
-rw-r--r--data/maps/FortreeCity_House1/border.bin1
-rw-r--r--data/maps/FortreeCity_House1/header.inc15
-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.inc15
-rw-r--r--data/maps/FortreeCity_House2/map.bin1
-rw-r--r--data/maps/FortreeCity_House3/header.inc15
-rw-r--r--data/maps/FortreeCity_House4/header.inc15
-rw-r--r--data/maps/FortreeCity_House5/header.inc15
-rw-r--r--data/maps/FortreeCity_Mart/header.inc15
-rw-r--r--data/maps/FortreeCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/FortreeCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/GraniteCave_1F/border.bin1
-rw-r--r--data/maps/GraniteCave_1F/header.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/GraniteCave_StevensRoom/map.bin4
-rw-r--r--data/maps/InsideOfTruck/border.bin1
-rw-r--r--data/maps/InsideOfTruck/header.inc15
-rw-r--r--data/maps/InsideOfTruck/map.bin2
-rw-r--r--data/maps/IslandCave/border.bin1
-rw-r--r--data/maps/IslandCave/header.inc15
-rw-r--r--data/maps/IslandCave/map.binbin0 -> 1122 bytes
-rw-r--r--data/maps/JaggedPass/border.bin1
-rw-r--r--data/maps/JaggedPass/header.inc15
-rw-r--r--data/maps/JaggedPass/map.binbin0 -> 2760 bytes
-rw-r--r--data/maps/LavaridgeTown/border.bin1
-rw-r--r--data/maps/LavaridgeTown/connections.inc7
-rw-r--r--data/maps/LavaridgeTown/header.inc15
-rw-r--r--data/maps/LavaridgeTown/map.bin3
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/header.inc15
-rw-r--r--data/maps/LavaridgeTown_Gym_1F/map.bin3
-rw-r--r--data/maps/LavaridgeTown_Gym_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LavaridgeTown_Gym_B1F/header.inc15
-rw-r--r--data/maps/LavaridgeTown_Gym_B1F/map.bin6
-rw-r--r--data/maps/LavaridgeTown_HerbShop/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LavaridgeTown_HerbShop/header.inc15
-rw-r--r--data/maps/LavaridgeTown_HerbShop/map.bin1
-rw-r--r--data/maps/LavaridgeTown_House/header.inc15
-rw-r--r--data/maps/LavaridgeTown_Mart/header.inc15
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_1F/border.bin1
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_1F/map.bin1
-rw-r--r--data/maps/LavaridgeTown_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/LilycoveCity/border.bin1
-rw-r--r--data/maps/LilycoveCity/connections.inc8
-rw-r--r--data/maps/LilycoveCity/header.inc15
-rw-r--r--data/maps/LilycoveCity/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/LilycoveCity_ContestHall/border.bin1
-rw-r--r--data/maps/LilycoveCity_ContestHall/header.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/header.inc15
-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.inc15
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_1F/header.inc15
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_1F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/header.inc15
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/header.inc15
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/header.inc15
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/map.bin1
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/header.inc15
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/map.binbin0 -> 288 bytes
-rw-r--r--data/maps/LilycoveCity_Harbor/header.inc15
-rw-r--r--data/maps/LilycoveCity_House1/header.inc15
-rw-r--r--data/maps/LilycoveCity_House2/border.bin1
-rw-r--r--data/maps/LilycoveCity_House2/header.inc15
-rw-r--r--data/maps/LilycoveCity_House2/map.bin1
-rw-r--r--data/maps/LilycoveCity_House3/header.inc15
-rw-r--r--data/maps/LilycoveCity_House4/header.inc15
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin1
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc15
-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.inc15
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin1
-rw-r--r--data/maps/LilycoveCity_MoveDeletersHouse/header.inc15
-rw-r--r--data/maps/LilycoveCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/LilycoveCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin1
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc15
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin2
-rw-r--r--data/maps/LilycoveCity_UnusedMart/header.inc15
-rw-r--r--data/maps/LinkContestRoom1/border.bin1
-rw-r--r--data/maps/LinkContestRoom1/header.inc15
-rw-r--r--data/maps/LinkContestRoom1/map.bin1
-rw-r--r--data/maps/LinkContestRoom2/border.bin1
-rw-r--r--data/maps/LinkContestRoom2/header.inc15
-rw-r--r--data/maps/LinkContestRoom2/map.bin1
-rw-r--r--data/maps/LinkContestRoom3/border.bin1
-rw-r--r--data/maps/LinkContestRoom3/header.inc15
-rw-r--r--data/maps/LinkContestRoom3/map.bin1
-rw-r--r--data/maps/LinkContestRoom4/border.bin1
-rw-r--r--data/maps/LinkContestRoom4/header.inc15
-rw-r--r--data/maps/LinkContestRoom4/map.bin1
-rw-r--r--data/maps/LinkContestRoom5/border.bin1
-rw-r--r--data/maps/LinkContestRoom5/header.inc15
-rw-r--r--data/maps/LinkContestRoom5/map.bin1
-rw-r--r--data/maps/LinkContestRoom6/border.bin1
-rw-r--r--data/maps/LinkContestRoom6/header.inc15
-rw-r--r--data/maps/LinkContestRoom6/map.bin1
-rw-r--r--data/maps/LittlerootTown/border.bin1
-rw-r--r--data/maps/LittlerootTown/connections.inc7
-rw-r--r--data/maps/LittlerootTown/header.inc15
-rw-r--r--data/maps/LittlerootTown/map.bin3
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/LittlerootTown_BrendansHouse_1F/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/MagmaHideout_1F/map.binbin0 -> 2812 bytes
-rw-r--r--data/maps/MagmaHideout_2F_1R/border.bin1
-rw-r--r--data/maps/MagmaHideout_2F_1R/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/MarineCave_Entrance/map.bin7
-rw-r--r--data/maps/MauvilleCity/border.bin1
-rw-r--r--data/maps/MauvilleCity/connections.inc10
-rw-r--r--data/maps/MauvilleCity/header.inc15
-rw-r--r--data/maps/MauvilleCity/map.binbin0 -> 1600 bytes
-rw-r--r--data/maps/MauvilleCity_BikeShop/border.bin1
-rw-r--r--data/maps/MauvilleCity_BikeShop/header.inc15
-rw-r--r--data/maps/MauvilleCity_BikeShop/map.bin2
-rw-r--r--data/maps/MauvilleCity_GameCorner/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/MauvilleCity_GameCorner/header.inc15
-rw-r--r--data/maps/MauvilleCity_GameCorner/map.bin3
-rw-r--r--data/maps/MauvilleCity_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/MauvilleCity_Gym/header.inc15
-rw-r--r--data/maps/MauvilleCity_Gym/map.binbin0 -> 420 bytes
-rw-r--r--data/maps/MauvilleCity_House1/header.inc15
-rw-r--r--data/maps/MauvilleCity_House2/header.inc15
-rw-r--r--data/maps/MauvilleCity_Mart/header.inc15
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/MauvilleCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/MeteorFalls_1F_1R/border.bin1
-rw-r--r--data/maps/MeteorFalls_1F_1R/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/MirageTower_4F/map.bin2
-rw-r--r--data/maps/MossdeepCity/border.bin1
-rw-r--r--data/maps/MossdeepCity/connections.inc8
-rw-r--r--data/maps/MossdeepCity/header.inc15
-rw-r--r--data/maps/MossdeepCity/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/header.inc15
-rw-r--r--data/maps/MossdeepCity_GameCorner_1F/map.bin53
-rw-r--r--data/maps/MossdeepCity_GameCorner_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/MossdeepCity_GameCorner_B1F/header.inc15
-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.inc15
-rw-r--r--data/maps/MossdeepCity_Gym/map.bin40
-rw-r--r--data/maps/MossdeepCity_House1/header.inc15
-rw-r--r--data/maps/MossdeepCity_House2/header.inc15
-rw-r--r--data/maps/MossdeepCity_House3/header.inc15
-rw-r--r--data/maps/MossdeepCity_House4/header.inc15
-rw-r--r--data/maps/MossdeepCity_Mart/header.inc15
-rw-r--r--data/maps/MossdeepCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/MossdeepCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/border.bin1
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/header.inc15
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_1F/map.binbin0 -> 320 bytes
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/border.bin1
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/header.inc15
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/map.binbin0 -> 320 bytes
-rw-r--r--data/maps/MossdeepCity_StevensHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/MossdeepCity_StevensHouse/header.inc15
-rw-r--r--data/maps/MossdeepCity_StevensHouse/map.bin1
-rw-r--r--data/maps/MtChimney/border.bin1
-rw-r--r--data/maps/MtChimney/header.inc15
-rw-r--r--data/maps/MtChimney/map.bin1
-rw-r--r--data/maps/MtChimney_CableCarStation/header.inc15
-rw-r--r--data/maps/MtPyre_1F/border.bin1
-rw-r--r--data/maps/MtPyre_1F/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/MtPyre_6F/map.bin1
-rw-r--r--data/maps/MtPyre_Exterior/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/MtPyre_Exterior/header.inc15
-rw-r--r--data/maps/MtPyre_Exterior/map.binbin0 -> 3876 bytes
-rw-r--r--data/maps/MtPyre_Summit/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/MtPyre_Summit/header.inc15
-rw-r--r--data/maps/MtPyre_Summit/map.binbin0 -> 3700 bytes
-rw-r--r--data/maps/NavelRock_B1F/border.bin1
-rw-r--r--data/maps/NavelRock_B1F/header.inc15
-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.inc15
-rw-r--r--data/maps/NavelRock_Bottom/map.bin1
-rw-r--r--data/maps/NavelRock_Down01/header.inc15
-rw-r--r--data/maps/NavelRock_Down02/header.inc15
-rw-r--r--data/maps/NavelRock_Down03/header.inc15
-rw-r--r--data/maps/NavelRock_Down04/header.inc15
-rw-r--r--data/maps/NavelRock_Down05/header.inc15
-rw-r--r--data/maps/NavelRock_Down06/header.inc15
-rw-r--r--data/maps/NavelRock_Down07/header.inc15
-rw-r--r--data/maps/NavelRock_Down08/header.inc15
-rw-r--r--data/maps/NavelRock_Down09/header.inc15
-rw-r--r--data/maps/NavelRock_Down10/header.inc15
-rw-r--r--data/maps/NavelRock_Down11/header.inc15
-rw-r--r--data/maps/NavelRock_Entrance/border.bin1
-rw-r--r--data/maps/NavelRock_Entrance/header.inc15
-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.inc15
-rw-r--r--data/maps/NavelRock_Exterior/map.binbin0 -> 1008 bytes
-rw-r--r--data/maps/NavelRock_Fork/border.bin1
-rw-r--r--data/maps/NavelRock_Fork/header.inc15
-rw-r--r--data/maps/NavelRock_Fork/map.bin1
-rw-r--r--data/maps/NavelRock_Harbor/header.inc15
-rw-r--r--data/maps/NavelRock_Top/border.bin1
-rw-r--r--data/maps/NavelRock_Top/header.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/NavelRock_Up2/map.bin1
-rw-r--r--data/maps/NavelRock_Up3/header.inc15
-rw-r--r--data/maps/NavelRock_Up4/header.inc15
-rw-r--r--data/maps/NewMauville_Entrance/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/NewMauville_Entrance/header.inc15
-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.inc15
-rw-r--r--data/maps/NewMauville_Inside/map.bin1
-rw-r--r--data/maps/OldaleTown/border.bin1
-rw-r--r--data/maps/OldaleTown/connections.inc9
-rw-r--r--data/maps/OldaleTown/header.inc15
-rw-r--r--data/maps/OldaleTown/map.bin1
-rw-r--r--data/maps/OldaleTown_House1/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/OldaleTown_House1/header.inc15
-rw-r--r--data/maps/OldaleTown_House1/map.bin1
-rw-r--r--data/maps/OldaleTown_House2/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/OldaleTown_House2/header.inc15
-rw-r--r--data/maps/OldaleTown_House2/map.bin1
-rw-r--r--data/maps/OldaleTown_Mart/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/OldaleTown_Mart/header.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/OldaleTown_PokemonCenter_2F/map.bin1
-rw-r--r--data/maps/PacifidlogTown/border.bin1
-rw-r--r--data/maps/PacifidlogTown/connections.inc8
-rw-r--r--data/maps/PacifidlogTown/header.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/PacifidlogTown_House2/map.bin1
-rw-r--r--data/maps/PacifidlogTown_House3/header.inc15
-rw-r--r--data/maps/PacifidlogTown_House4/header.inc15
-rw-r--r--data/maps/PacifidlogTown_House5/header.inc15
-rw-r--r--data/maps/PacifidlogTown_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/PacifidlogTown_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/PetalburgCity/border.bin1
-rw-r--r--data/maps/PetalburgCity/connections.inc8
-rw-r--r--data/maps/PetalburgCity/header.inc15
-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.inc15
-rw-r--r--data/maps/PetalburgCity_Gym/map.bin10
-rw-r--r--data/maps/PetalburgCity_House1/header.inc15
-rw-r--r--data/maps/PetalburgCity_House2/border.bin1
-rw-r--r--data/maps/PetalburgCity_House2/header.inc15
-rw-r--r--data/maps/PetalburgCity_House2/map.bin1
-rw-r--r--data/maps/PetalburgCity_Mart/header.inc15
-rw-r--r--data/maps/PetalburgCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/PetalburgCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/PetalburgCity_WallysHouse/header.inc15
-rw-r--r--data/maps/PetalburgWoods/border.bin1
-rw-r--r--data/maps/PetalburgWoods/header.inc15
-rw-r--r--data/maps/PetalburgWoods/map.bin1
-rw-r--r--data/maps/RecordCorner/border.bin1
-rw-r--r--data/maps/RecordCorner/header.inc15
-rw-r--r--data/maps/RecordCorner/map.bin1
-rw-r--r--data/maps/Route101/border.bin1
-rw-r--r--data/maps/Route101/connections.inc8
-rw-r--r--data/maps/Route101/header.inc15
-rw-r--r--data/maps/Route101/map.bin1
-rw-r--r--data/maps/Route102/border.bin1
-rw-r--r--data/maps/Route102/connections.inc8
-rw-r--r--data/maps/Route102/header.inc15
-rw-r--r--data/maps/Route102/map.bin1
-rw-r--r--data/maps/Route103/border.bin1
-rw-r--r--data/maps/Route103/connections.inc8
-rw-r--r--data/maps/Route103/header.inc15
-rw-r--r--data/maps/Route103/map.bin1
-rw-r--r--data/maps/Route104/border.bin1
-rw-r--r--data/maps/Route104/connections.inc9
-rw-r--r--data/maps/Route104/header.inc15
-rw-r--r--data/maps/Route104/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/Route104_MrBrineysHouse/border.bin1
-rw-r--r--data/maps/Route104_MrBrineysHouse/header.inc15
-rw-r--r--data/maps/Route104_MrBrineysHouse/map.bin1
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/header.inc15
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/map.binbin0 -> 270 bytes
-rw-r--r--data/maps/Route104_Prototype/border.bin1
-rw-r--r--data/maps/Route104_Prototype/header.inc15
-rw-r--r--data/maps/Route104_Prototype/map.bin1
-rw-r--r--data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc15
-rw-r--r--data/maps/Route105/border.bin1
-rw-r--r--data/maps/Route105/connections.inc9
-rw-r--r--data/maps/Route105/header.inc15
-rw-r--r--data/maps/Route105/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/Route106/border.bin1
-rw-r--r--data/maps/Route106/connections.inc8
-rw-r--r--data/maps/Route106/header.inc15
-rw-r--r--data/maps/Route106/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/Route107/border.bin1
-rw-r--r--data/maps/Route107/connections.inc8
-rw-r--r--data/maps/Route107/header.inc15
-rw-r--r--data/maps/Route107/map.binbin0 -> 2400 bytes
-rw-r--r--data/maps/Route108/border.bin1
-rw-r--r--data/maps/Route108/connections.inc8
-rw-r--r--data/maps/Route108/header.inc15
-rw-r--r--data/maps/Route108/map.bin1
-rw-r--r--data/maps/Route109/border.bin1
-rw-r--r--data/maps/Route109/connections.inc8
-rw-r--r--data/maps/Route109/header.inc15
-rw-r--r--data/maps/Route109/map.binbin0 -> 5040 bytes
-rw-r--r--data/maps/Route109_SeashoreHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route109_SeashoreHouse/header.inc15
-rw-r--r--data/maps/Route109_SeashoreHouse/map.bin3
-rw-r--r--data/maps/Route110/border.bin1
-rw-r--r--data/maps/Route110/connections.inc9
-rw-r--r--data/maps/Route110/header.inc15
-rw-r--r--data/maps/Route110/map.binbin0 -> 8000 bytes
-rw-r--r--data/maps/Route110_SeasideCyclingRoadEntrance1/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc15
-rw-r--r--data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin1
-rw-r--r--data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc15
-rw-r--r--data/maps/Route110_TrickHouseCorridor/border.bin1
-rw-r--r--data/maps/Route110_TrickHouseCorridor/header.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/Route110_TrickHouseEntrance/map.bin1
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle1/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle2/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle3/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle4/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle5/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle6/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle7/map.bin2
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/header.inc15
-rw-r--r--data/maps/Route110_TrickHousePuzzle8/map.bin2
-rw-r--r--data/maps/Route111/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route111/connections.inc9
-rw-r--r--data/maps/Route111/header.inc15
-rw-r--r--data/maps/Route111/map.binbin0 -> 11200 bytes
-rw-r--r--data/maps/Route111_OldLadysRestStop/header.inc15
-rw-r--r--data/maps/Route111_WinstrateFamilysHouse/header.inc15
-rw-r--r--data/maps/Route112/border.bin1
-rw-r--r--data/maps/Route112/connections.inc9
-rw-r--r--data/maps/Route112/header.inc15
-rw-r--r--data/maps/Route112/map.binbin0 -> 4800 bytes
-rw-r--r--data/maps/Route112_CableCarStation/border.bin1
-rw-r--r--data/maps/Route112_CableCarStation/header.inc15
-rw-r--r--data/maps/Route112_CableCarStation/map.binbin0 -> 312 bytes
-rw-r--r--data/maps/Route113/border.bin1
-rw-r--r--data/maps/Route113/connections.inc9
-rw-r--r--data/maps/Route113/header.inc15
-rw-r--r--data/maps/Route113/map.binbin0 -> 4000 bytes
-rw-r--r--data/maps/Route113_GlassWorkshop/header.inc15
-rw-r--r--data/maps/Route114/border.bin1
-rw-r--r--data/maps/Route114/connections.inc8
-rw-r--r--data/maps/Route114/header.inc15
-rw-r--r--data/maps/Route114/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/Route114_FossilManiacsHouse/border.bin1
-rw-r--r--data/maps/Route114_FossilManiacsHouse/header.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/Route114_LanettesHouse/map.bin2
-rw-r--r--data/maps/Route115/border.bin1
-rw-r--r--data/maps/Route115/connections.inc8
-rw-r--r--data/maps/Route115/header.inc15
-rw-r--r--data/maps/Route115/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/Route116/border.bin1
-rw-r--r--data/maps/Route116/connections.inc8
-rw-r--r--data/maps/Route116/header.inc15
-rw-r--r--data/maps/Route116/map.binbin0 -> 4000 bytes
-rw-r--r--data/maps/Route116_TunnelersRestHouse/border.bin1
-rw-r--r--data/maps/Route116_TunnelersRestHouse/header.inc15
-rw-r--r--data/maps/Route116_TunnelersRestHouse/map.bin1
-rw-r--r--data/maps/Route117/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route117/connections.inc8
-rw-r--r--data/maps/Route117/header.inc15
-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.inc15
-rw-r--r--data/maps/Route117_PokemonDayCare/map.bin2
-rw-r--r--data/maps/Route118/border.bin1
-rw-r--r--data/maps/Route118/connections.inc9
-rw-r--r--data/maps/Route118/header.inc15
-rw-r--r--data/maps/Route118/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/Route119/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route119/connections.inc8
-rw-r--r--data/maps/Route119/header.inc15
-rw-r--r--data/maps/Route119/map.binbin0 -> 11200 bytes
-rw-r--r--data/maps/Route119_House/header.inc15
-rw-r--r--data/maps/Route119_WeatherInstitute_1F/border.bin1
-rw-r--r--data/maps/Route119_WeatherInstitute_1F/header.inc15
-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.inc15
-rw-r--r--data/maps/Route119_WeatherInstitute_2F/map.bin1
-rw-r--r--data/maps/Route120/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route120/connections.inc8
-rw-r--r--data/maps/Route120/header.inc15
-rw-r--r--data/maps/Route120/map.binbin0 -> 8000 bytes
-rw-r--r--data/maps/Route121/border.bin1
-rw-r--r--data/maps/Route121/connections.inc9
-rw-r--r--data/maps/Route121/header.inc15
-rw-r--r--data/maps/Route121/map.bin1
-rw-r--r--data/maps/Route121_SafariZoneEntrance/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route121_SafariZoneEntrance/header.inc15
-rw-r--r--data/maps/Route121_SafariZoneEntrance/map.bin1
-rw-r--r--data/maps/Route122/border.bin1
-rw-r--r--data/maps/Route122/connections.inc8
-rw-r--r--data/maps/Route122/header.inc15
-rw-r--r--data/maps/Route122/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/Route123/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route123/connections.inc8
-rw-r--r--data/maps/Route123/header.inc15
-rw-r--r--data/maps/Route123/map.bin2
-rw-r--r--data/maps/Route123_BerryMastersHouse/header.inc15
-rw-r--r--data/maps/Route124/border.bin1
-rw-r--r--data/maps/Route124/connections.inc11
-rw-r--r--data/maps/Route124/header.inc15
-rw-r--r--data/maps/Route124/map.binbin0 -> 12800 bytes
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/header.inc15
-rw-r--r--data/maps/Route124_DivingTreasureHuntersHouse/map.bin1
-rw-r--r--data/maps/Route125/border.bin1
-rw-r--r--data/maps/Route125/connections.inc9
-rw-r--r--data/maps/Route125/header.inc15
-rw-r--r--data/maps/Route125/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/Route126/border.bin1
-rw-r--r--data/maps/Route126/connections.inc9
-rw-r--r--data/maps/Route126/header.inc15
-rw-r--r--data/maps/Route126/map.binbin0 -> 12800 bytes
-rw-r--r--data/maps/Route127/border.bin1
-rw-r--r--data/maps/Route127/connections.inc10
-rw-r--r--data/maps/Route127/header.inc15
-rw-r--r--data/maps/Route127/map.binbin0 -> 12800 bytes
-rw-r--r--data/maps/Route128/border.bin1
-rw-r--r--data/maps/Route128/connections.inc10
-rw-r--r--data/maps/Route128/header.inc15
-rw-r--r--data/maps/Route128/map.binbin0 -> 9600 bytes
-rw-r--r--data/maps/Route129/border.bin1
-rw-r--r--data/maps/Route129/connections.inc9
-rw-r--r--data/maps/Route129/header.inc15
-rw-r--r--data/maps/Route129/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/Route130/border.bin1
-rw-r--r--data/maps/Route130/connections.inc8
-rw-r--r--data/maps/Route130/header.inc15
-rw-r--r--data/maps/Route130/map.bin1
-rw-r--r--data/maps/Route131/border.bin1
-rw-r--r--data/maps/Route131/connections.inc8
-rw-r--r--data/maps/Route131/header.inc15
-rw-r--r--data/maps/Route131/map.bin1
-rw-r--r--data/maps/Route132/border.bin1
-rw-r--r--data/maps/Route132/connections.inc8
-rw-r--r--data/maps/Route132/header.inc15
-rw-r--r--data/maps/Route132/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/Route133/border.bin1
-rw-r--r--data/maps/Route133/connections.inc8
-rw-r--r--data/maps/Route133/header.inc15
-rw-r--r--data/maps/Route133/map.bin1
-rw-r--r--data/maps/Route134/border.bin1
-rw-r--r--data/maps/Route134/connections.inc8
-rw-r--r--data/maps/Route134/header.inc15
-rw-r--r--data/maps/Route134/map.binbin0 -> 6400 bytes
-rw-r--r--data/maps/RustboroCity/border.bin1
-rw-r--r--data/maps/RustboroCity/connections.inc9
-rw-r--r--data/maps/RustboroCity/header.inc15
-rw-r--r--data/maps/RustboroCity/map.binbin0 -> 4800 bytes
-rw-r--r--data/maps/RustboroCity_CuttersHouse/border.bin1
-rw-r--r--data/maps/RustboroCity_CuttersHouse/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/RustboroCity_Flat2_1F/map.binbin0 -> 252 bytes
-rw-r--r--data/maps/RustboroCity_Flat2_2F/border.bin1
-rw-r--r--data/maps/RustboroCity_Flat2_2F/header.inc15
-rw-r--r--data/maps/RustboroCity_Flat2_2F/map.binbin0 -> 252 bytes
-rw-r--r--data/maps/RustboroCity_Flat2_3F/border.bin1
-rw-r--r--data/maps/RustboroCity_Flat2_3F/header.inc15
-rw-r--r--data/maps/RustboroCity_Flat2_3F/map.binbin0 -> 252 bytes
-rw-r--r--data/maps/RustboroCity_Gym/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/RustboroCity_Gym/header.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/RustboroCity_House2/map.bin1
-rw-r--r--data/maps/RustboroCity_House3/header.inc15
-rw-r--r--data/maps/RustboroCity_Mart/header.inc15
-rw-r--r--data/maps/RustboroCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/RustboroCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/RustboroCity_PokemonSchool/border.bin1
-rw-r--r--data/maps/RustboroCity_PokemonSchool/header.inc15
-rw-r--r--data/maps/RustboroCity_PokemonSchool/map.binbin0 -> 264 bytes
-rw-r--r--data/maps/RusturfTunnel/border.bin1
-rw-r--r--data/maps/RusturfTunnel/header.inc15
-rw-r--r--data/maps/RusturfTunnel/map.bin2
-rw-r--r--data/maps/SSTidalCorridor/border.bin1
-rw-r--r--data/maps/SSTidalCorridor/header.inc15
-rw-r--r--data/maps/SSTidalCorridor/map.bin1
-rw-r--r--data/maps/SSTidalLowerDeck/border.bin1
-rw-r--r--data/maps/SSTidalLowerDeck/header.inc15
-rw-r--r--data/maps/SSTidalLowerDeck/map.bin1
-rw-r--r--data/maps/SSTidalRooms/border.bin1
-rw-r--r--data/maps/SSTidalRooms/header.inc15
-rw-r--r--data/maps/SSTidalRooms/map.bin1
-rw-r--r--data/maps/SafariZone_North/border.bin1
-rw-r--r--data/maps/SafariZone_North/connections.inc9
-rw-r--r--data/maps/SafariZone_North/header.inc15
-rw-r--r--data/maps/SafariZone_North/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/SafariZone_Northeast/border.bin1
-rw-r--r--data/maps/SafariZone_Northeast/connections.inc8
-rw-r--r--data/maps/SafariZone_Northeast/header.inc15
-rw-r--r--data/maps/SafariZone_Northeast/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/SafariZone_Northwest/border.bin1
-rw-r--r--data/maps/SafariZone_Northwest/connections.inc8
-rw-r--r--data/maps/SafariZone_Northwest/header.inc15
-rw-r--r--data/maps/SafariZone_Northwest/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/SafariZone_RestHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SafariZone_RestHouse/header.inc15
-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/connections.inc9
-rw-r--r--data/maps/SafariZone_South/header.inc15
-rw-r--r--data/maps/SafariZone_South/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/SafariZone_Southeast/border.bin1
-rw-r--r--data/maps/SafariZone_Southeast/connections.inc8
-rw-r--r--data/maps/SafariZone_Southeast/header.inc15
-rw-r--r--data/maps/SafariZone_Southeast/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/SafariZone_Southwest/border.bin1
-rw-r--r--data/maps/SafariZone_Southwest/connections.inc8
-rw-r--r--data/maps/SafariZone_Southwest/header.inc15
-rw-r--r--data/maps/SafariZone_Southwest/map.binbin0 -> 3200 bytes
-rw-r--r--data/maps/ScorchedSlab/border.bin1
-rw-r--r--data/maps/ScorchedSlab/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/SeafloorCavern_Room9/map.bin1
-rw-r--r--data/maps/SealedChamber_InnerRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SealedChamber_InnerRoom/header.inc15
-rw-r--r--data/maps/SealedChamber_InnerRoom/map.bin1
-rw-r--r--data/maps/SealedChamber_OuterRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SealedChamber_OuterRoom/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/ShoalCave_LowTideStairsRoom/map.bin1
-rw-r--r--data/maps/SingleBattleColosseum/border.bin1
-rw-r--r--data/maps/SingleBattleColosseum/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/SkyPillar_Top/map.bin1
-rw-r--r--data/maps/SlateportCity/border.bin1
-rw-r--r--data/maps/SlateportCity/connections.inc9
-rw-r--r--data/maps/SlateportCity/header.inc15
-rw-r--r--data/maps/SlateportCity/map.binbin0 -> 4800 bytes
-rw-r--r--data/maps/SlateportCity_BattleTentBattleRoom/header.inc15
-rw-r--r--data/maps/SlateportCity_BattleTentCorridor/header.inc15
-rw-r--r--data/maps/SlateportCity_BattleTentLobby/header.inc15
-rw-r--r--data/maps/SlateportCity_Harbor/border.bin1
-rw-r--r--data/maps/SlateportCity_Harbor/header.inc15
-rw-r--r--data/maps/SlateportCity_Harbor/map.bin1
-rw-r--r--data/maps/SlateportCity_House1/header.inc15
-rw-r--r--data/maps/SlateportCity_House2/header.inc15
-rw-r--r--data/maps/SlateportCity_Mart/header.inc15
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/header.inc15
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/map.bin2
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_2F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_2F/header.inc15
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_2F/map.bin1
-rw-r--r--data/maps/SlateportCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/SlateportCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/header.inc15
-rw-r--r--data/maps/SlateportCity_PokemonFanClub/map.binbin0 -> 308 bytes
-rw-r--r--data/maps/SlateportCity_SternsShipyard_1F/border.bin1
-rw-r--r--data/maps/SlateportCity_SternsShipyard_1F/header.inc15
-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.inc15
-rw-r--r--data/maps/SlateportCity_SternsShipyard_2F/map.bin1
-rw-r--r--data/maps/SootopolisCity/border.bin1
-rw-r--r--data/maps/SootopolisCity/connections.inc6
-rw-r--r--data/maps/SootopolisCity/header.inc15
-rw-r--r--data/maps/SootopolisCity/map.bin12
-rw-r--r--data/maps/SootopolisCity_Gym_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SootopolisCity_Gym_1F/header.inc15
-rw-r--r--data/maps/SootopolisCity_Gym_1F/map.binbin0 -> 884 bytes
-rw-r--r--data/maps/SootopolisCity_Gym_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SootopolisCity_Gym_B1F/header.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/SootopolisCity_House3/map.bin1
-rw-r--r--data/maps/SootopolisCity_House4/header.inc15
-rw-r--r--data/maps/SootopolisCity_House5/header.inc15
-rw-r--r--data/maps/SootopolisCity_House6/header.inc15
-rw-r--r--data/maps/SootopolisCity_House7/header.inc15
-rw-r--r--data/maps/SootopolisCity_LotadAndSeedotHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc15
-rw-r--r--data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin1
-rw-r--r--data/maps/SootopolisCity_Mart/header.inc15
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc15
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin1
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc15
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin2
-rw-r--r--data/maps/SootopolisCity_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/SootopolisCity_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/SouthernIsland_Exterior/border.bin1
-rw-r--r--data/maps/SouthernIsland_Exterior/header.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/TerraCave_Entrance/map.bin33
-rw-r--r--data/maps/TradeCenter/border.bin1
-rw-r--r--data/maps/TradeCenter/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/TrainerHill_4F/map.bin2
-rw-r--r--data/maps/TrainerHill_Elevator/header.inc15
-rw-r--r--data/maps/TrainerHill_Entrance/border.bin1
-rw-r--r--data/maps/TrainerHill_Entrance/header.inc15
-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.inc15
-rw-r--r--data/maps/TrainerHill_Roof/map.bin1
-rw-r--r--data/maps/Underwater1/border.bin1
-rw-r--r--data/maps/Underwater1/connections.inc8
-rw-r--r--data/maps/Underwater1/header.inc15
-rw-r--r--data/maps/Underwater1/map.bin17
-rw-r--r--data/maps/Underwater2/border.bin1
-rw-r--r--data/maps/Underwater2/connections.inc9
-rw-r--r--data/maps/Underwater2/header.inc15
-rw-r--r--data/maps/Underwater2/map.bin35
-rw-r--r--data/maps/Underwater3/border.bin1
-rw-r--r--data/maps/Underwater3/connections.inc9
-rw-r--r--data/maps/Underwater3/header.inc15
-rw-r--r--data/maps/Underwater3/map.bin1
-rw-r--r--data/maps/Underwater4/border.bin1
-rw-r--r--data/maps/Underwater4/connections.inc8
-rw-r--r--data/maps/Underwater4/header.inc15
-rw-r--r--data/maps/Underwater4/map.bin1
-rw-r--r--data/maps/Underwater5/border.bin1
-rw-r--r--data/maps/Underwater5/connections.inc7
-rw-r--r--data/maps/Underwater5/header.inc15
-rw-r--r--data/maps/Underwater5/map.bin1
-rw-r--r--data/maps/Underwater6/border.bin1
-rw-r--r--data/maps/Underwater6/connections.inc7
-rw-r--r--data/maps/Underwater6/header.inc15
-rw-r--r--data/maps/Underwater6/map.bin1
-rw-r--r--data/maps/Underwater7/border.bin1
-rw-r--r--data/maps/Underwater7/connections.inc7
-rw-r--r--data/maps/Underwater7/header.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/Underwater_SootopolisCity/map.bin2
-rw-r--r--data/maps/UnionRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/UnionRoom/header.inc15
-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.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_084294C4/border.bin1
-rw-r--r--data/maps/UnknownMap_084294C4/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_084294E8/border.bin1
-rw-r--r--data/maps/UnknownMap_084294E8/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E6C0/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E6C0/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E6E4/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E6E4/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E708/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E708/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E72C/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E72C/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E750/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E750/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E774/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E774/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E798/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E798/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E7BC/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E7BC/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E7E0/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E7E0/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E804/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E804/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E828/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E828/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E84C/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E84C/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E870/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E870/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_0843E894/border.bin1
-rw-r--r--data/maps/UnknownMap_0843E894/map.binbin0 -> 4 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.binbin0 -> 724 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.binbin0 -> 8 bytes
-rw-r--r--data/maps/UnknownMap_084693AC/map.binbin0 -> 4 bytes
-rw-r--r--data/maps/UnknownMap_08470BD8/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/UnknownMap_08470BD8/map.binbin0 -> 11200 bytes
-rw-r--r--data/maps/UnknownMap_08480DAC/border.bin1
-rw-r--r--data/maps/UnknownMap_08480DAC/map.binbin0 -> 340 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.binbin0 -> 8 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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/UnknownMap_25_34/map.bin1
-rw-r--r--data/maps/VerdanturfTown/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/VerdanturfTown/connections.inc8
-rw-r--r--data/maps/VerdanturfTown/header.inc15
-rw-r--r--data/maps/VerdanturfTown/map.binbin0 -> 800 bytes
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc15
-rw-r--r--data/maps/VerdanturfTown_BattleTentBattleRoom/map.binbin0 -> 234 bytes
-rw-r--r--data/maps/VerdanturfTown_BattleTentCorridor/header.inc15
-rw-r--r--data/maps/VerdanturfTown_BattleTentLobby/header.inc15
-rw-r--r--data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc15
-rw-r--r--data/maps/VerdanturfTown_House/header.inc15
-rw-r--r--data/maps/VerdanturfTown_Mart/header.inc15
-rw-r--r--data/maps/VerdanturfTown_PokemonCenter_1F/header.inc15
-rw-r--r--data/maps/VerdanturfTown_PokemonCenter_2F/header.inc15
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/header.inc15
-rw-r--r--data/maps/VerdanturfTown_WandasHouse/map.binbin0 -> 272 bytes
-rw-r--r--data/maps/VictoryRoad_1F/border.bin1
-rw-r--r--data/maps/VictoryRoad_1F/header.inc15
-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.inc15
-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.inc15
-rw-r--r--data/maps/VictoryRoad_B2F/map.bin1
-rw-r--r--data/maps/_assets.inc7606
-rw-r--r--data/maps/_groups.inc623
-rw-r--r--data/maps/attributes_table.inc444
-rw-r--r--data/maps/connections.inc65
-rw-r--r--data/maps/events/AbandonedShip_CaptainsOffice.inc11
-rw-r--r--data/maps/events/AbandonedShip_Corridors_1F.inc21
-rw-r--r--data/maps/events/AbandonedShip_Corridors_B1F.inc20
-rw-r--r--data/maps/events/AbandonedShip_Deck.inc10
-rw-r--r--data/maps/events/AbandonedShip_HiddenFloorCorridors.inc17
-rw-r--r--data/maps/events/AbandonedShip_HiddenFloorRooms.inc32
-rw-r--r--data/maps/events/AbandonedShip_Room_B1F.inc10
-rw-r--r--data/maps/events/AbandonedShip_Rooms2_1F.inc15
-rw-r--r--data/maps/events/AbandonedShip_Rooms2_B1F.inc13
-rw-r--r--data/maps/events/AbandonedShip_Rooms_1F.inc17
-rw-r--r--data/maps/events/AbandonedShip_Rooms_B1F.inc12
-rw-r--r--data/maps/events/AbandonedShip_Underwater1.inc7
-rw-r--r--data/maps/events/AbandonedShip_Underwater2.inc6
-rw-r--r--data/maps/events/AlteringCave.inc6
-rw-r--r--data/maps/events/AncientTomb.inc16
-rw-r--r--data/maps/events/AquaHideout_1F.inc13
-rw-r--r--data/maps/events/AquaHideout_B1F.inc41
-rw-r--r--data/maps/events/AquaHideout_B2F.inc27
-rw-r--r--data/maps/events/AquaHideout_UnusedRubyMap1.inc3
-rw-r--r--data/maps/events/AquaHideout_UnusedRubyMap2.inc3
-rw-r--r--data/maps/events/AquaHideout_UnusedRubyMap3.inc3
-rw-r--r--data/maps/events/ArtisanCave_1F.inc10
-rw-r--r--data/maps/events/ArtisanCave_B1F.inc16
-rw-r--r--data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc14
-rw-r--r--data/maps/events/BattleFrontier_BattleArenaCorridor.inc6
-rw-r--r--data/maps/events/BattleFrontier_BattleArenaLobby.inc17
-rw-r--r--data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc20
-rw-r--r--data/maps/events/BattleFrontier_BattleDomeCorridor.inc10
-rw-r--r--data/maps/events/BattleFrontier_BattleDomeLobby.inc21
-rw-r--r--data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc10
-rw-r--r--data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc13
-rw-r--r--data/maps/events/BattleFrontier_BattleFactoryLobby.inc20
-rw-r--r--data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc6
-rw-r--r--data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc14
-rw-r--r--data/maps/events/BattleFrontier_BattlePalaceCorridor.inc18
-rw-r--r--data/maps/events/BattleFrontier_BattlePalaceLobby.inc21
-rw-r--r--data/maps/events/BattleFrontier_BattlePikeCorridor.inc6
-rw-r--r--data/maps/events/BattleFrontier_BattlePikeLobby.inc18
-rw-r--r--data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc16
-rw-r--r--data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc6
-rw-r--r--data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc12
-rw-r--r--data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc18
-rw-r--r--data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc19
-rw-r--r--data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc21
-rw-r--r--data/maps/events/BattleFrontier_BattlePyramidLobby.inc16
-rw-r--r--data/maps/events/BattleFrontier_BattlePyramidTop.inc10
-rw-r--r--data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc12
-rw-r--r--data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc11
-rw-r--r--data/maps/events/BattleFrontier_BattleTowerCorridor.inc6
-rw-r--r--data/maps/events/BattleFrontier_BattleTowerCorridor2.inc9
-rw-r--r--data/maps/events/BattleFrontier_BattleTowerElevator.inc6
-rw-r--r--data/maps/events/BattleFrontier_BattleTowerLobby.inc26
-rw-r--r--data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc14
-rw-r--r--data/maps/events/BattleFrontier_Lounge1.inc11
-rw-r--r--data/maps/events/BattleFrontier_Lounge2.inc14
-rw-r--r--data/maps/events/BattleFrontier_Lounge3.inc13
-rw-r--r--data/maps/events/BattleFrontier_Lounge4.inc11
-rw-r--r--data/maps/events/BattleFrontier_Lounge5.inc13
-rw-r--r--data/maps/events/BattleFrontier_Lounge6.inc9
-rw-r--r--data/maps/events/BattleFrontier_Lounge7.inc12
-rw-r--r--data/maps/events/BattleFrontier_Lounge8.inc11
-rw-r--r--data/maps/events/BattleFrontier_Lounge9.inc10
-rw-r--r--data/maps/events/BattleFrontier_Mart.inc13
-rw-r--r--data/maps/events/BattleFrontier_OutsideEast.inc57
-rw-r--r--data/maps/events/BattleFrontier_OutsideWest.inc49
-rw-r--r--data/maps/events/BattleFrontier_PokemonCenter_1F.inc15
-rw-r--r--data/maps/events/BattleFrontier_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/BattleFrontier_RankingHall.inc26
-rw-r--r--data/maps/events/BattleFrontier_ReceptionGate.inc14
-rw-r--r--data/maps/events/BattleFrontier_ScottsHouse.inc10
-rw-r--r--data/maps/events/BattlePyramidSquare01.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare02.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare03.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare04.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare05.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare06.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare07.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare08.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare09.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare10.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare11.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare12.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare13.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare14.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare15.inc12
-rw-r--r--data/maps/events/BattlePyramidSquare16.inc12
-rw-r--r--data/maps/events/BirthIsland_Exterior.inc10
-rw-r--r--data/maps/events/BirthIsland_Harbor.inc10
-rw-r--r--data/maps/events/CaveOfOrigin_1F.inc7
-rw-r--r--data/maps/events/CaveOfOrigin_B1F.inc9
-rw-r--r--data/maps/events/CaveOfOrigin_Entrance.inc7
-rw-r--r--data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc7
-rw-r--r--data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc7
-rw-r--r--data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc7
-rw-r--r--data/maps/events/DesertRuins.inc16
-rw-r--r--data/maps/events/DesertUnderpass.inc9
-rw-r--r--data/maps/events/DewfordTown.inc24
-rw-r--r--data/maps/events/DewfordTown_Gym.inc23
-rw-r--r--data/maps/events/DewfordTown_Hall.inc22
-rw-r--r--data/maps/events/DewfordTown_House1.inc12
-rw-r--r--data/maps/events/DewfordTown_House2.inc11
-rw-r--r--data/maps/events/DewfordTown_PokemonCenter_1F.inc13
-rw-r--r--data/maps/events/DewfordTown_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/DoubleBattleColosseum.inc15
-rw-r--r--data/maps/events/EverGrandeCity.inc29
-rw-r--r--data/maps/events/EverGrandeCity_ChampionsRoom.inc12
-rw-r--r--data/maps/events/EverGrandeCity_DrakesRoom.inc10
-rw-r--r--data/maps/events/EverGrandeCity_GlaciasRoom.inc10
-rw-r--r--data/maps/events/EverGrandeCity_Hall1.inc9
-rw-r--r--data/maps/events/EverGrandeCity_Hall2.inc9
-rw-r--r--data/maps/events/EverGrandeCity_Hall3.inc9
-rw-r--r--data/maps/events/EverGrandeCity_Hall4.inc7
-rw-r--r--data/maps/events/EverGrandeCity_Hall5.inc9
-rw-r--r--data/maps/events/EverGrandeCity_HallOfFame.inc9
-rw-r--r--data/maps/events/EverGrandeCity_PhoebesRoom.inc10
-rw-r--r--data/maps/events/EverGrandeCity_PokemonCenter_1F.inc14
-rw-r--r--data/maps/events/EverGrandeCity_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/EverGrandeCity_PokemonLeague_1F.inc16
-rw-r--r--data/maps/events/EverGrandeCity_PokemonLeague_2F.inc14
-rw-r--r--data/maps/events/EverGrandeCity_SidneysRoom.inc10
-rw-r--r--data/maps/events/FallarborTown.inc26
-rw-r--r--data/maps/events/FallarborTown_BattleTentBattleRoom.inc8
-rw-r--r--data/maps/events/FallarborTown_BattleTentCorridor.inc6
-rw-r--r--data/maps/events/FallarborTown_BattleTentLobby.inc17
-rw-r--r--data/maps/events/FallarborTown_House1.inc11
-rw-r--r--data/maps/events/FallarborTown_House2.inc10
-rw-r--r--data/maps/events/FallarborTown_Mart.inc14
-rw-r--r--data/maps/events/FallarborTown_PokemonCenter_1F.inc14
-rw-r--r--data/maps/events/FallarborTown_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/FarawayIsland_Entrance.inc19
-rw-r--r--data/maps/events/FarawayIsland_Interior.inc10
-rw-r--r--data/maps/events/FieryPath.inc17
-rw-r--r--data/maps/events/FortreeCity.inc31
-rw-r--r--data/maps/events/FortreeCity_DecorationShop.inc13
-rw-r--r--data/maps/events/FortreeCity_Gym.inc21
-rw-r--r--data/maps/events/FortreeCity_House1.inc12
-rw-r--r--data/maps/events/FortreeCity_House2.inc11
-rw-r--r--data/maps/events/FortreeCity_House3.inc11
-rw-r--r--data/maps/events/FortreeCity_House4.inc12
-rw-r--r--data/maps/events/FortreeCity_House5.inc12
-rw-r--r--data/maps/events/FortreeCity_Mart.inc13
-rw-r--r--data/maps/events/FortreeCity_PokemonCenter_1F.inc14
-rw-r--r--data/maps/events/FortreeCity_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/GraniteCave_1F.inc13
-rw-r--r--data/maps/events/GraniteCave_B1F.inc15
-rw-r--r--data/maps/events/GraniteCave_B2F.inc25
-rw-r--r--data/maps/events/GraniteCave_StevensRoom.inc9
-rw-r--r--data/maps/events/InsideOfTruck.inc25
-rw-r--r--data/maps/events/IslandCave.inc16
-rw-r--r--data/maps/events/JaggedPass.inc35
-rw-r--r--data/maps/events/LavaridgeTown.inc35
-rw-r--r--data/maps/events/LavaridgeTown_Gym_1F.inc43
-rw-r--r--data/maps/events/LavaridgeTown_Gym_B1F.inc35
-rw-r--r--data/maps/events/LavaridgeTown_HerbShop.inc12
-rw-r--r--data/maps/events/LavaridgeTown_House.inc12
-rw-r--r--data/maps/events/LavaridgeTown_Mart.inc12
-rw-r--r--data/maps/events/LavaridgeTown_PokemonCenter_1F.inc15
-rw-r--r--data/maps/events/LavaridgeTown_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/LilycoveCity.inc58
-rw-r--r--data/maps/events/LilycoveCity_ContestHall.inc51
-rw-r--r--data/maps/events/LilycoveCity_ContestLobby.inc50
-rw-r--r--data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc14
-rw-r--r--data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc15
-rw-r--r--data/maps/events/LilycoveCity_DepartmentStoreElevator.inc10
-rw-r--r--data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc16
-rw-r--r--data/maps/events/LilycoveCity_DepartmentStore_1F.inc20
-rw-r--r--data/maps/events/LilycoveCity_DepartmentStore_2F.inc15
-rw-r--r--data/maps/events/LilycoveCity_DepartmentStore_3F.inc15
-rw-r--r--data/maps/events/LilycoveCity_DepartmentStore_4F.inc15
-rw-r--r--data/maps/events/LilycoveCity_DepartmentStore_5F.inc17
-rw-r--r--data/maps/events/LilycoveCity_Harbor.inc14
-rw-r--r--data/maps/events/LilycoveCity_House1.inc11
-rw-r--r--data/maps/events/LilycoveCity_House2.inc10
-rw-r--r--data/maps/events/LilycoveCity_House3.inc15
-rw-r--r--data/maps/events/LilycoveCity_House4.inc11
-rw-r--r--data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc38
-rw-r--r--data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc26
-rw-r--r--data/maps/events/LilycoveCity_MoveDeletersHouse.inc10
-rw-r--r--data/maps/events/LilycoveCity_PokemonCenter_1F.inc15
-rw-r--r--data/maps/events/LilycoveCity_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc18
-rw-r--r--data/maps/events/LilycoveCity_UnusedMart.inc7
-rw-r--r--data/maps/events/LinkContestRoom1.inc18
-rw-r--r--data/maps/events/LinkContestRoom2.inc1
-rw-r--r--data/maps/events/LinkContestRoom3.inc1
-rw-r--r--data/maps/events/LinkContestRoom4.inc1
-rw-r--r--data/maps/events/LinkContestRoom5.inc1
-rw-r--r--data/maps/events/LinkContestRoom6.inc1
-rw-r--r--data/maps/events/LittlerootTown.inc35
-rw-r--r--data/maps/events/LittlerootTown_BrendansHouse_1F.inc23
-rw-r--r--data/maps/events/LittlerootTown_BrendansHouse_2F.inc30
-rw-r--r--data/maps/events/LittlerootTown_MaysHouse_1F.inc23
-rw-r--r--data/maps/events/LittlerootTown_MaysHouse_2F.inc30
-rw-r--r--data/maps/events/LittlerootTown_ProfessorBirchsLab.inc32
-rw-r--r--data/maps/events/MagmaHideout_1F.inc17
-rw-r--r--data/maps/events/MagmaHideout_2F_1R.inc14
-rw-r--r--data/maps/events/MagmaHideout_2F_2R.inc15
-rw-r--r--data/maps/events/MagmaHideout_2F_3R.inc7
-rw-r--r--data/maps/events/MagmaHideout_3F_1R.inc13
-rw-r--r--data/maps/events/MagmaHideout_3F_2R.inc10
-rw-r--r--data/maps/events/MagmaHideout_3F_3R.inc10
-rw-r--r--data/maps/events/MagmaHideout_4F.inc17
-rw-r--r--data/maps/events/MarineCave_End.inc12
-rw-r--r--data/maps/events/MarineCave_Entrance.inc6
-rw-r--r--data/maps/events/MauvilleCity.inc35
-rw-r--r--data/maps/events/MauvilleCity_BikeShop.inc15
-rw-r--r--data/maps/events/MauvilleCity_GameCorner.inc47
-rw-r--r--data/maps/events/MauvilleCity_Gym.inc26
-rw-r--r--data/maps/events/MauvilleCity_House1.inc10
-rw-r--r--data/maps/events/MauvilleCity_House2.inc10
-rw-r--r--data/maps/events/MauvilleCity_Mart.inc12
-rw-r--r--data/maps/events/MauvilleCity_PokemonCenter_1F.inc15
-rw-r--r--data/maps/events/MauvilleCity_PokemonCenter_2F.inc15
-rw-r--r--data/maps/events/MeteorFalls_1F_1R.inc29
-rw-r--r--data/maps/events/MeteorFalls_1F_2R.inc17
-rw-r--r--data/maps/events/MeteorFalls_B1F_1R.inc11
-rw-r--r--data/maps/events/MeteorFalls_B1F_2R.inc9
-rw-r--r--data/maps/events/MeteorFalls_StevensCave.inc9
-rw-r--r--data/maps/events/MirageTower_1F.inc7
-rw-r--r--data/maps/events/MirageTower_2F.inc7
-rw-r--r--data/maps/events/MirageTower_3F.inc11
-rw-r--r--data/maps/events/MirageTower_4F.inc11
-rw-r--r--data/maps/events/MossdeepCity.inc56
-rw-r--r--data/maps/events/MossdeepCity_GameCorner_1F.inc17
-rw-r--r--data/maps/events/MossdeepCity_GameCorner_B1F.inc9
-rw-r--r--data/maps/events/MossdeepCity_Gym.inc72
-rw-r--r--data/maps/events/MossdeepCity_House1.inc11
-rw-r--r--data/maps/events/MossdeepCity_House2.inc12
-rw-r--r--data/maps/events/MossdeepCity_House3.inc10
-rw-r--r--data/maps/events/MossdeepCity_House4.inc12
-rw-r--r--data/maps/events/MossdeepCity_Mart.inc13
-rw-r--r--data/maps/events/MossdeepCity_PokemonCenter_1F.inc13
-rw-r--r--data/maps/events/MossdeepCity_PokemonCenter_2F.inc15
-rw-r--r--data/maps/events/MossdeepCity_SpaceCenter_1F.inc21
-rw-r--r--data/maps/events/MossdeepCity_SpaceCenter_2F.inc17
-rw-r--r--data/maps/events/MossdeepCity_StevensHouse.inc18
-rw-r--r--data/maps/events/MtChimney.inc45
-rw-r--r--data/maps/events/MtChimney_CableCarStation.inc11
-rw-r--r--data/maps/events/MtPyre_1F.inc16
-rw-r--r--data/maps/events/MtPyre_2F.inc20
-rw-r--r--data/maps/events/MtPyre_3F.inc17
-rw-r--r--data/maps/events/MtPyre_4F.inc15
-rw-r--r--data/maps/events/MtPyre_5F.inc14
-rw-r--r--data/maps/events/MtPyre_6F.inc12
-rw-r--r--data/maps/events/MtPyre_Exterior.inc23
-rw-r--r--data/maps/events/MtPyre_Summit.inc30
-rw-r--r--data/maps/events/NavelRock_B1F.inc7
-rw-r--r--data/maps/events/NavelRock_Bottom.inc9
-rw-r--r--data/maps/events/NavelRock_Down01.inc7
-rw-r--r--data/maps/events/NavelRock_Down02.inc7
-rw-r--r--data/maps/events/NavelRock_Down03.inc7
-rw-r--r--data/maps/events/NavelRock_Down04.inc7
-rw-r--r--data/maps/events/NavelRock_Down05.inc7
-rw-r--r--data/maps/events/NavelRock_Down06.inc7
-rw-r--r--data/maps/events/NavelRock_Down07.inc7
-rw-r--r--data/maps/events/NavelRock_Down08.inc7
-rw-r--r--data/maps/events/NavelRock_Down09.inc7
-rw-r--r--data/maps/events/NavelRock_Down10.inc7
-rw-r--r--data/maps/events/NavelRock_Down11.inc7
-rw-r--r--data/maps/events/NavelRock_Entrance.inc7
-rw-r--r--data/maps/events/NavelRock_Exterior.inc7
-rw-r--r--data/maps/events/NavelRock_Fork.inc8
-rw-r--r--data/maps/events/NavelRock_Harbor.inc10
-rw-r--r--data/maps/events/NavelRock_Top.inc15
-rw-r--r--data/maps/events/NavelRock_Up1.inc7
-rw-r--r--data/maps/events/NavelRock_Up2.inc7
-rw-r--r--data/maps/events/NavelRock_Up3.inc7
-rw-r--r--data/maps/events/NavelRock_Up4.inc7
-rw-r--r--data/maps/events/NewMauville_Entrance.inc10
-rw-r--r--data/maps/events/NewMauville_Inside.inc38
-rw-r--r--data/maps/events/OldaleTown.inc28
-rw-r--r--data/maps/events/OldaleTown_House1.inc10
-rw-r--r--data/maps/events/OldaleTown_House2.inc11
-rw-r--r--data/maps/events/OldaleTown_Mart.inc12
-rw-r--r--data/maps/events/OldaleTown_PokemonCenter_1F.inc14
-rw-r--r--data/maps/events/OldaleTown_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/PacifidlogTown.inc21
-rw-r--r--data/maps/events/PacifidlogTown_House1.inc11
-rw-r--r--data/maps/events/PacifidlogTown_House2.inc12
-rw-r--r--data/maps/events/PacifidlogTown_House3.inc11
-rw-r--r--data/maps/events/PacifidlogTown_House4.inc12
-rw-r--r--data/maps/events/PacifidlogTown_House5.inc11
-rw-r--r--data/maps/events/PacifidlogTown_PokemonCenter_1F.inc15
-rw-r--r--data/maps/events/PacifidlogTown_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/PetalburgCity.inc42
-rw-r--r--data/maps/events/PetalburgCity_Gym.inc72
-rw-r--r--data/maps/events/PetalburgCity_House1.inc11
-rw-r--r--data/maps/events/PetalburgCity_House2.inc11
-rw-r--r--data/maps/events/PetalburgCity_Mart.inc13
-rw-r--r--data/maps/events/PetalburgCity_PokemonCenter_1F.inc15
-rw-r--r--data/maps/events/PetalburgCity_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/PetalburgCity_WallysHouse.inc11
-rw-r--r--data/maps/events/PetalburgWoods.inc38
-rw-r--r--data/maps/events/RecordCorner.inc18
-rw-r--r--data/maps/events/Route101.inc25
-rw-r--r--data/maps/events/Route102.inc18
-rw-r--r--data/maps/events/Route103.inc31
-rw-r--r--data/maps/events/Route104.inc64
-rw-r--r--data/maps/events/Route104_MrBrineysHouse.inc11
-rw-r--r--data/maps/events/Route104_PrettyPetalFlowerShop.inc12
-rw-r--r--data/maps/events/Route104_Prototype.inc3
-rw-r--r--data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc3
-rw-r--r--data/maps/events/Route105.inc20
-rw-r--r--data/maps/events/Route106.inc19
-rw-r--r--data/maps/events/Route107.inc12
-rw-r--r--data/maps/events/Route108.inc18
-rw-r--r--data/maps/events/Route109.inc42
-rw-r--r--data/maps/events/Route109_SeashoreHouse.inc13
-rw-r--r--data/maps/events/Route110.inc79
-rw-r--r--data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc16
-rw-r--r--data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc16
-rw-r--r--data/maps/events/Route110_TrickHouseCorridor.inc9
-rw-r--r--data/maps/events/Route110_TrickHouseEnd.inc16
-rw-r--r--data/maps/events/Route110_TrickHouseEntrance.inc20
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle1.inc28
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle2.inc24
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle3.inc26
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle4.inc27
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle5.inc42
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle6.inc17
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle7.inc38
-rw-r--r--data/maps/events/Route110_TrickHousePuzzle8.inc17
-rw-r--r--data/maps/events/Route111.inc114
-rw-r--r--data/maps/events/Route111_OldLadysRestStop.inc10
-rw-r--r--data/maps/events/Route111_WinstrateFamilysHouse.inc13
-rw-r--r--data/maps/events/Route112.inc32
-rw-r--r--data/maps/events/Route112_CableCarStation.inc11
-rw-r--r--data/maps/events/Route113.inc57
-rw-r--r--data/maps/events/Route113_GlassWorkshop.inc11
-rw-r--r--data/maps/events/Route114.inc53
-rw-r--r--data/maps/events/Route114_FossilManiacsHouse.inc17
-rw-r--r--data/maps/events/Route114_FossilManiacsTunnel.inc15
-rw-r--r--data/maps/events/Route114_LanettesHouse.inc15
-rw-r--r--data/maps/events/Route115.inc49
-rw-r--r--data/maps/events/Route116.inc56
-rw-r--r--data/maps/events/Route116_TunnelersRestHouse.inc12
-rw-r--r--data/maps/events/Route117.inc38
-rw-r--r--data/maps/events/Route117_PokemonDayCare.inc10
-rw-r--r--data/maps/events/Route118.inc46
-rw-r--r--data/maps/events/Route119.inc99
-rw-r--r--data/maps/events/Route119_House.inc16
-rw-r--r--data/maps/events/Route119_WeatherInstitute_1F.inc21
-rw-r--r--data/maps/events/Route119_WeatherInstitute_2F.inc16
-rw-r--r--data/maps/events/Route120.inc90
-rw-r--r--data/maps/events/Route121.inc55
-rw-r--r--data/maps/events/Route121_SafariZoneEntrance.inc20
-rw-r--r--data/maps/events/Route122.inc6
-rw-r--r--data/maps/events/Route123.inc88
-rw-r--r--data/maps/events/Route123_BerryMastersHouse.inc11
-rw-r--r--data/maps/events/Route124.inc23
-rw-r--r--data/maps/events/Route124_DivingTreasureHuntersHouse.inc12
-rw-r--r--data/maps/events/Route125.inc24
-rw-r--r--data/maps/events/Route126.inc14
-rw-r--r--data/maps/events/Route127.inc23
-rw-r--r--data/maps/events/Route128.inc20
-rw-r--r--data/maps/events/Route129.inc10
-rw-r--r--data/maps/events/Route130.inc9
-rw-r--r--data/maps/events/Route131.inc16
-rw-r--r--data/maps/events/Route132.inc15
-rw-r--r--data/maps/events/Route133.inc15
-rw-r--r--data/maps/events/Route134.inc16
-rw-r--r--data/maps/events/RustboroCity.inc70
-rw-r--r--data/maps/events/RustboroCity_CuttersHouse.inc11
-rw-r--r--data/maps/events/RustboroCity_DevonCorp_1F.inc17
-rw-r--r--data/maps/events/RustboroCity_DevonCorp_2F.inc15
-rw-r--r--data/maps/events/RustboroCity_DevonCorp_3F.inc15
-rw-r--r--data/maps/events/RustboroCity_Flat1_1F.inc12
-rw-r--r--data/maps/events/RustboroCity_Flat1_2F.inc16
-rw-r--r--data/maps/events/RustboroCity_Flat2_1F.inc12
-rw-r--r--data/maps/events/RustboroCity_Flat2_2F.inc11
-rw-r--r--data/maps/events/RustboroCity_Flat2_3F.inc10
-rw-r--r--data/maps/events/RustboroCity_Gym.inc18
-rw-r--r--data/maps/events/RustboroCity_House1.inc11
-rw-r--r--data/maps/events/RustboroCity_House2.inc11
-rw-r--r--data/maps/events/RustboroCity_House3.inc12
-rw-r--r--data/maps/events/RustboroCity_Mart.inc13
-rw-r--r--data/maps/events/RustboroCity_PokemonCenter_1F.inc14
-rw-r--r--data/maps/events/RustboroCity_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/RustboroCity_PokemonSchool.inc23
-rw-r--r--data/maps/events/RusturfTunnel.inc27
-rw-r--r--data/maps/events/SSTidalCorridor.inc35
-rw-r--r--data/maps/events/SSTidalLowerDeck.inc13
-rw-r--r--data/maps/events/SSTidalRooms.inc31
-rw-r--r--data/maps/events/SafariZone_North.inc14
-rw-r--r--data/maps/events/SafariZone_Northeast.inc18
-rw-r--r--data/maps/events/SafariZone_Northwest.inc7
-rw-r--r--data/maps/events/SafariZone_RestHouse.inc12
-rw-r--r--data/maps/events/SafariZone_South.inc14
-rw-r--r--data/maps/events/SafariZone_Southeast.inc14
-rw-r--r--data/maps/events/SafariZone_Southwest.inc13
-rw-r--r--data/maps/events/ScorchedSlab.inc9
-rw-r--r--data/maps/events/SeafloorCavern_Entrance.inc10
-rw-r--r--data/maps/events/SeafloorCavern_Room1.inc15
-rw-r--r--data/maps/events/SeafloorCavern_Room2.inc19
-rw-r--r--data/maps/events/SeafloorCavern_Room3.inc19
-rw-r--r--data/maps/events/SeafloorCavern_Room4.inc13
-rw-r--r--data/maps/events/SeafloorCavern_Room5.inc16
-rw-r--r--data/maps/events/SeafloorCavern_Room6.inc8
-rw-r--r--data/maps/events/SeafloorCavern_Room7.inc7
-rw-r--r--data/maps/events/SeafloorCavern_Room8.inc21
-rw-r--r--data/maps/events/SeafloorCavern_Room9.inc18
-rw-r--r--data/maps/events/SealedChamber_InnerRoom.inc17
-rw-r--r--data/maps/events/SealedChamber_OuterRoom.inc37
-rw-r--r--data/maps/events/SecretBase_BlueCave1.inc23
-rw-r--r--data/maps/events/SecretBase_BlueCave2.inc23
-rw-r--r--data/maps/events/SecretBase_BlueCave3.inc23
-rw-r--r--data/maps/events/SecretBase_BlueCave4.inc23
-rw-r--r--data/maps/events/SecretBase_BrownCave1.inc23
-rw-r--r--data/maps/events/SecretBase_BrownCave2.inc23
-rw-r--r--data/maps/events/SecretBase_BrownCave3.inc23
-rw-r--r--data/maps/events/SecretBase_BrownCave4.inc23
-rw-r--r--data/maps/events/SecretBase_RedCave1.inc23
-rw-r--r--data/maps/events/SecretBase_RedCave2.inc23
-rw-r--r--data/maps/events/SecretBase_RedCave3.inc23
-rw-r--r--data/maps/events/SecretBase_RedCave4.inc23
-rw-r--r--data/maps/events/SecretBase_Shrub1.inc23
-rw-r--r--data/maps/events/SecretBase_Shrub2.inc23
-rw-r--r--data/maps/events/SecretBase_Shrub3.inc23
-rw-r--r--data/maps/events/SecretBase_Shrub4.inc23
-rw-r--r--data/maps/events/SecretBase_Tree1.inc23
-rw-r--r--data/maps/events/SecretBase_Tree2.inc23
-rw-r--r--data/maps/events/SecretBase_Tree3.inc23
-rw-r--r--data/maps/events/SecretBase_Tree4.inc23
-rw-r--r--data/maps/events/SecretBase_YellowCave1.inc23
-rw-r--r--data/maps/events/SecretBase_YellowCave2.inc23
-rw-r--r--data/maps/events/SecretBase_YellowCave3.inc23
-rw-r--r--data/maps/events/SecretBase_YellowCave4.inc23
-rw-r--r--data/maps/events/ShoalCave_HighTideEntranceRoom.inc3
-rw-r--r--data/maps/events/ShoalCave_HighTideInnerRoom.inc3
-rw-r--r--data/maps/events/ShoalCave_LowTideEntranceRoom.inc13
-rw-r--r--data/maps/events/ShoalCave_LowTideIceRoom.inc10
-rw-r--r--data/maps/events/ShoalCave_LowTideInnerRoom.inc24
-rw-r--r--data/maps/events/ShoalCave_LowTideLowerRoom.inc16
-rw-r--r--data/maps/events/ShoalCave_LowTideStairsRoom.inc13
-rw-r--r--data/maps/events/SingleBattleColosseum.inc14
-rw-r--r--data/maps/events/SkyPillar_1F.inc8
-rw-r--r--data/maps/events/SkyPillar_2F.inc7
-rw-r--r--data/maps/events/SkyPillar_3F.inc8
-rw-r--r--data/maps/events/SkyPillar_4F.inc8
-rw-r--r--data/maps/events/SkyPillar_5F.inc7
-rw-r--r--data/maps/events/SkyPillar_Entrance.inc7
-rw-r--r--data/maps/events/SkyPillar_Outside.inc10
-rw-r--r--data/maps/events/SkyPillar_Top.inc13
-rw-r--r--data/maps/events/SlateportCity.inc71
-rw-r--r--data/maps/events/SlateportCity_BattleTentBattleRoom.inc8
-rw-r--r--data/maps/events/SlateportCity_BattleTentCorridor.inc6
-rw-r--r--data/maps/events/SlateportCity_BattleTentLobby.inc17
-rw-r--r--data/maps/events/SlateportCity_Harbor.inc25
-rw-r--r--data/maps/events/SlateportCity_House1.inc10
-rw-r--r--data/maps/events/SlateportCity_House2.inc11
-rw-r--r--data/maps/events/SlateportCity_Mart.inc12
-rw-r--r--data/maps/events/SlateportCity_OceanicMuseum_1F.inc43
-rw-r--r--data/maps/events/SlateportCity_OceanicMuseum_2F.inc38
-rw-r--r--data/maps/events/SlateportCity_PokemonCenter_1F.inc13
-rw-r--r--data/maps/events/SlateportCity_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/SlateportCity_PokemonFanClub.inc18
-rw-r--r--data/maps/events/SlateportCity_SternsShipyard_1F.inc14
-rw-r--r--data/maps/events/SlateportCity_SternsShipyard_2F.inc11
-rw-r--r--data/maps/events/SootopolisCity.inc46
-rw-r--r--data/maps/events/SootopolisCity_Gym_1F.inc16
-rw-r--r--data/maps/events/SootopolisCity_Gym_B1F.inc18
-rw-r--r--data/maps/events/SootopolisCity_House1.inc11
-rw-r--r--data/maps/events/SootopolisCity_House2.inc10
-rw-r--r--data/maps/events/SootopolisCity_House3.inc11
-rw-r--r--data/maps/events/SootopolisCity_House4.inc12
-rw-r--r--data/maps/events/SootopolisCity_House5.inc11
-rw-r--r--data/maps/events/SootopolisCity_House6.inc10
-rw-r--r--data/maps/events/SootopolisCity_House7.inc11
-rw-r--r--data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc15
-rw-r--r--data/maps/events/SootopolisCity_Mart.inc12
-rw-r--r--data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc11
-rw-r--r--data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc9
-rw-r--r--data/maps/events/SootopolisCity_PokemonCenter_1F.inc14
-rw-r--r--data/maps/events/SootopolisCity_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/SouthernIsland_Exterior.inc14
-rw-r--r--data/maps/events/SouthernIsland_Interior.inc14
-rw-r--r--data/maps/events/TerraCave_End.inc12
-rw-r--r--data/maps/events/TerraCave_Entrance.inc7
-rw-r--r--data/maps/events/TradeCenter.inc14
-rw-r--r--data/maps/events/TrainerHill_1F.inc7
-rw-r--r--data/maps/events/TrainerHill_2F.inc7
-rw-r--r--data/maps/events/TrainerHill_3F.inc7
-rw-r--r--data/maps/events/TrainerHill_4F.inc7
-rw-r--r--data/maps/events/TrainerHill_Elevator.inc10
-rw-r--r--data/maps/events/TrainerHill_Entrance.inc21
-rw-r--r--data/maps/events/TrainerHill_Roof.inc10
-rw-r--r--data/maps/events/Underwater1.inc12
-rw-r--r--data/maps/events/Underwater2.inc16
-rw-r--r--data/maps/events/Underwater3.inc13
-rw-r--r--data/maps/events/Underwater4.inc10
-rw-r--r--data/maps/events/Underwater5.inc7
-rw-r--r--data/maps/events/Underwater6.inc7
-rw-r--r--data/maps/events/Underwater7.inc7
-rw-r--r--data/maps/events/Underwater_MarineCave.inc6
-rw-r--r--data/maps/events/Underwater_Route134.inc6
-rw-r--r--data/maps/events/Underwater_SeafloorCavern.inc12
-rw-r--r--data/maps/events/Underwater_SealedChamber.inc9
-rw-r--r--data/maps/events/Underwater_SootopolisCity.inc7
-rw-r--r--data/maps/events/UnionRoom.inc18
-rw-r--r--data/maps/events/UnknownMap_25_29.inc1
-rw-r--r--data/maps/events/UnknownMap_25_30.inc1
-rw-r--r--data/maps/events/UnknownMap_25_31.inc1
-rw-r--r--data/maps/events/UnknownMap_25_32.inc1
-rw-r--r--data/maps/events/UnknownMap_25_33.inc1
-rw-r--r--data/maps/events/UnknownMap_25_34.inc3
-rw-r--r--data/maps/events/VerdanturfTown.inc28
-rw-r--r--data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc8
-rw-r--r--data/maps/events/VerdanturfTown_BattleTentCorridor.inc6
-rw-r--r--data/maps/events/VerdanturfTown_BattleTentLobby.inc18
-rw-r--r--data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc11
-rw-r--r--data/maps/events/VerdanturfTown_House.inc11
-rw-r--r--data/maps/events/VerdanturfTown_Mart.inc13
-rw-r--r--data/maps/events/VerdanturfTown_PokemonCenter_1F.inc14
-rw-r--r--data/maps/events/VerdanturfTown_PokemonCenter_2F.inc14
-rw-r--r--data/maps/events/VerdanturfTown_WandasHouse.inc14
-rw-r--r--data/maps/events/VictoryRoad_1F.inc28
-rw-r--r--data/maps/events/VictoryRoad_B1F.inc35
-rw-r--r--data/maps/events/VictoryRoad_B2F.inc22
-rw-r--r--data/maps/headers.inc518
1988 files changed, 29329 insertions, 0 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/maps/AbandonedShip_CaptainsOffice/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_CaptainsOffice/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
new file mode 100644
index 000000000..143d0c61e
--- /dev/null
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_CaptainsOffice: @ 84845A4
+ .4byte AbandonedShip_CaptainsOffice_MapAttributes
+ .4byte AbandonedShip_CaptainsOffice_MapEvents
+ .4byte AbandonedShip_CaptainsOffice_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 195
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/maps/AbandonedShip_CaptainsOffice/map.bin
new file mode 100644
index 000000000..c9097fa63
--- /dev/null
+++ b/data/maps/AbandonedShip_CaptainsOffice/map.bin
Binary files differ
diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/maps/AbandonedShip_Corridors_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
new file mode 100644
index 000000000..5aa0d11c2
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_1F: @ 84844C4
+ .4byte AbandonedShip_Corridors_1F_MapAttributes
+ .4byte AbandonedShip_Corridors_1F_MapEvents
+ .4byte AbandonedShip_Corridors_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 187
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/maps/AbandonedShip_Corridors_1F/map.bin
new file mode 100644
index 000000000..5ef5ca949
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_1F/map.bin
@@ -0,0 +1,3 @@
+    22222
+2 662222222
+2 6222222222222222226201222220111122222012222201111222220122222011112222201222220111122262%#&2222%$"#&2222-+6.2222-2,*+6.262222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/maps/AbandonedShip_Corridors_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
new file mode 100644
index 000000000..39d3c52ea
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Corridors_B1F: @ 84844FC
+ .4byte AbandonedShip_Corridors_B1F_MapAttributes
+ .4byte AbandonedShip_Corridors_B1F_MapEvents
+ .4byte AbandonedShip_Corridors_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 189
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/maps/AbandonedShip_Corridors_B1F/map.bin
new file mode 100644
index 000000000..24b1a7b61
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_B1F/map.bin
@@ -0,0 +1 @@
+!!011112!!011)011112)0112011112201122%#$"&22%#$22-+6,*2.22-+6,22222222222222222222222226222222222222262220111111122222011111112 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/maps/AbandonedShip_Deck/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/AbandonedShip_Deck/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
new file mode 100644
index 000000000..563401ca7
--- /dev/null
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Deck: @ 84844A8
+ .4byte AbandonedShip_Deck_MapAttributes
+ .4byte AbandonedShip_Deck_MapEvents
+ .4byte AbandonedShip_Deck_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 186
+ .byte 61
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/maps/AbandonedShip_Deck/map.bin
new file mode 100644
index 000000000..67cdde3d7
--- /dev/null
+++ b/data/maps/AbandonedShip_Deck/map.bin
@@ -0,0 +1 @@
+(((`(`(((((b`(((((((((((`(''`(eif(b`(((((((((`('/`(((((b`('((ef(`(/'hiiiiij`(''('((((`(*/`(//(/((((`(* ]]]2hiiiiiiii(((`(((33*2*22*22ef(hiiiiif(2(2ei (((00((( ]]]2002]]]]]]]](((33*2*22*22*22*22*2*2*2*2*2*2*2(((((((2(2(2(2(2(2(2(2(2(2(2(2iiiiiiiiiiiif(2(2eiiiiiii00 00  22 44pppppppp \ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
new file mode 100644
index 000000000..e71aa5764
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorCorridors: @ 84845DC
+ .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
+ .4byte AbandonedShip_HiddenFloorCorridors_MapEvents
+ .4byte AbandonedShip_HiddenFloorCorridors_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 289
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
new file mode 100644
index 000000000..a4637ccbe
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
@@ -0,0 +1 @@
+    222222222222262242222224222222011111112266201111111222220111111122222%#$"#$"#&22-36,*36,*+6.22V2222222222GVx2222222222 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/maps/AbandonedShip_HiddenFloorRooms/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
new file mode 100644
index 000000000..08fd1b2cb
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_HiddenFloorRooms: @ 84845F8
+ .4byte AbandonedShip_HiddenFloorRooms_MapAttributes
+ .4byte AbandonedShip_HiddenFloorRooms_MapEvents
+ .4byte AbandonedShip_HiddenFloorRooms_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 310
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 7
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/maps/AbandonedShip_HiddenFloorRooms/map.bin
new file mode 100644
index 000000000..b63eeabe6
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.bin
@@ -0,0 +1 @@
+6''''c'''''76''''''''''76'''''c'''''7>////6/////?>/////2/////GF/////6/////?>h;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2665;266;2;2;2;2ON:2;2;2;2;2;2;2g2;2;266;2?>=28282828282a2828282826?>682a2^6_682b6682828282;2;2<28282b68282828282826682?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>682^6_6828282828282`282?>=2`2828282828282828282a282?>682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a2828282826?6''''''''''''76'''''''''''''76'''''''''''''7>////////////?>/////////////?>/////////////?>:2g2;2;2;2;25;2;2;2;2;2?>:2;2;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2g2;2;2;2;2;2;266;2?>=282828282a2828282V6W682?>=28282828282`2828282b6826?>682828282V6W68282826682?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>682`2828282828282828282?>=2V6W682828282828282828282?>=282828282828282828282826?>=282828282d2e2828282826?>=2^6_6828282d2e2828282a282?>=2`282b68282d2e282828282a2? \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/maps/AbandonedShip_Room_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Room_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
new file mode 100644
index 000000000..3e717ffb2
--- /dev/null
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Room_B1F: @ 848456C
+ .4byte AbandonedShip_Room_B1F_MapAttributes
+ .4byte AbandonedShip_Room_B1F_MapEvents
+ .4byte AbandonedShip_Room_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 193
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/maps/AbandonedShip_Room_B1F/map.bin
new file mode 100644
index 000000000..cb8393eb2
--- /dev/null
+++ b/data/maps/AbandonedShip_Room_B1F/map.bin
@@ -0,0 +1 @@
+6'''''''7>///////?>:2;2;2;2;2;2;2?>=282a282828282?>=2`28282828282?>=282828282a282?>=2828282828282?>=28282d2e282b? \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/maps/AbandonedShip_Rooms2_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
new file mode 100644
index 000000000..7f7b8140c
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_1F: @ 8484588
+ .4byte AbandonedShip_Rooms2_1F_MapAttributes
+ .4byte AbandonedShip_Rooms2_1F_MapEvents
+ .4byte AbandonedShip_Rooms2_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 194
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/maps/AbandonedShip_Rooms2_1F/map.bin
new file mode 100644
index 000000000..c897ce8a0
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_1F/map.bin
@@ -0,0 +1 @@
+6@kc''7>Hs6//?>PQ:2;2;2;2;2?>XY=282828282?>2;2<28282a282?>=2828282828282?>=282b82a28282?>=2828282828282?=26'''=2'''7>///=2///?>:2;2;2<2;2;2;2?>=2828282828282?>=2VW82a28282?>=2^_a2828282?>=2828282828282?>=28282d2e28282? \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/maps/AbandonedShip_Rooms2_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
new file mode 100644
index 000000000..ce86c382a
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_B1F: @ 8484534
+ .4byte AbandonedShip_Rooms2_B1F_MapAttributes
+ .4byte AbandonedShip_Rooms2_B1F_MapEvents
+ .4byte AbandonedShip_Rooms2_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 191
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/maps/AbandonedShip_Rooms2_B1F/map.bin
new file mode 100644
index 000000000..7865bb69d
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_B1F/map.bin
@@ -0,0 +1 @@
+6@AB''''76@AB'CDE7>HIJ////?>HIJ/KLM?>PQ:2;2;2;2;2GFPQ:2;2;2TU?>XY=282VW6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=282828282826?>6828282828282?>682828282`282?>=28282d2e282b?>=28282d2e28282? \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/maps/AbandonedShip_Rooms_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
new file mode 100644
index 000000000..46014cde9
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_1F: @ 84844E0
+ .4byte AbandonedShip_Rooms_1F_MapAttributes
+ .4byte AbandonedShip_Rooms_1F_MapEvents
+ .4byte AbandonedShip_Rooms_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 188
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/maps/AbandonedShip_Rooms_1F/map.bin
new file mode 100644
index 000000000..20529b3df
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_1F/map.bin
@@ -0,0 +1 @@
+6''c''76@kc''7>//6//?>Hs6//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=28282826?>682828282a282?>:2;2<282828282?>=2828282828282?>=2828282`28282?>=2b8282828282?>6828282828282?>=2828282a28282?>=2828282828282?=26@AB'''E76'''=2CDE7>HIJ////?>///=2KLM?>PQ:2;2;2;2;2GF:2;2;2<2;2TU?>XY=282`28282ON=282828282\]?>:2;2<2b828282;2;2<282828282;2;2?>=2828282828282?>=2VW8282826?>=2a28282828282?>=2^_82828282?>68282d2e28282?>=28282d2e28282? \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/maps/AbandonedShip_Rooms_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
new file mode 100644
index 000000000..f9fab80eb
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms_B1F: @ 8484518
+ .4byte AbandonedShip_Rooms_B1F_MapAttributes
+ .4byte AbandonedShip_Rooms_B1F_MapEvents
+ .4byte AbandonedShip_Rooms_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 190
+ .byte 61
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/maps/AbandonedShip_Rooms_B1F/map.bin
new file mode 100644
index 000000000..b18509507
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_B1F/map.bin
@@ -0,0 +1 @@
+6@kmE@kc''@kmE7>Hs2uMHs6//Hs2uM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<28282826:2;2<28282;2;2?>=2VW8282826=282=28282a2828282?>=2^_82`28282=2pVp82=2`2828282b82?>6828282828282=2VGV82=282828282826? \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/maps/AbandonedShip_Underwater1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
new file mode 100644
index 000000000..c3864d6c4
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Underwater1: @ 8484550
+ .4byte AbandonedShip_Underwater1_MapAttributes
+ .4byte AbandonedShip_Underwater1_MapEvents
+ .4byte AbandonedShip_Underwater1_MapScripts
+ .4byte 0x0
+ .2byte BGM_DEEPDEEP
+ .2byte 192
+ .byte 61
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/maps/AbandonedShip_Underwater1/map.bin
new file mode 100644
index 000000000..2c73cfe86
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater1/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/maps/AbandonedShip_Underwater2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
new file mode 100644
index 000000000..b8b591eed
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Underwater2: @ 84845C0
+ .4byte AbandonedShip_Underwater2_MapAttributes
+ .4byte AbandonedShip_Underwater2_MapEvents
+ .4byte AbandonedShip_Underwater2_MapScripts
+ .4byte 0x0
+ .2byte BGM_DEEPDEEP
+ .2byte 196
+ .byte 61
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/maps/AbandonedShip_Underwater2/map.bin
new file mode 100644
index 000000000..9dbd5c71a
--- /dev/null
+++ b/data/maps/AbandonedShip_Underwater2/map.bin
@@ -0,0 +1 @@
+2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/AlteringCave/border.bin b/data/maps/AlteringCave/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/AlteringCave/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc
new file mode 100644
index 000000000..bc062c9d5
--- /dev/null
+++ b/data/maps/AlteringCave/header.inc
@@ -0,0 +1,15 @@
+AlteringCave: @ 8484A58
+ .4byte AlteringCave_MapAttributes
+ .4byte AlteringCave_MapEvents
+ .4byte AlteringCave_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 420
+ .byte 210
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AlteringCave/map.bin b/data/maps/AlteringCave/map.bin
new file mode 100644
index 000000000..38bec91fa
--- /dev/null
+++ b/data/maps/AlteringCave/map.bin
@@ -0,0 +1 @@
+f222f222ff6662222226662222226662f2222222222222######"f22222222#######"2222222 !B!B!B!B!B!B"P22222222BBBBBBP222222222222fP222BBBBBB22222222222ffPf2BBBBBB22222222222222222BBBBB2222222222222222222222222222f2222222222222222f22222222222Pf22222222222222222P2222222222f22222222222222222####"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
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/maps/AncientTomb/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
new file mode 100644
index 000000000..daf7c5c2d
--- /dev/null
+++ b/data/maps/AncientTomb/header.inc
@@ -0,0 +1,15 @@
+AncientTomb: @ 8484630
+ .4byte AncientTomb_MapAttributes
+ .4byte AncientTomb_MapEvents
+ .4byte AncientTomb_MapScripts
+ .4byte 0x0
+ .2byte BGM_MABOROSI
+ .2byte 281
+ .byte 83
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/AncientTomb/map.bin b/data/maps/AncientTomb/map.bin
new file mode 100644
index 000000000..406cf7279
--- /dev/null
+++ b/data/maps/AncientTomb/map.bin
Binary files differ
diff --git a/data/maps/AquaHideout_1F/border.bin b/data/maps/AquaHideout_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AquaHideout_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
new file mode 100644
index 000000000..b9b43b2d2
--- /dev/null
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -0,0 +1,15 @@
+AquaHideout_1F: @ 8484144
+ .4byte AquaHideout_1F_MapAttributes
+ .4byte AquaHideout_1F_MapEvents
+ .4byte AquaHideout_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 143
+ .byte 197
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 3
+
diff --git a/data/maps/AquaHideout_1F/map.bin b/data/maps/AquaHideout_1F/map.bin
new file mode 100644
index 000000000..2330fe015
--- /dev/null
+++ b/data/maps/AquaHideout_1F/map.bin
@@ -0,0 +1,55 @@
+STST [\21$#![\0!21!!2"
+cd:292)2)2)2cd82)2:292)2)22)22)2'
+
+!!! k2l22(2(2(2(2k2l22(2(2(2(2(2(2(2(2(27
+
+2)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2)2
+
+'//2(2(2]iiiiiiiiii^2(2(2(2(2(2
+
+/'/2(2(2`q1q1q1q1q1q1q1q1q1q12(2(2(2(2(2
+
+'/22(2(2`q1p1p1p1p1p1p1p1p1q12(2(2(2(2(2
+
+/22(2(2(2hiiiiiiiiii2(2(2(2(2
+
+)22(2(2(2(2*2*2*2*2*2*2*2*2*2*2*2*22(2(2(2(2'
+
+)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2/
+
+)2(2(2]iiiiiif(2(2eiiiiii^2(2'
+
+)2(2(2`t||||||00||||||2(2/
+
+)2(2(2`us2(2*2
+
+)2(2(2`upppppppppppps2(2(2
+
+22(2`upppppppppppps2(2(2
+
+2uppppppppppppsy2(2(2
+
+2*BBBBtppppprBBBBB*2(2(2
+
+)2*22((BBBBuypppxsBBBBB((222
+
+)2(2(2t|||}ppp{||||2
+
+)2(2(2`uppps2
+
+)2(2(2`upppppppppppps2*2*2
+
+22(2`upppppppppppps2(2(2
+
+2`upppppppppppps222
+
+2uppppppppppppsy2
+
+)2*22*BBBBBtppprBBBBBB*2
+
+)2(2(2((BBBBBuypxsB(B(B(B(B(B((2*2*2
+
+mmmmmmmmougsnmmmmmmmmm
+
+qqqqqqqqusqqqqqqqqq
+llllllllllllllllllllll \ No newline at end of file
diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/maps/AquaHideout_B1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AquaHideout_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc
new file mode 100644
index 000000000..401f3ba9a
--- /dev/null
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -0,0 +1,15 @@
+AquaHideout_B1F: @ 8484160
+ .4byte AquaHideout_B1F_MapAttributes
+ .4byte AquaHideout_B1F_MapEvents
+ .4byte AquaHideout_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 144
+ .byte 197
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 3
+
diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/maps/AquaHideout_B1F/map.bin
new file mode 100644
index 000000000..97efacec8
--- /dev/null
+++ b/data/maps/AquaHideout_B1F/map.bin
@@ -0,0 +1,83 @@
+ 01!2
+112!
+!!2!!
+
+!!!
+ST8292)22)22
+92922)22)2
+')22)22)2'
+
+)2)2)2
+
+!2[\ )2(2(2(2(2(2
+)2(2(2(2(2(27
+/2(2(2(2(2/
+
+72(227
+
+)22)22cd2)2(2(2(2(2(2
+)2(2(2(2(22*2*27
+)22(2(2(22(2
+
+)2*22(2(2*2*27
+
+)2(2(2(2k2l22(2(2(2(2(2(2  2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 
+)22(2(22(2(22(2
+
+)2(2(2(22A2B2222(2(2(2+,-.
+iiiiiii^
+
+)2(2(2(2IJ222(2(2(2
+$#$!!!
+0013456
+
+`2222222
+
+)2(2(2(2222A2B22(2(2(2
+377C66
+828292;<=>
+
+hiiiiiii
+
+)2(2(2(2222IJ(2(2(2
+33377C333
+)263(2CDEF
+
+)22(2(22(2(22(2
+
+)2(2(2(2222222(2(2(2
+33333323
+)2(2(2KLMN
+
+iiiiiii^
+  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2 3333333333 )2(2(2(2UV)2
+
+`2222222
+)22(2(2(2(2(2
+
+hiiiiiii
+
+!!!!!!!!!!!!! !!!!!!!!!!  2Y2Y2Y2Y2Y2Y2 
+)22(2(22(2(22(2
+
+)2)2)2)2)2)2)2)2)2)2)2)2)22)2222222223
+iiiiiii^
+
+)2(22(2(2(2(2(2(2(2(2(2(2(2(23  2227 !!!!!!!
+
+`2222222
+
+iiiiiiiiiiiii^222D322222)2)2
+
+hiiiiiii
+
+`2222222222222222222222222222(2(2
+
+)22(2(22(2(22(2
+
+`2O1O1O1O1O1O1O1O1O1O1O1O12A2B2222A2B23322222(2(2
+  2Y2Y2Y2Y2Y2Y2Y2Y2 
+hiiiiiiiiiiiii2IJ222IJ22222(22
+
+)2*22*2*2*2*2*2*2*2*2*2*2*2*2222222222222222(2(2
+ !!!!!!!!!   2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file
diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/maps/AquaHideout_B2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc
new file mode 100644
index 000000000..6e4304732
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -0,0 +1,15 @@
+AquaHideout_B2F: @ 848417C
+ .4byte AquaHideout_B2F_MapAttributes
+ .4byte AquaHideout_B2F_MapEvents
+ .4byte AquaHideout_B2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 145
+ .byte 197
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 3
+
diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/maps/AquaHideout_B2F/map.bin
new file mode 100644
index 000000000..2e843a8e4
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/map.bin
@@ -0,0 +1,51 @@
+ST+,-.+,-.222 [\012
+!!23456!!3456!!!
+cd82922)22
+)2)22)22;<=>)2)2;<=>)2)2)2
+
+!2!
+k2l22(2(2(2(2
+)2(2(2(2(2CDEF2(2CDEF2(2(2
+
+)22)22)2
+)2(2(2(2(2(2(2
+)2(2(2(2(2KLMN2(2KLMN2(2(2
+
+)2(2(2(2(2
+)2(2(22A2B22
+)2(2(2(2(2(2UV2(2(2(2UV2(2(2(2
+
+)2(2(2
+)2(2(22IJ
+)2(222(2(2*2*22(2(2(2*2*22(2(2(2
+
+)2//(2
+)2(2(22222
+)2(22(222(2(222(222(2(2(2
+
+)277/2
+)22(22222
+)2(2202(2222(2
+  2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2 )2(2*2*22822(2:22(2(2
+)2(2(2(2(2(2*2*22(2*2*22*2*22(2(2
+
+!!!!! 012!!!!
+)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2
+
+)2)2)2)2)228292:2)2)2)2)2
+)2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2 
+)2(2(2(2(2(2(2(2(2(2(22(2 )2(2(22(2(2(2'2Y2Y2Y2Y2Y2Y2Y2Y2
+)2(2(2(2(2(2(2(2(2(2(2(2(2)2(2(2(2(2(2'/
+
+iiiiiiiiiiif )2(2(2(2(2(2/// !!!!!!!!
+
+2iiiiiii^2)2)2)2)2)2)2)2)2
+
+VVVVVVVVppp2(2(2(2(2(2(22(2
+
+GGGGGGGVVVVVVVVpppppy2(2(2(2(2
+
+GGGGGGGGGGGGGGVVVVVp*22(2(2(2(2''//
+
+GGGGGGGGGGGGGGGGGGVp2(2(2(2(2//)22
+ GGGGGGGGGGGGGGGGGGVp2Y2Y2Y2Y2 2 2 2Y2 GGGGGGGGGGGGGGGGGGVpb iiiiiiiiiiiiiiiiiiiiij !!!!!!!!  \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/border.bin b/data/maps/AquaHideout_UnusedRubyMap1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
new file mode 100644
index 000000000..1b678dfd1
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap1: @ 84846D8
+ .4byte AquaHideout_UnusedRubyMap1_MapAttributes
+ .4byte AquaHideout_UnusedRubyMap1_MapEvents
+ .4byte AquaHideout_UnusedRubyMap1_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 316
+ .byte 197
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 2
+
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.bin b/data/maps/AquaHideout_UnusedRubyMap1/map.bin
new file mode 100644
index 000000000..52c2d57eb
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap1/map.bin
Binary files differ
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/border.bin b/data/maps/AquaHideout_UnusedRubyMap2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
new file mode 100644
index 000000000..17d98b346
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap2: @ 84846F4
+ .4byte AquaHideout_UnusedRubyMap2_MapAttributes
+ .4byte AquaHideout_UnusedRubyMap2_MapEvents
+ .4byte AquaHideout_UnusedRubyMap2_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 317
+ .byte 197
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 2
+
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.bin b/data/maps/AquaHideout_UnusedRubyMap2/map.bin
new file mode 100644
index 000000000..1406dde5d
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap2/map.bin
@@ -0,0 +1,95 @@
+ 01!2
+012!!!!!!!3333
+
+!!!
+STST8292)22)22
+82922)22)2)2)2)2)2)2)27777//
+
+)2)2)2
+
+!2[\01!!
+2[\
+)2(2(2(2(2(2
+)2(2(2(2(22A2B222(2(2*2*27777
+
+72(227
+
+)22)22cd8292)2)2
+'2)22cd
+)2(2(2(2(2(2
+)2(2(2(2(22IJ2(2(2(2(2*2*2*2*2
+
+)2*22(2(2*2*27
+
+)2(2(2(2k2l2(22(2(2
+/2(2(2k2l2
+)2(2(2(22(2
+)2(2(2(2(222222(2(2(22(2(2(2(2
+
+)22(2(22(2(22(2
+
+)2(2(2(2(2(2(2(2(2(2
+'2(2(2(2(2
+)22A2B222  2Y2Y2Y2Y2Y2Y2Y2Y22Y2Y2Y2Y2Y2Y2Y2Y2 
+mmmmmmmo
+
+)2(2(2(2(2(2(22(2(2
+/62(2(2(2(2
+)22IJ2
+vq0q0q0q0q0q0q0w
+  2Y2Y2Y2Y2Y2Y2Y2Y2Y2 )222(2(2(2
+)222222
+$#$!!
+001!3333
+
+~yyyyyyy
+)2(2(2(2(2(2
+)2(2(2(2(2(2
+7733
+828292)2
+
+)22(2(22(2(22(2
+ !!!!!!!!!!  2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2 333C33
+)2(2(2(2*2*2
+
+mmmmmmmo
++,-.33333332
+)2(22(2(22*2*2
+
+vq0q0q0q0q0q0q0w
+
+345601
+0011!! 333333333  2Y2Y2Y2Y2Y2Y2Y2 
+~yyyyyyy
+
+;<=>8292
+82829292)2)2
+)22(2(22(2(22(2
+
+CDEF)22
+)2(22(2(2(2 !!!!!!!!! !!!!!!!!
+
+mmmmmmmo
+
+KLMN)2(2
+)2(2(2(2(2(22)2)2)2)2)2)2)2)2)22)2)2)2)2)2)2)2)2
+
+vq0q0q0q0q0q0q0w
+
+)2UV)22(2  2Y2Y2Y2Y2Y2Y2Y2Y223222222222222(2(2
+
+~yyyyyyy
+
+)2)2)2)2(2(2  2A2B222@2B2332(2(2
+
+)22(2(22(2(22(2
+
+)2(2(2(233
+!!!!!!!!! 2IJ22HJ2(2(2
+  2Y2Y2Y2Y2Y2Y2Y2Y2 
+)2(233
+)2)2)2)2)2)2)2)2)222222222222222(22
+
+3377(2(2
+)2(22(2(2(2(2(2(2(22222222222222(2(2
+ !!!!!!!!!  7777  2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  !!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!  \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/border.bin b/data/maps/AquaHideout_UnusedRubyMap3/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
new file mode 100644
index 000000000..73c8d7c0d
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -0,0 +1,15 @@
+AquaHideout_UnusedRubyMap3: @ 8484710
+ .4byte AquaHideout_UnusedRubyMap3_MapAttributes
+ .4byte AquaHideout_UnusedRubyMap3_MapEvents
+ .4byte AquaHideout_UnusedRubyMap3_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 318
+ .byte 197
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 2
+
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.bin b/data/maps/AquaHideout_UnusedRubyMap3/map.bin
new file mode 100644
index 000000000..68afb0063
--- /dev/null
+++ b/data/maps/AquaHideout_UnusedRubyMap3/map.bin
@@ -0,0 +1,49 @@
+ST|}~|}~ [\012
+!!23456!!3456!!!
+cd82922)22
+)2)22)22;<=>)2)2;<=>)2)2)2
+
+2! k2l22(2(2(2(2
+)2(2(2(2(2CDEF(2(2CDEF2(2(2
+
+'2)22)22)2(2(2(2(2(2(2
+)2(2(2(2(2KLMN(2(2KLMN22(2
+
+/(2(2(2(22A2B222(2(2(2
+)222(2(2(2UV2(2(2(2UV2(2(2(2
+
+/(2(2(2(22IJ2(2(2(2
+)222(2(2(2(2(2(2(2*2*22(2(2(2
+
+)2(2(2(2(222222(2(2(2
+)2:22(2(2(2(2(2(222(222(2(2
+
+)2(2(2(2(222222(2(2(2
+)2*2*22(2(2(2(2(2(2(222(2
+  2Y22Y2Y2Y2Y2Y2Y2Y2Y2Y2Y2  2Y2Y2Y2Y2Y2Y2Y22(2(2:22(2
+(2(2*2*22*2*22(2
+
+01
+!!!!!!!!!!
+!!!!!!!! (2(2(2(2(2(2(2(2(2
+
+8292
+)2)2)2)2)2)2)2)2)2)2 )2)2)2)2)2)2)2)22(2(2(2(2(22Y2Y2Y2 
+)2(2
+)2(2(2(2(2(2(2(22(2)2(22(2(2(2(2(2(2(2(2(2(2(2
+)22
+)2(2(2(2(2(2(2(2(2(2 iiiiiiiiiiii^ !!!
+
+)2(2
+)2(2(2(2piiiif22)2)2)2
+
+)2(2 )2(2(2(2`pppppVVVVVVb2(22(2
+
+)2(2)2(2(2(2`ppppppVVVVVGGGGGVb2(2(2(2
+
+)2(2 )2(2(2(2xpppVVVGGGGGGGGGGVb2(2(2(2
+
+)2(22)2(2(2(2*2pVVGGGGGGGGGGGGGVb2(2(2(2
+
+)2(2(2(2(2(2(2VGGGGGGGGGGGGGGGVb2(2(2(2
+  2Y2Y2Y2Y2Y22`VGGGGGGGGGGGGGGGVb{3(2(2(2 `VGGGGGGGGGGGGGGGVb !!!!!! hiiiiiiiiiiiiiiiiiiij !!!  \ No newline at end of file
diff --git a/data/maps/ArtisanCave_1F/border.bin b/data/maps/ArtisanCave_1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ArtisanCave_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc
new file mode 100644
index 000000000..dbfd31dba
--- /dev/null
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -0,0 +1,15 @@
+ArtisanCave_1F: @ 84849B0
+ .4byte ArtisanCave_1F_MapAttributes
+ .4byte ArtisanCave_1F_MapEvents
+ .4byte ArtisanCave_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 401
+ .byte 202
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ArtisanCave_1F/map.bin b/data/maps/ArtisanCave_1F/map.bin
new file mode 100644
index 000000000..2009f24f4
--- /dev/null
+++ b/data/maps/ArtisanCave_1F/map.bin
@@ -0,0 +1 @@
+666666666666666666666666666666666666666666666666666666666666666666?262666666262666666262666666262666666226666662266666626U266666622262226666662226222666666 6 6 6"22U22  6 6 6666666666"22222 666666666666"222 6666666666662<2666666666666 6XYZ 6666666666666 6 6 6 6 6 6 6666666666666 6 6 6 6 6 6 6 6 6666666666666666666666666666 \ No newline at end of file
diff --git a/data/maps/ArtisanCave_B1F/border.bin b/data/maps/ArtisanCave_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ArtisanCave_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc
new file mode 100644
index 000000000..3caf8f660
--- /dev/null
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -0,0 +1,15 @@
+ArtisanCave_B1F: @ 8484994
+ .4byte ArtisanCave_B1F_MapAttributes
+ .4byte ArtisanCave_B1F_MapEvents
+ .4byte ArtisanCave_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 400
+ .byte 202
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ArtisanCave_B1F/map.bin b/data/maps/ArtisanCave_B1F/map.bin
new file mode 100644
index 000000000..c5ce45c52
--- /dev/null
+++ b/data/maps/ArtisanCave_B1F/map.bin
@@ -0,0 +1 @@
+22222666666666666666666666666666666666666222226666666666666666666666666666666666666222266'6622226'666666662222666666622222266222222266662222'226666666'2222222222222222266662222 6 6"2662222  B B"222222222266662222662U222 "222222222666622226622222222222222 BB"2222222266662222 6 6"222222  B B B B B B B B B BBB B B B B B B"222266662222 2 6"22222   6 6 6 6"BBBBBBBBBBBB"22266662222U2222   6"B"2266662222U222266B2266662222U222266B2266662222222266B222222222222266662222'2222'66B22  6 6 6 6"2222266662222222  6 6 6B2  " ""2222666622222  6 6666BB B B B B B BU"222666622222  6 6 6 6 6BBBBBBBBBBU    6 6 6 66622222  B B B B BBBB             6 6 6 6 6"6622222BBBBBBBB     "   " " " "6622222BUBBUUU662222222222BBUBBUUU6622222BBBBBBU        662222222222BBBBBBUBBBBBBBB6666666662222222222BBBBBBBUB         2222222222BBBBBBBBB        22222BBBBBBBBB22266666  2222222222BBBBBBBBB226     62222222222BUBBBBBB2226     2222 6 6"2222BBBBBBBB'       6    2222 6"62222BBBBBBBBB  "     62222 2" 6" 6"222BUBBBBBBBBU6666622222U6222BBBBBBBBUBBBBBBBBB62222U6U222BBBBBB66666622226622  B B2222222BBBBBB662222U622BB22BB2226U22226622BBBBBBB22BB2226666662222U22B22BB22266666622222222B22222B       66666622222222B22222B'        66666622222222U2222U6        6666662222222222222266U6        66666622222222222222'U66U66222222222222222666622222222222222222666622222222U222222222666666622222<22222222222226666666666666666666662222 XYZ             6666666666666666666662222                      6666666666666666662222  6  6  6  6  6  6   6                       666622222666666666666666666666666666666666666666662222266666666666666666666666666666666666666666 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin b/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
new file mode 100644
index 000000000..f55683ddf
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaBattleRoom: @ 8485484
+ .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
+ .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_ARENA
+ .2byte 356
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin
new file mode 100644
index 000000000..526de2248
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin
@@ -0,0 +1 @@
+PPQPPQPPPPUPPUPPXXYXXYXXXX]XX]XX``a``a````e``e``22222222222222222222(2)2*2+2,2-2.2/22222}2}2}2}20212223242526272}2}2}2}222228292:2;2<2=2>2?22222u2u2v2w2@2A2B2C2D2E2F2G2u2v2u2u2 2 2 2 2H2I2J2K2L2M2N2O2 2 2 2 222222'2'222'2'2222222222222222222222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin b/data/maps/BattleFrontier_BattleArenaCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
new file mode 100644
index 000000000..2820635f3
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaCorridor: @ 8485468
+ .4byte BattleFrontier_BattleArenaCorridor_MapAttributes
+ .4byte BattleFrontier_BattleArenaCorridor_MapEvents
+ .4byte BattleFrontier_BattleArenaCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_ARENA
+ .2byte 355
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin b/data/maps/BattleFrontier_BattleArenaCorridor/map.bin
new file mode 100644
index 000000000..1b124b610
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.bin
@@ -0,0 +1 @@
+VWWVWWWWkWWk^__^____s__sf6g6g6f6g6g6g6g6{6g6g6{6nononononoVWWVWWWWkWWknonoVWWVWWWWkWWknono^__^____s__snonof6g6g6f6g6g6g6g6{6g6g6{6nont2222222222222z22o2222222222222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/border.bin b/data/maps/BattleFrontier_BattleArenaLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaLobby/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
new file mode 100644
index 000000000..660d353c1
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleArenaLobby: @ 848544C
+ .4byte BattleFrontier_BattleArenaLobby_MapAttributes
+ .4byte BattleFrontier_BattleArenaLobby_MapEvents
+ .4byte BattleFrontier_BattleArenaLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_ARENA
+ .2byte 354
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.bin b/data/maps/BattleFrontier_BattleArenaLobby/map.bin
new file mode 100644
index 000000000..2792d7979
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleArenaLobby/map.bin
@@ -0,0 +1,3 @@
+P6Q6P6P6P6P6S6X6R6P6P6P6P6U6P6P6X6Y666Z6[6S6\6R6Z6[666]6X6X6`6a666b6c6T6d6a6b6c666e6`6`6FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF#FFFFFF$FFFFFF2%FFFFFF&F24 2FFFFFF 22
+2 2 22222'222 22 22222 2222 2 222222222 222222222222222222222222
+222222222222222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin b/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
new file mode 100644
index 000000000..3a7eca639
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeBattleRoom: @ 8485388
+ .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
+ .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_DOME_TOURNAMENT
+ .2byte 335
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin
new file mode 100644
index 000000000..ffb450f3c
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin
@@ -0,0 +1,2 @@
+               !"#$%&      ()*+,-.      0123456       
+   89:;<=>>    \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin b/data/maps/BattleFrontier_BattleDomeCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
new file mode 100644
index 000000000..a9093cc84
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeCorridor: @ 8485350
+ .4byte BattleFrontier_BattleDomeCorridor_MapAttributes
+ .4byte BattleFrontier_BattleDomeCorridor_MapEvents
+ .4byte BattleFrontier_BattleDomeCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_DOME
+ .2byte 333
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin b/data/maps/BattleFrontier_BattleDomeCorridor/map.bin
new file mode 100644
index 000000000..2a9c49675
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.bin
@@ -0,0 +1 @@
+ABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDABCDEFGDIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLIJKLMNOLQRSSUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTQRSTUVWTYZ[[]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\YZ[\]^_\DBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBCBHA@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@A@AI@A@A@A@A@A@A@A@A@A@A@A=>@A@A@A@A@A@A@A@A@A@A@A@ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/border.bin b/data/maps/BattleFrontier_BattleDomeLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeLobby/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
new file mode 100644
index 000000000..e7b1c9935
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomeLobby: @ 8485334
+ .4byte BattleFrontier_BattleDomeLobby_MapAttributes
+ .4byte BattleFrontier_BattleDomeLobby_MapEvents
+ .4byte BattleFrontier_BattleDomeLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_DOME
+ .2byte 332
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.bin b/data/maps/BattleFrontier_BattleDomeLobby/map.bin
new file mode 100644
index 000000000..655c6a39c
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomeLobby/map.bin
@@ -0,0 +1 @@
+%&%&%&  -.  -.    -.  -.   567     567    34     34  $; <$$; <$DBCBCBCBCBCBCBCBCBCBCBCHA@A@A@A@A@A@A@A@A@A@A@I@A@A@A@A@A@A@A@Aqr@AHA@A@A@s@A@A@yzI@I@@tuv@A{A@`ab@HAI|}~hijII@CBBCTA@A@CBBCTAHA@A@A@A@A@A@A@A@A@A@A@@A@A@A@A@A@A@AA@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
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
new file mode 100644
index 000000000..a2c9d8bf6
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleDomePreBattleRoom: @ 848536C
+ .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
+ .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_DOME_TOURNAMENT
+ .2byte 334
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin
new file mode 100644
index 000000000..49f40213a
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
new file mode 100644
index 000000000..5ae64a1f5
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
+ .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
+ .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_FACTORY
+ .2byte 348
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin
new file mode 100644
index 000000000..feffbf038
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin b/data/maps/BattleFrontier_BattleFactoryLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
new file mode 100644
index 000000000..b376011f4
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryLobby: @ 84854A0
+ .4byte BattleFrontier_BattleFactoryLobby_MapAttributes
+ .4byte BattleFrontier_BattleFactoryLobby_MapEvents
+ .4byte BattleFrontier_BattleFactoryLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_FACTORY
+ .2byte 346
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin b/data/maps/BattleFrontier_BattleFactoryLobby/map.bin
new file mode 100644
index 000000000..66037e302
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.bin
@@ -0,0 +1,2 @@
+#""#"""#"""#""#$()$(%)$(%)$()$*+,*+,9<S234KTUVK234S<<A:`S\3]3^3LO;I22a-.=3202;/-432432 4!_1 4!3323322XYZ22532222PQR273243222222222222222228332222222222222222@4322222222 
+  H \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
new file mode 100644
index 000000000..b8427f82f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
+ .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
+ .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_FACTORY
+ .2byte 347
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
new file mode 100644
index 000000000..15e97cb30
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin
@@ -0,0 +1,2 @@
+01BR%&'JRR=>?-./ //=>?]^_*+,*+,ABCOMN234234DEFS\UVSSSHIJS`abcdDhijkl3L4PQ33PQXY 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
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
new file mode 100644
index 000000000..4bfde6991
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
+ .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
+ .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PALACE
+ .2byte 344
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin
new file mode 100644
index 000000000..58d0a581f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin
@@ -0,0 +1 @@
+K2L2?6K2L2?6K2L2?6K2L2?6H6I2JM2N2G6M2N2G6M2N2G6M2N2G6P6Q2RU2V2O6U2V2O6U2V2O6U2V2O61111X2Y6Z6[6\6]6^6112222&2`6a6b6c6d6e6f612222&21hijklmn12222pqrstuv12222xyz{|}~1222212222ppppppppp \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin b/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
new file mode 100644
index 000000000..a3786f794
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceCorridor: @ 84853C0
+ .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes
+ .4byte BattleFrontier_BattlePalaceCorridor_MapEvents
+ .4byte BattleFrontier_BattlePalaceCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PALACE
+ .2byte 343
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin b/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin
new file mode 100644
index 000000000..f2bc6aca4
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin b/data/maps/BattleFrontier_BattlePalaceLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
new file mode 100644
index 000000000..357a5d9e6
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePalaceLobby: @ 84853A4
+ .4byte BattleFrontier_BattlePalaceLobby_MapAttributes
+ .4byte BattleFrontier_BattlePalaceLobby_MapEvents
+ .4byte BattleFrontier_BattlePalaceLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PALACE
+ .2byte 342
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin b/data/maps/BattleFrontier_BattlePalaceLobby/map.bin
new file mode 100644
index 000000000..cda8ff10e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.bin
@@ -0,0 +1,7 @@
+ 
+  
+   
+    
+    
+   
+   6   6 2 2 2 6 2 2 2 2 6666 2 6 2 2 2 6 2  6 6   666 6 2 6666 2 666 6 2  6 666 6626 66 6#6$6%66 6626 666 6 !@A+,- !@A)*)*1"1" \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin b/data/maps/BattleFrontier_BattlePikeCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
new file mode 100644
index 000000000..3c305dbee
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeCorridor: @ 8485510
+ .4byte BattleFrontier_BattlePikeCorridor_MapAttributes
+ .4byte BattleFrontier_BattlePikeCorridor_MapEvents
+ .4byte BattleFrontier_BattlePikeCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PIKE
+ .2byte 350
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin b/data/maps/BattleFrontier_BattlePikeCorridor/map.bin
new file mode 100644
index 000000000..5e02c145b
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.bin
@@ -0,0 +1 @@
+666666666$2%222,22222,222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/border.bin b/data/maps/BattleFrontier_BattlePikeLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeLobby/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
new file mode 100644
index 000000000..c1533a1ed
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeLobby: @ 84854F4
+ .4byte BattleFrontier_BattlePikeLobby_MapAttributes
+ .4byte BattleFrontier_BattlePikeLobby_MapEvents
+ .4byte BattleFrontier_BattlePikeLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PIKE
+ .2byte 349
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.bin b/data/maps/BattleFrontier_BattlePikeLobby/map.bin
new file mode 100644
index 000000000..4cbdfb405
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeLobby/map.bin
@@ -0,0 +1 @@
+666666666666666666*+,()23422201:3;3<3222832932222 2 22222222 3!3"322222 2222222 2 22 222 22 222222222222 2222222 222222222222222 333 222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
new file mode 100644
index 000000000..f932492e0
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom1: @ 8485548
+ .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes
+ .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
+ .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PIKE
+ .2byte 352
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin
new file mode 100644
index 000000000..142150cbe
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin
@@ -0,0 +1 @@
+66666662666622,222,2222222222222322232222-222-22 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
new file mode 100644
index 000000000..35191e707
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom2: @ 8485564
+ .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes
+ .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
+ .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PIKE
+ .2byte 353
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin
new file mode 100644
index 000000000..27a6e52aa
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin
@@ -0,0 +1 @@
+6666666666666665252=@3A3B3=2H3I3J3242P3Q3R32<X3Y3Z3 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
new file mode 100644
index 000000000..69fcb0ee0
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom3: @ 8485580
+ .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes
+ .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
+ .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PIKE
+ .2byte 358
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin
new file mode 100644
index 000000000..8ce7f1c37
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin
@@ -0,0 +1 @@
+666662626262222222422 3222 322>22272 3 3222 3 32>22 3 3 3 3 3 3 32242 3 3 3 3 3 32 3>232 3 3 3 3 32 3>2722 3 3 3 3 32 3>23 3222222 3>322232222222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin b/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
new file mode 100644
index 000000000..95da241ae
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeThreePathRoom: @ 848552C
+ .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes
+ .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
+ .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PIKE
+ .2byte 351
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin
new file mode 100644
index 000000000..9618fe22a
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin
@@ -0,0 +1 @@
+6626262622222222222222222222222222222222222222222222222222222222222222223222232222222-2222-2222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
new file mode 100644
index 000000000..d0b08b300
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 398
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
new file mode 100644
index 000000000..62d5761e0
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
@@ -0,0 +1,2 @@
+ 
+  mnouvw \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
new file mode 100644
index 000000000..ead91f494
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidEmptySquare: @ 8485414
+ .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes
+ .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents
+ .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 361
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin
new file mode 100644
index 000000000..7c224d524
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin
@@ -0,0 +1 @@
+22222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin b/data/maps/BattleFrontier_BattlePyramidLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
new file mode 100644
index 000000000..fe8235101
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidLobby: @ 84853F8
+ .4byte BattleFrontier_BattlePyramidLobby_MapAttributes
+ .4byte BattleFrontier_BattlePyramidLobby_MapEvents
+ .4byte BattleFrontier_BattlePyramidLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_PYRAMID
+ .2byte 360
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin b/data/maps/BattleFrontier_BattlePyramidLobby/map.bin
new file mode 100644
index 000000000..32f23d3de
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.bin
@@ -0,0 +1,2 @@
+FF F
+FFFFFFFF F!F"FFFFFFFFFFFFF(F)F*FFFFFFFFFFFFFF0FFFFFF+FFFFF+FF0FFFFFF3FF F B F3FF0FFFBBF BF B B B B BF B1FBBBBB B B B B B B B B BBBB B B B B B B B B B B B B B B B B B BFFF#F$B%FFFF B B B B B BFFF#F$B%FFFF B B BFFF#F$B%FFFFFFFFF#F$B%FFFFFFFF#F$B%FFFFF&F B BBBB 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 BBBB 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
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidTop/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
new file mode 100644
index 000000000..fe3964510
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePyramidTop: @ 8485430
+ .4byte BattleFrontier_BattlePyramidTop_MapAttributes
+ .4byte BattleFrontier_BattlePyramidTop_MapEvents
+ .4byte BattleFrontier_BattlePyramidTop_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 378
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.bin b/data/maps/BattleFrontier_BattlePyramidTop/map.bin
new file mode 100644
index 000000000..dba9cf1b0
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidTop/map.bin
@@ -0,0 +1 @@
+}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}};;;;;;;;;;;;;;;xyz{|;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;BBB;;;;;;;;;;;;;;;;;;;;;;;;;;;;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
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
new file mode 100644
index 000000000..53542ab96
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerBattleRoom: @ 848521C
+ .4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
+ .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_TOWER
+ .2byte 268
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 8
+
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin
new file mode 100644
index 000000000..42d99b5a6
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin
@@ -0,0 +1 @@
+///LMMN///?77TU2U2V77?G<2<2<2<2<2<2<2<2;2:2H2B2I2J2B2K2:2:2;2:2D2P2Q2R2S2E2:2:2;2:2D2X2Y2Z2[2E2:2:2;2:2D2`2a2b2c2E2:2:2~2:2@2C21292C2A2:2>2:2:2:222:2:2:2F \ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
new file mode 100644
index 000000000..fffa32e0d
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerBattleRoom2: @ 8485318
+ .4byte BattleFrontier_BattleTowerBattleRoom2_MapAttributes
+ .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
+ .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_TOWER
+ .2byte 268
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 8
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin b/data/maps/BattleFrontier_BattleTowerCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
new file mode 100644
index 000000000..54a836985
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerCorridor: @ 8485200
+ .4byte BattleFrontier_BattleTowerCorridor_MapAttributes
+ .4byte BattleFrontier_BattleTowerCorridor_MapEvents
+ .4byte BattleFrontier_BattleTowerCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_TOWER
+ .2byte 267
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin b/data/maps/BattleFrontier_BattleTowerCorridor/map.bin
new file mode 100644
index 000000000..0b0803f91
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin b/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
new file mode 100644
index 000000000..2988c9d32
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerCorridor2: @ 84852FC
+ .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes
+ .4byte BattleFrontier_BattleTowerCorridor2_MapEvents
+ .4byte BattleFrontier_BattleTowerCorridor2_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_TOWER
+ .2byte 391
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin b/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin
new file mode 100644
index 000000000..87e93b640
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/border.bin b/data/maps/BattleFrontier_BattleTowerElevator/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerElevator/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
new file mode 100644
index 000000000..50cbdd309
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerElevator: @ 84851E4
+ .4byte BattleFrontier_BattleTowerElevator_MapAttributes
+ .4byte BattleFrontier_BattleTowerElevator_MapEvents
+ .4byte BattleFrontier_BattleTowerElevator_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_TOWER
+ .2byte 266
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.bin b/data/maps/BattleFrontier_BattleTowerElevator/map.bin
new file mode 100644
index 000000000..16dfe34ab
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerElevator/map.bin
@@ -0,0 +1 @@
+(***,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
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerLobby/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
new file mode 100644
index 000000000..8706ecb7f
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerLobby: @ 84851C8
+ .4byte BattleFrontier_BattleTowerLobby_MapAttributes
+ .4byte BattleFrontier_BattleTowerLobby_MapEvents
+ .4byte BattleFrontier_BattleTowerLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_TOWER
+ .2byte 264
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.bin b/data/maps/BattleFrontier_BattleTowerLobby/map.bin
new file mode 100644
index 000000000..77926803a
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerLobby/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
new file mode 100644
index 000000000..b02e91000
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
+ .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes
+ .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents
+ .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_BATTLE_TOWER
+ .2byte 390
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
new file mode 100644
index 000000000..b0a58e016
--- /dev/null
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_Lounge1/border.bin b/data/maps/BattleFrontier_Lounge1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge1/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc
new file mode 100644
index 000000000..6a85c8f6d
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge1: @ 84855B8
+ .4byte BattleFrontier_Lounge1_MapAttributes
+ .4byte BattleFrontier_Lounge1_MapEvents
+ .4byte BattleFrontier_Lounge1_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 429
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge1/map.bin b/data/maps/BattleFrontier_Lounge1/map.bin
new file mode 100644
index 000000000..f5f1745b1
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge1/map.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge2/border.bin b/data/maps/BattleFrontier_Lounge2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge2/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc
new file mode 100644
index 000000000..cd5c77c97
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge2: @ 84855F0
+ .4byte BattleFrontier_Lounge2_MapAttributes
+ .4byte BattleFrontier_Lounge2_MapEvents
+ .4byte BattleFrontier_Lounge2_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 397
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge2/map.bin b/data/maps/BattleFrontier_Lounge2/map.bin
new file mode 100644
index 000000000..11ae8d6ee
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge2/map.bin
@@ -0,0 +1 @@
+3333333333333333333333333333333333333333333333333333333333333333 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc
new file mode 100644
index 000000000..af18dd057
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge3: @ 848560C
+ .4byte BattleFrontier_Lounge3_MapAttributes
+ .4byte BattleFrontier_Lounge3_MapEvents
+ .4byte BattleFrontier_Lounge3_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 429
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc
new file mode 100644
index 000000000..4c1c34bbd
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge4: @ 8485628
+ .4byte BattleFrontier_Lounge4_MapAttributes
+ .4byte BattleFrontier_Lounge4_MapEvents
+ .4byte BattleFrontier_Lounge4_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 429
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc
new file mode 100644
index 000000000..beb6adceb
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge5: @ 8485660
+ .4byte BattleFrontier_Lounge5_MapAttributes
+ .4byte BattleFrontier_Lounge5_MapEvents
+ .4byte BattleFrontier_Lounge5_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 397
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc
new file mode 100644
index 000000000..7b41b7d47
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge6: @ 848567C
+ .4byte BattleFrontier_Lounge6_MapAttributes
+ .4byte BattleFrontier_Lounge6_MapEvents
+ .4byte BattleFrontier_Lounge6_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 429
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc
new file mode 100644
index 000000000..4c4096a18
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge7: @ 8485698
+ .4byte BattleFrontier_Lounge7_MapAttributes
+ .4byte BattleFrontier_Lounge7_MapEvents
+ .4byte BattleFrontier_Lounge7_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 429
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc
new file mode 100644
index 000000000..1517fb67c
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge8: @ 84856D0
+ .4byte BattleFrontier_Lounge8_MapAttributes
+ .4byte BattleFrontier_Lounge8_MapEvents
+ .4byte BattleFrontier_Lounge8_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 429
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc
new file mode 100644
index 000000000..388b0c1ec
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Lounge9: @ 84856EC
+ .4byte BattleFrontier_Lounge9_MapAttributes
+ .4byte BattleFrontier_Lounge9_MapEvents
+ .4byte BattleFrontier_Lounge9_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 429
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc
new file mode 100644
index 000000000..2a81bf2f6
--- /dev/null
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_Mart: @ 8485740
+ .4byte BattleFrontier_Mart_MapAttributes
+ .4byte BattleFrontier_Mart_MapEvents
+ .4byte BattleFrontier_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_OutsideEast/border.bin b/data/maps/BattleFrontier_OutsideEast/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideEast/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc
new file mode 100644
index 000000000..5bc70f3b4
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideEast/connections.inc
@@ -0,0 +1,7 @@
+BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4
+ connection left, 0, BATTLE_FRONTIER_OUTSIDE_WEST, 0
+
+BattleFrontier_OutsideEast_MapConnections: @ 8486EF0
+ .4byte 0x1
+ .4byte BattleFrontier_OutsideEast_MapConnectionsList
+
diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc
new file mode 100644
index 000000000..ca6b4ea3d
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_OutsideEast: @ 84852C4
+ .4byte BattleFrontier_OutsideEast_MapAttributes
+ .4byte BattleFrontier_OutsideEast_MapEvents
+ .4byte BattleFrontier_OutsideEast_MapScripts
+ .4byte BattleFrontier_OutsideEast_MapConnections
+ .2byte BGM_BATTLE_FRONTIER
+ .2byte 345
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_OutsideEast/map.bin b/data/maps/BattleFrontier_OutsideEast/map.bin
new file mode 100644
index 000000000..b073c4585
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideEast/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_OutsideWest/border.bin b/data/maps/BattleFrontier_OutsideWest/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideWest/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc
new file mode 100644
index 000000000..2ec2e4348
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideWest/connections.inc
@@ -0,0 +1,7 @@
+BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0
+ connection right, 0, BATTLE_FRONTIER_OUTSIDE_EAST, 0
+
+BattleFrontier_OutsideWest_MapConnections: @ 8486EDC
+ .4byte 0x1
+ .4byte BattleFrontier_OutsideWest_MapConnectionsList
+
diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc
new file mode 100644
index 000000000..bc9dd7dea
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_OutsideWest: @ 84851AC
+ .4byte BattleFrontier_OutsideWest_MapAttributes
+ .4byte BattleFrontier_OutsideWest_MapEvents
+ .4byte BattleFrontier_OutsideWest_MapScripts
+ .4byte BattleFrontier_OutsideWest_MapConnections
+ .2byte BGM_BATTLE_FRONTIER
+ .2byte 265
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_OutsideWest/map.bin b/data/maps/BattleFrontier_OutsideWest/map.bin
new file mode 100644
index 000000000..d43111bda
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideWest/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..08718a5cd
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_PokemonCenter_1F: @ 8485708
+ .4byte BattleFrontier_PokemonCenter_1F_MapAttributes
+ .4byte BattleFrontier_PokemonCenter_1F_MapEvents
+ .4byte BattleFrontier_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..ce6bb9e21
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_PokemonCenter_2F: @ 8485724
+ .4byte BattleFrontier_PokemonCenter_2F_MapAttributes
+ .4byte BattleFrontier_PokemonCenter_2F_MapEvents
+ .4byte BattleFrontier_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_RankingHall/border.bin b/data/maps/BattleFrontier_RankingHall/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_RankingHall/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc
new file mode 100644
index 000000000..067cd783e
--- /dev/null
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_RankingHall: @ 848559C
+ .4byte BattleFrontier_RankingHall_MapAttributes
+ .4byte BattleFrontier_RankingHall_MapEvents
+ .4byte BattleFrontier_RankingHall_MapScripts
+ .4byte 0x0
+ .2byte BGM_BIJYUTU
+ .2byte 396
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_RankingHall/map.bin b/data/maps/BattleFrontier_RankingHall/map.bin
new file mode 100644
index 000000000..df32e0665
--- /dev/null
+++ b/data/maps/BattleFrontier_RankingHall/map.bin
@@ -0,0 +1,64 @@
+(((((00000((((($88888%(((((00000&'2222222&'00000$88888%A2 2
+2 2
+22
+2 2
+2 2F2$88888%2222222I222222222N22222222&' 2 2
+22
+2 2
+2&'((("# 2 2
+2 2
+2 2
+2 2
+2 2
+2"#(((&' 2
+2 22 2
+2 2&'+22222222220P02222222222222220Q0222222222232 2
+22
+2 2
+22
+2 2
+2$8X8% 2 2
+2 2 2K2L2M2 2 2
+2 2
+2$8Y8% 2 2
+22
+2 2
+22
+2 2
+2+22222222222222222222STU2222222222222222222232 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2[2\2]2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+2 2
+22222222222222222222222222222222222222,2-2
+2 2
+2.2/2
+2 2
+2 2
+2 2
+2 2
+2 2
+2
+2;2
+2;2
+2;2
+242522226272222222222222C22C22C22
+2 2
+200 2
+2 \ No newline at end of file
diff --git a/data/maps/BattleFrontier_ReceptionGate/border.bin b/data/maps/BattleFrontier_ReceptionGate/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/maps/BattleFrontier_ReceptionGate/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc
new file mode 100644
index 000000000..fa89d7c99
--- /dev/null
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_ReceptionGate: @ 84856B4
+ .4byte BattleFrontier_ReceptionGate_MapAttributes
+ .4byte BattleFrontier_ReceptionGate_MapEvents
+ .4byte BattleFrontier_ReceptionGate_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 399
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.bin b/data/maps/BattleFrontier_ReceptionGate/map.bin
new file mode 100644
index 000000000..2b75ea851
--- /dev/null
+++ b/data/maps/BattleFrontier_ReceptionGate/map.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_ScottsHouse/border.bin b/data/maps/BattleFrontier_ScottsHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_ScottsHouse/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc
new file mode 100644
index 000000000..0dfb989d4
--- /dev/null
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_ScottsHouse: @ 8485644
+ .4byte BattleFrontier_ScottsHouse_MapAttributes
+ .4byte BattleFrontier_ScottsHouse_MapEvents
+ .4byte BattleFrontier_ScottsHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 430
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_ScottsHouse/map.bin b/data/maps/BattleFrontier_ScottsHouse/map.bin
new file mode 100644
index 000000000..8844e94dd
--- /dev/null
+++ b/data/maps/BattleFrontier_ScottsHouse/map.bin
@@ -0,0 +1 @@
+33 \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare01/border.bin b/data/maps/BattlePyramidSquare01/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare01/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc
new file mode 100644
index 000000000..94605c92c
--- /dev/null
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare01: @ 8484F60
+ .4byte BattlePyramidSquare01_MapAttributes
+ .4byte BattlePyramidSquare01_MapEvents
+ .4byte BattlePyramidSquare01_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 362
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare01/map.bin b/data/maps/BattlePyramidSquare01/map.bin
new file mode 100644
index 000000000..586ccbdbd
--- /dev/null
+++ b/data/maps/BattlePyramidSquare01/map.bin
@@ -0,0 +1 @@
+BBBBBBBBBBBBBBaBB`tjBBsBBsBBBBsBBsBBBBsBBsBBhtrBBqBBBBBBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare02/border.bin b/data/maps/BattlePyramidSquare02/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare02/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc
new file mode 100644
index 000000000..44a5e7a99
--- /dev/null
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare02: @ 8484F7C
+ .4byte BattlePyramidSquare02_MapAttributes
+ .4byte BattlePyramidSquare02_MapEvents
+ .4byte BattlePyramidSquare02_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 363
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare02/map.bin b/data/maps/BattlePyramidSquare02/map.bin
new file mode 100644
index 000000000..5a9b8d4ce
--- /dev/null
+++ b/data/maps/BattlePyramidSquare02/map.bin
@@ -0,0 +1 @@
+BBhtttjBBBBBBBBBBBBBBBBBaBBBBBaBsBBBBqBsBBBBBBBsBBBBBBBptjBhjBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare03/border.bin b/data/maps/BattlePyramidSquare03/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare03/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc
new file mode 100644
index 000000000..300825ffa
--- /dev/null
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare03: @ 8484F98
+ .4byte BattlePyramidSquare03_MapAttributes
+ .4byte BattlePyramidSquare03_MapEvents
+ .4byte BattlePyramidSquare03_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 364
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare03/map.bin b/data/maps/BattlePyramidSquare03/map.bin
new file mode 100644
index 000000000..903b8a49b
--- /dev/null
+++ b/data/maps/BattlePyramidSquare03/map.bin
@@ -0,0 +1 @@
+BBBBBBBBBaBBBBBBBsBBBBaBBsBBBBqBhkjBBBBBBBBBBBaBB`ttttrBBqBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare04/border.bin b/data/maps/BattlePyramidSquare04/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare04/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc
new file mode 100644
index 000000000..4031f62e3
--- /dev/null
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare04: @ 8484FB4
+ .4byte BattlePyramidSquare04_MapAttributes
+ .4byte BattlePyramidSquare04_MapEvents
+ .4byte BattlePyramidSquare04_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 365
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare04/map.bin b/data/maps/BattlePyramidSquare04/map.bin
new file mode 100644
index 000000000..32a264546
--- /dev/null
+++ b/data/maps/BattlePyramidSquare04/map.bin
@@ -0,0 +1 @@
+BBBBBBBBB`ttttjBBsBBBBBBBqBBBBBBBBBBBBBBBaBBBBBBBqBBBBBBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare05/border.bin b/data/maps/BattlePyramidSquare05/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare05/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc
new file mode 100644
index 000000000..72575d629
--- /dev/null
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare05: @ 8484FD0
+ .4byte BattlePyramidSquare05_MapAttributes
+ .4byte BattlePyramidSquare05_MapEvents
+ .4byte BattlePyramidSquare05_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 366
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare05/map.bin b/data/maps/BattlePyramidSquare05/map.bin
new file mode 100644
index 000000000..d6c5a6897
--- /dev/null
+++ b/data/maps/BattlePyramidSquare05/map.bin
@@ -0,0 +1 @@
+BBBBBBBBBhbBBBBBBBsBBaBBBBsBBsBBBBsBBsBBBBqBBsBBBBBBpjBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare06/border.bin b/data/maps/BattlePyramidSquare06/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare06/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc
new file mode 100644
index 000000000..8d0fa49b1
--- /dev/null
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare06: @ 8484FEC
+ .4byte BattlePyramidSquare06_MapAttributes
+ .4byte BattlePyramidSquare06_MapEvents
+ .4byte BattlePyramidSquare06_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 367
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare06/map.bin b/data/maps/BattlePyramidSquare06/map.bin
new file mode 100644
index 000000000..c30533aab
--- /dev/null
+++ b/data/maps/BattlePyramidSquare06/map.bin
@@ -0,0 +1 @@
+BBBBBBBBBaBhjBaBBsBBBBqBBqBBBBBBBBBBBaBBaBBBBsBBqBhjBqBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare07/border.bin b/data/maps/BattlePyramidSquare07/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare07/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc
new file mode 100644
index 000000000..12c74516a
--- /dev/null
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare07: @ 8485008
+ .4byte BattlePyramidSquare07_MapAttributes
+ .4byte BattlePyramidSquare07_MapEvents
+ .4byte BattlePyramidSquare07_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 368
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare07/map.bin b/data/maps/BattlePyramidSquare07/map.bin
new file mode 100644
index 000000000..25f9c1529
--- /dev/null
+++ b/data/maps/BattlePyramidSquare07/map.bin
@@ -0,0 +1 @@
+BaBBBBBBBsBBaBaBhrBBqBsBBBBBBBqBBBBBaBBhttttrBaBBBBBBBsBBBBBBBq \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare08/border.bin b/data/maps/BattlePyramidSquare08/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare08/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc
new file mode 100644
index 000000000..cfe221f4b
--- /dev/null
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare08: @ 8485024
+ .4byte BattlePyramidSquare08_MapAttributes
+ .4byte BattlePyramidSquare08_MapEvents
+ .4byte BattlePyramidSquare08_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 369
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare08/map.bin b/data/maps/BattlePyramidSquare08/map.bin
new file mode 100644
index 000000000..86a830696
--- /dev/null
+++ b/data/maps/BattlePyramidSquare08/map.bin
@@ -0,0 +1 @@
+BBttttjBBBBBBBBBsBBBBBBasBBBBBssBBBBBBssBBBBBBsqBBBBBBqBBhttjB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare09/border.bin b/data/maps/BattlePyramidSquare09/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare09/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc
new file mode 100644
index 000000000..624b64800
--- /dev/null
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare09: @ 8485040
+ .4byte BattlePyramidSquare09_MapAttributes
+ .4byte BattlePyramidSquare09_MapEvents
+ .4byte BattlePyramidSquare09_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 370
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare09/map.bin b/data/maps/BattlePyramidSquare09/map.bin
new file mode 100644
index 000000000..e4f648704
--- /dev/null
+++ b/data/maps/BattlePyramidSquare09/map.bin
@@ -0,0 +1 @@
+BBaBBBBBB`rBBaBBBqBBhrBBBBBBBBBBaBBBBBa`rBBaB`rqBB`rBqBBBqBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare10/border.bin b/data/maps/BattlePyramidSquare10/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare10/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc
new file mode 100644
index 000000000..16206bfe9
--- /dev/null
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare10: @ 848505C
+ .4byte BattlePyramidSquare10_MapAttributes
+ .4byte BattlePyramidSquare10_MapEvents
+ .4byte BattlePyramidSquare10_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 371
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare10/map.bin b/data/maps/BattlePyramidSquare10/map.bin
new file mode 100644
index 000000000..4aa7fd771
--- /dev/null
+++ b/data/maps/BattlePyramidSquare10/map.bin
@@ -0,0 +1 @@
+BBBBhtjBBBBBBBBBBhjBhtjBBBBBBBBBhtjBhtjBBBBBBBBBhtjBBBBBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare11/border.bin b/data/maps/BattlePyramidSquare11/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare11/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc
new file mode 100644
index 000000000..34a53fdee
--- /dev/null
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare11: @ 8485078
+ .4byte BattlePyramidSquare11_MapAttributes
+ .4byte BattlePyramidSquare11_MapEvents
+ .4byte BattlePyramidSquare11_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 372
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare11/map.bin b/data/maps/BattlePyramidSquare11/map.bin
new file mode 100644
index 000000000..f393f51e5
--- /dev/null
+++ b/data/maps/BattlePyramidSquare11/map.bin
@@ -0,0 +1 @@
+BBBBBhjBBB`jBBBBBBsBBaBBhtrBBptbBBBBBqBBaBBBBBhrBBBBBBBBBhjBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare12/border.bin b/data/maps/BattlePyramidSquare12/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare12/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc
new file mode 100644
index 000000000..c514b4f4f
--- /dev/null
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare12: @ 8485094
+ .4byte BattlePyramidSquare12_MapAttributes
+ .4byte BattlePyramidSquare12_MapEvents
+ .4byte BattlePyramidSquare12_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 373
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare12/map.bin b/data/maps/BattlePyramidSquare12/map.bin
new file mode 100644
index 000000000..64dd96955
--- /dev/null
+++ b/data/maps/BattlePyramidSquare12/map.bin
@@ -0,0 +1 @@
+htjBhtjBBBBBBBBBBBBBBBBBhjBhttjBBBBBBBBBBBBBBBBBBBBBBBBhtttttjB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare13/border.bin b/data/maps/BattlePyramidSquare13/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare13/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc
new file mode 100644
index 000000000..23df0c29c
--- /dev/null
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare13: @ 84850B0
+ .4byte BattlePyramidSquare13_MapAttributes
+ .4byte BattlePyramidSquare13_MapEvents
+ .4byte BattlePyramidSquare13_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 374
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare13/map.bin b/data/maps/BattlePyramidSquare13/map.bin
new file mode 100644
index 000000000..5fc1485a7
--- /dev/null
+++ b/data/maps/BattlePyramidSquare13/map.bin
@@ -0,0 +1 @@
+aBBBaBBBsBaBsBaBqBqBsBsBBBBBqBqBBBBBBBsBsBaaBqBsBqBsBBBqBBBqB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare14/border.bin b/data/maps/BattlePyramidSquare14/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare14/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc
new file mode 100644
index 000000000..8570d95ef
--- /dev/null
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare14: @ 84850CC
+ .4byte BattlePyramidSquare14_MapAttributes
+ .4byte BattlePyramidSquare14_MapEvents
+ .4byte BattlePyramidSquare14_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 375
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare14/map.bin b/data/maps/BattlePyramidSquare14/map.bin
new file mode 100644
index 000000000..21655a872
--- /dev/null
+++ b/data/maps/BattlePyramidSquare14/map.bin
@@ -0,0 +1 @@
+BeBeBeBeBBBBBBBBeBeBeBeBBBBBBBBBeBeBeBeBBBBBBBBeBeBeBeBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare15/border.bin b/data/maps/BattlePyramidSquare15/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare15/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc
new file mode 100644
index 000000000..6120ec220
--- /dev/null
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare15: @ 84850E8
+ .4byte BattlePyramidSquare15_MapAttributes
+ .4byte BattlePyramidSquare15_MapEvents
+ .4byte BattlePyramidSquare15_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 376
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare15/map.bin b/data/maps/BattlePyramidSquare15/map.bin
new file mode 100644
index 000000000..ccbd87d9a
--- /dev/null
+++ b/data/maps/BattlePyramidSquare15/map.bin
@@ -0,0 +1 @@
+BBBeBBBeBeBBBeBBBBBeBBBeBeBBeBBBBBeBBBeBeBBBeBBBBBeBBBeBeBBBeBB \ No newline at end of file
diff --git a/data/maps/BattlePyramidSquare16/border.bin b/data/maps/BattlePyramidSquare16/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare16/border.bin
Binary files differ
diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc
new file mode 100644
index 000000000..4df56bbc7
--- /dev/null
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -0,0 +1,15 @@
+BattlePyramidSquare16: @ 8485104
+ .4byte BattlePyramidSquare16_MapAttributes
+ .4byte BattlePyramidSquare16_MapEvents
+ .4byte BattlePyramidSquare16_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 377
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/BattlePyramidSquare16/map.bin b/data/maps/BattlePyramidSquare16/map.bin
new file mode 100644
index 000000000..601eb526e
--- /dev/null
+++ b/data/maps/BattlePyramidSquare16/map.bin
@@ -0,0 +1 @@
+BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB \ No newline at end of file
diff --git a/data/maps/BirthIsland_Exterior/border.bin b/data/maps/BirthIsland_Exterior/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc
new file mode 100644
index 000000000..5697555de
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/header.inc
@@ -0,0 +1,15 @@
+BirthIsland_Exterior: @ 8485794
+ .4byte BirthIsland_Exterior_MapAttributes
+ .4byte BirthIsland_Exterior_MapEvents
+ .4byte BirthIsland_Exterior_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 404
+ .byte 200
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/BirthIsland_Exterior/map.bin b/data/maps/BirthIsland_Exterior/map.bin
new file mode 100644
index 000000000..38dfe77a8
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/map.bin
Binary files differ
diff --git a/data/maps/BirthIsland_Harbor/border.bin b/data/maps/BirthIsland_Harbor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc
new file mode 100644
index 000000000..9a9a5954b
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/header.inc
@@ -0,0 +1,15 @@
+BirthIsland_Harbor: @ 84857B0
+ .4byte BirthIsland_Harbor_MapAttributes
+ .4byte BirthIsland_Harbor_MapEvents
+ .4byte BirthIsland_Harbor_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 405
+ .byte 200
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BirthIsland_Harbor/map.bin b/data/maps/BirthIsland_Harbor/map.bin
new file mode 100644
index 000000000..e14816107
--- /dev/null
+++ b/data/maps/BirthIsland_Harbor/map.bin
@@ -0,0 +1 @@
+       *+89:+.pppp@ABppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/maps/CaveOfOrigin_1F/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/CaveOfOrigin_1F/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
new file mode 100644
index 000000000..1d15339d7
--- /dev/null
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_1F: @ 84842E8
+ .4byte CaveOfOrigin_1F_MapAttributes
+ .4byte CaveOfOrigin_1F_MapEvents
+ .4byte CaveOfOrigin_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 158
+ .byte 72
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/maps/CaveOfOrigin_1F/map.bin
new file mode 100644
index 000000000..c3c5e7abf
--- /dev/null
+++ b/data/maps/CaveOfOrigin_1F/map.bin
@@ -0,0 +1 @@
+)))))))))))))))))))))"33333333))))3333333 ")))))))*3333()))))) ""33)))))))))))))33  ""3*333)))))))) 33  ""3"3))*33333=333  33  ""3"*33333333333  33  "$""33333333322$ 33  "3"""33333222$333 33  "3"""3333$3333333 3$ "3"""333$33333333( 3 "3"""333 3333333333  3 "3"""333 3333333333  3 "3"""333()333)))  3 "*""33333()))*333   3 ""3""3333333333333   3 ""3"$33333333333$  3 ""3"3$3333;33333$3  3 ""3$3$22289:222$2$ 3 "$3$222222222222$33 $"3"33222223332222$ 3"3$22$33333$222$3332$3$222222222222222222$333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/maps/CaveOfOrigin_B1F/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B1F/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
new file mode 100644
index 000000000..d9d011a50
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_B1F: @ 8484358
+ .4byte CaveOfOrigin_B1F_MapAttributes
+ .4byte CaveOfOrigin_B1F_MapEvents
+ .4byte CaveOfOrigin_B1F_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 162
+ .byte 72
+ .byte 0
+ .byte 6
+ .byte 4
+ .2byte 0
+ .byte 14
+ .byte 0
+
diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/maps/CaveOfOrigin_B1F/map.bin
new file mode 100644
index 000000000..1fb2d71bb
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B1F/map.bin
@@ -0,0 +1 @@
+)))))))))))))))))3)))))))))))))3 "3"333))@))333H3 "*3)*33A333()3( "3*333333333(3 H"3M333)))333 3& ""3"33*#0#(33N3  ""33*0###0(3 3 H"3"3"####### 3 3  ""3"3"0##0##0 3H3& "3M3"####### 3 3  ""3"3$30###0$33N3&H"3"33$3#0#$333 3  "M3$33$3$3$3$3$333$3  "$3$3333333$3$ "3332222222$233N3 "3$22223332222$3 "333333$222$333333N$222222232222222$ \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/maps/CaveOfOrigin_Entrance/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/CaveOfOrigin_Entrance/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
new file mode 100644
index 000000000..24e245e20
--- /dev/null
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_Entrance: @ 84842CC
+ .4byte CaveOfOrigin_Entrance_MapAttributes
+ .4byte CaveOfOrigin_Entrance_MapEvents
+ .4byte CaveOfOrigin_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 157
+ .byte 72
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/maps/CaveOfOrigin_Entrance/map.bin
new file mode 100644
index 000000000..4bbffd109
--- /dev/null
+++ b/data/maps/CaveOfOrigin_Entrance/map.bin
@@ -0,0 +1 @@
+3333333333333333333333333))))))3333333)))*)))3())3333")))*333())) 3333"")))-./))3 (333"""3)5637) 3 3 33*""3"33333333  3( 33"3""3"33333333  33  33"3""3"33333333  33  33"3""3"33333333 (3 (**"3"33333333 3 3 3 "3"3"3"33333333 3 3 3 "3"3"3"33333333 3( 3 "3"3"3"33333333 33  3 "3"3"3"33333333 33 ( "*3"3"33333333 33 3  ""33"3"33333333 33 3  ""33"3"33333333 3$3  ""3*3"33333333 3 33  ""3"33"33333333 3 33  ""3"33"333#3333 3 33  "%"33$289:2$3 33  "3"$22233322$33  "3"3333$222$33333  "3$22222222222222$ $222222233322222$ \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
new file mode 100644
index 000000000..734e2d2ad
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
+ .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents
+ .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 159
+ .byte 72
+ .byte 1
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
new file mode 100644
index 000000000..0ffbdaaa0
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin
@@ -0,0 +1 @@
+33))))))))))))))))33333"33)))3333))) 33333"33"333())))*333 (33)*33"3))))))))3( 33"33)*3"))))))(3  33"33"333""3333<33( 3  33"3*333""3333333  3  33"3"3333%%333333  3  33"3"333333%23333  3  33"*)))333%333  2 33""3")(333"33   3 33""3""=3( 333""33   3 33""3""33  33*"33   3 33""3""33 ())**33   3 33""3""33())))*333   3 33""3""33333333333  ( 33""3"%333333333% 3  33""3"3%3333333%3 3  33""3%3%2222222%2%3  33"%3%2222222222%32% 33"3%23322222233 33 33%33%22%333333%22%2%333%2222222222222222%3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
new file mode 100644
index 000000000..4117717f2
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin
@@ -0,0 +1 @@
+#### \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
new file mode 100644
index 000000000..63b629e0a
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 160
+ .byte 72
+ .byte 1
+ .byte 6
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
new file mode 100644
index 000000000..4c1fd5ab8
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin
@@ -0,0 +1 @@
+)))))###))))##)"#####()))*))())*# "#))))))))*##()))) "#"##))))))))))##  "#"##"))))))))(#  "*)*"33333333( #  ""#")*333333333  % ""#""333223333   # ""#""33%##%333   %""#""33 ####%33    #""#""<33 #####"33    #""#"%22%#####"33    #"%%2#####)*33    #"#"##"#)))*3333   ("#"##"#"=33333332  # "#"##%"333333%#  # "#"###"%222222%2%( "#"###%22222222%###  "#%222##222222##  %222#%22%######%22% ####%222222222222222% \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
new file mode 100644
index 000000000..e3f7d3fad
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -0,0 +1,15 @@
+CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 161
+ .byte 72
+ .byte 1
+ .byte 6
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
new file mode 100644
index 000000000..ea574b224
--- /dev/null
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin
@@ -0,0 +1 @@
+)))))))))))))))))")))3333)))333 ""333())))*333()) ""33)))))))))33  ""33")))))))(3  ""3*"3333333( 3  "$"*333333=33  $ "3"""3322233   3 "3"""3$333$3   3 "3"""3 33333"$  3 "3"""3(3333" 3  3 "3"""33(33* 3  3 "*""333 33"$3 ( ""3""333())* 33 3  ""3"$3<33333 2$3  ""3$"333333  333  ""33"$222222$ 333  ""33$22222222$333  "$2233332222222$ "333$2222$3222222$$2222222222$3333333 \ No newline at end of file
diff --git a/data/maps/DesertRuins/border.bin b/data/maps/DesertRuins/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/maps/DesertRuins/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
new file mode 100644
index 000000000..617568f5c
--- /dev/null
+++ b/data/maps/DesertRuins/header.inc
@@ -0,0 +1,15 @@
+DesertRuins: @ 8483F68
+ .4byte DesertRuins_MapAttributes
+ .4byte DesertRuins_MapEvents
+ .4byte DesertRuins_MapScripts
+ .4byte 0x0
+ .2byte BGM_MABOROSI
+ .2byte 131
+ .byte 82
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/DesertRuins/map.bin b/data/maps/DesertRuins/map.bin
new file mode 100644
index 000000000..406cf7279
--- /dev/null
+++ b/data/maps/DesertRuins/map.bin
Binary files differ
diff --git a/data/maps/DesertUnderpass/border.bin b/data/maps/DesertUnderpass/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/DesertUnderpass/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
new file mode 100644
index 000000000..1a253a839
--- /dev/null
+++ b/data/maps/DesertUnderpass/header.inc
@@ -0,0 +1,15 @@
+DesertUnderpass: @ 8484978
+ .4byte DesertUnderpass_MapAttributes
+ .4byte DesertUnderpass_MapEvents
+ .4byte DesertUnderpass_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 389
+ .byte 209
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/DesertUnderpass/map.bin b/data/maps/DesertUnderpass/map.bin
new file mode 100644
index 000000000..2f82e9357
--- /dev/null
+++ b/data/maps/DesertUnderpass/map.bin
@@ -0,0 +1 @@
+ ##" #" !!" !!"##" #" #" ####" ####" #" #" "#" ###" # # #" "#" # #"#" #" ###" " ######"##' # " " ' ##"#"' "#"h ####" ##" ##" #" #q##"##"< # #"#" " # "#" " ##" #####" ##"##" ###" q#"#"#XYZ# ##"#"#" #" " ###" " #"#" # #" #"" ###"  #"" ###qp######" ##"  #01##"##" 0#101#####"#####" ####" #### #01######q 0##101##qp#"" ######" #######"  ##"##" #"#" ##########" #####"#q###### "####################" ##########" #############" #"" " #####" #" ########" ##############" #### ######" #####" ##" ##" ##"  ##" #" ###" # ####" ######"" # " ##"#"' ## ##"##" # #"#" # "#########" ########" ##"#" #"### ##### #"##### " ##"####"#" #####" ###### # ##"### ##"#" ## ######" "### " ###"#"#"#" # #" #" #"#" ## #####" ##" # " #" ###"### ## " #"##"#"#"###" ##"##" #####" ##" #"## # # #"#" #"#" ############# \ No newline at end of file
diff --git a/data/maps/DewfordTown/border.bin b/data/maps/DewfordTown/border.bin
new file mode 100644
index 000000000..281762f5b
--- /dev/null
+++ b/data/maps/DewfordTown/border.bin
@@ -0,0 +1 @@
+CCCC \ No newline at end of file
diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc
new file mode 100644
index 000000000..4386e2295
--- /dev/null
+++ b/data/maps/DewfordTown/connections.inc
@@ -0,0 +1,8 @@
+DewfordTown_MapConnectionsList: @ 8486640
+ connection up, -60, ROUTE_106, 0
+ connection right, 0, ROUTE_107, 0
+
+DewfordTown_MapConnections: @ 8486658
+ .4byte 0x2
+ .4byte DewfordTown_MapConnectionsList
+
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
new file mode 100644
index 000000000..b0e34c3b3
--- /dev/null
+++ b/data/maps/DewfordTown/header.inc
@@ -0,0 +1,15 @@
+DewfordTown: @ 84825EC
+ .4byte DewfordTown_MapAttributes
+ .4byte DewfordTown_MapEvents
+ .4byte DewfordTown_MapScripts
+ .4byte DewfordTown_MapConnections
+ .2byte BGM_HIGHTOWN
+ .2byte 12
+ .byte 2
+ .byte 0
+ .byte 2
+ .byte 1
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/DewfordTown/map.bin b/data/maps/DewfordTown/map.bin
new file mode 100644
index 000000000..e8a1154e8
--- /dev/null
+++ b/data/maps/DewfordTown/map.bin
@@ -0,0 +1,2 @@
+C 2 2 2$1$1$1$1$1%pzCCC92C92C$1$1$1$1$1%pzC:CCCC:$1$1$1$1$1%pzC92CC:C92'%&$1$1$1$1$1%pz5CC:C92:C$1$1$1$1$1$1$19292%pzCC92CC92:$1$1$1$1$1$1 2 2%pz:::CCC$1$1$1$1$1$1$1%pyy:::$12222$1$1%ppppyyy$1PQRS$1$1%&%pppppppp$1XYZ[$1$1$1$1$1$1(2)2)2pppppp$1 ab
+$1$1$1$1$101111111$1$1$1$1$1$1$1$1$1$1$1>111=1$1 2 2 2 2$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1222222$1$1$1$1$192$1$1$1$1"####$$1$1$1$1$1%&C$1$1$1$1+,-./2$1$1$1$1$1$192C$1$1$1$134567$1$1$1$1$1$1$1C:92$1$1$1;2<2=>?2$1$1$1$1$1929292:92C92$1$1$1$1$1$1$1$1$1$149292:CCCCC9292929292929292929292CC92CC92 \ No newline at end of file
diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/maps/DewfordTown_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/DewfordTown_Gym/border.bin
Binary files differ
diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
new file mode 100644
index 000000000..04946f4b8
--- /dev/null
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -0,0 +1,15 @@
+DewfordTown_Gym: @ 8482C60
+ .4byte DewfordTown_Gym_MapAttributes
+ .4byte DewfordTown_Gym_MapEvents
+ .4byte DewfordTown_Gym_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 65
+ .byte 2
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/maps/DewfordTown_Gym/map.bin
new file mode 100644
index 000000000..43cd6e64a
--- /dev/null
+++ b/data/maps/DewfordTown_Gym/map.bin
Binary files differ
diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/maps/DewfordTown_Hall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc
new file mode 100644
index 000000000..97afc139c
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -0,0 +1,15 @@
+DewfordTown_Hall: @ 8482C7C
+ .4byte DewfordTown_Hall_MapAttributes
+ .4byte DewfordTown_Hall_MapEvents
+ .4byte DewfordTown_Hall_MapScripts
+ .4byte 0x0
+ .2byte BGM_HIGHTOWN
+ .2byte 66
+ .byte 2
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/maps/DewfordTown_Hall/map.bin
new file mode 100644
index 000000000..5fd13209d
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/map.bin
Binary files differ
diff --git a/data/maps/DewfordTown_House1/border.bin b/data/maps/DewfordTown_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/DewfordTown_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc
new file mode 100644
index 000000000..3b4a236f0
--- /dev/null
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -0,0 +1,15 @@
+DewfordTown_House1: @ 8482C0C
+ .4byte DewfordTown_House1_MapAttributes
+ .4byte DewfordTown_House1_MapEvents
+ .4byte DewfordTown_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_HIGHTOWN
+ .2byte 64
+ .byte 2
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/DewfordTown_House1/map.bin b/data/maps/DewfordTown_House1/map.bin
new file mode 100644
index 000000000..1f732ba3f
--- /dev/null
+++ b/data/maps/DewfordTown_House1/map.bin
@@ -0,0 +1 @@
+222!2!2@22222!2)2)2D2NOD2)2)2)2!2)2)2D2VWD2)2)2)2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/maps/DewfordTown_House2/border.bin b/data/maps/DewfordTown_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/DewfordTown_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc
new file mode 100644
index 000000000..b0d09baa7
--- /dev/null
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -0,0 +1,15 @@
+DewfordTown_House2: @ 8482C98
+ .4byte DewfordTown_House2_MapAttributes
+ .4byte DewfordTown_House2_MapEvents
+ .4byte DewfordTown_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_HIGHTOWN
+ .2byte 67
+ .byte 2
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/DewfordTown_House2/map.bin b/data/maps/DewfordTown_House2/map.bin
new file mode 100644
index 000000000..6274e4418
--- /dev/null
+++ b/data/maps/DewfordTown_House2/map.bin
@@ -0,0 +1 @@
+22266!2!2!222!2)2D2)2)2)2)2)2)2)2!2)2)2)2)2)2)2N_D2!2)2)2)2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..a9eb10a91
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+DewfordTown_PokemonCenter_1F: @ 8482C28
+ .4byte DewfordTown_PokemonCenter_1F_MapAttributes
+ .4byte DewfordTown_PokemonCenter_1F_MapEvents
+ .4byte DewfordTown_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 2
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..9206bb564
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+DewfordTown_PokemonCenter_2F: @ 8482C44
+ .4byte DewfordTown_PokemonCenter_2F_MapAttributes
+ .4byte DewfordTown_PokemonCenter_2F_MapEvents
+ .4byte DewfordTown_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 2
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/maps/DoubleBattleColosseum/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/DoubleBattleColosseum/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
new file mode 100644
index 000000000..61ab5bccd
--- /dev/null
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -0,0 +1,15 @@
+DoubleBattleColosseum: @ 8484D84
+ .4byte DoubleBattleColosseum_MapAttributes
+ .4byte DoubleBattleColosseum_MapEvents
+ .4byte DoubleBattleColosseum_MapScripts
+ .4byte 0x0
+ .2byte BGM_RAINBOW
+ .2byte 224
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 8
+
diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/maps/DoubleBattleColosseum/map.bin
new file mode 100644
index 000000000..77606e818
--- /dev/null
+++ b/data/maps/DoubleBattleColosseum/map.bin
@@ -0,0 +1 @@
+hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_22L2M22222M2N2222U2`2U2U2b2c2U2U2a2U222U2T2U2U2d2e2U2U2V2U222U2`2U2U2f2g2U2U2a2U222U2\2]2]2]2]2]2]2^2U22!2!2!2!2 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity/border.bin b/data/maps/EverGrandeCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/EverGrandeCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc
new file mode 100644
index 000000000..a472e456a
--- /dev/null
+++ b/data/maps/EverGrandeCity/connections.inc
@@ -0,0 +1,7 @@
+EverGrandeCity_MapConnectionsList: @ 84867F8
+ connection left, 40, ROUTE_128, 0
+
+EverGrandeCity_MapConnections: @ 8486804
+ .4byte 0x1
+ .4byte EverGrandeCity_MapConnectionsList
+
diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
new file mode 100644
index 000000000..5ae9fcb36
--- /dev/null
+++ b/data/maps/EverGrandeCity/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity: @ 8482598
+ .4byte EverGrandeCity_MapAttributes
+ .4byte EverGrandeCity_MapEvents
+ .4byte EverGrandeCity_MapScripts
+ .4byte EverGrandeCity_MapConnections
+ .2byte BGM_RAINBOW
+ .2byte 9
+ .byte 15
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity/map.bin b/data/maps/EverGrandeCity/map.bin
new file mode 100644
index 000000000..33b271d5d
--- /dev/null
+++ b/data/maps/EverGrandeCity/map.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/maps/EverGrandeCity_ChampionsRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
new file mode 100644
index 000000000..ea45c416b
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_ChampionsRoom: @ 8483C3C
+ .4byte EverGrandeCity_ChampionsRoom_MapAttributes
+ .4byte EverGrandeCity_ChampionsRoom_MapEvents
+ .4byte EverGrandeCity_ChampionsRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 115
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/maps/EverGrandeCity_ChampionsRoom/map.bin
new file mode 100644
index 000000000..a234307b5
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/map.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/maps/EverGrandeCity_DrakesRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc
new file mode 100644
index 000000000..18b46c1e2
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_DrakesRoom: @ 8483C20
+ .4byte EverGrandeCity_DrakesRoom_MapAttributes
+ .4byte EverGrandeCity_DrakesRoom_MapEvents
+ .4byte EverGrandeCity_DrakesRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 114
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 7
+
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/maps/EverGrandeCity_DrakesRoom/map.bin
new file mode 100644
index 000000000..3b5248d98
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222HIHI222HIHI \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/maps/EverGrandeCity_GlaciasRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
new file mode 100644
index 000000000..328308ce7
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_GlaciasRoom: @ 8483C04
+ .4byte EverGrandeCity_GlaciasRoom_MapAttributes
+ .4byte EverGrandeCity_GlaciasRoom_MapEvents
+ .4byte EverGrandeCity_GlaciasRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 113
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 6
+
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/maps/EverGrandeCity_GlaciasRoom/map.bin
new file mode 100644
index 000000000..2d7db7377
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      r2r2r2r2r2222r2r2r2r2r2v22p2s2s2s2t222wu}~22x2y2z2{2|222}222222222q22x2222|22222x2222|222222222222222222222222222222222222222222222HIHI222HIHI \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall1/border.bin b/data/maps/EverGrandeCity_Hall1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall1/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc
new file mode 100644
index 000000000..433a41352
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall1/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_Hall1: @ 8483C58
+ .4byte EverGrandeCity_Hall1_MapAttributes
+ .4byte EverGrandeCity_Hall1_MapEvents
+ .4byte EverGrandeCity_Hall1_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 116
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_Hall1/map.bin b/data/maps/EverGrandeCity_Hall1/map.bin
new file mode 100644
index 000000000..75812b238
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall1/map.bin
@@ -0,0 +1 @@
+DHIHI E HIHI2222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc
new file mode 100644
index 000000000..c8a77751d
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall2/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_Hall2: @ 8483C74
+ .4byte EverGrandeCity_Hall2_MapAttributes
+ .4byte EverGrandeCity_Hall2_MapEvents
+ .4byte EverGrandeCity_Hall2_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 116
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc
new file mode 100644
index 000000000..d6a05734f
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall3/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_Hall3: @ 8483C90
+ .4byte EverGrandeCity_Hall3_MapAttributes
+ .4byte EverGrandeCity_Hall3_MapEvents
+ .4byte EverGrandeCity_Hall3_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 116
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_Hall4/border.bin b/data/maps/EverGrandeCity_Hall4/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall4/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc
new file mode 100644
index 000000000..511e8873e
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall4/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_Hall4: @ 8483CAC
+ .4byte EverGrandeCity_Hall4_MapAttributes
+ .4byte EverGrandeCity_Hall4_MapEvents
+ .4byte EverGrandeCity_Hall4_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 315
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_Hall4/map.bin b/data/maps/EverGrandeCity_Hall4/map.bin
new file mode 100644
index 000000000..580ae095a
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall4/map.bin
@@ -0,0 +1 @@
+D     E     2222222222222222222222222222J222J222J222J222J222J222222J222J222222222J222J222222222222J222J222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc
new file mode 100644
index 000000000..7907489a0
--- /dev/null
+++ b/data/maps/EverGrandeCity_Hall5/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_Hall5: @ 8483CC8
+ .4byte EverGrandeCity_Hall5_MapAttributes
+ .4byte EverGrandeCity_Hall5_MapEvents
+ .4byte EverGrandeCity_Hall5_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 116
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/maps/EverGrandeCity_HallOfFame/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
new file mode 100644
index 000000000..d91044f10
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_HallOfFame: @ 8483D00
+ .4byte EverGrandeCity_HallOfFame_MapAttributes
+ .4byte EverGrandeCity_HallOfFame_MapEvents
+ .4byte EverGrandeCity_HallOfFame_MapScripts
+ .4byte 0x0
+ .2byte BGM_EIKOU_R
+ .2byte 298
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/maps/EverGrandeCity_HallOfFame/map.bin
new file mode 100644
index 000000000..1df9e4804
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/map.bin
@@ -0,0 +1 @@
+2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222262226 \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/maps/EverGrandeCity_PhoebesRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
new file mode 100644
index 000000000..3d2321bff
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PhoebesRoom: @ 8483BE8
+ .4byte EverGrandeCity_PhoebesRoom_MapAttributes
+ .4byte EverGrandeCity_PhoebesRoom_MapEvents
+ .4byte EverGrandeCity_PhoebesRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 112
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 5
+
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/maps/EverGrandeCity_PhoebesRoom/map.bin
new file mode 100644
index 000000000..2e75b706c
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      B2B2B2B2B2X2X2X2B2B2B2B2B2EF\2\2@2C2C2C2D2\2\2GAMN\2\2H2I2J2K2L2\2\2O@UV\2\2P2Q2R2S2T2\2\2WA]^\2\2H2Y2Z2[2L2\2\2WBef\2\2H2a2b2c2L2\2\2gCm2n2\2\2h2k2k2k2l2\2\2o2`2j2i2i2i2i2i2i2i2i2i2i2i2i22222222222222\2\2\2HIHId2d2d2HIHI \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..32f35a157
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PokemonCenter_1F: @ 8483D1C
+ .4byte EverGrandeCity_PokemonCenter_1F_MapAttributes
+ .4byte EverGrandeCity_PokemonCenter_1F_MapEvents
+ .4byte EverGrandeCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..c7e4b2917
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PokemonCenter_2F: @ 8483D38
+ .4byte EverGrandeCity_PokemonCenter_2F_MapAttributes
+ .4byte EverGrandeCity_PokemonCenter_2F_MapEvents
+ .4byte EverGrandeCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin b/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
new file mode 100644
index 000000000..0921e41a5
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PokemonLeague_1F: @ 8483CE4
+ .4byte EverGrandeCity_PokemonLeague_1F_MapAttributes
+ .4byte EverGrandeCity_PokemonLeague_1F_MapEvents
+ .4byte EverGrandeCity_PokemonLeague_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 270
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin b/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin
new file mode 100644
index 000000000..6bab68102
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin
@@ -0,0 +1,2 @@
+  JK        "#RSI22Hs2*+2[Q$22222222P}2)2t2u2!!!!Y<2@2@2@2@2@2@2@2X!!! 222222%2@2@20232@2@2@2g2222D2 2@2@2@2@2@2@2@2v2{2{2w2@2@2@2@2@2@2'22222@2@2@202{222{232@2@2@2@2^2
+26B2@2@2@282|222|2;2@2@2@2&2f222@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
new file mode 100644
index 000000000..1811dd10d
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_PokemonLeague_2F: @ 8483D54
+ .4byte EverGrandeCity_PokemonLeague_2F_MapAttributes
+ .4byte EverGrandeCity_PokemonLeague_2F_MapEvents
+ .4byte EverGrandeCity_PokemonLeague_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/maps/EverGrandeCity_SidneysRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/border.bin
Binary files differ
diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc
new file mode 100644
index 000000000..8ec323838
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -0,0 +1,15 @@
+EverGrandeCity_SidneysRoom: @ 8483BCC
+ .4byte EverGrandeCity_SidneysRoom_MapAttributes
+ .4byte EverGrandeCity_SidneysRoom_MapEvents
+ .4byte EverGrandeCity_SidneysRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 111
+ .byte 15
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 4
+
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/maps/EverGrandeCity_SidneysRoom/map.bin
new file mode 100644
index 000000000..ebca00c5c
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/map.bin
@@ -0,0 +1,2 @@
+      
+      22222(2(2(222222>,2,222222,2,2,2,222222,2,2%&,2,2 2!2"2#2$2,2,2'%?:,2,22)2*2+22,2,2'?-.,2,221222322,2,2/-=262,2,282;2;2;2<2,2,27252922222222222222222222222222,2,2,2HIHI424242HIHI \ No newline at end of file
diff --git a/data/maps/FallarborTown/border.bin b/data/maps/FallarborTown/border.bin
new file mode 100644
index 000000000..23e2a92e5
--- /dev/null
+++ b/data/maps/FallarborTown/border.bin
@@ -0,0 +1 @@
+klst \ No newline at end of file
diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc
new file mode 100644
index 000000000..27b654f90
--- /dev/null
+++ b/data/maps/FallarborTown/connections.inc
@@ -0,0 +1,8 @@
+FallarborTown_MapConnectionsList: @ 8486674
+ connection left, 0, ROUTE_114, 0
+ connection right, 0, ROUTE_113, 0
+
+FallarborTown_MapConnections: @ 848668C
+ .4byte 0x2
+ .4byte FallarborTown_MapConnectionsList
+
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
new file mode 100644
index 000000000..1b4df9b80
--- /dev/null
+++ b/data/maps/FallarborTown/header.inc
@@ -0,0 +1,15 @@
+FallarborTown: @ 8482624
+ .4byte FallarborTown_MapAttributes
+ .4byte FallarborTown_MapEvents
+ .4byte FallarborTown_MapScripts
+ .4byte FallarborTown_MapConnections
+ .2byte BGM_TONEKUSA
+ .2byte 14
+ .byte 4
+ .byte 0
+ .byte 2
+ .byte 1
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/FallarborTown/map.bin b/data/maps/FallarborTown/map.bin
new file mode 100644
index 000000000..950a54761
--- /dev/null
+++ b/data/maps/FallarborTown/map.bin
@@ -0,0 +1 @@
+yyyyyiiiiiiiiiiiiijiiiiiiiiiiiijziiiiij"##$JKLMNjziiiiijz66RSTUVzijzi2y2Z[\]^q2q2PQRSziiy2#6bcdef#6y2XYZ[q2q2q2y2y2y2y2#6jklmn#6y2aby2y222y2y2y2y2y2222y2y2y2y222y2y2y2y2y2222222222222222222y2y2222222222222222222y2y22222y2y2y2y2y222y2y22222y2y2y2y2y2y2y2y2y2y2y2y222y22222y2y2y2y2y2y2y2y2y2 3!3y2y222y20123y22y2%3&3'3y2}2~2(3)3y2y222y289:;22y2-3.3/3y2y2222y2AB6t6y2536373y2y2y222222y222l2y2y2y2y2y2y222222y22s6t6k2222y2y2y2y2y2y2y2y2y2222l6kllklk2222222222st6sts6t6 \ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin b/data/maps/FallarborTown_BattleTentBattleRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
new file mode 100644
index 000000000..ed7556471
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_BattleTentBattleRoom: @ 8482DCC
+ .4byte FallarborTown_BattleTentBattleRoom_MapAttributes
+ .4byte FallarborTown_BattleTentBattleRoom_MapEvents
+ .4byte FallarborTown_BattleTentBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 386
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin b/data/maps/FallarborTown_BattleTentBattleRoom/map.bin
new file mode 100644
index 000000000..92a738d5e
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.bin
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentCorridor/border.bin b/data/maps/FallarborTown_BattleTentCorridor/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentCorridor/border.bin
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc
new file mode 100644
index 000000000..024894c7c
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_BattleTentCorridor: @ 8482DB0
+ .4byte FallarborTown_BattleTentCorridor_MapAttributes
+ .4byte FallarborTown_BattleTentCorridor_MapEvents
+ .4byte FallarborTown_BattleTentCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 385
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.bin b/data/maps/FallarborTown_BattleTentCorridor/map.bin
new file mode 100644
index 000000000..4cd270b21
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentCorridor/map.bin
@@ -0,0 +1 @@
+6b6c6d66 jkl +*+*#:;:;$;:;:#:;:;$;:;:#%; \ No newline at end of file
diff --git a/data/maps/FallarborTown_BattleTentLobby/border.bin b/data/maps/FallarborTown_BattleTentLobby/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentLobby/border.bin
Binary files differ
diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc
new file mode 100644
index 000000000..0fb27e1d9
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentLobby/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_BattleTentLobby: @ 8482D94
+ .4byte FallarborTown_BattleTentLobby_MapAttributes
+ .4byte FallarborTown_BattleTentLobby_MapEvents
+ .4byte FallarborTown_BattleTentLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 384
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FallarborTown_BattleTentLobby/map.bin b/data/maps/FallarborTown_BattleTentLobby/map.bin
new file mode 100644
index 000000000..9ff37dc2c
--- /dev/null
+++ b/data/maps/FallarborTown_BattleTentLobby/map.bin
@@ -0,0 +1,2 @@
+666b6c6d6666
+ `a jkl fg2hi 22 22 2no2p 22222 w6"2xyz{2|}~6'222&2222222222222222222222222222222222222220(2222./222( \ No newline at end of file
diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
new file mode 100644
index 000000000..d413c18b8
--- /dev/null
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_House1: @ 8482E20
+ .4byte FallarborTown_House1_MapAttributes
+ .4byte FallarborTown_House1_MapEvents
+ .4byte FallarborTown_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_TONEKUSA
+ .2byte 59
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc
new file mode 100644
index 000000000..548e2dc09
--- /dev/null
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_House2: @ 8482E3C
+ .4byte FallarborTown_House2_MapAttributes
+ .4byte FallarborTown_House2_MapEvents
+ .4byte FallarborTown_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_TONEKUSA
+ .2byte 60
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin b/data/maps/FallarborTown_LeftoverRSContestHall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestHall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin b/data/maps/FallarborTown_LeftoverRSContestHall/map.bin
new file mode 100644
index 000000000..d65e7c489
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestHall/map.bin
@@ -0,0 +1 @@
+/////////////////////nnnbbbbbbbbbbbbbbbbbbbbb 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2(2`2`2              f2`2*2(2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2*2(2`2`2$%2%2hiiiiiiij%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q22qwBqr%2%2&f2`2*2(2`2`2$%2%2pq2q2q22q2qq2r%2%2&f2`2*2(2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2*2(2`2`2$%2%2xyyk2l2m2yyz%2%2&f2`2*2(2`2`222222s2t2u222222f2`2*2(2`2`26s2t2u26f2`2*2(2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2*2(2`2J2`2`2J2`2`2`2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R6`2`2R6`2`2`2`2`2`2`2R6`2`2R6`2*2 \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin b/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin
new file mode 100644
index 000000000..87407546a
--- /dev/null
+++ b/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin
@@ -0,0 +1 @@
+[\]NMcdebVbbbbTb 2!2!2222U2!2!2!2!2!2"2(2`2`2f2`2`2`2`292(2`2`22_2_2_2_2g2`2`2`2`2`2A2(2`2`2`2`2`2`2`2`2`2`2`2`292(2`2`2`2`2`2`2`2`2`2`2`2A2 \ No newline at end of file
diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc
new file mode 100644
index 000000000..b210fbe4c
--- /dev/null
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_Mart: @ 8482D78
+ .4byte FallarborTown_Mart_MapAttributes
+ .4byte FallarborTown_Mart_MapEvents
+ .4byte FallarborTown_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..1258df061
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_PokemonCenter_1F: @ 8482DE8
+ .4byte FallarborTown_PokemonCenter_1F_MapAttributes
+ .4byte FallarborTown_PokemonCenter_1F_MapEvents
+ .4byte FallarborTown_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..1a99a604c
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+FallarborTown_PokemonCenter_2F: @ 8482E04
+ .4byte FallarborTown_PokemonCenter_2F_MapAttributes
+ .4byte FallarborTown_PokemonCenter_2F_MapEvents
+ .4byte FallarborTown_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 4
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FarawayIsland_Entrance/border.bin b/data/maps/FarawayIsland_Entrance/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/FarawayIsland_Entrance/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc
new file mode 100644
index 000000000..2e8720ab6
--- /dev/null
+++ b/data/maps/FarawayIsland_Entrance/header.inc
@@ -0,0 +1,15 @@
+FarawayIsland_Entrance: @ 848575C
+ .4byte FarawayIsland_Entrance_MapAttributes
+ .4byte FarawayIsland_Entrance_MapEvents
+ .4byte FarawayIsland_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 402
+ .byte 201
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/FarawayIsland_Entrance/map.bin b/data/maps/FarawayIsland_Entrance/map.bin
new file mode 100644
index 000000000..389f6b0cd
--- /dev/null
+++ b/data/maps/FarawayIsland_Entrance/map.bin
Binary files differ
diff --git a/data/maps/FarawayIsland_Interior/border.bin b/data/maps/FarawayIsland_Interior/border.bin
new file mode 100644
index 000000000..addb5d6ce
--- /dev/null
+++ b/data/maps/FarawayIsland_Interior/border.bin
Binary files differ
diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc
new file mode 100644
index 000000000..2669d360a
--- /dev/null
+++ b/data/maps/FarawayIsland_Interior/header.inc
@@ -0,0 +1,15 @@
+FarawayIsland_Interior: @ 8485778
+ .4byte FarawayIsland_Interior_MapAttributes
+ .4byte FarawayIsland_Interior_MapEvents
+ .4byte FarawayIsland_Interior_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 403
+ .byte 201
+ .byte 0
+ .byte 11
+ .byte 8
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/FarawayIsland_Interior/map.bin b/data/maps/FarawayIsland_Interior/map.bin
new file mode 100644
index 000000000..847295734
--- /dev/null
+++ b/data/maps/FarawayIsland_Interior/map.bin
Binary files differ
diff --git a/data/maps/FieryPath/border.bin b/data/maps/FieryPath/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/FieryPath/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
new file mode 100644
index 000000000..1c4c59e3a
--- /dev/null
+++ b/data/maps/FieryPath/header.inc
@@ -0,0 +1,15 @@
+FieryPath: @ 8484048
+ .4byte FieryPath_MapAttributes
+ .4byte FieryPath_MapEvents
+ .4byte FieryPath_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 293
+ .byte 74
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/FieryPath/map.bin b/data/maps/FieryPath/map.bin
new file mode 100644
index 000000000..5928fb173
--- /dev/null
+++ b/data/maps/FieryPath/map.bin
@@ -0,0 +1,10 @@
+qqqq{ttttttt|qqqq{ttttttttttt|qqqqqqqqqr{ttt|qpqqqqr{tttttttt|qpqqqqqqqq{z{333|pqqq{z33333333|pqqqqqqqqrq33333pqqqrq333333333pqqqqqqq{zq33333pqqqr{3333333 33pqqqqqq{zq3
+   ~pqqqr3333
+   ~~qqqqqqr{tt3h   ~qqqr333
+pqqqqqqqqqqqqqrr3333pqqqqqqr333pqqqqqqqqqqqqqrr3
+ 3pqqqqqqqr333pqqqqqqqqqqqqqrr33xttttt|qr333pqqqqqqqqqqqqqrr33ttttt|pqr333pqqqqqqqqqqqqqrr3333333333pqr333pqqqqqqqqqqqqqrr3
+      3
+~xtz333pqqqqqqqqqqqqqrr3qqq 3qqqq333pqqqqqqqqqqqqqrr3h  jr33tttt333x|qqqqqqqqqqqqrr3pqrr33333333333pqqqqqqqqqqqqrr3pqqrr333
+    333qpqqqqqqqqqqqqrr3pqqr   ~h j333|x|qqqqqqqqqqrr3pqq     ~qr3333qxtttt|qqqqq{zr3xt|qqqqqqqqr3333tttt|pqqqqqr{3t|xt|qqqqqqr 33333333|pqqqqqrr33 73|x|qqqqqr333333333pqqqqqrr33333|qpqqqqqj333333333pqqqqqr   333qpqqqqqqr     3333pqqqqq  jr333qpqqqqqqiiiij3333pqqqqqqqqrr33
+~qpqqqqqqqqqqqr3333pqqqqqqqqrr3
+~qqpqqqqqqqqqqqr 333pqqqqqqqrr3tt|pqqqqqqqqqqqrq333pqqqqqqqqrr3333ppqqqqqqqqqqqj333pqqqqqqq{z 333pxt|qqqqqqqqqqr333pqqqqqqqr{tz333xt|pqqqqqqqqqqr333pqqqqqqqrr 33333 ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqrr3333333ppqqqqqqqqqqr333pqqqqqqqr       ~pqqqqqqqqqqr333pqqqqqqqiiiiiiiii~qqqqqqqqqqr3 33pqqqqqqqqqqqqqqqqqqqqqqqqqqqq ~~qqqqq \ No newline at end of file
diff --git a/data/maps/FortreeCity/border.bin b/data/maps/FortreeCity/border.bin
new file mode 100644
index 000000000..addb5d6ce
--- /dev/null
+++ b/data/maps/FortreeCity/border.bin
Binary files differ
diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc
new file mode 100644
index 000000000..08541215c
--- /dev/null
+++ b/data/maps/FortreeCity/connections.inc
@@ -0,0 +1,8 @@
+FortreeCity_MapConnectionsList: @ 8486784
+ connection left, 0, ROUTE_119, 0
+ connection right, 0, ROUTE_120, 0
+
+FortreeCity_MapConnections: @ 848679C
+ .4byte 0x2
+ .4byte FortreeCity_MapConnectionsList
+
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
new file mode 100644
index 000000000..9cbb544e1
--- /dev/null
+++ b/data/maps/FortreeCity/header.inc
@@ -0,0 +1,15 @@
+FortreeCity: @ 8482528
+ .4byte FortreeCity_MapAttributes
+ .4byte FortreeCity_MapEvents
+ .4byte FortreeCity_MapScripts
+ .4byte FortreeCity_MapConnections
+ .2byte BGM_MACHI_S3
+ .2byte 5
+ .byte 11
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/FortreeCity/map.bin b/data/maps/FortreeCity/map.bin
new file mode 100644
index 000000000..a2aa40e98
--- /dev/null
+++ b/data/maps/FortreeCity/map.bin
@@ -0,0 +1 @@
+$%&HIJ$%&*$%&$%&+,-./PQR+,-./**+,-./+,-./34567D\DHIJK3456734567**34567*3<B>B>B7PQRS3<B=B>B?BVBVB;B<B>B>B?BVBVBVB;B<B=B>B?BVBVB;B<B>B>B7XYZ[CFEFGDDCFFFGDDDCFEFGDDCFEFG0`abcMHIJMHIJM00000X2Y2Y2SSa2PQRcddddea2PQRa2SSS00000000`2a2a2a2a2a2Aa2SAa2a2a2b2000000000h2a2a2a2a2sS`2U2sa2a2a2j200000000000h2a2a2a20`2]*Sa2a2j20000000(0)0)0+00`2a2K2$%&**0111`2a2a2a2a20$%&01230`2K2+,-./0X2Y2Y2Y2Y2a2K2*Sa2a2a2+,-./89:;0`234567K2K2K2K2K2K20h2i2i234567`ABCX2a23<B=B>B?BVBVBVBVBVBVBVBVBVBVBVBVBVBVBVBNNNNVB;B<B>B>B7000X2a2a2SCFEFGDDDDDDDDDDDDDDD00X2Y2DCFEF6GX2Y2a2a2a2a2SSMHIJL2Y2a2a2S6S6S6MK2K2a2a2a2a2a2a2a2PQRHIJK2a2a2a2a2a2a2K2K2K2a2a2a2a2D\DPQRK2K2a2a2a2K2**K2K2K2K2*D\DK2K2K2 \ No newline at end of file
diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/maps/FortreeCity_DecorationShop/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/FortreeCity_DecorationShop/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
new file mode 100644
index 000000000..f3108c361
--- /dev/null
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_DecorationShop: @ 848361C
+ .4byte FortreeCity_DecorationShop_MapAttributes
+ .4byte FortreeCity_DecorationShop_MapEvents
+ .4byte FortreeCity_DecorationShop_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 255
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/maps/FortreeCity_DecorationShop/map.bin
new file mode 100644
index 000000000..6ca8b4e61
--- /dev/null
+++ b/data/maps/FortreeCity_DecorationShop/map.bin
@@ -0,0 +1 @@
+333333333333733337 \ No newline at end of file
diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/maps/FortreeCity_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/FortreeCity_Gym/border.bin
Binary files differ
diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc
new file mode 100644
index 000000000..bc2af7730
--- /dev/null
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_Gym: @ 848353C
+ .4byte FortreeCity_Gym_MapAttributes
+ .4byte FortreeCity_Gym_MapEvents
+ .4byte FortreeCity_Gym_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 100
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/maps/FortreeCity_Gym/map.bin
new file mode 100644
index 000000000..cff943707
--- /dev/null
+++ b/data/maps/FortreeCity_Gym/map.bin
Binary files differ
diff --git a/data/maps/FortreeCity_House1/border.bin b/data/maps/FortreeCity_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/FortreeCity_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc
new file mode 100644
index 000000000..ec239aa37
--- /dev/null
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_House1: @ 8483520
+ .4byte FortreeCity_House1_MapAttributes
+ .4byte FortreeCity_House1_MapEvents
+ .4byte FortreeCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 99
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_House1/map.bin b/data/maps/FortreeCity_House1/map.bin
new file mode 100644
index 000000000..5a3ac8cb6
--- /dev/null
+++ b/data/maps/FortreeCity_House1/map.bin
@@ -0,0 +1 @@
+33333333333333333333733337 \ No newline at end of file
diff --git a/data/maps/FortreeCity_House2/border.bin b/data/maps/FortreeCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/FortreeCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc
new file mode 100644
index 000000000..3c6c6f5ec
--- /dev/null
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_House2: @ 84835AC
+ .4byte FortreeCity_House2_MapAttributes
+ .4byte FortreeCity_House2_MapEvents
+ .4byte FortreeCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 101
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_House2/map.bin b/data/maps/FortreeCity_House2/map.bin
new file mode 100644
index 000000000..3fbcd6043
--- /dev/null
+++ b/data/maps/FortreeCity_House2/map.bin
@@ -0,0 +1 @@
+37733333333333333333733337 \ No newline at end of file
diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc
new file mode 100644
index 000000000..b9482eaff
--- /dev/null
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_House3: @ 84835C8
+ .4byte FortreeCity_House3_MapAttributes
+ .4byte FortreeCity_House3_MapEvents
+ .4byte FortreeCity_House3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 99
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc
new file mode 100644
index 000000000..61453ee82
--- /dev/null
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_House4: @ 84835E4
+ .4byte FortreeCity_House4_MapAttributes
+ .4byte FortreeCity_House4_MapEvents
+ .4byte FortreeCity_House4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 101
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc
new file mode 100644
index 000000000..0f98a0a2b
--- /dev/null
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_House5: @ 8483600
+ .4byte FortreeCity_House5_MapAttributes
+ .4byte FortreeCity_House5_MapEvents
+ .4byte FortreeCity_House5_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 99
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc
new file mode 100644
index 000000000..ad102af2d
--- /dev/null
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_Mart: @ 8483590
+ .4byte FortreeCity_Mart_MapAttributes
+ .4byte FortreeCity_Mart_MapEvents
+ .4byte FortreeCity_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..a7e525f6e
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_PokemonCenter_1F: @ 8483558
+ .4byte FortreeCity_PokemonCenter_1F_MapAttributes
+ .4byte FortreeCity_PokemonCenter_1F_MapEvents
+ .4byte FortreeCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..693b04eb7
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+FortreeCity_PokemonCenter_2F: @ 8483574
+ .4byte FortreeCity_PokemonCenter_2F_MapAttributes
+ .4byte FortreeCity_PokemonCenter_2F_MapEvents
+ .4byte FortreeCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 11
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/GraniteCave_1F/border.bin b/data/maps/GraniteCave_1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/GraniteCave_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc
new file mode 100644
index 000000000..320567d23
--- /dev/null
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -0,0 +1,15 @@
+GraniteCave_1F: @ 8483F84
+ .4byte GraniteCave_1F_MapAttributes
+ .4byte GraniteCave_1F_MapEvents
+ .4byte GraniteCave_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 132
+ .byte 55
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/GraniteCave_1F/map.bin b/data/maps/GraniteCave_1F/map.bin
new file mode 100644
index 000000000..58c7945ab
--- /dev/null
+++ b/data/maps/GraniteCave_1F/map.bin
@@ -0,0 +1,5 @@
+22222222222222222222222?22''2222222222222222222222222222222    "2222222222222222222222222222222222222222222222222222222222226222222  
+222222222222222222222J6R6F622222 $# 
+22222222222<22222222;62;622222#
+22222222# XYZ  "222;62;62?22      "#    
+2222# "# "2;2;6222#   "2222#      "#       $'# XYZ$$#            $#         $ \ No newline at end of file
diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/maps/GraniteCave_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/GraniteCave_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc
new file mode 100644
index 000000000..798aec9f2
--- /dev/null
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -0,0 +1,15 @@
+GraniteCave_B1F: @ 8483FA0
+ .4byte GraniteCave_B1F_MapAttributes
+ .4byte GraniteCave_B1F_MapEvents
+ .4byte GraniteCave_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 133
+ .byte 55
+ .byte 1
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/maps/GraniteCave_B1F/map.bin
new file mode 100644
index 000000000..27f98c6cf
--- /dev/null
+++ b/data/maps/GraniteCave_B1F/map.bin
@@ -0,0 +1,10 @@
+2/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2!!!!
+222/2/2/2/2/2/22222222/2/2/2/2/2/2/2/2?2222!!!!!!
+2?222/2/2/2/2/2/2/2/22222!!!!!
+/2/2/2/2/2/222222222/2/2/222?222/2/2/2/2/2/2/222222222/2/2/222222/2/2/2/2/2/2/222222#!#!!
+222222#!#!#!#!!!!!!!#222222020222222222222222222222222222222222222222222222222>2222?22222  
+222  
+222222222222222222222222222  #222222222222222#  
+2222222222222222222222222222222222#  
+222222=22# 
+222 !!!!"2222?222222222#     !!!"#   ###    ##      #     ##       ##                              # \ No newline at end of file
diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/maps/GraniteCave_B2F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/GraniteCave_B2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc
new file mode 100644
index 000000000..2ec2c7089
--- /dev/null
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -0,0 +1,15 @@
+GraniteCave_B2F: @ 8483FBC
+ .4byte GraniteCave_B2F_MapAttributes
+ .4byte GraniteCave_B2F_MapEvents
+ .4byte GraniteCave_B2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 134
+ .byte 55
+ .byte 1
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/maps/GraniteCave_B2F/map.bin
new file mode 100644
index 000000000..bbf8dc7af
--- /dev/null
+++ b/data/maps/GraniteCave_B2F/map.bin
@@ -0,0 +1,2 @@
+2222222222222222222222262222222222S22222222222222'62>22222222222:2>22222222222222222222222222:2     "222222222222222222>22BR22222226222222222222222222222 $P622            $$        $    666666666666666666666666666666666666666666666S66622  2 2b6 2 2"22S622222222222222222222222222222222222222>2222222222222222222222222222'2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222    
+222222222222222222222222222222'222   $22=222222222222     "'222$            $$    $$                $$      $$                              # \ No newline at end of file
diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/maps/GraniteCave_StevensRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
new file mode 100644
index 000000000..1734d1114
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -0,0 +1,15 @@
+GraniteCave_StevensRoom: @ 8483FD8
+ .4byte GraniteCave_StevensRoom_MapAttributes
+ .4byte GraniteCave_StevensRoom_MapEvents
+ .4byte GraniteCave_StevensRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 288
+ .byte 55
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/maps/GraniteCave_StevensRoom/map.bin
new file mode 100644
index 000000000..3dc6987c2
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/map.bin
@@ -0,0 +1,4 @@
+   22222222222222222222222222$!
+22222$
+2222$
+$!!!!!$$!!!!!!!!$$!!!!!!!!!!$ \ No newline at end of file
diff --git a/data/maps/InsideOfTruck/border.bin b/data/maps/InsideOfTruck/border.bin
new file mode 100644
index 000000000..8459c2996
--- /dev/null
+++ b/data/maps/InsideOfTruck/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
new file mode 100644
index 000000000..7e63d060f
--- /dev/null
+++ b/data/maps/InsideOfTruck/header.inc
@@ -0,0 +1,15 @@
+InsideOfTruck: @ 8484EF0
+ .4byte InsideOfTruck_MapAttributes
+ .4byte InsideOfTruck_MapEvents
+ .4byte InsideOfTruck_MapScripts
+ .4byte 0x0
+ .2byte 65535
+ .2byte 237
+ .byte 84
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/InsideOfTruck/map.bin b/data/maps/InsideOfTruck/map.bin
new file mode 100644
index 000000000..84b946be5
--- /dev/null
+++ b/data/maps/InsideOfTruck/map.bin
@@ -0,0 +1,2 @@
+ 
+2 2 22222!"#$  \ No newline at end of file
diff --git a/data/maps/IslandCave/border.bin b/data/maps/IslandCave/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/maps/IslandCave/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
new file mode 100644
index 000000000..454c3cf92
--- /dev/null
+++ b/data/maps/IslandCave/header.inc
@@ -0,0 +1,15 @@
+IslandCave: @ 8484614
+ .4byte IslandCave_MapAttributes
+ .4byte IslandCave_MapEvents
+ .4byte IslandCave_MapScripts
+ .4byte 0x0
+ .2byte BGM_MABOROSI
+ .2byte 280
+ .byte 81
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/IslandCave/map.bin b/data/maps/IslandCave/map.bin
new file mode 100644
index 000000000..a7fa61b4d
--- /dev/null
+++ b/data/maps/IslandCave/map.bin
Binary files differ
diff --git a/data/maps/JaggedPass/border.bin b/data/maps/JaggedPass/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/JaggedPass/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
new file mode 100644
index 000000000..24e700ebb
--- /dev/null
+++ b/data/maps/JaggedPass/header.inc
@@ -0,0 +1,15 @@
+JaggedPass: @ 848402C
+ .4byte JaggedPass_MapAttributes
+ .4byte JaggedPass_MapEvents
+ .4byte JaggedPass_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 292
+ .byte 76
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/JaggedPass/map.bin b/data/maps/JaggedPass/map.bin
new file mode 100644
index 000000000..57195b4f5
--- /dev/null
+++ b/data/maps/JaggedPass/map.bin
Binary files differ
diff --git a/data/maps/LavaridgeTown/border.bin b/data/maps/LavaridgeTown/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/LavaridgeTown/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc
new file mode 100644
index 000000000..c522a3460
--- /dev/null
+++ b/data/maps/LavaridgeTown/connections.inc
@@ -0,0 +1,7 @@
+LavaridgeTown_MapConnectionsList: @ 8486660
+ connection right, -40, ROUTE_112, 0
+
+LavaridgeTown_MapConnections: @ 848666C
+ .4byte 0x1
+ .4byte LavaridgeTown_MapConnectionsList
+
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
new file mode 100644
index 000000000..c107a2643
--- /dev/null
+++ b/data/maps/LavaridgeTown/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown: @ 8482608
+ .4byte LavaridgeTown_MapAttributes
+ .4byte LavaridgeTown_MapEvents
+ .4byte LavaridgeTown_MapScripts
+ .4byte LavaridgeTown_MapConnections
+ .2byte BGM_MACHI_S4
+ .2byte 13
+ .byte 3
+ .byte 0
+ .byte 2
+ .byte 1
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/LavaridgeTown/map.bin b/data/maps/LavaridgeTown/map.bin
new file mode 100644
index 000000000..604ad5f3f
--- /dev/null
+++ b/data/maps/LavaridgeTown/map.bin
@@ -0,0 +1,3 @@
+qqqq{ttttt|qqqqqqq66{tttzq22222xttttttttr{2t2|qqqNKLOq6rr2222JHIMyy0123rr2332PQRS2289:;44rr2222XYZ[55`ABC44rr`abc550 1"1044rr2222220 1"10000 1"1000rr2222220 1"1000 1"1000rrBB00 1!11111!1!1111rr22200(1)1)1)1)1)1)1)1)1)1)1rr111111000000000000rr0000 0 0
+00 0 0
+00rr0000rr000  4rr11000 !" !"4rr000000000000400004m00000000000000044qqrm0000000000000044qqllllllllllllllll \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/maps/LavaridgeTown_Gym_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_1F/border.bin
Binary files differ
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
new file mode 100644
index 000000000..a82f59c89
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_Gym_1F: @ 8482CD0
+ .4byte LavaridgeTown_Gym_1F_MapAttributes
+ .4byte LavaridgeTown_Gym_1F_MapEvents
+ .4byte LavaridgeTown_Gym_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 69
+ .byte 3
+ .byte 0
+ .byte 6
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/maps/LavaridgeTown_Gym_1F/map.bin
new file mode 100644
index 000000000..31d16da5e
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_1F/map.bin
@@ -0,0 +1,3 @@
+   22222' 222 2222  22222  2222 222  222222  2222  2222  222222  2222  2222 2222  22  222      2222 2 2  22  22  22  !"#$  2222  22  22  22222  2222  22  22  2222  2222  22  22 %&&&&  22 2  22 22222 222 %&  22 22222 2222  22  222
+2222222222
+22  222222222 2222222  22220022 \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/maps/LavaridgeTown_Gym_B1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_B1F/border.bin
Binary files differ
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
new file mode 100644
index 000000000..0d7857c1a
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_Gym_B1F: @ 8482CEC
+ .4byte LavaridgeTown_Gym_B1F_MapAttributes
+ .4byte LavaridgeTown_Gym_B1F_MapEvents
+ .4byte LavaridgeTown_Gym_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 70
+ .byte 3
+ .byte 0
+ .byte 6
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/maps/LavaridgeTown_Gym_B1F/map.bin
new file mode 100644
index 000000000..aeaf0177c
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_B1F/map.bin
@@ -0,0 +1,6 @@
+++++)+++++)++++++3333(33333(3333332222022;220222222 22822
+222222
+282222++++)++)+)+++)+++33331331313331333<22;1221212221222 22221 221 21 2221 222 22221 221 21 2221 222 22221 22191 2221 22292221 221 21%&&1%&& 22221%&1 21 2221 222%&&&1 221 21 2281 222 22221 221 21 2221 222 2822(92( 21 2221 222 22220 220 21%&&( 222 2222:
+222
+21 2220 2229222222221 222:
+222 22228222219222222 \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/maps/LavaridgeTown_HerbShop/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LavaridgeTown_HerbShop/border.bin
Binary files differ
diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc
new file mode 100644
index 000000000..6afc82a8b
--- /dev/null
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_HerbShop: @ 8482CB4
+ .4byte LavaridgeTown_HerbShop_MapAttributes
+ .4byte LavaridgeTown_HerbShop_MapEvents
+ .4byte LavaridgeTown_HerbShop_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S4
+ .2byte 68
+ .byte 3
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/maps/LavaridgeTown_HerbShop/map.bin
new file mode 100644
index 000000000..cc0294a80
--- /dev/null
+++ b/data/maps/LavaridgeTown_HerbShop/map.bin
@@ -0,0 +1 @@
+32222x2p2p2p2p22h2h2h2x2p2p2p2p2p2y2h2h2h232h2h2h2h2h2h2h2h2h22g2h2h2h2h2h2h2h2f2Z2abh2h2h2h2h2ab \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc
new file mode 100644
index 000000000..f9f8dbfeb
--- /dev/null
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_House: @ 8482D08
+ .4byte LavaridgeTown_House_MapAttributes
+ .4byte LavaridgeTown_House_MapEvents
+ .4byte LavaridgeTown_House_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S4
+ .2byte 64
+ .byte 3
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc
new file mode 100644
index 000000000..05a9c6b94
--- /dev/null
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_Mart: @ 8482D24
+ .4byte LavaridgeTown_Mart_MapAttributes
+ .4byte LavaridgeTown_Mart_MapEvents
+ .4byte LavaridgeTown_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 3
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..bb99b86d5
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_PokemonCenter_1F: @ 8482D40
+ .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
+ .4byte LavaridgeTown_PokemonCenter_1F_MapEvents
+ .4byte LavaridgeTown_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 71
+ .byte 3
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin
new file mode 100644
index 000000000..d841f9f1a
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin
@@ -0,0 +1 @@
+   JK   H"#RSI2222P*+2[Q$2222 2&222X!!!Y<222'2 24222`2l2m2n2o22%222'222222021222322222'26B228292:2;2242=>'222222@2A2B2C22&2EF'2(2222222222&2427 \ No newline at end of file
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..d81479abe
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_PokemonCenter_2F: @ 8482D5C
+ .4byte LavaridgeTown_PokemonCenter_2F_MapAttributes
+ .4byte LavaridgeTown_PokemonCenter_2F_MapEvents
+ .4byte LavaridgeTown_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 3
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity/border.bin b/data/maps/LilycoveCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/LilycoveCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc
new file mode 100644
index 000000000..e19e02829
--- /dev/null
+++ b/data/maps/LilycoveCity/connections.inc
@@ -0,0 +1,8 @@
+LilycoveCity_MapConnectionsList: @ 84867A4
+ connection left, 10, ROUTE_121, 0
+ connection right, -10, ROUTE_124, 0
+
+LilycoveCity_MapConnections: @ 84867BC
+ .4byte 0x2
+ .4byte LilycoveCity_MapConnectionsList
+
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
new file mode 100644
index 000000000..5f063576e
--- /dev/null
+++ b/data/maps/LilycoveCity/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity: @ 8482544
+ .4byte LilycoveCity_MapAttributes
+ .4byte LilycoveCity_MapEvents
+ .4byte LilycoveCity_MapScripts
+ .4byte LilycoveCity_MapConnections
+ .2byte BGM_MINAMO
+ .2byte 6
+ .byte 12
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/LilycoveCity/map.bin b/data/maps/LilycoveCity/map.bin
new file mode 100644
index 000000000..5d6b56ad9
--- /dev/null
+++ b/data/maps/LilycoveCity/map.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/maps/LilycoveCity_ContestHall/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestHall/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
new file mode 100644
index 000000000..4aa6ce82a
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_ContestHall: @ 84836C4
+ .4byte LilycoveCity_ContestHall_MapAttributes
+ .4byte LilycoveCity_ContestHall_MapEvents
+ .4byte LilycoveCity_ContestHall_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONLOBBY
+ .2byte 106
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/maps/LilycoveCity_ContestHall/map.bin
new file mode 100644
index 000000000..06fdae4f7
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestHall/map.bin
@@ -0,0 +1,3 @@
+///////////////////////////////2222222222~v 2222222222////
+////22222<=>bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb<=> 22222////
+DEF. 2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2!2"2,DEF////<=>bbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*24bbbb<=>DEF. 2!2!2!2!202`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`222!2!2!2!2"2,DEFbbbb6(2`2`2`2`2`2`2`2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2`2`2`2*24bbbb 2!2!2!2!202`2`2J2`2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2J2`2`222!2!2!2!2"2(2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2`2`2`2`2R`2`2`2`2`2`2`2*2(2`2J2`2`2J2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2`2`2I2`2I2`2`2`2`2`2`2J2`2`2J2`2*2(2`2R`2`2R`2`2`2`2`2`2P2`2P2`2`2`2$%2%2pq2q2q22qwBqr%2%2&f2`2`2Q2`2Q2`2`2`2`2`2`2R`2`2R`2*2(2`2`2`2`2`2`2`2`2`2`2`2X2`2X2`2`2`2$%2%2pq2q2q22q2qq2r%2%2&f2`2`2Y2`2Y2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2H2`2H2`2`2`2$%2%2xyy{2|2}2yyz%2%2&f2`2`2I2`2I2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2P2`2P2`2`2`22222222222222f2`2`2Q2`2Q2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2222f2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2              f2`2`2`2`2`2`2`2`2              f2`2`2`2`2*2(2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2`2`2`2`2$%2%2%2%2%2%2%2%2%2%2%2%2%2&f2`2`2`2`2*2(2`2`2`2`2`2$%2%2hiiiiiiij%2%2&f2I2`2`2`2`2`2H2`2$%2%2hiiiiiiij%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2Q2`2`2`2`2`2P2`2$%2%2pq2q2q2q2q2o2q2r%2%2&f2I2`2I2`2*2(2`2P2`2P2`2$%2%2pq2q2q22qwBqr%2%2&f2Y2`2`2`2`2`2X2`2$%2%2pq2q2q22qwBqr%2%2&f2Q2`2Q2`2*2(2`2X2`2X2`2$%2%2pq2q2q22q2qq2r%2%2&f2`2`2`2`2`2`2`2`2$%2%2pq2q2q22q2qq2r%2%2&f2Y2`2Y2`2*2(2`2`2`2`2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2I2`2`2`2`2`2H2`2$%2%2pq2q2q2q2q2q2q2r%2%2&f2`2`2`2`2*2(2`2H2`2H2`2$%2%2xyy222yyz%2%2&f2Q2`2`2`2`2`2P2`2$%2%2xyy222yyz%2%2&f2I2`2I2`2*2(2`2P2`2P2`22222222222222f2Y2`2`2`2`2`2X2`22222222222222f2Q2`2Q2`2*2(2`2X2`2X2`2222f2`2`2`2`2`2`2`2`2222f2Y2`2Y2`2*2(2`2`2`2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`22_2_2_2_2_2_2_2_2_2_2_2_2_2_2g2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2*2(2`2`2J2`2`2`2J2`2`2`2J2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2J2`2`2`2J2`2`2`2J2`2`2*2(2`2`2R`2`2`2R`2`2`2R`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2R`2`2`2R`2`2`2R`2`2*2 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/maps/LilycoveCity_ContestLobby/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc
new file mode 100644
index 000000000..9ff5e1978
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_ContestLobby: @ 84836A8
+ .4byte LilycoveCity_ContestLobby_MapAttributes
+ .4byte LilycoveCity_ContestLobby_MapEvents
+ .4byte LilycoveCity_ContestLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONLOBBY
+ .2byte 105
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/maps/LilycoveCity_ContestLobby/map.bin
new file mode 100644
index 000000000..122962e42
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/map.bin
@@ -0,0 +1 @@
+[\]:;M[\]bbbbbc6debbBCbbc6debbbbT 2!2!2!2!2!2!2!2!2!2!2222222U2!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`22_2_2_2_2_2_2_2g2`2`2`2`2`2`2`2`2`2`2*2(2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`2`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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
new file mode 100644
index 000000000..9cae21a94
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_1F: @ 8483638
+ .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
+ .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents
+ .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 299
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin
new file mode 100644
index 000000000..5242f8e57
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin
@@ -0,0 +1 @@
+a 2!2!2!2!2222!2!2@22!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2D2N_D2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
new file mode 100644
index 000000000..abaa01313
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_2F: @ 8483654
+ .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
+ .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents
+ .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 300
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin
new file mode 100644
index 000000000..4484b5b55
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin
@@ -0,0 +1 @@
+a2!2!2!2!2!2!2!22222!2)2N_D2)2)2D2NOD2)2!2D2VWD2)2)2D2VWD2)2!2)2)2)2)2)2)2)2)2)2)2)2!2D2NOD2)2)2)2N_)2)2!2D2VWD2)2)2D2VW)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
new file mode 100644
index 000000000..4f71e1479
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStoreElevator: @ 84838A0
+ .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
+ .4byte LilycoveCity_DepartmentStoreElevator_MapEvents
+ .4byte LilycoveCity_DepartmentStoreElevator_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 273
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
new file mode 100644
index 000000000..7d9ae193b
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
@@ -0,0 +1 @@
+(***,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
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
new file mode 100644
index 000000000..dee8b5b4e
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStoreRooftop: @ 8483884
+ .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
+ .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents
+ .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 262
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin
new file mode 100644
index 000000000..e9125baf0
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin
@@ -0,0 +1 @@
+&oo'.S2S2S2S2S2S2S2S2wwS2NO5/622J2J2J2J2J2J2M2M23VW=z'6J2J2J2J2J2J2J2J2J2^_ET2S2/622J2J2J2J2J2J2J2J2J2M2M2M2M2676J2J266J2J266J2J2J2J2J267>U2[2[2[2[2[2[2[2[2[2[2[2[2[2[2[2?FccccccccccccccccG \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/maps/LilycoveCity_DepartmentStore_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/border.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
new file mode 100644
index 000000000..263b13ad8
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_1F: @ 84837F8
+ .4byte LilycoveCity_DepartmentStore_1F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_1F_MapEvents
+ .4byte LilycoveCity_DepartmentStore_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 257
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/maps/LilycoveCity_DepartmentStore_1F/map.bin
new file mode 100644
index 000000000..2d3d15360
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.bin
@@ -0,0 +1 @@
+|}~  Px2222p2p22222x2p2p2p2p2p22h2h2h2h2h22h2h2h2n2h22g2h2h2h2h2q2p2p2p2p2p2y2h2h2h2h2h2abhh2h2h2h2h2h2h2h2h2h2h2h2h2n2h22g2h2h2h2h2h2h2h2h2h2h2h2h2l2h2l2l2abh2h2h2h2h2h2h2h2h2h2th2tt \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/maps/LilycoveCity_DepartmentStore_2F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/border.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
new file mode 100644
index 000000000..7ca78c745
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_2F: @ 8483814
+ .4byte LilycoveCity_DepartmentStore_2F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_2F_MapEvents
+ .4byte LilycoveCity_DepartmentStore_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 258
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/maps/LilycoveCity_DepartmentStore_2F/map.bin
new file mode 100644
index 000000000..82ca90b08
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.bin
@@ -0,0 +1 @@
+|}~    PQ 22222222222222222222222222222222222m22222222222222u2234222234222222 2222222m2222222222222222u \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/maps/LilycoveCity_DepartmentStore_3F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/border.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
new file mode 100644
index 000000000..796b58232
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_3F: @ 8483830
+ .4byte LilycoveCity_DepartmentStore_3F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_3F_MapEvents
+ .4byte LilycoveCity_DepartmentStore_3F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 259
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/maps/LilycoveCity_DepartmentStore_3F/map.bin
new file mode 100644
index 000000000..c10b776f5
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.bin
@@ -0,0 +1 @@
+|}~6    6QP 222222C2222 22222222222222222222+,2222222222+,2222342222222222342222;<2222222222;<22222222222222222222 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/maps/LilycoveCity_DepartmentStore_4F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/border.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
new file mode 100644
index 000000000..c86acb62c
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_4F: @ 848384C
+ .4byte LilycoveCity_DepartmentStore_4F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_4F_MapEvents
+ .4byte LilycoveCity_DepartmentStore_4F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 260
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/maps/LilycoveCity_DepartmentStore_4F/map.bin
new file mode 100644
index 000000000..bc1a09e2c
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.bin
@@ -0,0 +1 @@
+|}~    PQ 2222222222222222222222222222222222222222222222222222222662222266662266222 22222666622222222222222222 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/maps/LilycoveCity_DepartmentStore_5F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/border.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
new file mode 100644
index 000000000..1336b59c6
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_5F: @ 8483868
+ .4byte LilycoveCity_DepartmentStore_5F_MapAttributes
+ .4byte LilycoveCity_DepartmentStore_5F_MapEvents
+ .4byte LilycoveCity_DepartmentStore_5F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 261
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/maps/LilycoveCity_DepartmentStore_5F/map.bin
new file mode 100644
index 000000000..80acc3900
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.bin
Binary files differ
diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
new file mode 100644
index 000000000..4a79f9691
--- /dev/null
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_Harbor: @ 8483750
+ .4byte LilycoveCity_Harbor_MapAttributes
+ .4byte LilycoveCity_Harbor_MapEvents
+ .4byte LilycoveCity_Harbor_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 88
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc
new file mode 100644
index 000000000..ebff864c0
--- /dev/null
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House1: @ 8483788
+ .4byte LilycoveCity_House1_MapAttributes
+ .4byte LilycoveCity_House1_MapEvents
+ .4byte LilycoveCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 59
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/maps/LilycoveCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc
new file mode 100644
index 000000000..d589b3c55
--- /dev/null
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House2: @ 84837A4
+ .4byte LilycoveCity_House2_MapAttributes
+ .4byte LilycoveCity_House2_MapEvents
+ .4byte LilycoveCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 74
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/maps/LilycoveCity_House2/map.bin
new file mode 100644
index 000000000..e381f20eb
--- /dev/null
+++ b/data/maps/LilycoveCity_House2/map.bin
@@ -0,0 +1 @@
+222!2!2222Y2N6O6)2)2)2)2)2Y2V6W6D2)2)2)2)2!2)2)2)2)2)2)2)2 33333333#333333 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
new file mode 100644
index 000000000..cb79f9bf6
--- /dev/null
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House3: @ 84837C0
+ .4byte LilycoveCity_House3_MapAttributes
+ .4byte LilycoveCity_House3_MapEvents
+ .4byte LilycoveCity_House3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 60
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc
new file mode 100644
index 000000000..c971f6d7d
--- /dev/null
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House4: @ 84837DC
+ .4byte LilycoveCity_House4_MapAttributes
+ .4byte LilycoveCity_House4_MapEvents
+ .4byte LilycoveCity_House4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 59
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
new file mode 100644
index 000000000..a354518a9
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_LilycoveMuseum_1F: @ 8483670
+ .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
+ .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents
+ .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_BIJYUTU
+ .2byte 103
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin
new file mode 100644
index 000000000..6e92a8b58
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin
@@ -0,0 +1 @@
+          !"#$% &'222222222222222222222222222222222 22222222 2 2 2 2 2 2 2 222222222222  -.  /  2222222222256722222:2;2;2;2<22222222222 22222B()*DO222222222222222J012LO22:2;2;2;2;2<222222222RSSSTO22HSAS@I>22222222?2?2?2?2?2F22M2?2?2?2O22222222+222,>222842;2;2;29O222222223>22?2F222RSSSSTO222222?2F22222 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
new file mode 100644
index 000000000..77630b6b4
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_LilycoveMuseum_2F: @ 848368C
+ .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
+ .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents
+ .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_BIJYUTU
+ .2byte 104
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin
new file mode 100644
index 000000000..76a918838
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin
@@ -0,0 +1 @@
+yyyzjklxyyyrstq2p2q2p2q2p2q2q2p2q2q2p2p2q2p2q2p2i2h2i2h2i2h2i2h2i2h2i2h2i2p2q2p2q2q2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2p2nno2h2i2h2nno2h2i2h2nno2q2XYw{2i2h2i2XYw{2i2h2i2XYw{2p2|2}2~222h2i2h2|2}2~222h2i2h2|2}2~222q2h2i2h2i2d2e2f2g2h2i2h2i2d2e2f2g2h2i2h2i2h2p2i2h2i2h2nno2h2i2h2nno2h2i2h2i2q2h2i2h2i2XYw{2i2h2i2XYw{2i2h2i2h2p2i2h2i2h2|2}2~222h2i2h2|2}2~222h2i2h2i2q2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2i2h2 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
new file mode 100644
index 000000000..6d0b19df0
--- /dev/null
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_MoveDeletersHouse: @ 848376C
+ .4byte LilycoveCity_MoveDeletersHouse_MapAttributes
+ .4byte LilycoveCity_MoveDeletersHouse_MapEvents
+ .4byte LilycoveCity_MoveDeletersHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 60
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..477bfd87b
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_PokemonCenter_1F: @ 84836E0
+ .4byte LilycoveCity_PokemonCenter_1F_MapAttributes
+ .4byte LilycoveCity_PokemonCenter_1F_MapEvents
+ .4byte LilycoveCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..30f10e387
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_PokemonCenter_2F: @ 84836FC
+ .4byte LilycoveCity_PokemonCenter_2F_MapAttributes
+ .4byte LilycoveCity_PokemonCenter_2F_MapEvents
+ .4byte LilycoveCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
new file mode 100644
index 000000000..eb5b6e74e
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_PokemonTrainerFanClub: @ 8483734
+ .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
+ .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents
+ .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 107
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin
new file mode 100644
index 000000000..cddfe5d9d
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin
@@ -0,0 +1,2 @@
+no0vwi    ~22q2$2$2$2$2$282$22292#2#2+2LMLM,2#2#2#292#2#2#2TUTU#2#2#2#292#2#2#2#2#2#2,2#2#2#2#2 322#2#2#2#2#2#2222#2#2#2#2#2#2 526262626272
+hi22$2=2H^HI?2%2p2q292#2#2=2PQPQ?2#2#2#292#2#2E2F2F2F2F2G2#2#2#292#2#2#2#2#2#2#2#2#2#2#292#2#2#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
new file mode 100644
index 000000000..d205d5312
--- /dev/null
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -0,0 +1,15 @@
+LilycoveCity_UnusedMart: @ 8483718
+ .4byte LilycoveCity_UnusedMart_MapAttributes
+ .4byte LilycoveCity_UnusedMart_MapEvents
+ .4byte LilycoveCity_UnusedMart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 12
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LinkContestRoom1/border.bin b/data/maps/LinkContestRoom1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LinkContestRoom1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
new file mode 100644
index 000000000..e257caad9
--- /dev/null
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -0,0 +1,15 @@
+LinkContestRoom1: @ 8484DA0
+ .4byte LinkContestRoom1_MapAttributes
+ .4byte LinkContestRoom1_MapEvents
+ .4byte LinkContestRoom1_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONTEST0
+ .2byte 225
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LinkContestRoom1/map.bin b/data/maps/LinkContestRoom1/map.bin
new file mode 100644
index 000000000..a8853f6ae
--- /dev/null
+++ b/data/maps/LinkContestRoom1/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ No newline at end of file
diff --git a/data/maps/LinkContestRoom2/border.bin b/data/maps/LinkContestRoom2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LinkContestRoom2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
new file mode 100644
index 000000000..f370ad121
--- /dev/null
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -0,0 +1,15 @@
+LinkContestRoom2: @ 8484E64
+ .4byte LinkContestRoom2_MapAttributes
+ .4byte LinkContestRoom2_MapEvents
+ .4byte LinkContestRoom2_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONTEST0
+ .2byte 232
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LinkContestRoom2/map.bin b/data/maps/LinkContestRoom2/map.bin
new file mode 100644
index 000000000..7cb63b40d
--- /dev/null
+++ b/data/maps/LinkContestRoom2/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&222222222222262226 \ No newline at end of file
diff --git a/data/maps/LinkContestRoom3/border.bin b/data/maps/LinkContestRoom3/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LinkContestRoom3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
new file mode 100644
index 000000000..f7deff02d
--- /dev/null
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -0,0 +1,15 @@
+LinkContestRoom3: @ 8484E80
+ .4byte LinkContestRoom3_MapAttributes
+ .4byte LinkContestRoom3_MapEvents
+ .4byte LinkContestRoom3_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONTEST0
+ .2byte 233
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LinkContestRoom3/map.bin b/data/maps/LinkContestRoom3/map.bin
new file mode 100644
index 000000000..59e9e9182
--- /dev/null
+++ b/data/maps/LinkContestRoom3/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ No newline at end of file
diff --git a/data/maps/LinkContestRoom4/border.bin b/data/maps/LinkContestRoom4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LinkContestRoom4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
new file mode 100644
index 000000000..1d25edacb
--- /dev/null
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -0,0 +1,15 @@
+LinkContestRoom4: @ 8484E9C
+ .4byte LinkContestRoom4_MapAttributes
+ .4byte LinkContestRoom4_MapEvents
+ .4byte LinkContestRoom4_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONTEST0
+ .2byte 234
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LinkContestRoom4/map.bin b/data/maps/LinkContestRoom4/map.bin
new file mode 100644
index 000000000..4e2166c19
--- /dev/null
+++ b/data/maps/LinkContestRoom4/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ No newline at end of file
diff --git a/data/maps/LinkContestRoom5/border.bin b/data/maps/LinkContestRoom5/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LinkContestRoom5/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
new file mode 100644
index 000000000..59a9c2d3b
--- /dev/null
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -0,0 +1,15 @@
+LinkContestRoom5: @ 8484EB8
+ .4byte LinkContestRoom5_MapAttributes
+ .4byte LinkContestRoom5_MapEvents
+ .4byte LinkContestRoom5_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONTEST0
+ .2byte 235
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LinkContestRoom5/map.bin b/data/maps/LinkContestRoom5/map.bin
new file mode 100644
index 000000000..ad068fe7c
--- /dev/null
+++ b/data/maps/LinkContestRoom5/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ No newline at end of file
diff --git a/data/maps/LinkContestRoom6/border.bin b/data/maps/LinkContestRoom6/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LinkContestRoom6/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
new file mode 100644
index 000000000..c09392bf9
--- /dev/null
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -0,0 +1,15 @@
+LinkContestRoom6: @ 8484ED4
+ .4byte LinkContestRoom6_MapAttributes
+ .4byte LinkContestRoom6_MapEvents
+ .4byte LinkContestRoom6_MapScripts
+ .4byte 0x0
+ .2byte BGM_CONTEST0
+ .2byte 236
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LinkContestRoom6/map.bin b/data/maps/LinkContestRoom6/map.bin
new file mode 100644
index 000000000..9fcec5a5e
--- /dev/null
+++ b/data/maps/LinkContestRoom6/map.bin
@@ -0,0 +1 @@
+```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q22q2w6q2r%2%2&$%2%2pq2q2q22q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy222yyz%2%2&222222222222262226 \ No newline at end of file
diff --git a/data/maps/LittlerootTown/border.bin b/data/maps/LittlerootTown/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/LittlerootTown/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc
new file mode 100644
index 000000000..3f8f421f5
--- /dev/null
+++ b/data/maps/LittlerootTown/connections.inc
@@ -0,0 +1,7 @@
+LittlerootTown_MapConnectionsList: @ 8486600
+ connection up, 0, ROUTE_101, 0
+
+LittlerootTown_MapConnections: @ 848660C
+ .4byte 0x1
+ .4byte LittlerootTown_MapConnectionsList
+
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
new file mode 100644
index 000000000..3b9655a8c
--- /dev/null
+++ b/data/maps/LittlerootTown/header.inc
@@ -0,0 +1,15 @@
+LittlerootTown: @ 84825B4
+ .4byte LittlerootTown_MapAttributes
+ .4byte LittlerootTown_MapEvents
+ .4byte LittlerootTown_MapScripts
+ .4byte LittlerootTown_MapConnections
+ .2byte BGM_MISHIRO
+ .2byte 10
+ .byte 0
+ .byte 0
+ .byte 2
+ .byte 1
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/LittlerootTown/map.bin b/data/maps/LittlerootTown/map.bin
new file mode 100644
index 000000000..9af76f90e
--- /dev/null
+++ b/data/maps/LittlerootTown/map.bin
@@ -0,0 +1,3 @@
+5000000000000000000000000000000000000002 2 2 2
+20000002 2 2 2
+2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000000000000000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-0000000011000&4I5'00000000110000200000000110000000000000011111111111111 \ No newline at end of file
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/maps/LittlerootTown_BrendansHouse_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/border.bin
Binary files differ
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
new file mode 100644
index 000000000..cbac012de
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -0,0 +1,15 @@
+LittlerootTown_BrendansHouse_1F: @ 8482AF4
+ .4byte LittlerootTown_BrendansHouse_1F_MapAttributes
+ .4byte LittlerootTown_BrendansHouse_1F_MapEvents
+ .4byte LittlerootTown_BrendansHouse_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_MISHIRO
+ .2byte 54
+ .byte 0
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/maps/LittlerootTown_BrendansHouse_1F/map.bin
new file mode 100644
index 000000000..3ae8e69a6
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.bin
@@ -0,0 +1 @@
+nnnn01234&&  M89:;<222222B222d222222@A222222252H2I2J2.2622222222662222222 2!2"#$2%222222(2)2*2+2,2-222 \ No newline at end of file
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/maps/LittlerootTown_BrendansHouse_2F/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
new file mode 100644
index 000000000..35946ac05
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -0,0 +1,15 @@
+LittlerootTown_BrendansHouse_2F: @ 8482B10
+ .4byte LittlerootTown_BrendansHouse_2F_MapAttributes
+ .4byte LittlerootTown_BrendansHouse_2F_MapEvents
+ .4byte LittlerootTown_BrendansHouse_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_MISHIRO
+ .2byte 55
+ .byte 0
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
new file mode 100644
index 000000000..bfa5b907e
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
@@ -0,0 +1 @@
+RTPTV   Z[Ueb2c2x2f2]2x2222{2|2}22222222222222BB222222222222222222222 \ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/maps/LittlerootTown_MaysHouse_1F/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
new file mode 100644
index 000000000..6da065fab
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MaysHouse_1F: @ 8482B2C
+ .4byte LittlerootTown_MaysHouse_1F_MapAttributes
+ .4byte LittlerootTown_MaysHouse_1F_MapEvents
+ .4byte LittlerootTown_MaysHouse_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_MISHIRO
+ .2byte 56
+ .byte 0
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/maps/LittlerootTown_MaysHouse_1F/map.bin
new file mode 100644
index 000000000..21f62ebe3
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/map.bin
@@ -0,0 +1 @@
+nnnnno m&&CD120vwux22KL9:82222y22F22222222222@A22222222222222222222 \ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/maps/LittlerootTown_MaysHouse_2F/border.bin
new file mode 100644
index 000000000..c1b82435c
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
new file mode 100644
index 000000000..bb48d9bcf
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -0,0 +1,15 @@
+LittlerootTown_MaysHouse_2F: @ 8482B48
+ .4byte LittlerootTown_MaysHouse_2F_MapAttributes
+ .4byte LittlerootTown_MaysHouse_2F_MapEvents
+ .4byte LittlerootTown_MaysHouse_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_MISHIRO
+ .2byte 57
+ .byte 0
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/maps/LittlerootTown_MaysHouse_2F/map.bin
new file mode 100644
index 000000000..5904a9639
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/map.bin
@@ -0,0 +1,2 @@
+ 
+'VTPTQ/WUXYE2222]2g22`2a2222222222222222222222BB2222222222222222 \ No newline at end of file
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
new file mode 100644
index 000000000..84409297e
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -0,0 +1,15 @@
+LittlerootTown_ProfessorBirchsLab: @ 8482B64
+ .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
+ .4byte LittlerootTown_ProfessorBirchsLab_MapEvents
+ .4byte LittlerootTown_ProfessorBirchsLab_MapScripts
+ .4byte 0x0
+ .2byte BGM_ODAMAKI
+ .2byte 58
+ .byte 0
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
new file mode 100644
index 000000000..0f84e80b2
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
@@ -0,0 +1,5 @@
+  <
+   
+
+
+ !2D"2#2>2"232"232>2(2*2*2A22222)2:2222222222221B22$2%2627222222?2?222,-,-22222224545222222=2>2>2>2222222G2?2220222222222;.H8922222222I2C:2H@2&22222222KBO2?22.22222?2?2 \ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/maps/MagmaHideout_1F/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
new file mode 100644
index 000000000..b768e2996
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_1F: @ 8484828
+ .4byte MagmaHideout_1F_MapAttributes
+ .4byte MagmaHideout_1F_MapEvents
+ .4byte MagmaHideout_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 336
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/maps/MagmaHideout_1F/map.bin
new file mode 100644
index 000000000..fdf0d4252
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/map.bin
Binary files differ
diff --git a/data/maps/MagmaHideout_2F_1R/border.bin b/data/maps/MagmaHideout_2F_1R/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_1R/border.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..503dd0d73
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_1R/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_1R: @ 8484844
+ .4byte MagmaHideout_2F_1R_MapAttributes
+ .4byte MagmaHideout_2F_1R_MapEvents
+ .4byte MagmaHideout_2F_1R_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 337
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_2F_1R/map.bin b/data/maps/MagmaHideout_2F_1R/map.bin
new file mode 100644
index 000000000..d74c32347
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_1R/map.bin
@@ -0,0 +1,2 @@
+qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq{tttttVttttttttttttttttttttt|qqqqrqqq{t^ttttt-|qqqqq{ttttt|qqqqqrqq33333333tttttz33333qqqqqqrqqq33333333333333333333t|qqqqr{tt3333333333333333333333qqqqrr3333333333333333333333333qqqqrr{tttttttttttttttttt|333qqqqrrr33333333333333333333333qqqqrrr33333333333333333333tt|qqqqrrr33333333333333333333333qqqqrrr33333333333333333333333qqqqrrr{ttttttttttttttttttt|pqqqqrrrr7{tttttttttttttt|77pqqqqrrrr7r33333333333377pqqqqrrr17r333333333333t|pqqqqrrrr7r333333mn33333333pqqqqrrrr7r333333uv33333333pqqqqrrrr{333333}~33333333pqqqqrrrrr3333333333333333333pqqqqrrrrr3333333333333333333pqqqqrrrrr{ttttttttttttttt|pqqqqrrrrrr{ttVt#tttttttt|pqqqqrrrrrrr{t^tt|333333333qqqqrrr1rrrr3333|33333333qqqqrrrrrrrr33333tttttt|pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr3333333333333pqqqqrrrrrrrr{ttttt-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
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_2R/border.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..9407bb8e8
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_2R/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_2R: @ 8484860
+ .4byte MagmaHideout_2F_2R_MapAttributes
+ .4byte MagmaHideout_2F_2R_MapEvents
+ .4byte MagmaHideout_2F_2R_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 338
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_2F_2R/map.bin b/data/maps/MagmaHideout_2F_2R/map.bin
new file mode 100644
index 000000000..34cbf7eaa
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_2R/map.bin
@@ -0,0 +1,5 @@
+qqqqqqqqqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqxtttttttttt|qq{ttt|qqqqqqqqqqqqqqq{tttttttttttttttt|p{x|qqqqqqqqqqqqq{z{ttt-tttttttttt|pp{pqqqqqqqqqqqqr{z{GGGGGGGGGGG|ppprx|qqqqqqttttttzrFppp  jpqqqqqqqqqqqqqrq23q2hppqqq{x|qqqqqqqqqqqqr3pqpx|qqqr{|pqqqqqqqqqqqqrh     jF3pqx|pqq{rppqqqqqqqqqq{zpqh  jjh qqppq{{x|x|qqqqqqqqqqrppqqjqqqq jph   p{qr{|x|pqqqqqqqqqqrpqpqq{z{tt|qqjpx|qqqpr{trpq2ppqqqqqqqqqqrpqpq{zqrqqpqqqrx|xt|qxr{tx|pxttttqqqqq{zx|xtz{tzqhqqrx|qx|{tr{t|pxtttttqqqqqr{tt|xt-tzqqqpqqq{3x|qxq{r33ppqqqqqqqqqqq1r333ttttt-t|x|qqr{-ttt|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
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_3R/border.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..87360978c
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_3R/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_3R: @ 84848EC
+ .4byte MagmaHideout_2F_3R_MapAttributes
+ .4byte MagmaHideout_2F_3R_MapEvents
+ .4byte MagmaHideout_2F_3R_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 380
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_2F_3R/map.bin b/data/maps/MagmaHideout_2F_3R/map.bin
new file mode 100644
index 000000000..f25017291
--- /dev/null
+++ b/data/maps/MagmaHideout_2F_3R/map.bin
@@ -0,0 +1 @@
+{tttttttttttttttVttttttttttttttt|r{ttt#ttt#tttttt^ttttttttttr{ttt#ttt#tttttt^tttttttttttttt|rr{tttttttttttt|{tttttt###rr{tttttttttttt|{tttttt###ttt|rr{tttttt#ttt|xz{ttttttttrr{tttttt#ttt|xz{tttttttttt|rrr{tttttttt|r{tttt#ttrrr{tttttttt|r{tttt#ttt|rrrr{tttttt|xttzr{tt#tttrrrr{tttttt|xttzr{tt#ttt|rrrrr{tttt|xttttzr{tttt|rrrrr{tttt|xttttzr{tttt|rrrrrr{tt|xttttttzr{tt|rrrrrr{tt|xttttttzr{tt|rrrrrrr{|xttttttttzr{|rrrrrrr{|xttttttttzr{|rrrrrrrrxtttt#ttt#tzrrrrrrrrrxtttt#ttt#tzrrrrrrrrrxttttttttt#ttzrrrrrrrrxttttttttt#ttzrrrrrrrrXYXYrrrrrrrrXYXYrrrrrrrr`a`arrrrrrrr`a`arrrrr1rr rrrrr1rr                           qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqx|pxttttqqqqq{zx|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
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_1R/border.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..7338ebf27
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_1R/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_1R: @ 848487C
+ .4byte MagmaHideout_3F_1R_MapAttributes
+ .4byte MagmaHideout_3F_1R_MapEvents
+ .4byte MagmaHideout_3F_1R_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 339
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_3F_1R/map.bin b/data/maps/MagmaHideout_3F_1R/map.bin
new file mode 100644
index 000000000..da590f5dd
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_1R/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqq{tttttt|qqqqqq{ttttttttt|qqqr{|qqqqqr{-t#tt-t|xtttzrxtVttt|r*+++++,xt#-tt}~xtt^tt|r1233+++,r233334r:;;;;;;;;;<r{tt|r{ttttttttttz{|xtVttt|rrr{tttttttt-tz}~xtt^tt|rMrrrrrr{tt|rrMr{ttz{|xttttttt|rrrrr{t#z}~x--t#ttt|rrrrr1{GGGGGGGGGG|rrrrrrF33rrrrrr333rr1rrrF3qrrrrrr{G3rrrrrrF33rrrrMr3rrrrrr~~~~~~ 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
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_2R/border.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..224cb4d02
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_2R/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_2R: @ 8484898
+ .4byte MagmaHideout_3F_2R_MapAttributes
+ .4byte MagmaHideout_3F_2R_MapEvents
+ .4byte MagmaHideout_3F_2R_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 340
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_3F_2R/map.bin b/data/maps/MagmaHideout_3F_2R/map.bin
new file mode 100644
index 000000000..49857819a
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_2R/map.bin
@@ -0,0 +1,7 @@
+qqqqq{tttttttttttttt|qqqqqqqqr{|qqqqqqqqrr`a`a`abcbcbcxtt|qqqqrrXYXYZ[7|qqqqqrr`a`abcuvq{-ttzr}~qr{hijkkknZ[qrpqrsssvbcqrrxyz{{{~Z[qrXYmnmnbcqrr`aXYuvuv
+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
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_3R/border.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..df152cb6c
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_3R/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_3F_3R: @ 84848D0
+ .4byte MagmaHideout_3F_3R_MapAttributes
+ .4byte MagmaHideout_3F_3R_MapEvents
+ .4byte MagmaHideout_3F_3R_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 379
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_3F_3R/map.bin b/data/maps/MagmaHideout_3F_3R/map.bin
new file mode 100644
index 000000000..7c808ffb5
--- /dev/null
+++ b/data/maps/MagmaHideout_3F_3R/map.bin
@@ -0,0 +1 @@
+{tttttttttttttttVttttttttttttttt|r{tttttttttttttt^tttttttttttttt|rr{tttttttttttt|{tttttttttttt|rr{tttttttttt|xz{tttttttttt|rr1r{tttttttt|r{tttt#ttt|rr1rr{tttttt|xttzr{tttttt|rrrrr{tttt|rr{tttt|rrrrrr{#t|xttttzrr{#t|rrrrrrr{|rrr{|rrrrrrrrxttt#t#zrrrrrrrrrrrr{zrrrrMrrrrrrx#ttttttzrrrrrrrrrrrx|rrrrrrrrrrrxttttttt#tzrrrrrrrrrr{ttzrrrrrrrrrxt#tttttttz{G|rrrrrrrrrFrrrrrrrrr{GGGG|qq{GGGrrrrrrrrrFqqFrrrrrrrrrrrrrrMrrrFqefFrrrrrrrrr~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
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MagmaHideout_4F/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc
new file mode 100644
index 000000000..98df121a2
--- /dev/null
+++ b/data/maps/MagmaHideout_4F/header.inc
@@ -0,0 +1,15 @@
+MagmaHideout_4F: @ 84848B4
+ .4byte MagmaHideout_4F_MapAttributes
+ .4byte MagmaHideout_4F_MapEvents
+ .4byte MagmaHideout_4F_MapScripts
+ .4byte 0x0
+ .2byte BGM_AJITO
+ .2byte 341
+ .byte 198
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MagmaHideout_4F/map.bin b/data/maps/MagmaHideout_4F/map.bin
new file mode 100644
index 000000000..45a5547c6
--- /dev/null
+++ b/data/maps/MagmaHideout_4F/map.bin
@@ -0,0 +1 @@
+qqqqqqqqq{tttttttt-ttttt|{|ppqqqqpqhiiiiijpppqqq{ttz{ttttttqqqq{ttttz{ttttttt|qq{-|xzppxttt|pqxttt|qrppp{ttz{ttzqqqqqqqqqqr{ttz{|qp{tzqx|qpxt|qqpxtt-t|pqrppxzq{tz{tttttttt{-ttzr{zx|xz{-t|pqx|qpqqpqqqqqppqrppq{zqqrhiiiiiiir{tzrxttzpxt|x|pqqx--t|qppqrpxttzqq{zpqqqqqqrr{tzxt||pxttttt|pqpxtzxttttt-zqpqqqqqqqrrrpqpxtt|qqqppqxt|q{tttVttt|p{ttttttrrrqefh     jqx|tt|t|ppqqqpq1{tt^tt|ppr{tttttrrrqh {-t#| jpqqqt|pqpxt|qxtzrppxzrqqqqqrrjh {t{G|xt|jx|px|pqqpqq{zpxttzqq{ttrrqrqhjqr{GG|x|jppqpx|qxtttzxttttttzqqMrqrhp{{F3qx|jppqx|p{-ttttttttttttt-ttttrjrppr{{33|qprpxt|pxz{ttttt-ttttt|qqqhijjrrpp1rqF3|x|jx|qppqqr{ttttt|pqhqrqrrMppr1{333|pq  jx|pxttzr{-|ppqhqqr{rrpxzrF333ph  j1px|q{tzrqqppphqqqrr{rpqq1F33pphjrjx|pr{tzppppqqqrrrqM|qrF33pppprjrppqrrefppppqqqqrr1qrqtz\3ppppjrrpp{zrefpppxtt|qrrr{qd3ppppqrrrpxz{zpppqqqpqrrrrmnFppppqrrjx|qrqh ppqqqpqrrrruvqppppqrjrxtzqh     h pqqqpqrr1r}~mnqh   qjrrh  qqqqqpqpqqqpqr juvqmnpqqqqqqqqqqq jqpqqqh     qqpqqqpqrqqqqr j}~quvpqqqqqqqqqqqqqqrjpqqqpqqqhiiiiqqpqrqqqq     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
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/MarineCave_End/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc
new file mode 100644
index 000000000..8a3bcdc98
--- /dev/null
+++ b/data/maps/MarineCave_End/header.inc
@@ -0,0 +1,15 @@
+MarineCave_End: @ 8484A04
+ .4byte MarineCave_End_MapAttributes
+ .4byte MarineCave_End_MapEvents
+ .4byte MarineCave_End_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 413
+ .byte 203
+ .byte 0
+ .byte 6
+ .byte 4
+ .2byte 0
+ .byte 14
+ .byte 0
+
diff --git a/data/maps/MarineCave_End/map.bin b/data/maps/MarineCave_End/map.bin
new file mode 100644
index 000000000..85138661d
--- /dev/null
+++ b/data/maps/MarineCave_End/map.bin
@@ -0,0 +1,14 @@
+ 
+ 2222222222222
+
+ 2222222222222
+
+  2222222222222
+
+  2222222
+ 2222222
+  2222222
+
+2222222
+    "22222222222
+ 222222222 2222222222222 #####"2222222 #####"##"22222222 ##"2222 #"22222 2#"2222 O2222 OOO222222 NOOOOOON222222 NOOOOOON222222 NNOOOONN222222 NNNNOONNN222222 #2lpNNNNNNp222222 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
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/MarineCave_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc
new file mode 100644
index 000000000..219ab2712
--- /dev/null
+++ b/data/maps/MarineCave_Entrance/header.inc
@@ -0,0 +1,15 @@
+MarineCave_Entrance: @ 84849E8
+ .4byte MarineCave_Entrance_MapAttributes
+ .4byte MarineCave_Entrance_MapEvents
+ .4byte MarineCave_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 407
+ .byte 203
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 14
+ .byte 0
+
diff --git a/data/maps/MarineCave_Entrance/map.bin b/data/maps/MarineCave_Entrance/map.bin
new file mode 100644
index 000000000..62aa8537f
--- /dev/null
+++ b/data/maps/MarineCave_Entrance/map.bin
@@ -0,0 +1,7 @@
+3  $1$1$1$1$1$1$1$1$1  $111111$1$1111111  $11111111$1$11111  $1111pp1$1111ppp1  111pppp1 
+ $1111ppppp11$1
+ 111pppppp11$1
+ 11ppppppp11
+ 11ppppppppp11
+ 11ppppppppp11
+1ppVVVVppppVVpVV \ No newline at end of file
diff --git a/data/maps/MauvilleCity/border.bin b/data/maps/MauvilleCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/MauvilleCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc
new file mode 100644
index 000000000..172a7bc05
--- /dev/null
+++ b/data/maps/MauvilleCity/connections.inc
@@ -0,0 +1,10 @@
+MauvilleCity_MapConnectionsList: @ 8486720
+ connection up, 0, ROUTE_111, 0
+ connection down, 0, ROUTE_110, 0
+ connection left, 0, ROUTE_117, 0
+ connection right, 0, ROUTE_118, 0
+
+MauvilleCity_MapConnections: @ 8486750
+ .4byte 0x4
+ .4byte MauvilleCity_MapConnectionsList
+
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
new file mode 100644
index 000000000..c9bbb62c1
--- /dev/null
+++ b/data/maps/MauvilleCity/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity: @ 84824F0
+ .4byte MauvilleCity_MapAttributes
+ .4byte MauvilleCity_MapEvents
+ .4byte MauvilleCity_MapScripts
+ .4byte MauvilleCity_MapConnections
+ .2byte BGM_GOTOWN
+ .2byte 3
+ .byte 9
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/MauvilleCity/map.bin b/data/maps/MauvilleCity/map.bin
new file mode 100644
index 000000000..80a38e902
--- /dev/null
+++ b/data/maps/MauvilleCity/map.bin
Binary files differ
diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/maps/MauvilleCity_BikeShop/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/MauvilleCity_BikeShop/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
new file mode 100644
index 000000000..7523d3344
--- /dev/null
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_BikeShop: @ 8483280
+ .4byte MauvilleCity_BikeShop_MapAttributes
+ .4byte MauvilleCity_BikeShop_MapEvents
+ .4byte MauvilleCity_BikeShop_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 90
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/maps/MauvilleCity_BikeShop/map.bin
new file mode 100644
index 000000000..9891b9fd5
--- /dev/null
+++ b/data/maps/MauvilleCity_BikeShop/map.bin
@@ -0,0 +1,2 @@
+()*+,- 
+    012345222892:2;2<2:2@A2B2?2C2D2!"#2$2%2&2HIJ2?2KL?2?2?2?2P2Q2R2?2ST"?2?2?2?2?2?2?2?2EF!"?2?2?2?2?2?2?2?2MN6?22 2?2?2?2?2?2UV \ No newline at end of file
diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/maps/MauvilleCity_GameCorner/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/MauvilleCity_GameCorner/border.bin
Binary files differ
diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc
new file mode 100644
index 000000000..acad413c2
--- /dev/null
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_GameCorner: @ 84832B8
+ .4byte MauvilleCity_GameCorner_MapAttributes
+ .4byte MauvilleCity_GameCorner_MapEvents
+ .4byte MauvilleCity_GameCorner_MapScripts
+ .4byte 0x0
+ .2byte BGM_CASINO
+ .2byte 91
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/maps/MauvilleCity_GameCorner/map.bin
new file mode 100644
index 000000000..ce3f9bf73
--- /dev/null
+++ b/data/maps/MauvilleCity_GameCorner/map.bin
@@ -0,0 +1,3 @@
+<=>>>>? 
+
+ ///DFEFFFG.227772LC2M2N2M2M2O22222222222TVUVUUW 222222222222222\2]2^2^2^2]2_2 22222622$2%2222$2%222222222222222&2,-'22&2,-'22222"# 22"# 222&2,-'22&2,-'22222*+ 22*+ 222&2,-'22&2,-'2222223 2223 222&245'22&245'22222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/maps/MauvilleCity_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/MauvilleCity_Gym/border.bin
Binary files differ
diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc
new file mode 100644
index 000000000..a858b0c31
--- /dev/null
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_Gym: @ 8483264
+ .4byte MauvilleCity_Gym_MapAttributes
+ .4byte MauvilleCity_Gym_MapEvents
+ .4byte MauvilleCity_Gym_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 89
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/maps/MauvilleCity_Gym/map.bin
new file mode 100644
index 000000000..8860e5651
--- /dev/null
+++ b/data/maps/MauvilleCity_Gym/map.bin
Binary files differ
diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
new file mode 100644
index 000000000..d4c8b5923
--- /dev/null
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_House1: @ 848329C
+ .4byte MauvilleCity_House1_MapAttributes
+ .4byte MauvilleCity_House1_MapEvents
+ .4byte MauvilleCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 60
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc
new file mode 100644
index 000000000..b29a1666b
--- /dev/null
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_House2: @ 84832D4
+ .4byte MauvilleCity_House2_MapAttributes
+ .4byte MauvilleCity_House2_MapEvents
+ .4byte MauvilleCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 59
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc
new file mode 100644
index 000000000..a6e0b0fc3
--- /dev/null
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_Mart: @ 8483328
+ .4byte MauvilleCity_Mart_MapAttributes
+ .4byte MauvilleCity_Mart_MapEvents
+ .4byte MauvilleCity_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..715655b50
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_PokemonCenter_1F: @ 84832F0
+ .4byte MauvilleCity_PokemonCenter_1F_MapAttributes
+ .4byte MauvilleCity_PokemonCenter_1F_MapEvents
+ .4byte MauvilleCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..78d2301e4
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+MauvilleCity_PokemonCenter_2F: @ 848330C
+ .4byte MauvilleCity_PokemonCenter_2F_MapAttributes
+ .4byte MauvilleCity_PokemonCenter_2F_MapEvents
+ .4byte MauvilleCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 9
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/maps/MeteorFalls_1F_1R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc
new file mode 100644
index 000000000..a451bdcec
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -0,0 +1,15 @@
+MeteorFalls_1F_1R: @ 8483EC0
+ .4byte MeteorFalls_1F_1R_MapAttributes
+ .4byte MeteorFalls_1F_1R_MapEvents
+ .4byte MeteorFalls_1F_1R_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 125
+ .byte 63
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/maps/MeteorFalls_1F_1R/map.bin
new file mode 100644
index 000000000..4891475a3
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/map.bin
@@ -0,0 +1 @@
+4deDDDLDDDDDDDDDDDDDDdeDDDDfg<4lmDDDTDDDDDDfgDDDDDDlmDDDDno<4tu.D/\.DEFGDnoDDDDD/tu.DDDno<42222242DMN2O/vw.DD<22222242vw<42222 242222242(<222222422<422222?2>2>2>2>2?2ppp(<222222?222<42222422ppp(<222224222<42222?2pppppppp(<2222242222<4>2>2>2?2ppppppppp(=2>2>2>2>2?2222<46666>272yppppppx5262>2>2>2<4deDDDD/.DDfgDDDdeD2D<4lmDDDD/.DDnoDDDlmD2D<4tu.DDD/.LDnoDD/tu.2D<42242DD/.TDnoDD<2222<42242*D/LLLLLLLL.\.vw.(<22222<4>2>2?2*TTTTTTTTZ[22((=2>2>2>2>2<422ppppppppppXY(<4>2>2>2?2pppp8pBqBqBqBqBrB9pp(<BBBBB<42pppx(<BBBBB4B`BaaabB<BBBBBB<42222ppp<B4BhBiiijB=B3}~<42222222222222(<B4B*q0(<<4222222222222(<B4B*p((=>>><42>2>2>2>2>2>222222(=B?B*pp(01111<4>2?2LDD2Dde<2222272yp011111<4fgTDD2Dlm=2>2>2?2DLDD/.DDDDD<4no\)2)2)2)2tu.DDD/DTDD/.DDDDD<4vw)2)2)2)2)2)2)2.DDD/\.D/.DDDDL<4)2)2)2)2)2)2)2)2)2)2)2)2)2)2*DD/.DEFGT<4)2)2)2U2V2W2)2)2)2)2)2)2**D/.DMN2O\<411]^_1111212**/LLL.<2222<4*)2U2W2U2V2V2W2)2)2)2)2)2***TTT(<222<42]_]^^_112112**ppp(<2222<41U2V2V2V2W2U2W2)2)2)2)**ppp(<2222<41]^^^_]_121112*ppp(<2222<4*U2W2U2V2V2W2U2V2W2)2)2)2)2*ppp(<2222<4*]_]^^_]^_)222)22pPQ(=222<4*U2V2V2V2W2U2V2V2W2)222)2*pXY0=2>2<4*]^^^_]^^_21112pppp0111<4*)2)2)2)2)2)2)2)2)2)2)2)2)2pppppZ[<42)2)2)2$2)2)2)2)2)2)2)2)26)2ppppPQppXY<4XXYHIJY")2)2)2)2)2)26ppppXYpppp<6666666666666666666666666666 \ No newline at end of file
diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/maps/MeteorFalls_1F_2R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
new file mode 100644
index 000000000..4f8ebbff4
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -0,0 +1,15 @@
+MeteorFalls_1F_2R: @ 8483EDC
+ .4byte MeteorFalls_1F_2R_MapAttributes
+ .4byte MeteorFalls_1F_2R_MapEvents
+ .4byte MeteorFalls_1F_2R_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 126
+ .byte 63
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/maps/MeteorFalls_1F_2R/map.bin
new file mode 100644
index 000000000..67ce2b784
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/map.bin
@@ -0,0 +1,2 @@
+>>>>>>>>>>>>>>4111111111111<4222222222222(=>>>>?22222222222201111=>>>>>>>>?2>2>2>2>2>2U2V2V2W2U2W2=>>01111111111212111]^^_]_11=>>>>>11111112>2>2>2>2>2U2W2U2V2V2V2W2=01111114112111]_]^^^_1111<>>>>?*>2>2>2>2>2U2V2W2U2W2U2V2V2W2=>>(<4111121211]^_]_]^^_11(<4*11112>2>2>2U2W2U2V2V2W22U2V2V2W2=((=>4**4111121]_]^^_]^^_(01<4**?2222222U2V2V2W222222201(<4**2222222]^^_2U2W2U2V2W2=>((<4** 22222U2V2V2W2222]_]^_1((<4**2222]^^_2222222(((<4**
+2222222<42U2W2U2V2V2W2(((<4**>?2222U2V2W2=?2]_]^^_(((<4**?22]^_2222222(((<4**?22222222222222222(((<4**22 2222222222222222(((<4**22222Z[22222222223(<4**pXY222222(<(<4**pppppPQpppp2222 22((34**dQppPQXYpppp222222(((<4**lYPQXYpppppp222222(((<4**pXYppppp6262622223((<4**pppppppp222222(<((<4**pp626262626262222222(<3(<4**pp222222222222(<(<34**kzqqzk}Q(<(<66 \ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/maps/MeteorFalls_B1F_1R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_1R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
new file mode 100644
index 000000000..c39710f33
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -0,0 +1,15 @@
+MeteorFalls_B1F_1R: @ 8483EF8
+ .4byte MeteorFalls_B1F_1R_MapAttributes
+ .4byte MeteorFalls_B1F_1R_MapEvents
+ .4byte MeteorFalls_B1F_1R_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 127
+ .byte 63
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/maps/MeteorFalls_B1F_1R/map.bin
new file mode 100644
index 000000000..a37afdb17
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_1R/map.bin
@@ -0,0 +1,6 @@
+>>>>>>>>>>>>>>>?DDDDDDDDDD=>>>4DDDD/DDDEFGDDDD.DD<?DDD/DDDMN2ODDDD.D(<411111D/22222222.((<4*11c11B*222222222(((<4*BB BBBBB*2222222222p(((<4*BBBBBB*p(((<4*BBBBBB*ppppppppppp((=4*BBRRR
+*ppppppppppp((0<4*BB<R4R*ppppppppppp0(<4*BB<R R4R*pppBqBqBqBqBpp0((<4*BB<RR4R*px(<B
+*yp((<4*BB=R>R?R*p(<B=?*pp(<4*BB1*p(<Bc*pp(<4*BBB211p(<BBB BB*pp(<4*BBB222p(<BBBBB*pp(<4*BBB222pp(<BBBBB*pp(<4*BBB222pp(<BBBB*pp(<4*BBBBBBkBzBqBqBzBkBBBB12pp(<4*BBBBBBBBBBBBBBB*pp(<4*6RRRRRRRR
+BBBBB>BB*pppp(<4*RRRRRR4RBBBBB12pppp(<4R RRRRR>R?RBBBBB*pppp(<4RRR4RBBBBB*pppppp(<4RRRR4RBBBBBBB*pppppp(<4RRRR4RBBBBBBB2pppppxk(<6
+B*ppppx(<(<R4
+*ppppp(<(<R4*ppppp(<(<R4*ppppp(<R4*ppppp(<<R4*ppppp(<<R4*ppppp(<<R4*2222222<<R4*222222<<R4*222222<<R66}~ \ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/maps/MeteorFalls_B1F_2R/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_2R/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
new file mode 100644
index 000000000..dfee7e50e
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -0,0 +1,15 @@
+MeteorFalls_B1F_2R: @ 8483F14
+ .4byte MeteorFalls_B1F_2R_MapAttributes
+ .4byte MeteorFalls_B1F_2R_MapEvents
+ .4byte MeteorFalls_B1F_2R_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 128
+ .byte 63
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/maps/MeteorFalls_B1F_2R/map.bin
new file mode 100644
index 000000000..5f4497752
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_2R/map.bin
@@ -0,0 +1 @@
+>>>>>>>>>41111111<4*11111(<4**22222((<4**22222((<4**((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**ppp((<4**22222((<4**22222((<4*}~(< \ No newline at end of file
diff --git a/data/maps/MeteorFalls_StevensCave/border.bin b/data/maps/MeteorFalls_StevensCave/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MeteorFalls_StevensCave/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc
new file mode 100644
index 000000000..b30ae1da5
--- /dev/null
+++ b/data/maps/MeteorFalls_StevensCave/header.inc
@@ -0,0 +1,15 @@
+MeteorFalls_StevensCave: @ 8484A74
+ .4byte MeteorFalls_StevensCave_MapAttributes
+ .4byte MeteorFalls_StevensCave_MapEvents
+ .4byte MeteorFalls_StevensCave_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN03
+ .2byte 431
+ .byte 63
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MeteorFalls_StevensCave/map.bin b/data/maps/MeteorFalls_StevensCave/map.bin
new file mode 100644
index 000000000..e509d66c2
--- /dev/null
+++ b/data/maps/MeteorFalls_StevensCave/map.bin
@@ -0,0 +1,21 @@
+               "11111     
+             "111((   
+(  "1111111121((((666(61111111122((((1112(61111111122(((111112(61111111122((111116(61111111122(11111(6(6222222222011111((6(62222222222222(((6(62222222         (6(6222222(       
+(6(12222222((1111111(6(111      
+22(111111!!611111     "
+21
+1(( 
+111111 
+222((((((6111111((6 
+22((2((((61111(((6622((2((((6*2222(((1622(2((((6*2222(((612622112((((6*22(((612222222((((6*222(((*1222222((((6   
+222(((6**2222222    (6 
+
+2((**222222(6   6(6**
+2(222222((6(  
+(6***2222   ((6((
+(6***2222222222(66  6((((6** 
+2222222(6(666((((6**6  
+22222222(((   (((6*   
+*2222   ((((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
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/maps/MirageTower_1F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc
new file mode 100644
index 000000000..7d3cde71e
--- /dev/null
+++ b/data/maps/MirageTower_1F/header.inc
@@ -0,0 +1,15 @@
+MirageTower_1F: @ 8484908
+ .4byte MirageTower_1F_MapAttributes
+ .4byte MirageTower_1F_MapEvents
+ .4byte MirageTower_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 381
+ .byte 199
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MirageTower_1F/map.bin b/data/maps/MirageTower_1F/map.bin
new file mode 100644
index 000000000..b77d14890
--- /dev/null
+++ b/data/maps/MirageTower_1F/map.bin
@@ -0,0 +1,3 @@
+EE  EEEEEE2222222222222222222222222222222p     q22222222p 22222 q2222222p2222222q22222222222222222222222222222222222222222222222222222222hi2222222hi222  
+2222222222222p    
+22222<222222   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
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/maps/MirageTower_2F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc
new file mode 100644
index 000000000..304212a0b
--- /dev/null
+++ b/data/maps/MirageTower_2F/header.inc
@@ -0,0 +1,15 @@
+MirageTower_2F: @ 8484924
+ .4byte MirageTower_2F_MapAttributes
+ .4byte MirageTower_2F_MapEvents
+ .4byte MirageTower_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 382
+ .byte 199
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MirageTower_2F/map.bin b/data/maps/MirageTower_2F/map.bin
new file mode 100644
index 000000000..79c3056a9
--- /dev/null
+++ b/data/maps/MirageTower_2F/map.bin
@@ -0,0 +1,3 @@
+EE  EEEEEE22222222222?222222222222222/2/2222p     q2222/2/222p 22222 q2222/2/22p2222222q222/2/222222222222/2222222222/22222222222/2222222222222hi222222hi2222  
+2222222222222    
+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
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/maps/MirageTower_3F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc
new file mode 100644
index 000000000..2b0ca6c69
--- /dev/null
+++ b/data/maps/MirageTower_3F/header.inc
@@ -0,0 +1,15 @@
+MirageTower_3F: @ 8484940
+ .4byte MirageTower_3F_MapAttributes
+ .4byte MirageTower_3F_MapEvents
+ .4byte MirageTower_3F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 383
+ .byte 199
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MirageTower_3F/map.bin b/data/maps/MirageTower_3F/map.bin
new file mode 100644
index 000000000..376ac2836
--- /dev/null
+++ b/data/maps/MirageTower_3F/map.bin
@@ -0,0 +1,6 @@
+EE  EEEEEE2222222222222222222222222222222     
+222222222 22222 
+22222222222
+/222222222222/22/222222222222222222222222222222222222222222222222222  
+2222222222222    
+2222222222222   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
new file mode 100644
index 000000000..58596f99a
--- /dev/null
+++ b/data/maps/MirageTower_4F/border.bin
@@ -0,0 +1 @@
+EEEE \ No newline at end of file
diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc
new file mode 100644
index 000000000..4d319fe5d
--- /dev/null
+++ b/data/maps/MirageTower_4F/header.inc
@@ -0,0 +1,15 @@
+MirageTower_4F: @ 848495C
+ .4byte MirageTower_4F_MapAttributes
+ .4byte MirageTower_4F_MapEvents
+ .4byte MirageTower_4F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 388
+ .byte 199
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/MirageTower_4F/map.bin b/data/maps/MirageTower_4F/map.bin
new file mode 100644
index 000000000..283534fb7
--- /dev/null
+++ b/data/maps/MirageTower_4F/map.bin
@@ -0,0 +1,2 @@
+EE EE22222222  B B B B Bq2222BBBBB2222BBBBB2222BBBBB2222i222222222222  
+2222222   E         E \ No newline at end of file
diff --git a/data/maps/MossdeepCity/border.bin b/data/maps/MossdeepCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/MossdeepCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc
new file mode 100644
index 000000000..04a3f0c4b
--- /dev/null
+++ b/data/maps/MossdeepCity/connections.inc
@@ -0,0 +1,8 @@
+MossdeepCity_MapConnectionsList: @ 84867C4
+ connection up, 0, ROUTE_125, 0
+ connection down, 0, ROUTE_127, 0
+ connection left, -40, ROUTE_124, 0
+
+MossdeepCity_MapConnections: @ 84867E8
+ .4byte 0x3
+ .4byte MossdeepCity_MapConnectionsList
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
new file mode 100644
index 000000000..155706b5d
--- /dev/null
+++ b/data/maps/MossdeepCity/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity: @ 8482560
+ .4byte MossdeepCity_MapAttributes
+ .4byte MossdeepCity_MapEvents
+ .4byte MossdeepCity_MapScripts
+ .4byte MossdeepCity_MapConnections
+ .2byte BGM_GOTOWN
+ .2byte 7
+ .byte 13
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/MossdeepCity/map.bin b/data/maps/MossdeepCity/map.bin
new file mode 100644
index 000000000..bf150f5bb
--- /dev/null
+++ b/data/maps/MossdeepCity/map.bin
Binary files differ
diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/maps/MossdeepCity_GameCorner_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_1F/border.bin
Binary files differ
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
new file mode 100644
index 000000000..fef2ebae1
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_GameCorner_1F: @ 84839F0
+ .4byte MossdeepCity_GameCorner_1F_MapAttributes
+ .4byte MossdeepCity_GameCorner_1F_MapEvents
+ .4byte MossdeepCity_GameCorner_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 305
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/maps/MossdeepCity_GameCorner_1F/map.bin
new file mode 100644
index 000000000..8be990dde
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_1F/map.bin
@@ -0,0 +1,53 @@
+)2(2  12  22*22022 2
+2"#$2%&'
+2
+2
+2 2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 2
+222
+2
+2
+222
+2
+2
+2 22
+2
+2
+22
+2
+2 22 !
+2
+2
+2 !2
+2
+2 2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 2
+2
+2
+2
+2-2.2
+2
+2
+2
+2
+2 \ No newline at end of file
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/maps/MossdeepCity_GameCorner_B1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_B1F/border.bin
Binary files differ
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
new file mode 100644
index 000000000..e369f8488
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_GameCorner_B1F: @ 8483A0C
+ .4byte MossdeepCity_GameCorner_B1F_MapAttributes
+ .4byte MossdeepCity_GameCorner_B1F_MapEvents
+ .4byte MossdeepCity_GameCorner_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 306
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/maps/MossdeepCity_GameCorner_B1F/map.bin
new file mode 100644
index 000000000..399d05705
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_B1F/map.bin
@@ -0,0 +1,2 @@
+ 
+        6$2$2$2$2$2$2$2$2$2$2692#2#2#2#2#2#2#2#2#2#2#292#2#2#252626272#2#2#2#292#2#2#2=2>2>2?2#2#2#2#292#2#2#2E2F2F2G2#2#2#2#22#2#2#2#2#2#2#2#2#2#2"2#2#2#2#2#2#2#2#2#2#2* \ No newline at end of file
diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/maps/MossdeepCity_Gym/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc
new file mode 100644
index 000000000..cf9b14394
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_Gym: @ 84838BC
+ .4byte MossdeepCity_Gym_MapAttributes
+ .4byte MossdeepCity_Gym_MapEvents
+ .4byte MossdeepCity_Gym_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 108
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/maps/MossdeepCity_Gym/map.bin
new file mode 100644
index 000000000..da585f73f
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/map.bin
@@ -0,0 +1,40 @@
+666666666666666666666666666666626666666666666666666 66666666666666666 66666666666666666$ 666666666666666 
+q2r2
+q2r266666666 6666 
+p2s2t2 p2s266666666()6666 \2
+ 666666666 6666 
+Y2Z2Y2Z2666666666  !"#666666X2[2
+X2[2
+666666666 
+
+
+
+66666666]2666666666666666666666666 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666266
+66666666666666Q2R2
+66666666666 6T2P2S266666666666666m26 
+
+
+
+66666666666666i2j2i2j26266666666666666666h2k2
+h2k266666666666666666666
+l2
+66666666666666666666666i2j2
+$6666666666666666666h2k2
+66 6666666666666666 
+6666666666666666666Q2R2Q2R26666666666666 66P2S2T2P2S2% 666666666 66 
+
+
+
+$666666666 6
+
+
+
+$6666626 
+
+
+
+6a2b26666666  
+
+ 6`2c2
+6d26666666 $00$62
+6666666666666 \ No newline at end of file
diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
new file mode 100644
index 000000000..ba20cbb55
--- /dev/null
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_House1: @ 84838D8
+ .4byte MossdeepCity_House1_MapAttributes
+ .4byte MossdeepCity_House1_MapEvents
+ .4byte MossdeepCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 60
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc
new file mode 100644
index 000000000..ba845b72b
--- /dev/null
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_House2: @ 84838F4
+ .4byte MossdeepCity_House2_MapAttributes
+ .4byte MossdeepCity_House2_MapEvents
+ .4byte MossdeepCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 59
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc
new file mode 100644
index 000000000..b1359288e
--- /dev/null
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_House3: @ 8483964
+ .4byte MossdeepCity_House3_MapAttributes
+ .4byte MossdeepCity_House3_MapEvents
+ .4byte MossdeepCity_House3_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 60
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc
new file mode 100644
index 000000000..8e9c7a9c4
--- /dev/null
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_House4: @ 848399C
+ .4byte MossdeepCity_House4_MapAttributes
+ .4byte MossdeepCity_House4_MapEvents
+ .4byte MossdeepCity_House4_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 80
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc
new file mode 100644
index 000000000..d09103549
--- /dev/null
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_Mart: @ 8483948
+ .4byte MossdeepCity_Mart_MapAttributes
+ .4byte MossdeepCity_Mart_MapEvents
+ .4byte MossdeepCity_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..6b69cc8b9
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_PokemonCenter_1F: @ 8483910
+ .4byte MossdeepCity_PokemonCenter_1F_MapAttributes
+ .4byte MossdeepCity_PokemonCenter_1F_MapEvents
+ .4byte MossdeepCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..715a2a939
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_PokemonCenter_2F: @ 848392C
+ .4byte MossdeepCity_PokemonCenter_2F_MapAttributes
+ .4byte MossdeepCity_PokemonCenter_2F_MapEvents
+ .4byte MossdeepCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/maps/MossdeepCity_SpaceCenter_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
new file mode 100644
index 000000000..679f0f576
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_SpaceCenter_1F: @ 84839B8
+ .4byte MossdeepCity_SpaceCenter_1F_MapAttributes
+ .4byte MossdeepCity_SpaceCenter_1F_MapEvents
+ .4byte MossdeepCity_SpaceCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 275
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/maps/MossdeepCity_SpaceCenter_1F/map.bin
new file mode 100644
index 000000000..44f5081b9
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.bin
Binary files differ
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/maps/MossdeepCity_SpaceCenter_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
new file mode 100644
index 000000000..a0e66bd48
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_SpaceCenter_2F: @ 84839D4
+ .4byte MossdeepCity_SpaceCenter_2F_MapAttributes
+ .4byte MossdeepCity_SpaceCenter_2F_MapEvents
+ .4byte MossdeepCity_SpaceCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 276
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/maps/MossdeepCity_SpaceCenter_2F/map.bin
new file mode 100644
index 000000000..d2e52d780
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.bin
Binary files differ
diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/maps/MossdeepCity_StevensHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/border.bin
Binary files differ
diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc
new file mode 100644
index 000000000..806d47883
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -0,0 +1,15 @@
+MossdeepCity_StevensHouse: @ 8483980
+ .4byte MossdeepCity_StevensHouse_MapAttributes
+ .4byte MossdeepCity_StevensHouse_MapEvents
+ .4byte MossdeepCity_StevensHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 327
+ .byte 13
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/maps/MossdeepCity_StevensHouse/map.bin
new file mode 100644
index 000000000..ade25497a
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/map.bin
@@ -0,0 +1 @@
+h     ii22p2$2$2$2$2$2$2q2q292#2#2#26666#2#2[392#2#2#26666#2#2c792#2#2#2#2#2,2#2#2#2[392#2#2#2#2#2#2#2#2#2c792#2#2 #2#2#2#2#2#2 \ No newline at end of file
diff --git a/data/maps/MtChimney/border.bin b/data/maps/MtChimney/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/MtChimney/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc
new file mode 100644
index 000000000..f8dfa991a
--- /dev/null
+++ b/data/maps/MtChimney/header.inc
@@ -0,0 +1,15 @@
+MtChimney: @ 8484010
+ .4byte MtChimney_MapAttributes
+ .4byte MtChimney_MapEvents
+ .4byte MtChimney_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 136
+ .byte 56
+ .byte 0
+ .byte 7
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/MtChimney/map.bin b/data/maps/MtChimney/map.bin
new file mode 100644
index 000000000..1e7e2868d
--- /dev/null
+++ b/data/maps/MtChimney/map.bin
@@ -0,0 +1 @@
+h~qpqqpqpqrrrq2rx|q2{zppppqrrqqqrqqpqqpqqpqpqrrr{z|xtz{~6ppppqrrqqqrqqpqh~qqph~qrrrr{yyyqppppqrrqqqrq{pqpqqqppqqrrrrh~pppqrrqq{zqrpqpqqqppqqrrrrph~pxtzrqqrqqrpqpqqqppq{zrrrU~pph~2q2q2q2rqqrqqrpqpqqqpxtzq22227qpppq2q2q2q2rq{zqqrpqpqqqpq2q2q2q2q2q2q2q2h~ppq2q2q2q2rqrqq{zpqpqqqpq2q2q2q2{tttpqppq2q2q2q2rqrqqrqpqx|qqpq2q2q2q2rrr~~h~pq2q2q2{zqrq{zqx|qpqqphijq2rrpqh~h~2q2q2q2rq{zqrqqqpqx|qppqrq222jqqr~h~qph~2q2q2q2q2rqrqqrq{qpqqpqpxtzq2q2q22i2jiiiii~qh~6pq2q2q2q2q2rqrqqrqr|x|qx|x|q2q2q2q2hijriijqqhii~6q6pq2q2q2q2q2rqrqqr{zpqpqqpqx|q2q2q2pqr2i2jii~hi2i2i2~2q2q2q2q2q2rqrq{zr{x|x|qpqqpq2q2q2xtzq2q22i2i2i2i2~2q2q2q2q2q2q2q2q2q2r{zqr{zrqpqpqx|qpq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zrq{zr{z|pqpqqpqx|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6rqrqrrqppqx|qpqqxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2rq6r{z{zr{px|qx|xttt|pq2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6rrqrqrrpqx|qxttt|pxt|q2q2q2q2q2q2q2q2q2q2q2q2q2q2q2{zq6q6rrqr{zrpqqxt|qqqppq6q6x|q2q2q2q2q2q2q2q2q2q2q2q2q2{z{ttzrqrrqrxtt|qxt|qpxt|q2xt|q2q2{ttttt2ttz{z{ttz{zrqrqqqxt|qpqxt|xtt|xttzq2q2q2q2q2q2{ttz{z{ttz{zqrttt|qx|xt|qxt|q6x|q2q2{2tttttzq2q2{z{z{ttz{tztt|pqqxt|x|qqxt|xttzq2q2q2q2q2q2q2q2q2r{z{z{ttzqqqqpx|qqqpqxtt|qxt|q2q2q2q2q2q2q2q2q2{tzrq2rq2rqqq2{tqqpqxt|q|qqqx|qqx|q2q2q2{ttt2z{tz{{zqq{qqqx|q2pq6pqqqqxtt|xtttzq2q2q2q2{zq2q2r6r{ttzqqqqx|t|xttttt|qxtttttttt2zq2q2q2rqrrq2q262qqqqp66qpqqqqqqxtttttt|q2q2q2q2q2q2q2q2r{rq6qq6qqqqxtt|pqq2qqpq2q2q2q2q2{ttzr6r22{tt|qqqqqqppqq2qqq2&2'2!2!2"2q2q2xttt2tzq2q2q2r{z6r2qxtt|qqqppq22q&2.6/))*Z2Z2Z2Z2Z2Z2Z2Z2T2S2q2{zr26{z2tt|pqqqppq6q-67112q2q2q2q2q2q2q2q2\2[2R2Qq2r6{z266qqpxt|2pxt|62->?9:%q2q2q2q2q2q2q2q2d6q2q2YRQqrq6{|qxt|pt||5FGABWq2q2q2q2q2q2q2q2q2q2q2rqYRQq{z6pq2qpp66qpp22q2q2q2q2q2q2q2q24q2q2q222q2rqrqYRQ{tp22pxt|qp6p666q2q2q2q2q2q2q2q2q2q2q2q266{z{2rqYPap66t|p2x|pqq2q2q2q2{z{6r2rrYx|66qppqpt|q2q2q2q2q2q2q2q2q2q2{z{z66{zrrrqt|qpp6qp66qt6226ttz{z2q2q2rq26rrrq66qp2px|2|6277226{zq26{zq2{zrrtt|qpx|p666|776rq2q2{z2q2rq2rr22p2pqpt|p{z22rq2q2r2rrpp2p6q6p6p6r2r2662rrrpp6xtt|x|x|6r6r22rrr \ No newline at end of file
diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
new file mode 100644
index 000000000..7c531570e
--- /dev/null
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -0,0 +1,15 @@
+MtChimney_CableCarStation: @ 8483DFC
+ .4byte MtChimney_CableCarStation_MapAttributes
+ .4byte MtChimney_CableCarStation_MapEvents
+ .4byte MtChimney_CableCarStation_MapScripts
+ .4byte 0x0
+ .2byte BGM_DOORO_X1
+ .2byte 118
+ .byte 56
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/MtPyre_1F/border.bin b/data/maps/MtPyre_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MtPyre_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
new file mode 100644
index 000000000..83234f6d9
--- /dev/null
+++ b/data/maps/MtPyre_1F/header.inc
@@ -0,0 +1,15 @@
+MtPyre_1F: @ 8484064
+ .4byte MtPyre_1F_MapAttributes
+ .4byte MtPyre_1F_MapEvents
+ .4byte MtPyre_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 137
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/MtPyre_1F/map.bin b/data/maps/MtPyre_1F/map.bin
new file mode 100644
index 000000000..60b992a73
--- /dev/null
+++ b/data/maps/MtPyre_1F/map.bin
@@ -0,0 +1 @@
+22222&7&722222222222662666266'7222266266626622222222226622222222222222222222666266&7622222666266&762222222222222662222222222266222222222&7622662222266&7622662222266222222222222 \ No newline at end of file
diff --git a/data/maps/MtPyre_2F/border.bin b/data/maps/MtPyre_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MtPyre_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
new file mode 100644
index 000000000..f7251c337
--- /dev/null
+++ b/data/maps/MtPyre_2F/header.inc
@@ -0,0 +1,15 @@
+MtPyre_2F: @ 8484080
+ .4byte MtPyre_2F_MapAttributes
+ .4byte MtPyre_2F_MapEvents
+ .4byte MtPyre_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 138
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/MtPyre_2F/map.bin b/data/maps/MtPyre_2F/map.bin
new file mode 100644
index 000000000..97b7e9e31
--- /dev/null
+++ b/data/maps/MtPyre_2F/map.bin
@@ -0,0 +1 @@
+22222222&&2222&22222222222&22222222&22222222222222222222222222222&2222&22222232222222222222&22222&22222 \ No newline at end of file
diff --git a/data/maps/MtPyre_3F/border.bin b/data/maps/MtPyre_3F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MtPyre_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
new file mode 100644
index 000000000..445ad8206
--- /dev/null
+++ b/data/maps/MtPyre_3F/header.inc
@@ -0,0 +1,15 @@
+MtPyre_3F: @ 848409C
+ .4byte MtPyre_3F_MapAttributes
+ .4byte MtPyre_3F_MapEvents
+ .4byte MtPyre_3F_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 139
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/MtPyre_3F/map.bin b/data/maps/MtPyre_3F/map.bin
new file mode 100644
index 000000000..758eccc3a
--- /dev/null
+++ b/data/maps/MtPyre_3F/map.bin
@@ -0,0 +1 @@
+22&2222&&&2222&&2222222222222222222&2222222222&22222222222222222&222&2222222222222222222222222323 \ No newline at end of file
diff --git a/data/maps/MtPyre_4F/border.bin b/data/maps/MtPyre_4F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MtPyre_4F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
new file mode 100644
index 000000000..4ab79b0d3
--- /dev/null
+++ b/data/maps/MtPyre_4F/header.inc
@@ -0,0 +1,15 @@
+MtPyre_4F: @ 84840B8
+ .4byte MtPyre_4F_MapAttributes
+ .4byte MtPyre_4F_MapEvents
+ .4byte MtPyre_4F_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 140
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/MtPyre_4F/map.bin b/data/maps/MtPyre_4F/map.bin
new file mode 100644
index 000000000..98dc679ff
--- /dev/null
+++ b/data/maps/MtPyre_4F/map.bin
@@ -0,0 +1 @@
+2&&222&'&2222002200&222&&&&&222&&2222222222222222222222&226223222&22222&232222222222 \ No newline at end of file
diff --git a/data/maps/MtPyre_5F/border.bin b/data/maps/MtPyre_5F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MtPyre_5F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
new file mode 100644
index 000000000..9b34efafe
--- /dev/null
+++ b/data/maps/MtPyre_5F/header.inc
@@ -0,0 +1,15 @@
+MtPyre_5F: @ 84840D4
+ .4byte MtPyre_5F_MapAttributes
+ .4byte MtPyre_5F_MapEvents
+ .4byte MtPyre_5F_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 141
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/MtPyre_5F/map.bin b/data/maps/MtPyre_5F/map.bin
new file mode 100644
index 000000000..12fbeeb7e
--- /dev/null
+++ b/data/maps/MtPyre_5F/map.bin
@@ -0,0 +1 @@
+2&222&2&2222222&222&&&&&222&&2222222222222222222222&2222222226223&222222222&222222222223 \ No newline at end of file
diff --git a/data/maps/MtPyre_6F/border.bin b/data/maps/MtPyre_6F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/MtPyre_6F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
new file mode 100644
index 000000000..72d2808f0
--- /dev/null
+++ b/data/maps/MtPyre_6F/header.inc
@@ -0,0 +1,15 @@
+MtPyre_6F: @ 84840F0
+ .4byte MtPyre_6F_MapAttributes
+ .4byte MtPyre_6F_MapEvents
+ .4byte MtPyre_6F_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 142
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/MtPyre_6F/map.bin b/data/maps/MtPyre_6F/map.bin
new file mode 100644
index 000000000..1f7438bfb
--- /dev/null
+++ b/data/maps/MtPyre_6F/map.bin
@@ -0,0 +1 @@
+2&222&&222222&22222222222222222262222&2222226622222&22&&272&&22&22222222222232222222222222222222222&2222222 \ No newline at end of file
diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/maps/MtPyre_Exterior/border.bin
new file mode 100644
index 000000000..1d7df4a00
--- /dev/null
+++ b/data/maps/MtPyre_Exterior/border.bin
Binary files differ
diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
new file mode 100644
index 000000000..c9c8e7380
--- /dev/null
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -0,0 +1,15 @@
+MtPyre_Exterior: @ 848410C
+ .4byte MtPyre_Exterior_MapAttributes
+ .4byte MtPyre_Exterior_MapEvents
+ .4byte MtPyre_Exterior_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHUPI
+ .2byte 302
+ .byte 65
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/maps/MtPyre_Exterior/map.bin
new file mode 100644
index 000000000..7ab1e0461
--- /dev/null
+++ b/data/maps/MtPyre_Exterior/map.bin
Binary files differ
diff --git a/data/maps/MtPyre_Summit/border.bin b/data/maps/MtPyre_Summit/border.bin
new file mode 100644
index 000000000..1d7df4a00
--- /dev/null
+++ b/data/maps/MtPyre_Summit/border.bin
Binary files differ
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
new file mode 100644
index 000000000..7f62acb50
--- /dev/null
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -0,0 +1,15 @@
+MtPyre_Summit: @ 8484128
+ .4byte MtPyre_Summit_MapAttributes
+ .4byte MtPyre_Summit_MapEvents
+ .4byte MtPyre_Summit_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHUPI
+ .2byte 303
+ .byte 65
+ .byte 0
+ .byte 6
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/MtPyre_Summit/map.bin b/data/maps/MtPyre_Summit/map.bin
new file mode 100644
index 000000000..1de8bd5ea
--- /dev/null
+++ b/data/maps/MtPyre_Summit/map.bin
Binary files differ
diff --git a/data/maps/NavelRock_B1F/border.bin b/data/maps/NavelRock_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/NavelRock_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc
new file mode 100644
index 000000000..99d66911f
--- /dev/null
+++ b/data/maps/NavelRock_B1F/header.inc
@@ -0,0 +1,15 @@
+NavelRock_B1F: @ 84858C8
+ .4byte NavelRock_B1F_MapAttributes
+ .4byte NavelRock_B1F_MapEvents
+ .4byte NavelRock_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 427
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_B1F/map.bin b/data/maps/NavelRock_B1F/map.bin
new file mode 100644
index 000000000..861fb6575
--- /dev/null
+++ b/data/maps/NavelRock_B1F/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222?22GGGGGGGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Bottom/border.bin b/data/maps/NavelRock_Bottom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/NavelRock_Bottom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc
new file mode 100644
index 000000000..c14a2a33a
--- /dev/null
+++ b/data/maps/NavelRock_Bottom/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Bottom: @ 8485AC0
+ .4byte NavelRock_Bottom_MapAttributes
+ .4byte NavelRock_Bottom_MapEvents
+ .4byte NavelRock_Bottom_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 424
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Bottom/map.bin b/data/maps/NavelRock_Bottom/map.bin
new file mode 100644
index 000000000..af2f8a245
--- /dev/null
+++ b/data/maps/NavelRock_Bottom/map.bin
@@ -0,0 +1 @@
+reeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeGGGccpreeeFGccpreFF]ddd[GGpredde]d[cddpreddee{ccddpreddeFdGcddpredde=ddcddpreslmdddktpree=dddddcpreed=dddd>cpGGGGGGGGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc
new file mode 100644
index 000000000..398493f52
--- /dev/null
+++ b/data/maps/NavelRock_Down01/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down01: @ 848598C
+ .4byte NavelRock_Down01_MapAttributes
+ .4byte NavelRock_Down01_MapEvents
+ .4byte NavelRock_Down01_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc
new file mode 100644
index 000000000..d852e71b6
--- /dev/null
+++ b/data/maps/NavelRock_Down02/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down02: @ 84859A8
+ .4byte NavelRock_Down02_MapAttributes
+ .4byte NavelRock_Down02_MapEvents
+ .4byte NavelRock_Down02_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 426
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc
new file mode 100644
index 000000000..67d6cade8
--- /dev/null
+++ b/data/maps/NavelRock_Down03/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down03: @ 84859C4
+ .4byte NavelRock_Down03_MapAttributes
+ .4byte NavelRock_Down03_MapEvents
+ .4byte NavelRock_Down03_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc
new file mode 100644
index 000000000..9aa24c310
--- /dev/null
+++ b/data/maps/NavelRock_Down04/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down04: @ 84859E0
+ .4byte NavelRock_Down04_MapAttributes
+ .4byte NavelRock_Down04_MapEvents
+ .4byte NavelRock_Down04_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 426
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc
new file mode 100644
index 000000000..f4fd2057a
--- /dev/null
+++ b/data/maps/NavelRock_Down05/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down05: @ 84859FC
+ .4byte NavelRock_Down05_MapAttributes
+ .4byte NavelRock_Down05_MapEvents
+ .4byte NavelRock_Down05_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc
new file mode 100644
index 000000000..5d135527f
--- /dev/null
+++ b/data/maps/NavelRock_Down06/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down06: @ 8485A18
+ .4byte NavelRock_Down06_MapAttributes
+ .4byte NavelRock_Down06_MapEvents
+ .4byte NavelRock_Down06_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 426
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc
new file mode 100644
index 000000000..50cdebf34
--- /dev/null
+++ b/data/maps/NavelRock_Down07/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down07: @ 8485A34
+ .4byte NavelRock_Down07_MapAttributes
+ .4byte NavelRock_Down07_MapEvents
+ .4byte NavelRock_Down07_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc
new file mode 100644
index 000000000..c15ca867e
--- /dev/null
+++ b/data/maps/NavelRock_Down08/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down08: @ 8485A50
+ .4byte NavelRock_Down08_MapAttributes
+ .4byte NavelRock_Down08_MapEvents
+ .4byte NavelRock_Down08_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 426
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc
new file mode 100644
index 000000000..57636fd9b
--- /dev/null
+++ b/data/maps/NavelRock_Down09/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down09: @ 8485A6C
+ .4byte NavelRock_Down09_MapAttributes
+ .4byte NavelRock_Down09_MapEvents
+ .4byte NavelRock_Down09_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc
new file mode 100644
index 000000000..c34916015
--- /dev/null
+++ b/data/maps/NavelRock_Down10/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down10: @ 8485A88
+ .4byte NavelRock_Down10_MapAttributes
+ .4byte NavelRock_Down10_MapEvents
+ .4byte NavelRock_Down10_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 426
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc
new file mode 100644
index 000000000..0842774a0
--- /dev/null
+++ b/data/maps/NavelRock_Down11/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Down11: @ 8485AA4
+ .4byte NavelRock_Down11_MapAttributes
+ .4byte NavelRock_Down11_MapEvents
+ .4byte NavelRock_Down11_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Entrance/border.bin b/data/maps/NavelRock_Entrance/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/NavelRock_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc
new file mode 100644
index 000000000..2770d9005
--- /dev/null
+++ b/data/maps/NavelRock_Entrance/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Entrance: @ 84858AC
+ .4byte NavelRock_Entrance_MapAttributes
+ .4byte NavelRock_Entrance_MapEvents
+ .4byte NavelRock_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 422
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Entrance/map.bin b/data/maps/NavelRock_Entrance/map.bin
new file mode 100644
index 000000000..6fd5b9fa0
--- /dev/null
+++ b/data/maps/NavelRock_Entrance/map.bin
@@ -0,0 +1 @@
+22222222222222222222222222222222222?2222222222222222222222222222222222222222222222222222222222222222222GGGG2222222GGGGG2222222222222222222222222222222222222222222222222222222222222222222222222222GGXYZGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Exterior/border.bin b/data/maps/NavelRock_Exterior/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/NavelRock_Exterior/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc
new file mode 100644
index 000000000..9b77fae48
--- /dev/null
+++ b/data/maps/NavelRock_Exterior/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Exterior: @ 8485874
+ .4byte NavelRock_Exterior_MapAttributes
+ .4byte NavelRock_Exterior_MapEvents
+ .4byte NavelRock_Exterior_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_SEVII_ISLANDS
+ .2byte 421
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/NavelRock_Exterior/map.bin b/data/maps/NavelRock_Exterior/map.bin
new file mode 100644
index 000000000..9b3342a1a
--- /dev/null
+++ b/data/maps/NavelRock_Exterior/map.bin
Binary files differ
diff --git a/data/maps/NavelRock_Fork/border.bin b/data/maps/NavelRock_Fork/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/NavelRock_Fork/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc
new file mode 100644
index 000000000..0bb1df72d
--- /dev/null
+++ b/data/maps/NavelRock_Fork/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Fork: @ 84858E4
+ .4byte NavelRock_Fork_MapAttributes
+ .4byte NavelRock_Fork_MapEvents
+ .4byte NavelRock_Fork_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 428
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Fork/map.bin b/data/maps/NavelRock_Fork/map.bin
new file mode 100644
index 000000000..0b314cc16
--- /dev/null
+++ b/data/maps/NavelRock_Fork/map.bin
@@ -0,0 +1 @@
+2222222222222222222?22222222222222222222222222222222222222222222GGGGGGGGGG222GGGGGGGGGG2222222222222222222222222222222222222222222222222222222222222222222GGGGGGGGGG22222222222222222222222222222GGGGGGGGGG222222222222222222222222222222222222222222222222222222222GGGGGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc
new file mode 100644
index 000000000..9af423363
--- /dev/null
+++ b/data/maps/NavelRock_Harbor/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Harbor: @ 8485890
+ .4byte NavelRock_Harbor_MapAttributes
+ .4byte NavelRock_Harbor_MapEvents
+ .4byte NavelRock_Harbor_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_SEVII_ISLANDS
+ .2byte 405
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/NavelRock_Top/border.bin b/data/maps/NavelRock_Top/border.bin
new file mode 100644
index 000000000..8d839d092
--- /dev/null
+++ b/data/maps/NavelRock_Top/border.bin
@@ -0,0 +1 @@
+<<<< \ No newline at end of file
diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc
new file mode 100644
index 000000000..691bdd2a6
--- /dev/null
+++ b/data/maps/NavelRock_Top/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Top: @ 8485970
+ .4byte NavelRock_Top_MapAttributes
+ .4byte NavelRock_Top_MapEvents
+ .4byte NavelRock_Top_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 423
+ .byte 211
+ .byte 0
+ .byte 11
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Top/map.bin b/data/maps/NavelRock_Top/map.bin
new file mode 100644
index 000000000..fce085ae6
--- /dev/null
+++ b/data/maps/NavelRock_Top/map.bin
@@ -0,0 +1 @@
+<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<PQ3R<<<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<<P2R<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X2Z<<<<<<<<<<<<<<<<<<X22222Z<<<<<<<<<<<<<<<<CDp22222rDE<<<<<<<<<<<<CDFLp22222rLGDE<<<<<<<<<CF[\\p22222r\\]GE<<<<<<<CFLcLLp222?22rLLeLGE<<<<<CFL[FLLp22222rLLG]LGE<<DDFL[FLLLLLLG]LGDD\\\\F[\\\\\]LG\\\\LL[\\FLLLLLGG]LLLLL[FLLLL[\lllll\]LLG]LLLFFLLLL[FLlllllLG]LLG\\\LLLL[\FLLlllllLLGG]LLLL \ No newline at end of file
diff --git a/data/maps/NavelRock_Up1/border.bin b/data/maps/NavelRock_Up1/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/NavelRock_Up1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc
new file mode 100644
index 000000000..37ee4bdcd
--- /dev/null
+++ b/data/maps/NavelRock_Up1/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Up1: @ 8485900
+ .4byte NavelRock_Up1_MapAttributes
+ .4byte NavelRock_Up1_MapEvents
+ .4byte NavelRock_Up1_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Up1/map.bin b/data/maps/NavelRock_Up1/map.bin
new file mode 100644
index 000000000..c2951c043
--- /dev/null
+++ b/data/maps/NavelRock_Up1/map.bin
@@ -0,0 +1 @@
+22222222?2GGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Up2/border.bin b/data/maps/NavelRock_Up2/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/NavelRock_Up2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc
new file mode 100644
index 000000000..4ce083ea7
--- /dev/null
+++ b/data/maps/NavelRock_Up2/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Up2: @ 848591C
+ .4byte NavelRock_Up2_MapAttributes
+ .4byte NavelRock_Up2_MapEvents
+ .4byte NavelRock_Up2_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 426
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Up2/map.bin b/data/maps/NavelRock_Up2/map.bin
new file mode 100644
index 000000000..47dd37b93
--- /dev/null
+++ b/data/maps/NavelRock_Up2/map.bin
@@ -0,0 +1 @@
+?22V22^22fGGGGGGGGGGGG \ No newline at end of file
diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc
new file mode 100644
index 000000000..c683f402c
--- /dev/null
+++ b/data/maps/NavelRock_Up3/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Up3: @ 8485938
+ .4byte NavelRock_Up3_MapAttributes
+ .4byte NavelRock_Up3_MapEvents
+ .4byte NavelRock_Up3_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 425
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc
new file mode 100644
index 000000000..2ef111cfd
--- /dev/null
+++ b/data/maps/NavelRock_Up4/header.inc
@@ -0,0 +1,15 @@
+NavelRock_Up4: @ 8485954
+ .4byte NavelRock_Up4_MapAttributes
+ .4byte NavelRock_Up4_MapEvents
+ .4byte NavelRock_Up4_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRLG_MT_EMBER
+ .2byte 426
+ .byte 211
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/maps/NewMauville_Entrance/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/maps/NewMauville_Entrance/border.bin
Binary files differ
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
new file mode 100644
index 000000000..21263d9f7
--- /dev/null
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -0,0 +1,15 @@
+NewMauville_Entrance: @ 8484470
+ .4byte NewMauville_Entrance_MapAttributes
+ .4byte NewMauville_Entrance_MapEvents
+ .4byte NewMauville_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 184
+ .byte 62
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/maps/NewMauville_Entrance/map.bin
new file mode 100644
index 000000000..1e3f471e8
--- /dev/null
+++ b/data/maps/NewMauville_Entrance/map.bin
@@ -0,0 +1 @@
+t||||ut2suu33333suu33333suu33333suu33333suu33333suslllllll \ No newline at end of file
diff --git a/data/maps/NewMauville_Inside/border.bin b/data/maps/NewMauville_Inside/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/NewMauville_Inside/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc
new file mode 100644
index 000000000..5784acd35
--- /dev/null
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -0,0 +1,15 @@
+NewMauville_Inside: @ 848448C
+ .4byte NewMauville_Inside_MapAttributes
+ .4byte NewMauville_Inside_MapEvents
+ .4byte NewMauville_Inside_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 185
+ .byte 62
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/NewMauville_Inside/map.bin b/data/maps/NewMauville_Inside/map.bin
new file mode 100644
index 000000000..78d1e39ce
--- /dev/null
+++ b/data/maps/NewMauville_Inside/map.bin
@@ -0,0 +1 @@
+hjhjp'''''rp''rpu222u2/2/26/22222u2226u22266rp}22727272726727222'''''''}222266}26666}2266rp}2'''''''}22/2/2/2/2/26/2/2/2~22222/2~26666}222/2rh}2jp}22727272727267272222222222/2/2/2~2222rp'}2rp}2''''''''}22222222>22222rpu22/2~2222rh}2jp}22222222222ry2o2222o272p}2'rxy27272727272727272727272727272zp'w}2w'rp2/2~22/222r'''''''''''''''pu2/2/2~22/2/2rp}262222.22rp}2.2222622rxy2727272727272zy2722227272'''''''p}2''rhjp66u2~22/2/2rp''''rp66}22222rpu222u2/2222u26622rpu2/2~22222}22222222}266}22rp}222222'}22222222}22/2~22rp2222222/26/2~222222222~2222.2rpX6266222726222272727272272o27272o272pX62222''}22'''''w''ry2o272o272o272p}222/2/2/2/2u2/2/2/222rp'w'wwrp}22226222}222222`''ajpu2/2/2/22/22rp}222222}222222'u222/222'''rp}2227222272722222222/26/2~2222222/2/2/2rp6222''}2'}22222726222222227222rp2622222/26/2/2/2/2~2222u2/2~2222''}222222'}2rp2222227262222222}222222rxy27272727272zp}2rp222''}222222~222222r''''''p}2rxy222227272zxy272727272727272727272727272zp}2r'}22''''''''''''''''p}2rp}22rp}2rp}22rhjh\n]p}2rp}22rp'rpv2a}2rp}2222u22222222/2/2/222}2rp}22'''}22}2222'''}22222222226/2~2rp}222/22222/2/2/2~22}2.2222/26/2/2/2~22222o2727272267272zxy27272727272727272722222~22222726727222222w''''''''''''''}2222222''''}222622/222/2rxy2727272727272zxy27272727272727272z'''''''''''''''' \ No newline at end of file
diff --git a/data/maps/OldaleTown/border.bin b/data/maps/OldaleTown/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/OldaleTown/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc
new file mode 100644
index 000000000..f6b5336bb
--- /dev/null
+++ b/data/maps/OldaleTown/connections.inc
@@ -0,0 +1,9 @@
+OldaleTown_MapConnectionsList: @ 8486614
+ connection up, 0, ROUTE_103, 0
+ connection down, 0, ROUTE_101, 0
+ connection left, 0, ROUTE_102, 0
+
+OldaleTown_MapConnections: @ 8486638
+ .4byte 0x3
+ .4byte OldaleTown_MapConnectionsList
+
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
new file mode 100644
index 000000000..e000987db
--- /dev/null
+++ b/data/maps/OldaleTown/header.inc
@@ -0,0 +1,15 @@
+OldaleTown: @ 84825D0
+ .4byte OldaleTown_MapAttributes
+ .4byte OldaleTown_MapEvents
+ .4byte OldaleTown_MapScripts
+ .4byte OldaleTown_MapConnections
+ .2byte BGM_MACHI_S4
+ .2byte 11
+ .byte 1
+ .byte 0
+ .byte 2
+ .byte 1
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/OldaleTown/map.bin b/data/maps/OldaleTown/map.bin
new file mode 100644
index 000000000..28b17c441
--- /dev/null
+++ b/data/maps/OldaleTown/map.bin
@@ -0,0 +1 @@
+01101110000011110000000011110(0)0)000l2m2m2n2111100123000tuuv1111189:;000|}~11111`ABC00011111111110001111000111111100111111001111111020111111100011111100211111111111111110110001111111111000000H0I02211111l2m2m2n2000PQRS11110tuuv110XYZ[11110|}~0`abc1111000011111000011000111110000111x211111111 \ No newline at end of file
diff --git a/data/maps/OldaleTown_House1/border.bin b/data/maps/OldaleTown_House1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/OldaleTown_House1/border.bin
Binary files differ
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
new file mode 100644
index 000000000..f39cc9a39
--- /dev/null
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -0,0 +1,15 @@
+OldaleTown_House1: @ 8482B80
+ .4byte OldaleTown_House1_MapAttributes
+ .4byte OldaleTown_House1_MapEvents
+ .4byte OldaleTown_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S4
+ .2byte 59
+ .byte 1
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/OldaleTown_House1/map.bin b/data/maps/OldaleTown_House1/map.bin
new file mode 100644
index 000000000..ea185484d
--- /dev/null
+++ b/data/maps/OldaleTown_House1/map.bin
@@ -0,0 +1 @@
+yz   222222$2$2$2$29252626262626272#2#292=H6I62>2>2?2#2#292=P6Q62>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file
diff --git a/data/maps/OldaleTown_House2/border.bin b/data/maps/OldaleTown_House2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/OldaleTown_House2/border.bin
Binary files differ
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
new file mode 100644
index 000000000..8c88814f1
--- /dev/null
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -0,0 +1,15 @@
+OldaleTown_House2: @ 8482B9C
+ .4byte OldaleTown_House2_MapAttributes
+ .4byte OldaleTown_House2_MapEvents
+ .4byte OldaleTown_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S4
+ .2byte 60
+ .byte 1
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/OldaleTown_House2/map.bin b/data/maps/OldaleTown_House2/map.bin
new file mode 100644
index 000000000..0e9f07964
--- /dev/null
+++ b/data/maps/OldaleTown_House2/map.bin
@@ -0,0 +1 @@
+0x   hlm2282$2$2$2$2p2t2u2292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#22#2#2#2#2#2#2#2#2#2"2#2#2 #2#2#2#2#2* \ No newline at end of file
diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/maps/OldaleTown_Mart/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/OldaleTown_Mart/border.bin
Binary files differ
diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc
new file mode 100644
index 000000000..e2ac903a3
--- /dev/null
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -0,0 +1,15 @@
+OldaleTown_Mart: @ 8482BF0
+ .4byte OldaleTown_Mart_MapAttributes
+ .4byte OldaleTown_Mart_MapEvents
+ .4byte OldaleTown_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 1
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/maps/OldaleTown_Mart/map.bin
new file mode 100644
index 000000000..08f393264
--- /dev/null
+++ b/data/maps/OldaleTown_Mart/map.bin
@@ -0,0 +1,3 @@
+"#$#$D*()() 222 2220212!212%292:2222222- AB222+,22+
+22222234223
+222222;<22;222222222 \ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/maps/OldaleTown_PokemonCenter_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..1d14d924d
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+OldaleTown_PokemonCenter_1F: @ 8482BB8
+ .4byte OldaleTown_PokemonCenter_1F_MapAttributes
+ .4byte OldaleTown_PokemonCenter_1F_MapEvents
+ .4byte OldaleTown_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 1
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/maps/OldaleTown_PokemonCenter_1F/map.bin
new file mode 100644
index 000000000..5201dde15
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_1F/map.bin
@@ -0,0 +1 @@
+ ij   JK   qrH"#RSI22y2z2P*+2[Q$2222 2&2422X!!!Y<222'2 2222`2l2m2n2o22%222'222222021222322222'26B228292:2;2242=>'222222@2A2B2C22&2EF'2(2222222222&24276 \ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/maps/OldaleTown_PokemonCenter_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..5417fb67b
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+OldaleTown_PokemonCenter_2F: @ 8482BD4
+ .4byte OldaleTown_PokemonCenter_2F_MapAttributes
+ .4byte OldaleTown_PokemonCenter_2F_MapEvents
+ .4byte OldaleTown_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 1
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/maps/OldaleTown_PokemonCenter_2F/map.bin
new file mode 100644
index 000000000..c623d86fc
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/map.bin
@@ -0,0 +1 @@
+  ? \  ?\  ?Gd6Gd6G2O2Ob2]]/2 2l2l22a22l2<2l2/222222222g2222g2DB2222222222'22222222222222'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
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/PacifidlogTown/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc
new file mode 100644
index 000000000..fcbdec008
--- /dev/null
+++ b/data/maps/PacifidlogTown/connections.inc
@@ -0,0 +1,8 @@
+PacifidlogTown_MapConnectionsList: @ 84866B4
+ connection left, 0, ROUTE_132, 0
+ connection right, 0, ROUTE_131, 0
+
+PacifidlogTown_MapConnections: @ 84866CC
+ .4byte 0x2
+ .4byte PacifidlogTown_MapConnectionsList
+
diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc
new file mode 100644
index 000000000..d883ed7d7
--- /dev/null
+++ b/data/maps/PacifidlogTown/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown: @ 848265C
+ .4byte PacifidlogTown_MapAttributes
+ .4byte PacifidlogTown_MapEvents
+ .4byte PacifidlogTown_MapScripts
+ .4byte PacifidlogTown_MapConnections
+ .2byte BGM_MINAMO
+ .2byte 16
+ .byte 6
+ .byte 0
+ .byte 2
+ .byte 1
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/PacifidlogTown/map.bin b/data/maps/PacifidlogTown/map.bin
new file mode 100644
index 000000000..02c1454bb
--- /dev/null
+++ b/data/maps/PacifidlogTown/map.bin
@@ -0,0 +1,6 @@
+qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqt||qqqqqqqqqqqqqt||}q{qqqqqqqqqqt|}qqq{q{y|||||||||}qqt||{|qqqqqqt||}qt{{y|||||}t|}{}pppppuv 
+  pppppppppppp}~22ppppppppp 
+  p22pp0123ppp22p2!2!2!22pPQRS p22p 2!2!2!2$2p2XYZ[2p 2!2!2!2$2p())*2,p2HabK2p()*2),ppX2p2!2!2!22pX2ppp`2P2Q2 2!2!2!2!2$2P2Q2P2Q2`2pp()*2)),pppppppppppppX2ppppp 
+  p 
+  pp`2ppppp22p22ppX2pppp22p22pp`2p 
+   2!2!2!2$2p 2!2!2!2$2ppX2p22()*2),()*2),`2p22ppX2ppppX2ppppX2p 2!2!2!2$2pp`2ppppp`2P2Q2P2Q2`2p()*2),ppX2ppppppppX2P2Q2P2Q2P2Q2P2Q2`2pppppppp`2pppppppppppuvpppppppppppppppppp}~ppppppppppppppuvppppr{{{{{{{{{{{{t}~pp{{qqqqklllllmq{{{{qqqqkllqqqqqlllmqqkllqqqqqqqqqqqqllqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/maps/PacifidlogTown_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/PacifidlogTown_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
new file mode 100644
index 000000000..224d9da80
--- /dev/null
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House1: @ 8482F8C
+ .4byte PacifidlogTown_House1_MapAttributes
+ .4byte PacifidlogTown_House1_MapEvents
+ .4byte PacifidlogTown_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 77
+ .byte 6
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/maps/PacifidlogTown_House1/map.bin
new file mode 100644
index 000000000..7865fdc7c
--- /dev/null
+++ b/data/maps/PacifidlogTown_House1/map.bin
@@ -0,0 +1 @@
+3333373333333333333333333333733333333333333333733333333373333337 \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/maps/PacifidlogTown_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/PacifidlogTown_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc
new file mode 100644
index 000000000..aa005a306
--- /dev/null
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House2: @ 8482FA8
+ .4byte PacifidlogTown_House2_MapAttributes
+ .4byte PacifidlogTown_House2_MapEvents
+ .4byte PacifidlogTown_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 78
+ .byte 6
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/maps/PacifidlogTown_House2/map.bin
new file mode 100644
index 000000000..617346322
--- /dev/null
+++ b/data/maps/PacifidlogTown_House2/map.bin
@@ -0,0 +1 @@
+3333333333733333333373333333333333333333333333333333333373333337 \ No newline at end of file
diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc
new file mode 100644
index 000000000..6bfefd00a
--- /dev/null
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House3: @ 8482FC4
+ .4byte PacifidlogTown_House3_MapAttributes
+ .4byte PacifidlogTown_House3_MapEvents
+ .4byte PacifidlogTown_House3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 77
+ .byte 6
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc
new file mode 100644
index 000000000..fad1fa0e8
--- /dev/null
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House4: @ 8482FE0
+ .4byte PacifidlogTown_House4_MapAttributes
+ .4byte PacifidlogTown_House4_MapEvents
+ .4byte PacifidlogTown_House4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 78
+ .byte 6
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc
new file mode 100644
index 000000000..aab011d9b
--- /dev/null
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_House5: @ 8482FFC
+ .4byte PacifidlogTown_House5_MapAttributes
+ .4byte PacifidlogTown_House5_MapEvents
+ .4byte PacifidlogTown_House5_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 77
+ .byte 6
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..ee83a387e
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_PokemonCenter_1F: @ 8482F54
+ .4byte PacifidlogTown_PokemonCenter_1F_MapAttributes
+ .4byte PacifidlogTown_PokemonCenter_1F_MapEvents
+ .4byte PacifidlogTown_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 6
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..f2d6605d7
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_PokemonCenter_2F: @ 8482F70
+ .4byte PacifidlogTown_PokemonCenter_2F_MapAttributes
+ .4byte PacifidlogTown_PokemonCenter_2F_MapEvents
+ .4byte PacifidlogTown_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 6
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PetalburgCity/border.bin b/data/maps/PetalburgCity/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/PetalburgCity/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc
new file mode 100644
index 000000000..4a75eea3a
--- /dev/null
+++ b/data/maps/PetalburgCity/connections.inc
@@ -0,0 +1,8 @@
+PetalburgCity_MapConnectionsList: @ 84866D4
+ connection left, -50, ROUTE_104, 0
+ connection right, 10, ROUTE_102, 0
+
+PetalburgCity_MapConnections: @ 84866EC
+ .4byte 0x2
+ .4byte PetalburgCity_MapConnectionsList
+
diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc
new file mode 100644
index 000000000..a78619139
--- /dev/null
+++ b/data/maps/PetalburgCity/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity: @ 84824B8
+ .4byte PetalburgCity_MapAttributes
+ .4byte PetalburgCity_MapEvents
+ .4byte gStdScripts_End
+ .4byte PetalburgCity_MapConnections
+ .2byte BGM_MACHI_S2
+ .2byte 1
+ .byte 7
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/PetalburgCity/map.bin b/data/maps/PetalburgCity/map.bin
new file mode 100644
index 000000000..35f0172ca
--- /dev/null
+++ b/data/maps/PetalburgCity/map.bin
@@ -0,0 +1,4 @@
+UNMNMNVD   
+F000LL55T  L??0 !"LLL001100LLL00 1"100LLL00 1"10<2fL111L5500 1"1deT0011101T00000P2Q2XY0000 1"1000000 1!1"110000000123550000 1"1000000 1!1"1000000089:;001111!1!1111111!1!1"10000000`ABC11(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110000000 1"100PQRS00 1"10000000 1"100XYZ[00 1"1050 0 0
+000 1"10`abc00 1"100000 1!111111111!1!1100 00 1!1)1)1)1)1)1)1)1)1)1)1*10055 !"00 1"1000000000111100020000 1"10<2=2=2=2=2=2=2>200000000 1"10D  
+EEF00000000 1"10LL110 1"10T L0 1"100 !"00L0 1!111111000L0(1)1)1)1)1)1*1000T11111111111100001111 \ No newline at end of file
diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/maps/PetalburgCity_Gym/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
new file mode 100644
index 000000000..e3c7c3cf7
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity_Gym: @ 8483034
+ .4byte PetalburgCity_Gym_MapAttributes
+ .4byte PetalburgCity_Gym_MapEvents
+ .4byte PetalburgCity_Gym_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 79
+ .byte 7
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/maps/PetalburgCity_Gym/map.bin
new file mode 100644
index 000000000..17d5ba980
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/map.bin
@@ -0,0 +1,10 @@
+()()
+01  01 2*234567*22 222;<=>?222 222222222 222222222 222222222 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2A2B2C2D2E2F2G22 2I2J2K2L2M2N2O22 2Q2R2S2T2U2V2W22 2Y2Z2[2\2]2^2_22 222222222
+        222222222 2ABCDEFG2 2IJKLMNO2 2QRSTUVW2 2YZ[\]^_2 222222222
+        222222222 22 22 22 22 222222222
+        222222222 22 22 22 22 222222222
+        222222222 22 22 22 22 222222222
+        222222222 22 22 22 22 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
new file mode 100644
index 000000000..38428c30a
--- /dev/null
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity_House1: @ 8483050
+ .4byte PetalburgCity_House1_MapAttributes
+ .4byte PetalburgCity_House1_MapEvents
+ .4byte PetalburgCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S2
+ .2byte 59
+ .byte 7
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/maps/PetalburgCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/PetalburgCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc
new file mode 100644
index 000000000..07b4ee885
--- /dev/null
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity_House2: @ 848306C
+ .4byte PetalburgCity_House2_MapAttributes
+ .4byte PetalburgCity_House2_MapEvents
+ .4byte PetalburgCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S2
+ .2byte 80
+ .byte 7
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/maps/PetalburgCity_House2/map.bin
new file mode 100644
index 000000000..b91b7153b
--- /dev/null
+++ b/data/maps/PetalburgCity_House2/map.bin
@@ -0,0 +1 @@
+nohi    vwp2q2$2$2$2$2$2$2~22Z6[6#2#2#2#2#2#2#2,2b6c6#2#2#2#2#2#2LM92#2#2#2#2#2#2+2TU92#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc
new file mode 100644
index 000000000..2e9f8df17
--- /dev/null
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity_Mart: @ 84830C0
+ .4byte PetalburgCity_Mart_MapAttributes
+ .4byte PetalburgCity_Mart_MapEvents
+ .4byte PetalburgCity_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 7
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..fd59dc90e
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity_PokemonCenter_1F: @ 8483088
+ .4byte PetalburgCity_PokemonCenter_1F_MapAttributes
+ .4byte PetalburgCity_PokemonCenter_1F_MapEvents
+ .4byte PetalburgCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 7
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..53affa40f
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity_PokemonCenter_2F: @ 84830A4
+ .4byte PetalburgCity_PokemonCenter_2F_MapAttributes
+ .4byte PetalburgCity_PokemonCenter_2F_MapEvents
+ .4byte PetalburgCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 7
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
new file mode 100644
index 000000000..c54f5c32d
--- /dev/null
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -0,0 +1,15 @@
+PetalburgCity_WallysHouse: @ 8483018
+ .4byte PetalburgCity_WallysHouse_MapAttributes
+ .4byte PetalburgCity_WallysHouse_MapEvents
+ .4byte PetalburgCity_WallysHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S2
+ .2byte 60
+ .byte 7
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/PetalburgWoods/border.bin b/data/maps/PetalburgWoods/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/PetalburgWoods/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
new file mode 100644
index 000000000..7eca96e6f
--- /dev/null
+++ b/data/maps/PetalburgWoods/header.inc
@@ -0,0 +1,15 @@
+PetalburgWoods: @ 8483FF4
+ .4byte PetalburgWoods_MapAttributes
+ .4byte PetalburgWoods_MapEvents
+ .4byte PetalburgWoods_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 135
+ .byte 59
+ .byte 0
+ .byte 11
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/PetalburgWoods/map.bin b/data/maps/PetalburgWoods/map.bin
new file mode 100644
index 000000000..a032b4c43
--- /dev/null
+++ b/data/maps/PetalburgWoods/map.bin
@@ -0,0 +1 @@
+000000 0 0 0 0 0 0IIII000001111 0 0 000000000000005555 0 0 0000000000000000 0 0000000 0 0 0 04000000 0 0000000 0 0 0000 0 0 0 0 0 00000000 0 0 00111111 0 0000000 0 0 0 0 0 0 00000000000 0 0 0 0 0 0 0555555 0 0 000000000 0 0 0 0 0111111000011111111111111110000 0 00 0 0 05555550000555555555555555000 0 0 000000000100 0 0 00000500 0 0 0000 00000010 0 0 00 0 0 0 0 0 00000000000000000050 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0000000000 0 0 0 0 0 0 0 0 000000 0 0 0 0 0 0 0 0 0000000 011111111000011111111110000005555555500005555555555000000000000 000000 000000 0 000000000 000000 0 0 00000000000000 0 0 0 0 0 0 0 000 0 0000000 0 0 0 0 00 0 0 00000000000 0 0 0 0 0 0000 0 0 00110 0 0 0 0 0 0 00 0 0 0 0 0 0 0 0000000000000000 0 0 0 0550 0 0 0 0 0 0 0 0 0 0 0 0 0111111000000111111 0 0 0 011 0 0 0 011 0 0 0 0 0 0555000000555555 0 0 0 05 0 0 0 05 0 0 0 0 0 00000000 0 0 01111 0 0 0 0 0 0000 0 0 0 0 0 0 000000000000 0 0 0 0 0 0 0 0 040000000 0 0 0 0110 0 0 0 0 0 000000000 0 0 0 0 000005000000000000000 0 0 0 0 0 0 000000000 0 0 0 0 0 01111111100000011111111111111000 0 00 0 0500000055000 0 0 0 0 00000000000 0 011IIIIIIII5 \ No newline at end of file
diff --git a/data/maps/RecordCorner/border.bin b/data/maps/RecordCorner/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RecordCorner/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
new file mode 100644
index 000000000..9fd5f13f5
--- /dev/null
+++ b/data/maps/RecordCorner/header.inc
@@ -0,0 +1,15 @@
+RecordCorner: @ 8484D68
+ .4byte RecordCorner_MapAttributes
+ .4byte RecordCorner_MapEvents
+ .4byte RecordCorner_MapScripts
+ .4byte 0x0
+ .2byte BGM_RAINBOW
+ .2byte 223
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RecordCorner/map.bin b/data/maps/RecordCorner/map.bin
new file mode 100644
index 000000000..51dfb6e5a
--- /dev/null
+++ b/data/maps/RecordCorner/map.bin
@@ -0,0 +1 @@
+22222222222222222222222222222222222222222222222222222222222222222222"2"2"2"2 \ No newline at end of file
diff --git a/data/maps/Route101/border.bin b/data/maps/Route101/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/Route101/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc
new file mode 100644
index 000000000..aee630352
--- /dev/null
+++ b/data/maps/Route101/connections.inc
@@ -0,0 +1,8 @@
+Route101_MapConnectionsList: @ 848680C
+ connection up, 0, OLDALE_TOWN, 0
+ connection down, 0, LITTLEROOT_TOWN, 0
+
+Route101_MapConnections: @ 8486824
+ .4byte 0x2
+ .4byte Route101_MapConnectionsList
+
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
new file mode 100644
index 000000000..dcab12376
--- /dev/null
+++ b/data/maps/Route101/header.inc
@@ -0,0 +1,15 @@
+Route101: @ 8482678
+ .4byte Route101_MapAttributes
+ .4byte Route101_MapEvents
+ .4byte Route101_MapScripts
+ .4byte Route101_MapConnections
+ .2byte BGM_DOORO1
+ .2byte 17
+ .byte 16
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route101/map.bin b/data/maps/Route101/map.bin
new file mode 100644
index 000000000..fab3a1d69
--- /dev/null
+++ b/data/maps/Route101/map.bin
@@ -0,0 +1 @@
+11101110 0 0 000000000 0 0 05 0 0 0 0000000 0 0 0 0 0 0 0 0 0 0000000 0 0 0 0 0 011 0 0 000000011 0 0 0 0 0 0 000n11 0 000000000011011000000001110001110 0 0011110111110 0 0 0 0 001110111110 0 0 0 0 0 00110011100 0 0 0 0 0 0000 0 0000011 0 0 0011 0 0 0 0 00000000 0 00011 0 0 0 00000001111 0 0 0 000000011111111000000 \ No newline at end of file
diff --git a/data/maps/Route102/border.bin b/data/maps/Route102/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/Route102/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc
new file mode 100644
index 000000000..7fa2d516f
--- /dev/null
+++ b/data/maps/Route102/connections.inc
@@ -0,0 +1,8 @@
+Route102_MapConnectionsList: @ 848682C
+ connection left, -10, PETALBURG_CITY, 0
+ connection right, 0, OLDALE_TOWN, 0
+
+Route102_MapConnections: @ 8486844
+ .4byte 0x2
+ .4byte Route102_MapConnectionsList
+
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
new file mode 100644
index 000000000..79e726fe1
--- /dev/null
+++ b/data/maps/Route102/header.inc
@@ -0,0 +1,15 @@
+Route102: @ 8482694
+ .4byte Route102_MapAttributes
+ .4byte Route102_MapEvents
+ .4byte Route102_MapScripts
+ .4byte Route102_MapConnections
+ .2byte BGM_DOORO1
+ .2byte 18
+ .byte 17
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route102/map.bin b/data/maps/Route102/map.bin
new file mode 100644
index 000000000..7378bb44b
--- /dev/null
+++ b/data/maps/Route102/map.bin
@@ -0,0 +1 @@
+ 0 0 00000000000026620 0 0 0 0 0 0 000011110000011110 0 0 0 0 0 0 0 0 0 0 0 0 0011111111000000000000000 0 0 0 0 0 0 0 0 0 0 0 00111q2y211110000000000110000 0 0 0000 0 0 0 0 0 0 0011100111100000 0 00000 0 0 0 00001r210000 0 0 0 0 00110000000000000000000000000 0 0 0 0 0 0 00{00000000000001111111100000 0 0 0 0 0 0 00011000000000000011 0 0 0 0 0 000000000011110000000 0 0 0 000000000111111100011 0 000 0 0 00011000 0 0111111111000 0 01100011000 0 0 0 0111111101111 0 0 0000000000 0 0 0 0 000111111000 0 0 001100 0 0 00000 0 0 0000111001111 0 0 0 00 0 0 0 0 0 0 0000000000000001111111111 0 0 00000011111111 0 0 0 0000011111111 \ No newline at end of file
diff --git a/data/maps/Route103/border.bin b/data/maps/Route103/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/Route103/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc
new file mode 100644
index 000000000..10d98cec7
--- /dev/null
+++ b/data/maps/Route103/connections.inc
@@ -0,0 +1,8 @@
+Route103_MapConnectionsList: @ 848684C
+ connection down, 0, OLDALE_TOWN, 0
+ connection right, -60, ROUTE_110, 0
+
+Route103_MapConnections: @ 8486864
+ .4byte 0x2
+ .4byte Route103_MapConnectionsList
+
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
new file mode 100644
index 000000000..470cfbdc2
--- /dev/null
+++ b/data/maps/Route103/header.inc
@@ -0,0 +1,15 @@
+Route103: @ 84826B0
+ .4byte Route103_MapAttributes
+ .4byte Route103_MapEvents
+ .4byte Route103_MapScripts
+ .4byte Route103_MapConnections
+ .2byte BGM_DOORO1
+ .2byte 19
+ .byte 18
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route103/map.bin b/data/maps/Route103/map.bin
new file mode 100644
index 000000000..44518dc92
--- /dev/null
+++ b/data/maps/Route103/map.bin
@@ -0,0 +1 @@
+ppppppppppsq{sqqqt}qsqqqqqqqqqqqqqqqqqqqqqqqt|}qqquuvpppppppp{|s{qquqq{qqqqt|||||||qqqqqqqqt}qqqqqu000000 0 0 0 0 0 0}~pppppppps{sqquqt{||||}qtq{||||||||}qqqqqqu0001111 0 0 0 0 0ppppppuvPQpp{s{ququ{|||||}qqq{|||||||} 0 0000111100 0 0 0 0 0puvppp}~XYpps{{|}t}tyyy 0 0 0 04444444o4 0 0 0 0dQpp}~uvPQpppuvPesq{|||}qr0000000K1L5L5L5M10000 0 0 0 0 0 0 000004444444lYuvpp}~XYppp}~Xm{|yz011111000000 0 0 0 0 0 0 000000000000p}~pppppppppppp0000000000000000000000 0 0 0 0 0 0 00000111110000pppppppppppppppppp000000000000000000011 0 0 0 0 00040111111000ppppppppppppppppppppppppp000000000000000111 0 0 0 000000001111000ppppppppppppppppppppppppp011110000000000011!1!1)1 0 0 0 0000000 0 0 0 00000ppppppppppppppppppppppppp0(1)1!1!1111100000011!1!1)1*104444444444 0 0 0 0 000000yppppppppppppppppppppppp000(1)1)1)1!1!1111111111111111!1!1)1*1000000000 0 0 0 0 0 0 0111111dQPQppppppppppuvppppp0000000(1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1)1*100000000000 0 0 0 0 0 0 05555lYXYuvppppPQPQ}~puvpx00000000000000000000000001100000011111122yp}~uvPQXYXYpPQ}~Pe0000000000000005ppp}~XYpppppXYppXm000000000110000uvppppppppppppppp000000000550000}~ppppppppppppppx00000pppppppppppppppp550000pppppppppppppppp0000pppppppppppppppp \ No newline at end of file
diff --git a/data/maps/Route104/border.bin b/data/maps/Route104/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/Route104/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc
new file mode 100644
index 000000000..0486aba98
--- /dev/null
+++ b/data/maps/Route104/connections.inc
@@ -0,0 +1,9 @@
+Route104_MapConnectionsList: @ 848686C
+ connection up, 0, RUSTBORO_CITY, 0
+ connection down, 0, ROUTE_105, 0
+ connection right, 50, PETALBURG_CITY, 0
+
+Route104_MapConnections: @ 8486890
+ .4byte 0x3
+ .4byte Route104_MapConnectionsList
+
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
new file mode 100644
index 000000000..7efc69c08
--- /dev/null
+++ b/data/maps/Route104/header.inc
@@ -0,0 +1,15 @@
+Route104: @ 84826CC
+ .4byte Route104_MapAttributes
+ .4byte Route104_MapEvents
+ .4byte Route104_MapScripts
+ .4byte Route104_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 20
+ .byte 19
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route104/map.bin b/data/maps/Route104/map.bin
new file mode 100644
index 000000000..7731bc31c
--- /dev/null
+++ b/data/maps/Route104/map.bin
Binary files differ
diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/maps/Route104_MrBrineysHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route104_MrBrineysHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
new file mode 100644
index 000000000..cc7767bc4
--- /dev/null
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -0,0 +1,15 @@
+Route104_MrBrineysHouse: @ 8483D70
+ .4byte Route104_MrBrineysHouse_MapAttributes
+ .4byte Route104_MrBrineysHouse_MapEvents
+ .4byte Route104_MrBrineysHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S2
+ .2byte 102
+ .byte 19
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/maps/Route104_MrBrineysHouse/map.bin
new file mode 100644
index 000000000..7660fd5d7
--- /dev/null
+++ b/data/maps/Route104_MrBrineysHouse/map.bin
@@ -0,0 +1 @@
+222!22!2!22222266)2)2)2)2)2)2)2)2)2)26)2)2)2)2)2)2NO)2)2)2!2)2)2)2)2)2)2VWD2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 333333333333#3333333333 \ No newline at end of file
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/maps/Route104_PrettyPetalFlowerShop/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route104_PrettyPetalFlowerShop/border.bin
Binary files differ
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
new file mode 100644
index 000000000..b7a8a4a18
--- /dev/null
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -0,0 +1,15 @@
+Route104_PrettyPetalFlowerShop: @ 8483D8C
+ .4byte Route104_PrettyPetalFlowerShop_MapAttributes
+ .4byte Route104_PrettyPetalFlowerShop_MapEvents
+ .4byte Route104_PrettyPetalFlowerShop_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S2
+ .2byte 117
+ .byte 19
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/maps/Route104_PrettyPetalFlowerShop/map.bin
new file mode 100644
index 000000000..d34ff5c1a
--- /dev/null
+++ b/data/maps/Route104_PrettyPetalFlowerShop/map.bin
Binary files differ
diff --git a/data/maps/Route104_Prototype/border.bin b/data/maps/Route104_Prototype/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/Route104_Prototype/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
new file mode 100644
index 000000000..5848bf3fd
--- /dev/null
+++ b/data/maps/Route104_Prototype/header.inc
@@ -0,0 +1,15 @@
+Route104_Prototype: @ 8485AF8
+ .4byte Route104_Prototype_MapAttributes
+ .4byte Route104_Prototype_MapEvents
+ .4byte Route104_Prototype_MapScripts
+ .4byte 0x0
+ .2byte BGM_NEXTROAD
+ .2byte 287
+ .byte 19
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/Route104_Prototype/map.bin b/data/maps/Route104_Prototype/map.bin
new file mode 100644
index 000000000..71bd63e62
--- /dev/null
+++ b/data/maps/Route104_Prototype/map.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
new file mode 100644
index 000000000..39e57f344
--- /dev/null
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -0,0 +1,15 @@
+Route104_PrototypePrettyPetalFlowerShop: @ 8485B14
+ .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes
+ .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents
+ .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts
+ .4byte 0x0
+ .2byte BGM_NEXTROAD
+ .2byte 117
+ .byte 19
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 8
+ .byte 0
+
diff --git a/data/maps/Route105/border.bin b/data/maps/Route105/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route105/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc
new file mode 100644
index 000000000..44357db1e
--- /dev/null
+++ b/data/maps/Route105/connections.inc
@@ -0,0 +1,9 @@
+Route105_MapConnectionsList: @ 8486898
+ connection up, 0, ROUTE_104, 0
+ connection down, 0, ROUTE_106, 0
+ connection dive, 0, UNDERWATER_6, 0
+
+Route105_MapConnections: @ 84868BC
+ .4byte 0x3
+ .4byte Route105_MapConnectionsList
+
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
new file mode 100644
index 000000000..1df88f877
--- /dev/null
+++ b/data/maps/Route105/header.inc
@@ -0,0 +1,15 @@
+Route105: @ 84826E8
+ .4byte Route105_MapAttributes
+ .4byte Route105_MapEvents
+ .4byte Route105_MapScripts
+ .4byte Route105_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 21
+ .byte 20
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route105/map.bin b/data/maps/Route105/map.bin
new file mode 100644
index 000000000..c4bd8286c
--- /dev/null
+++ b/data/maps/Route105/map.bin
Binary files differ
diff --git a/data/maps/Route106/border.bin b/data/maps/Route106/border.bin
new file mode 100644
index 000000000..281762f5b
--- /dev/null
+++ b/data/maps/Route106/border.bin
@@ -0,0 +1 @@
+CCCC \ No newline at end of file
diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc
new file mode 100644
index 000000000..a3b16c452
--- /dev/null
+++ b/data/maps/Route106/connections.inc
@@ -0,0 +1,8 @@
+Route106_MapConnectionsList: @ 84868C4
+ connection up, 0, ROUTE_105, 0
+ connection down, 60, DEWFORD_TOWN, 0
+
+Route106_MapConnections: @ 84868DC
+ .4byte 0x2
+ .4byte Route106_MapConnectionsList
+
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
new file mode 100644
index 000000000..1e944a5b9
--- /dev/null
+++ b/data/maps/Route106/header.inc
@@ -0,0 +1,15 @@
+Route106: @ 8482704
+ .4byte Route106_MapAttributes
+ .4byte Route106_MapEvents
+ .4byte Route106_MapScripts
+ .4byte Route106_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 22
+ .byte 21
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route106/map.bin b/data/maps/Route106/map.bin
new file mode 100644
index 000000000..b7e7d7238
--- /dev/null
+++ b/data/maps/Route106/map.bin
Binary files differ
diff --git a/data/maps/Route107/border.bin b/data/maps/Route107/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route107/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc
new file mode 100644
index 000000000..2e17530d6
--- /dev/null
+++ b/data/maps/Route107/connections.inc
@@ -0,0 +1,8 @@
+Route107_MapConnectionsList: @ 84868E4
+ connection left, 0, DEWFORD_TOWN, 0
+ connection right, 0, ROUTE_108, 0
+
+Route107_MapConnections: @ 84868FC
+ .4byte 0x2
+ .4byte Route107_MapConnectionsList
+
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
new file mode 100644
index 000000000..d508e2346
--- /dev/null
+++ b/data/maps/Route107/header.inc
@@ -0,0 +1,15 @@
+Route107: @ 8482720
+ .4byte Route107_MapAttributes
+ .4byte Route107_MapEvents
+ .4byte Route107_MapScripts
+ .4byte Route107_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 23
+ .byte 22
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route107/map.bin b/data/maps/Route107/map.bin
new file mode 100644
index 000000000..521997b0f
--- /dev/null
+++ b/data/maps/Route107/map.bin
Binary files differ
diff --git a/data/maps/Route108/border.bin b/data/maps/Route108/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route108/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc
new file mode 100644
index 000000000..1208a2138
--- /dev/null
+++ b/data/maps/Route108/connections.inc
@@ -0,0 +1,8 @@
+Route108_MapConnectionsList: @ 8486904
+ connection left, 0, ROUTE_107, 0
+ connection right, -40, ROUTE_109, 0
+
+Route108_MapConnections: @ 848691C
+ .4byte 0x2
+ .4byte Route108_MapConnectionsList
+
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
new file mode 100644
index 000000000..d4542cb24
--- /dev/null
+++ b/data/maps/Route108/header.inc
@@ -0,0 +1,15 @@
+Route108: @ 848273C
+ .4byte Route108_MapAttributes
+ .4byte Route108_MapEvents
+ .4byte Route108_MapScripts
+ .4byte Route108_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 24
+ .byte 23
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route108/map.bin b/data/maps/Route108/map.bin
new file mode 100644
index 000000000..138ddc020
--- /dev/null
+++ b/data/maps/Route108/map.bin
@@ -0,0 +1 @@
+ppppppppppppppppPQpp111111111111pppppppppppppPQpppppppppppPQppppppppppppppXYp11511^5_515^5_511bQppppppppppppXYpppppppppPQXY11pPQpppppppppPc^5_5155n5o551n5o555jYppp1111111pPQppuvpuvPQXYpPc^5_5bQXY11pPQppXkn5o5111^5_51Q3R3S3T35puvPc^5_51515bQXYpp}~p}~XYpppXkn5o5jYpPc^5_5bQXYuvpn5o5X7YZ[\7]p}~Xkn5o55151jYppPQpPQppppppppppXkn5o5jYpp}~pppppp1`abcdepppp1111pppXYpXYpppppppppppppppppppppppppppi3j3k3ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppuvppppppppppppppPQp11pppppppppppppppPQpppppppppppppppppppp}~ppppppppp11pXY1511ppppppppppppppXYpppppppppppppp111ppppPQppPQpp5ppp1511pp11ppppppPQppPQuvppppp11p51ppuvXYuvXYpppuvppPc^5_5bQpppppXYppXY}~uvppPc^5_5bQpPQ}~pp}~puvppPQp}~PQppPQuvXkn5o5jYppppPQppppppp}~PQXkn5o5jYpPQuvXYppppppp}~PQXYuvpXYPQXY}~ppPQPQXYpppppppppXYpPQXY}~pppPQppppppXYpp}~pppXYpppppPQpppXYXYppppppppppppppppppXYpppppppXYppppppppppppppppppppppXYppppppp \ No newline at end of file
diff --git a/data/maps/Route109/border.bin b/data/maps/Route109/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route109/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc
new file mode 100644
index 000000000..8e1ff175f
--- /dev/null
+++ b/data/maps/Route109/connections.inc
@@ -0,0 +1,8 @@
+Route109_MapConnectionsList: @ 8486924
+ connection up, 0, SLATEPORT_CITY, 0
+ connection left, 40, ROUTE_108, 0
+
+Route109_MapConnections: @ 848693C
+ .4byte 0x2
+ .4byte Route109_MapConnectionsList
+
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
new file mode 100644
index 000000000..749c52643
--- /dev/null
+++ b/data/maps/Route109/header.inc
@@ -0,0 +1,15 @@
+Route109: @ 8482758
+ .4byte Route109_MapAttributes
+ .4byte Route109_MapEvents
+ .4byte Route109_MapScripts
+ .4byte Route109_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 25
+ .byte 24
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route109/map.bin b/data/maps/Route109/map.bin
new file mode 100644
index 000000000..62350867e
--- /dev/null
+++ b/data/maps/Route109/map.bin
Binary files differ
diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/maps/Route109_SeashoreHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route109_SeashoreHouse/border.bin
Binary files differ
diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
new file mode 100644
index 000000000..dd4b098e9
--- /dev/null
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -0,0 +1,15 @@
+Route109_SeashoreHouse: @ 8485B30
+ .4byte Route109_SeashoreHouse_MapAttributes
+ .4byte Route109_SeashoreHouse_MapEvents
+ .4byte Route109_SeashoreHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_HIGHTOWN
+ .2byte 243
+ .byte 24
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/maps/Route109_SeashoreHouse/map.bin
new file mode 100644
index 000000000..cb7853a17
--- /dev/null
+++ b/data/maps/Route109_SeashoreHouse/map.bin
@@ -0,0 +1,3 @@
+./   67
+
+   22222'22222"2,2,2-2$2$2,2,2-2$2$2$2,2,2&2 %2%2%2%2%2!22*2222*2*2222*2*222 $2$2$2$2$2!22%2222%2%2222%2%222 *2*2*2*2*2*2*2*2*2*2*2!22%2%2%2%2%2%2%2%2%222 \ No newline at end of file
diff --git a/data/maps/Route110/border.bin b/data/maps/Route110/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route110/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc
new file mode 100644
index 000000000..92a12b42a
--- /dev/null
+++ b/data/maps/Route110/connections.inc
@@ -0,0 +1,9 @@
+Route110_MapConnectionsList: @ 8486944
+ connection up, 0, MAUVILLE_CITY, 0
+ connection down, 0, SLATEPORT_CITY, 0
+ connection left, 60, ROUTE_103, 0
+
+Route110_MapConnections: @ 8486968
+ .4byte 0x3
+ .4byte Route110_MapConnectionsList
+
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
new file mode 100644
index 000000000..ffbae7d28
--- /dev/null
+++ b/data/maps/Route110/header.inc
@@ -0,0 +1,15 @@
+Route110: @ 8482774
+ .4byte Route110_MapAttributes
+ .4byte Route110_MapEvents
+ .4byte Route110_MapScripts
+ .4byte Route110_MapConnections
+ .2byte BGM_DOORO_X1
+ .2byte 26
+ .byte 25
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route110/map.bin b/data/maps/Route110/map.bin
new file mode 100644
index 000000000..ac83cb93d
--- /dev/null
+++ b/data/maps/Route110/map.bin
Binary files differ
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin b/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin
Binary files differ
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
new file mode 100644
index 000000000..b11a4e74e
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadEntrance1: @ 8485C80
+ .4byte Route110_SeasideCyclingRoadEntrance1_MapAttributes
+ .4byte Route110_SeasideCyclingRoadEntrance1_MapEvents
+ .4byte Route110_SeasideCyclingRoadEntrance1_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 256
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 1
+ .byte 0
+
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin b/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin
new file mode 100644
index 000000000..e9fc770d4
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin
@@ -0,0 +1 @@
+x2p2p2p2p2622226x2p2p2p22h2h2h2h26666662h2h2h2\2h2h2h2h2p2Y2Z2Y2Z2p2y2h2h2l2d6h2h2h2a6b6a6b6h2h2t6 \ No newline at end of file
diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
new file mode 100644
index 000000000..7102a670c
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadEntrance2: @ 8485C9C
+ .4byte Route110_SeasideCyclingRoadEntrance2_MapAttributes
+ .4byte Route110_SeasideCyclingRoadEntrance2_MapEvents
+ .4byte Route110_SeasideCyclingRoadEntrance2_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 256
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 1
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/maps/Route110_TrickHouseCorridor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route110_TrickHouseCorridor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
new file mode 100644
index 000000000..c605c80b2
--- /dev/null
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseCorridor: @ 8485B84
+ .4byte Route110_TrickHouseCorridor_MapAttributes
+ .4byte Route110_TrickHouseCorridor_MapEvents
+ .4byte Route110_TrickHouseCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 246
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/maps/Route110_TrickHouseCorridor/map.bin
new file mode 100644
index 000000000..8981d28bd
--- /dev/null
+++ b/data/maps/Route110_TrickHouseCorridor/map.bin
@@ -0,0 +1 @@
+2!2!2!2!2!2!2!2!2!2!22!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2!2)2)2!2)2)2!2)2)22!22!2)2)2!2)2)2)2)2)2!2)2)2)2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)2!2)2)22!22!2)2)2)222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/maps/Route110_TrickHouseEnd/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
new file mode 100644
index 000000000..d965eacf6
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseEnd: @ 8485B68
+ .4byte Route110_TrickHouseEnd_MapAttributes
+ .4byte Route110_TrickHouseEnd_MapEvents
+ .4byte Route110_TrickHouseEnd_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 245
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/maps/Route110_TrickHouseEnd/map.bin
new file mode 100644
index 000000000..506fdb644
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/map.bin
@@ -0,0 +1 @@
+26 26!22222!2!2!22!2!2!2!2)2)2)2)2)2D2)2)2)2)2)2!2)2)2)2)2NO)2)2)2)2)2!2)2)2)2D2VWD2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2!2)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/maps/Route110_TrickHouseEntrance/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
new file mode 100644
index 000000000..01db89ecd
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseEntrance: @ 8485B4C
+ .4byte Route110_TrickHouseEntrance_MapAttributes
+ .4byte Route110_TrickHouseEntrance_MapEvents
+ .4byte Route110_TrickHouseEntrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 244
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/maps/Route110_TrickHouseEntrance/map.bin
new file mode 100644
index 000000000..1306bb9b5
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/map.bin
@@ -0,0 +1 @@
+6!2!2!2!2!2!2!2!2!2222!2)2)2)2D2NOD2)2)2)2)23)2)2)2D2VWD2)2)2)23'7)2)2)2)2)2)2)2)2)2)2"7 333333333333#333332233333 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/maps/Route110_TrickHousePuzzle1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle1/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
new file mode 100644
index 000000000..84fe3c0f1
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle1: @ 8485BA0
+ .4byte Route110_TrickHousePuzzle1_MapAttributes
+ .4byte Route110_TrickHousePuzzle1_MapEvents
+ .4byte Route110_TrickHousePuzzle1_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 247
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/maps/Route110_TrickHousePuzzle1/map.bin
new file mode 100644
index 000000000..2bf5b392c
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle1/map.bin
@@ -0,0 +1,2 @@
+o233333333334
+w6 #$+$$$+$+$$!222Z2Z2*Z2Z2Z2*Z2*Z2Z2"22222222222222"22222,222,2,22,2222#$$+$$$$$$+%202Z2Z2Z2*Z2Z2Z2Z2Z2Z2*Z22Z22"22222222222222,22(220%22,2220$!2#!2Z2Z22#+$$%Z2Z2*2Z2"22"2Z2*Z2Z2Z222222"22"22222222(22,22,22,22222#$+$+$$$$+$%222Z2Z2"Z2*Z2Z2Z2Z2*Z2Z22222"2Z2222222222222,222222,222#$$$+$$$$+$$%20Z2Z2Z2Z2*Z2Z2Z2Z2*Z2Z2Z22Z22222Z22222Z222222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/maps/Route110_TrickHousePuzzle2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle2/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
new file mode 100644
index 000000000..37259a907
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle2: @ 8485BBC
+ .4byte Route110_TrickHousePuzzle2_MapAttributes
+ .4byte Route110_TrickHousePuzzle2_MapEvents
+ .4byte Route110_TrickHousePuzzle2_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 248
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/maps/Route110_TrickHousePuzzle2/map.bin
new file mode 100644
index 000000000..cb35a063e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle2/map.bin
@@ -0,0 +1,2 @@
+o         
+w6 222222222222222222222222X22222222222222X222222i2222222222222222222222222222222222222222222222X222222222X22ii22222222222222222222i2222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/maps/Route110_TrickHousePuzzle3/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle3/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
new file mode 100644
index 000000000..199f7ff22
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle3: @ 8485BD8
+ .4byte Route110_TrickHousePuzzle3_MapAttributes
+ .4byte Route110_TrickHousePuzzle3_MapEvents
+ .4byte Route110_TrickHousePuzzle3_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 249
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/maps/Route110_TrickHousePuzzle3/map.bin
new file mode 100644
index 000000000..ac4f344d9
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle3/map.bin
@@ -0,0 +1,2 @@
+o         
+w6 &22&22&2X2&22&22-8292-22-22-22-82925@A522M22:225@Aq222q222U222B22X222K2L2829222&8292225S2T2M@A522"@AM22q222222U222"22q222K2L2./8292-22K2L25S2T25675@A5225S2T2q222X222q222U222U22282928292228292&225@AM@A5225@A"22~22U2X22q222q222"22./K2L2&./22-K2L2567:S2T2"67M225S2T2q2q2q2B22"q2q2U222222228292-228292225225@A5225@A522q222q222q222q222q222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/maps/Route110_TrickHousePuzzle4/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle4/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
new file mode 100644
index 000000000..d44eed5a1
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle4: @ 8485BF4
+ .4byte Route110_TrickHousePuzzle4_MapAttributes
+ .4byte Route110_TrickHousePuzzle4_MapEvents
+ .4byte Route110_TrickHousePuzzle4_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 250
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/maps/Route110_TrickHousePuzzle4/map.bin
new file mode 100644
index 000000000..2dbcf251b
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle4/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222q2q2q2q2q2q2q2q2q2q2q2q2q2q2222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/maps/Route110_TrickHousePuzzle5/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
new file mode 100644
index 000000000..1c8f0a7fd
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle5: @ 8485C10
+ .4byte Route110_TrickHousePuzzle5_MapAttributes
+ .4byte Route110_TrickHousePuzzle5_MapEvents
+ .4byte Route110_TrickHousePuzzle5_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 251
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/maps/Route110_TrickHousePuzzle5/map.bin
new file mode 100644
index 000000000..470e3eba3
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/map.bin
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle6/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
new file mode 100644
index 000000000..50a1dde0d
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle6: @ 8485C2C
+ .4byte Route110_TrickHousePuzzle6_MapAttributes
+ .4byte Route110_TrickHousePuzzle6_MapEvents
+ .4byte Route110_TrickHousePuzzle6_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 252
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/maps/Route110_TrickHousePuzzle6/map.bin
new file mode 100644
index 000000000..45dc20ba1
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle6/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 222222222222222222222222222222222222222222222222222222222222222222222222222222222222222622222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/maps/Route110_TrickHousePuzzle7/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle7/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
new file mode 100644
index 000000000..df10ee4b1
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle7: @ 8485C48
+ .4byte Route110_TrickHousePuzzle7_MapAttributes
+ .4byte Route110_TrickHousePuzzle7_MapEvents
+ .4byte Route110_TrickHousePuzzle7_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 253
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/maps/Route110_TrickHousePuzzle7/map.bin
new file mode 100644
index 000000000..68ac73547
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle7/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/maps/Route110_TrickHousePuzzle8/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle8/border.bin
Binary files differ
diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc
new file mode 100644
index 000000000..b569f0721
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -0,0 +1,15 @@
+Route110_TrickHousePuzzle8: @ 8485C64
+ .4byte Route110_TrickHousePuzzle8_MapAttributes
+ .4byte Route110_TrickHousePuzzle8_MapEvents
+ .4byte Route110_TrickHousePuzzle8_MapScripts
+ .4byte 0x0
+ .2byte BGM_KARAKURI
+ .2byte 254
+ .byte 25
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/maps/Route110_TrickHousePuzzle8/map.bin
new file mode 100644
index 000000000..b59b0f606
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle8/map.bin
@@ -0,0 +1,2 @@
+o            
+w6 222622222222226k2k2l6l6l6k2l6l6l6l6l6l6l6l6l6k2k2k2k2l6k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2222662266666k262626666666262k262k2l6k2k2k2k2l6l6k2k2k2k2k2k22k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2l6k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2k2k2k2k2k2k22k2l6k2k2k2k2k2k2k2k2k2k2k2k2k2k2l6k2k2k2k2k2k2l6l6l6k2l6k2k2k2l6k2k2k2k2226662622262222226622622222222 \ No newline at end of file
diff --git a/data/maps/Route111/border.bin b/data/maps/Route111/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/maps/Route111/border.bin
Binary files differ
diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc
new file mode 100644
index 000000000..8133a0b78
--- /dev/null
+++ b/data/maps/Route111/connections.inc
@@ -0,0 +1,9 @@
+Route111_MapConnectionsList: @ 8486970
+ connection down, 0, MAUVILLE_CITY, 0
+ connection left, 0, ROUTE_113, 0
+ connection left, 20, ROUTE_112, 0
+
+Route111_MapConnections: @ 8486994
+ .4byte 0x3
+ .4byte Route111_MapConnectionsList
+
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
new file mode 100644
index 000000000..0eacd64e3
--- /dev/null
+++ b/data/maps/Route111/header.inc
@@ -0,0 +1,15 @@
+Route111: @ 8482790
+ .4byte Route111_MapAttributes
+ .4byte Route111_MapEvents
+ .4byte Route111_MapScripts
+ .4byte Route111_MapConnections
+ .2byte BGM_DOORO_X1
+ .2byte 27
+ .byte 26
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route111/map.bin b/data/maps/Route111/map.bin
new file mode 100644
index 000000000..4ce11a8a9
--- /dev/null
+++ b/data/maps/Route111/map.bin
Binary files differ
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
new file mode 100644
index 000000000..5543bd06c
--- /dev/null
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -0,0 +1,15 @@
+Route111_OldLadysRestStop: @ 8483DC4
+ .4byte Route111_OldLadysRestStop_MapAttributes
+ .4byte Route111_OldLadysRestStop_MapEvents
+ .4byte Route111_OldLadysRestStop_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 64
+ .byte 26
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
new file mode 100644
index 000000000..1ae67a0e6
--- /dev/null
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -0,0 +1,15 @@
+Route111_WinstrateFamilysHouse: @ 8483DA8
+ .4byte Route111_WinstrateFamilysHouse_MapAttributes
+ .4byte Route111_WinstrateFamilysHouse_MapEvents
+ .4byte Route111_WinstrateFamilysHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 60
+ .byte 26
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route112/border.bin b/data/maps/Route112/border.bin
new file mode 100644
index 000000000..9ae2c2126
--- /dev/null
+++ b/data/maps/Route112/border.bin
@@ -0,0 +1 @@
+qqqq \ No newline at end of file
diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc
new file mode 100644
index 000000000..a8d94d710
--- /dev/null
+++ b/data/maps/Route112/connections.inc
@@ -0,0 +1,9 @@
+Route112_MapConnectionsList: @ 848699C
+ connection up, -60, ROUTE_113, 0
+ connection left, 40, LAVARIDGE_TOWN, 0
+ connection right, -20, ROUTE_111, 0
+
+Route112_MapConnections: @ 84869C0
+ .4byte 0x3
+ .4byte Route112_MapConnectionsList
+
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
new file mode 100644
index 000000000..ed5f682cf
--- /dev/null
+++ b/data/maps/Route112/header.inc
@@ -0,0 +1,15 @@
+Route112: @ 84827AC
+ .4byte Route112_MapAttributes
+ .4byte Route112_MapEvents
+ .4byte Route112_MapScripts
+ .4byte Route112_MapConnections
+ .2byte BGM_DOORO_X1
+ .2byte 28
+ .byte 27
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route112/map.bin b/data/maps/Route112/map.bin
new file mode 100644
index 000000000..ef3fd5f10
--- /dev/null
+++ b/data/maps/Route112/map.bin
Binary files differ
diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/maps/Route112_CableCarStation/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
new file mode 100644
index 000000000..7a36e0e11
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -0,0 +1,15 @@
+Route112_CableCarStation: @ 8483DE0
+ .4byte Route112_CableCarStation_MapAttributes
+ .4byte Route112_CableCarStation_MapEvents
+ .4byte Route112_CableCarStation_MapScripts
+ .4byte 0x0
+ .2byte BGM_DOORO_X1
+ .2byte 118
+ .byte 27
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/maps/Route112_CableCarStation/map.bin
new file mode 100644
index 000000000..93db9d5f0
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/map.bin
Binary files differ
diff --git a/data/maps/Route113/border.bin b/data/maps/Route113/border.bin
new file mode 100644
index 000000000..73e1e3c60
--- /dev/null
+++ b/data/maps/Route113/border.bin
@@ -0,0 +1 @@
+mnuv \ No newline at end of file
diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc
new file mode 100644
index 000000000..1ba0cf64c
--- /dev/null
+++ b/data/maps/Route113/connections.inc
@@ -0,0 +1,9 @@
+Route113_MapConnectionsList: @ 84869C8
+ connection down, 60, ROUTE_112, 0
+ connection left, 0, FALLARBOR_TOWN, 0
+ connection right, 0, ROUTE_111, 0
+
+Route113_MapConnections: @ 84869EC
+ .4byte 0x3
+ .4byte Route113_MapConnectionsList
+
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
new file mode 100644
index 000000000..35f16139d
--- /dev/null
+++ b/data/maps/Route113/header.inc
@@ -0,0 +1,15 @@
+Route113: @ 84827C8
+ .4byte Route113_MapAttributes
+ .4byte Route113_MapEvents
+ .4byte Route113_MapScripts
+ .4byte Route113_MapConnections
+ .2byte BGM_KAZANBAI
+ .2byte 29
+ .byte 28
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route113/map.bin b/data/maps/Route113/map.bin
new file mode 100644
index 000000000..609690de2
--- /dev/null
+++ b/data/maps/Route113/map.bin
Binary files differ
diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
new file mode 100644
index 000000000..0c06ce631
--- /dev/null
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -0,0 +1,15 @@
+Route113_GlassWorkshop: @ 8485CB8
+ .4byte Route113_GlassWorkshop_MapAttributes
+ .4byte Route113_GlassWorkshop_MapEvents
+ .4byte Route113_GlassWorkshop_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 67
+ .byte 28
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route114/border.bin b/data/maps/Route114/border.bin
new file mode 100644
index 000000000..23e2a92e5
--- /dev/null
+++ b/data/maps/Route114/border.bin
@@ -0,0 +1 @@
+klst \ No newline at end of file
diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc
new file mode 100644
index 000000000..8569b143f
--- /dev/null
+++ b/data/maps/Route114/connections.inc
@@ -0,0 +1,8 @@
+Route114_MapConnectionsList: @ 84869F4
+ connection left, 40, ROUTE_115, 0
+ connection right, 0, FALLARBOR_TOWN, 0
+
+Route114_MapConnections: @ 8486A0C
+ .4byte 0x2
+ .4byte Route114_MapConnectionsList
+
diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc
new file mode 100644
index 000000000..f7bff7b83
--- /dev/null
+++ b/data/maps/Route114/header.inc
@@ -0,0 +1,15 @@
+Route114: @ 84827E4
+ .4byte Route114_MapAttributes
+ .4byte Route114_MapEvents
+ .4byte Route114_MapScripts
+ .4byte Route114_MapConnections
+ .2byte BGM_DOORO_X1
+ .2byte 30
+ .byte 29
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route114/map.bin b/data/maps/Route114/map.bin
new file mode 100644
index 000000000..3bad45e04
--- /dev/null
+++ b/data/maps/Route114/map.bin
Binary files differ
diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/maps/Route114_FossilManiacsHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
new file mode 100644
index 000000000..38ead1057
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsHouse: @ 8483E18
+ .4byte Route114_FossilManiacsHouse_MapAttributes
+ .4byte Route114_FossilManiacsHouse_MapEvents
+ .4byte Route114_FossilManiacsHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_TONEKUSA
+ .2byte 119
+ .byte 29
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/maps/Route114_FossilManiacsHouse/map.bin
new file mode 100644
index 000000000..ea2d94fda
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsHouse/map.bin
@@ -0,0 +1 @@
+622!22233@2!2)2)2)2)277222!2NOD2)222)2)2)2Y2VW)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/maps/Route114_FossilManiacsTunnel/border.bin
new file mode 100644
index 000000000..580a207f4
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsTunnel/border.bin
@@ -0,0 +1 @@
+wwww \ No newline at end of file
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
new file mode 100644
index 000000000..e2fe8a26b
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsTunnel: @ 8483E34
+ .4byte Route114_FossilManiacsTunnel_MapAttributes
+ .4byte Route114_FossilManiacsTunnel_MapEvents
+ .4byte Route114_FossilManiacsTunnel_MapScripts
+ .4byte 0x0
+ .2byte BGM_TONEKUSA
+ .2byte 120
+ .byte 29
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/maps/Route114_FossilManiacsTunnel/map.bin
new file mode 100644
index 000000000..61838bff2
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsTunnel/map.bin
@@ -0,0 +1 @@
+w2whiiiiiijw2w2w2whxhiiGijrw2wwwphxhiOjrzjwww2pphx33rzjrwwwppp332zjrrwwwppp6y233rrrwwwppp3y2y26rrrwwwppp3y2y22rrrwwwpp-2y2y22rrrwwwp-2p3y26rrrwwww2pp3y22rrrwwww2ppp3y26,rrwwww2ppp62r6rzjw2ww2ppp32r3zjrw2ww2ppp32r3y6rrw2ww2ppp32r3y6rrw2whxp-22r3y6rrw2wp2p2p 3r77rrw2wp6p2p 3zj3rzjwp2p6p 33r3r3rwp2p2p32r3r7rwp2p2p36r3zjrhx2p7p32r77rrpy62phx32zj3rrpy62pp3333r3rrpy62pp3222r3rr \ No newline at end of file
diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/maps/Route114_LanettesHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route114_LanettesHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc
new file mode 100644
index 000000000..8ce68732c
--- /dev/null
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -0,0 +1,15 @@
+Route114_LanettesHouse: @ 8483E50
+ .4byte Route114_LanettesHouse_MapAttributes
+ .4byte Route114_LanettesHouse_MapEvents
+ .4byte Route114_LanettesHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_TONEKUSA
+ .2byte 121
+ .byte 29
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/maps/Route114_LanettesHouse/map.bin
new file mode 100644
index 000000000..de1858be4
--- /dev/null
+++ b/data/maps/Route114_LanettesHouse/map.bin
@@ -0,0 +1,2 @@
+  
+L  !2 !22"2#2"2#2 !2(2(202PQ2(:2Q62%2282XY22BY,-2@22J262%2P4522222)2,-XJ2222145 \ No newline at end of file
diff --git a/data/maps/Route115/border.bin b/data/maps/Route115/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route115/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc
new file mode 100644
index 000000000..3f283eb91
--- /dev/null
+++ b/data/maps/Route115/connections.inc
@@ -0,0 +1,8 @@
+Route115_MapConnectionsList: @ 8486A14
+ connection down, 0, RUSTBORO_CITY, 0
+ connection right, -40, ROUTE_114, 0
+
+Route115_MapConnections: @ 8486A2C
+ .4byte 0x2
+ .4byte Route115_MapConnectionsList
+
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
new file mode 100644
index 000000000..a7564b752
--- /dev/null
+++ b/data/maps/Route115/header.inc
@@ -0,0 +1,15 @@
+Route115: @ 8482800
+ .4byte Route115_MapAttributes
+ .4byte Route115_MapEvents
+ .4byte Route115_MapScripts
+ .4byte Route115_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 31
+ .byte 30
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route115/map.bin b/data/maps/Route115/map.bin
new file mode 100644
index 000000000..64a58e691
--- /dev/null
+++ b/data/maps/Route115/map.bin
Binary files differ
diff --git a/data/maps/Route116/border.bin b/data/maps/Route116/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/Route116/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc
new file mode 100644
index 000000000..e037bff3b
--- /dev/null
+++ b/data/maps/Route116/connections.inc
@@ -0,0 +1,8 @@
+Route116_MapConnectionsList: @ 8486A34
+ connection down, 80, VERDANTURF_TOWN, 0
+ connection left, 0, RUSTBORO_CITY, 0
+
+Route116_MapConnections: @ 8486A4C
+ .4byte 0x2
+ .4byte Route116_MapConnectionsList
+
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
new file mode 100644
index 000000000..291cea02b
--- /dev/null
+++ b/data/maps/Route116/header.inc
@@ -0,0 +1,15 @@
+Route116: @ 848281C
+ .4byte Route116_MapAttributes
+ .4byte Route116_MapEvents
+ .4byte Route116_MapScripts
+ .4byte Route116_MapConnections
+ .2byte BGM_NEXTROAD
+ .2byte 32
+ .byte 31
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route116/map.bin b/data/maps/Route116/map.bin
new file mode 100644
index 000000000..a6e9d8843
--- /dev/null
+++ b/data/maps/Route116/map.bin
Binary files differ
diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/maps/Route116_TunnelersRestHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route116_TunnelersRestHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
new file mode 100644
index 000000000..44707b27d
--- /dev/null
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -0,0 +1,15 @@
+Route116_TunnelersRestHouse: @ 8483E6C
+ .4byte Route116_TunnelersRestHouse_MapAttributes
+ .4byte Route116_TunnelersRestHouse_MapEvents
+ .4byte Route116_TunnelersRestHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 122
+ .byte 31
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/maps/Route116_TunnelersRestHouse/map.bin
new file mode 100644
index 000000000..91e2c2019
--- /dev/null
+++ b/data/maps/Route116_TunnelersRestHouse/map.bin
@@ -0,0 +1 @@
+222!2!2!2!2222!2)2)2)2)2)2)2)2)2)2Y2NO)2)2)2)2NOD2!2VWD2)2)2D2VWD2!2)2)2)2)2)2)2)2)2)2 3333333333#33333333 \ No newline at end of file
diff --git a/data/maps/Route117/border.bin b/data/maps/Route117/border.bin
new file mode 100644
index 000000000..addb5d6ce
--- /dev/null
+++ b/data/maps/Route117/border.bin
Binary files differ
diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc
new file mode 100644
index 000000000..ab64dd3b6
--- /dev/null
+++ b/data/maps/Route117/connections.inc
@@ -0,0 +1,8 @@
+Route117_MapConnectionsList: @ 8486A54
+ connection left, 0, VERDANTURF_TOWN, 0
+ connection right, 0, MAUVILLE_CITY, 0
+
+Route117_MapConnections: @ 8486A6C
+ .4byte 0x2
+ .4byte Route117_MapConnectionsList
+
diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc
new file mode 100644
index 000000000..35e03215a
--- /dev/null
+++ b/data/maps/Route117/header.inc
@@ -0,0 +1,15 @@
+Route117: @ 8482838
+ .4byte Route117_MapAttributes
+ .4byte Route117_MapEvents
+ .4byte Route117_MapScripts
+ .4byte Route117_MapConnections
+ .2byte BGM_DOORO_X1
+ .2byte 33
+ .byte 32
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route117/map.bin b/data/maps/Route117/map.bin
new file mode 100644
index 000000000..bdeda9cd4
--- /dev/null
+++ b/data/maps/Route117/map.bin
@@ -0,0 +1,10 @@
+5670 2 000000000 0 0
+20000000000 0 00000h4s4q0u4i0j4000 2 0000040 0 0 0 00000000 0 0 0 0 0 0 00000000p4{4|4}4q0r440 0 000000 0000 0 0
+00000008IIIIII:0000000p4q0q0t4y4z40 0 00000 0 200 2004000@2 22
+222B000000
+2x4y4y4z400 00 04000000 20 000000@222 22
+2B000000000000 !"20@2222 22B000000000
+202000000000000000000000000000IIIIIIIHI0000IJ0111111100000200011111111111111100000000002202020200000000 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*10110(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100200000(1)1!1!1!1"10000 1!1*1000000020202000000000000000000000(1!1!1"1000 1"100000000II@@@@II8II000II:0 0 00200000 1!1!110K1L5L5L5M1001!1"10000000000@22 22
+222B 0 0 00 0 0 00(1!1!1"101111100 1!1*10000@222 22
+22B 0 0 0 0 0 0 0 00 1!1!1100000000001!1"100@2222 22
+2B 0 0 0 0 0 0 0 0 0(1!1!1!11111111111!1!1*100H0IIIIIIJ@@@------%0%0 0 0 0 0 0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*1000000000000000000%0%0 0 0 00000000000000000000%0%0%00000 \ No newline at end of file
diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/maps/Route117_PokemonDayCare/border.bin
new file mode 100644
index 000000000..7f603e844
--- /dev/null
+++ b/data/maps/Route117_PokemonDayCare/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
new file mode 100644
index 000000000..6d586358e
--- /dev/null
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -0,0 +1,15 @@
+Route117_PokemonDayCare: @ 8483E88
+ .4byte Route117_PokemonDayCare_MapAttributes
+ .4byte Route117_PokemonDayCare_MapEvents
+ .4byte Route117_PokemonDayCare_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 123
+ .byte 32
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/maps/Route117_PokemonDayCare/map.bin
new file mode 100644
index 000000000..bd4b64e13
--- /dev/null
+++ b/data/maps/Route117_PokemonDayCare/map.bin
@@ -0,0 +1,2 @@
+567      
+=>?$2&22&244222 22 .!.#222222222(222322222-2022222222222)*%2222222820212222222C222922%2;<22@AAAAA \ No newline at end of file
diff --git a/data/maps/Route118/border.bin b/data/maps/Route118/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route118/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc
new file mode 100644
index 000000000..fe473be52
--- /dev/null
+++ b/data/maps/Route118/connections.inc
@@ -0,0 +1,9 @@
+Route118_MapConnectionsList: @ 8486A74
+ connection up, 40, ROUTE_119, 0
+ connection left, 0, MAUVILLE_CITY, 0
+ connection right, 0, ROUTE_123, 0
+
+Route118_MapConnections: @ 8486A98
+ .4byte 0x3
+ .4byte Route118_MapConnectionsList
+
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
new file mode 100644
index 000000000..fe01c71cb
--- /dev/null
+++ b/data/maps/Route118/header.inc
@@ -0,0 +1,15 @@
+Route118: @ 8482854
+ .4byte Route118_MapAttributes
+ .4byte Route118_MapEvents
+ .4byte Route118_MapScripts
+ .4byte Route118_MapConnections
+ .2byte BGM_ROUTE_118
+ .2byte 34
+ .byte 33
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route118/map.bin b/data/maps/Route118/map.bin
new file mode 100644
index 000000000..dfd8a293d
--- /dev/null
+++ b/data/maps/Route118/map.bin
Binary files differ
diff --git a/data/maps/Route119/border.bin b/data/maps/Route119/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/maps/Route119/border.bin
Binary files differ
diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc
new file mode 100644
index 000000000..20dd27498
--- /dev/null
+++ b/data/maps/Route119/connections.inc
@@ -0,0 +1,8 @@
+Route119_MapConnectionsList: @ 8486AA0
+ connection down, -40, ROUTE_118, 0
+ connection right, 0, FORTREE_CITY, 0
+
+Route119_MapConnections: @ 8486AB8
+ .4byte 0x2
+ .4byte Route119_MapConnectionsList
+
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
new file mode 100644
index 000000000..e58aae1a8
--- /dev/null
+++ b/data/maps/Route119/header.inc
@@ -0,0 +1,15 @@
+Route119: @ 8482870
+ .4byte Route119_MapAttributes
+ .4byte Route119_MapEvents
+ .4byte Route119_MapScripts
+ .4byte Route119_MapConnections
+ .2byte BGM_GRANROAD
+ .2byte 35
+ .byte 34
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route119/map.bin b/data/maps/Route119/map.bin
new file mode 100644
index 000000000..1126455a2
--- /dev/null
+++ b/data/maps/Route119/map.bin
Binary files differ
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
new file mode 100644
index 000000000..c609c06ff
--- /dev/null
+++ b/data/maps/Route119_House/header.inc
@@ -0,0 +1,15 @@
+Route119_House: @ 8485D28
+ .4byte Route119_House_MapAttributes
+ .4byte Route119_House_MapEvents
+ .4byte Route119_House_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 59
+ .byte 34
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/maps/Route119_WeatherInstitute_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc
new file mode 100644
index 000000000..868b28371
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -0,0 +1,15 @@
+Route119_WeatherInstitute_1F: @ 8485CF0
+ .4byte Route119_WeatherInstitute_1F_MapAttributes
+ .4byte Route119_WeatherInstitute_1F_MapEvents
+ .4byte Route119_WeatherInstitute_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 271
+ .byte 34
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/maps/Route119_WeatherInstitute_1F/map.bin
new file mode 100644
index 000000000..07a4e7ebb
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_1F/map.bin
@@ -0,0 +1 @@
+__nk___k______|}~_ggkgggk,-,-gglmv2kj2z2z2k4545j222z2222tuR2sr2R2R2sj2z2z2z2w2R2R2R2R2R2R2R2r2R2R2pr2R2R2pr2R2R2`aR2R2R2`aR2R2r2R2R2xr2R2R2xr2R2^2STV2R2^2STV2R2r2U2R22w2R2R22w2R2R2R2R2R2R2U22fZ2h2R2R2R2h2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2Z2f___pR2R2R2p____________gggxR2R2R2xggggggggggggj2z2z22R2R2R22z2z2z2z2z2z2z2z2z2z2z2z2r2R2R2R2R2R2R2R2U2R2R2U2R2R2R2R2R2R2R2R2r2R2R2R2R2R2R2R2]]R2R2R2R2R2R2R2R2 \ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/maps/Route119_WeatherInstitute_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
new file mode 100644
index 000000000..d93617bfc
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -0,0 +1,15 @@
+Route119_WeatherInstitute_2F: @ 8485D0C
+ .4byte Route119_WeatherInstitute_2F_MapAttributes
+ .4byte Route119_WeatherInstitute_2F_MapEvents
+ .4byte Route119_WeatherInstitute_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 272
+ .byte 34
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/maps/Route119_WeatherInstitute_2F/map.bin
new file mode 100644
index 000000000..97953f463
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/map.bin
@@ -0,0 +1 @@
+__k___________|6}6~6_ggk,-,-,-,-,-g66gj222z2k4545454545j22z22z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2i2i2i2i2i2i2i2i2r2i2i2i22w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2i2i2i2i2i2i2i2i2r2\i2i2kr2i2i2i2i2i2i2i2i2i2i2i2i2i2i2 \ No newline at end of file
diff --git a/data/maps/Route120/border.bin b/data/maps/Route120/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/maps/Route120/border.bin
Binary files differ
diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc
new file mode 100644
index 000000000..f05e65739
--- /dev/null
+++ b/data/maps/Route120/connections.inc
@@ -0,0 +1,8 @@
+Route120_MapConnectionsList: @ 8486AC0
+ connection left, 0, FORTREE_CITY, 0
+ connection right, 80, ROUTE_121, 0
+
+Route120_MapConnections: @ 8486AD8
+ .4byte 0x2
+ .4byte Route120_MapConnectionsList
+
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
new file mode 100644
index 000000000..5b67adea4
--- /dev/null
+++ b/data/maps/Route120/header.inc
@@ -0,0 +1,15 @@
+Route120: @ 848288C
+ .4byte Route120_MapAttributes
+ .4byte Route120_MapEvents
+ .4byte Route120_MapScripts
+ .4byte Route120_MapConnections
+ .2byte BGM_DOORO_X3
+ .2byte 36
+ .byte 35
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route120/map.bin b/data/maps/Route120/map.bin
new file mode 100644
index 000000000..599e6014d
--- /dev/null
+++ b/data/maps/Route120/map.bin
Binary files differ
diff --git a/data/maps/Route121/border.bin b/data/maps/Route121/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/Route121/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc
new file mode 100644
index 000000000..47d55b65d
--- /dev/null
+++ b/data/maps/Route121/connections.inc
@@ -0,0 +1,9 @@
+Route121_MapConnectionsList: @ 8486AE0
+ connection down, 20, ROUTE_122, 0
+ connection left, -80, ROUTE_120, 0
+ connection right, -10, LILYCOVE_CITY, 0
+
+Route121_MapConnections: @ 8486B04
+ .4byte 0x3
+ .4byte Route121_MapConnectionsList
+
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
new file mode 100644
index 000000000..ac6277e86
--- /dev/null
+++ b/data/maps/Route121/header.inc
@@ -0,0 +1,15 @@
+Route121: @ 84828A8
+ .4byte Route121_MapAttributes
+ .4byte Route121_MapEvents
+ .4byte Route121_MapScripts
+ .4byte Route121_MapConnections
+ .2byte BGM_DOORO_X3
+ .2byte 37
+ .byte 36
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route121/map.bin b/data/maps/Route121/map.bin
new file mode 100644
index 000000000..cfee98f2a
--- /dev/null
+++ b/data/maps/Route121/map.bin
@@ -0,0 +1 @@
+urX011120Z6ururX011120Zururs6L5L5u6X0000000001112000Zur00000000000000000000ur{211}255X000000008999:000Zur000000000000000000||||}r 0 0 0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQRD55 0 0 0 000000 0 0 0000000110BD-EC0tyy}r00000000 0 0 0 0 0000000000 0 0 0 00Z0000000000000000000000000000 0 0 0 0 000000000000r00tz000000000 0 0 0 0 0 0 000000 0 0 0 0 0 0Z0000000000000000000000000000 0 0 0 0 0000001100000r&'rPQQQQR00PQQR00PQR00PQQQQQQQQR000000000001111111100000000 0 0 0 0 0 0 00000t00yyz00r 0 0000000000Z0000Z00X0 0 00 0 0 00Z00000000011!1!1)1)1)1)1)1*10 0 0 0PQQQQQQQQQQQR00r0000000r 0 0 0PQQQQR0PR0000Z00X0 0 0 0 0 0 00Z000011111!1!1!1*100000 0 0 0 0 0 0 0 0 0 0 00t|||||00||||z0000000r 0 0 0 0 0 0 00000Z 0 000Z0000 0 0 0 0 0 000001155)1)1)1)1)1*10011111111 0 0 0 0t|||}t00yyyy00zPQQQQQQQQQQR 0 0 00Z00000000000000555500000000t|||}tz000000000000 0 0 0 0 0000000000000 0 0 0 0 00ZPQQQQQQQQR000055t|00000000555utz00000tyy00yy0000 0 0 0 0 0 0 0000000000 0 0 0 0 00Z011111100000t|||}yyyyyy||||||||}r00000t|||}]^0^0^0_{|||| 0 0 0 0 0 0 00000000 0 0 0 0 0PQR026666200000uPPPPPPt}t||||}]^0^0^0^0_{||||||||||||||||||||||||||||||||||}p1p1p1p111P55t||}q0q0q0q0q0q0t}pPe]^0^0^0^0_dQppp1p1p1p1Pt|}t||||||}ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p155t}q0q0uppppppppPQe^0^0^0^0gpXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}pppppppppppppppppXYpppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1 \ No newline at end of file
diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/maps/Route121_SafariZoneEntrance/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/border.bin
Binary files differ
diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
new file mode 100644
index 000000000..cc17751f8
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -0,0 +1,15 @@
+Route121_SafariZoneEntrance: @ 8483EA4
+ .4byte Route121_SafariZoneEntrance_MapAttributes
+ .4byte Route121_SafariZoneEntrance_MapEvents
+ .4byte Route121_SafariZoneEntrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 124
+ .byte 36
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/maps/Route121_SafariZoneEntrance/map.bin
new file mode 100644
index 000000000..35c1badac
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/map.bin
@@ -0,0 +1 @@
+]x2p2p2p2p2p22222e2x2p2p2p2p22h2h2h2h2h22h22h2h22\2h2h2h2h2h2q2Y2Z2Y2Z2p2y2h2h2h2h22d6h2h2h2h2ababh2h2h2h2h2h2h22h2h2h222\2h2h2h2dh2h2h2x22h2h2h222h2h2h222h2h2h2\2h2h2h2q22d6h2h2t6 \ No newline at end of file
diff --git a/data/maps/Route122/border.bin b/data/maps/Route122/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route122/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc
new file mode 100644
index 000000000..2d6f53859
--- /dev/null
+++ b/data/maps/Route122/connections.inc
@@ -0,0 +1,8 @@
+Route122_MapConnectionsList: @ 8486B0C
+ connection up, -20, ROUTE_121, 0
+ connection down, -100, ROUTE_123, 0
+
+Route122_MapConnections: @ 8486B24
+ .4byte 0x2
+ .4byte Route122_MapConnectionsList
+
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
new file mode 100644
index 000000000..5c8926df4
--- /dev/null
+++ b/data/maps/Route122/header.inc
@@ -0,0 +1,15 @@
+Route122: @ 84828C4
+ .4byte Route122_MapAttributes
+ .4byte Route122_MapEvents
+ .4byte Route122_MapScripts
+ .4byte Route122_MapConnections
+ .2byte BGM_DOORO_X4
+ .2byte 38
+ .byte 37
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route122/map.bin b/data/maps/Route122/map.bin
new file mode 100644
index 000000000..1c76b0b0a
--- /dev/null
+++ b/data/maps/Route122/map.bin
Binary files differ
diff --git a/data/maps/Route123/border.bin b/data/maps/Route123/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/maps/Route123/border.bin
Binary files differ
diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc
new file mode 100644
index 000000000..ef10fb974
--- /dev/null
+++ b/data/maps/Route123/connections.inc
@@ -0,0 +1,8 @@
+Route123_MapConnectionsList: @ 8486B2C
+ connection up, 100, ROUTE_122, 0
+ connection left, 0, ROUTE_118, 0
+
+Route123_MapConnections: @ 8486B44
+ .4byte 0x2
+ .4byte Route123_MapConnectionsList
+
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
new file mode 100644
index 000000000..8c240ba9d
--- /dev/null
+++ b/data/maps/Route123/header.inc
@@ -0,0 +1,15 @@
+Route123: @ 84828E0
+ .4byte Route123_MapAttributes
+ .4byte Route123_MapEvents
+ .4byte Route123_MapScripts
+ .4byte Route123_MapConnections
+ .2byte BGM_DOORO_X4
+ .2byte 39
+ .byte 38
+ .byte 0
+ .byte 2
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route123/map.bin b/data/maps/Route123/map.bin
new file mode 100644
index 000000000..e1ab62bd7
--- /dev/null
+++ b/data/maps/Route123/map.bin
@@ -0,0 +1,2 @@
+pppppppppppppppppppppE00Gppppppppppppppppp@000000000@00hiiiiiiiiiiiij 0 0 0 0 00 0 04K1L5L5L5M1pppppppppppppppppppE00Gppppppppppppppppp@AIIIIIIII90@00000pqqqqqqqqqqqqr0 0 0 0 0 0 0 0 0 0 001111100pppppppppppppppppE00Gppppppppppppppppp@Bs6u60s6u60s6u6@00 0 0
+00@00000040xyyyyqqqqqr00 0 0 0 0 0 0 0 0 0 0000000ppppppppppppppppE00Gppppppppppppppppp@B{2}20{2}20{2}2@00@00000000 0 0xqqqqr000 0 0 0 0 0 0 0 0 0 0 00000000pppppppppppppppE00Gppppppppppppppppp@Bs6u60s6u60s6u6@0 0@0000000 0 0 0 0xyyw44444440 0 0000 0 00000 0 000000000pppppppppppppE00Gppppppppppppppppp0@B{2}20{2}20{2}2@0 !"0@00000000 0 0 0 0 04o000000000 0000000000 0 0 0 0 00pppppppppppE00Gpppppppppppppp000@3II0000II2400000@04000000000 0 0 0 0 0 00000000000000000000 0 0 0 0 0 0 00ppppppppppE00Gpppppppppppp00000@0000000000000000@000000000000%0%0 0 0 0 0000000000000400000%0 0 0 0 0 0 00ppppppppE00Gppppppppp00000000@00000000011000@000000000000000004000%0 0 0 00004444440 0 0 000000%0 0 0 0 0 0 00pppE00Gpp000000000@000000000011000@0000000000000000000 0 00000000000%0 0 00000%0 0 0 0 0 00000000000>4>4>40000>4>4>4000000000HIIIIIIIIII0110II200440444444o400000000000000 0 0 0 04000 0 0 000040001100400000000000400000000001100000000000000000000000000%0 0 0 0 0000000000000000000 0 0 00000001!1"10000000000000000000000000000000011000000000000000000004444444%0%0 0 00000000000400000000 0 0 0 0 00K1L5L5L5M100111!1!1*10000000011111111111111111111111111111111000444444o0000000 000001111011111000000 0 0 0 0 0 0 000001111111!1!1!1!1*1000000000000111111111111111111111111111111110000000000001111111000111!1!1)1*10(1)1)1!1!1111140 0 0 0 0 0 0 00011111111111!1!1!1)1)1*10040000000000000000000000000000000000000000000000000111111110000(1)1)1)1)1!1!11111100(1)1)1)1*1000000(1)1)1)1)1*10%0%0%0 0 0 0 0 000(1)1)1)1)1)1)1)1)1)1)1)1)1*100000000@4I0IIIIIIIIIII@4@4IIIII0@40000000(1)1)1)1)1)1)1*1000000000(1)1)1)1)1)1*10000000040000000000%0%0%0%0 00000000040000000000000000000000000000000000000004000000000000004000000000000000000400000000000000000000000000000000000000000000000000 \ No newline at end of file
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
new file mode 100644
index 000000000..d25fea9b1
--- /dev/null
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -0,0 +1,15 @@
+Route123_BerryMastersHouse: @ 8485CD4
+ .4byte Route123_BerryMastersHouse_MapAttributes
+ .4byte Route123_BerryMastersHouse_MapEvents
+ .4byte Route123_BerryMastersHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 60
+ .byte 38
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route124/border.bin b/data/maps/Route124/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route124/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc
new file mode 100644
index 000000000..72e358f4c
--- /dev/null
+++ b/data/maps/Route124/connections.inc
@@ -0,0 +1,11 @@
+Route124_MapConnectionsList: @ 8486B4C
+ connection down, 0, ROUTE_126, 0
+ connection left, 10, LILYCOVE_CITY, 0
+ connection right, 0, ROUTE_125, 0
+ connection right, 40, MOSSDEEP_CITY, 0
+ connection dive, 0, UNDERWATER_1, 0
+
+Route124_MapConnections: @ 8486B88
+ .4byte 0x5
+ .4byte Route124_MapConnectionsList
+
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
new file mode 100644
index 000000000..bdd54bf00
--- /dev/null
+++ b/data/maps/Route124/header.inc
@@ -0,0 +1,15 @@
+Route124: @ 84828FC
+ .4byte Route124_MapAttributes
+ .4byte Route124_MapEvents
+ .4byte Route124_MapScripts
+ .4byte Route124_MapConnections
+ .2byte BGM_DOORO_X3
+ .2byte 40
+ .byte 39
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route124/map.bin b/data/maps/Route124/map.bin
new file mode 100644
index 000000000..acd4a65fb
--- /dev/null
+++ b/data/maps/Route124/map.bin
Binary files differ
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/maps/Route124_DivingTreasureHuntersHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/border.bin
Binary files differ
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
new file mode 100644
index 000000000..438ceff8a
--- /dev/null
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -0,0 +1,15 @@
+Route124_DivingTreasureHuntersHouse: @ 8485D44
+ .4byte Route124_DivingTreasureHuntersHouse_MapAttributes
+ .4byte Route124_DivingTreasureHuntersHouse_MapEvents
+ .4byte Route124_DivingTreasureHuntersHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_MINAMO
+ .2byte 301
+ .byte 39
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/maps/Route124_DivingTreasureHuntersHouse/map.bin
new file mode 100644
index 000000000..8f1f6cbef
--- /dev/null
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.bin
@@ -0,0 +1 @@
+yzX  g 22222$2$2$2$2$29252626262626272#2#292=2H6I6>?#2#292=2P6Q6>?#2#292E2F2F2F2F2F2G#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6 \ No newline at end of file
diff --git a/data/maps/Route125/border.bin b/data/maps/Route125/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route125/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc
new file mode 100644
index 000000000..1abbf0979
--- /dev/null
+++ b/data/maps/Route125/connections.inc
@@ -0,0 +1,9 @@
+Route125_MapConnectionsList: @ 8486B90
+ connection down, 0, MOSSDEEP_CITY, 0
+ connection left, 0, ROUTE_124, 0
+ connection dive, 0, UNDERWATER_7, 0
+
+Route125_MapConnections: @ 8486BB4
+ .4byte 0x3
+ .4byte Route125_MapConnectionsList
+
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
new file mode 100644
index 000000000..6f81fee85
--- /dev/null
+++ b/data/maps/Route125/header.inc
@@ -0,0 +1,15 @@
+Route125: @ 8482918
+ .4byte Route125_MapAttributes
+ .4byte Route125_MapEvents
+ .4byte Route125_MapScripts
+ .4byte Route125_MapConnections
+ .2byte BGM_DOORO_X3
+ .2byte 41
+ .byte 40
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route125/map.bin b/data/maps/Route125/map.bin
new file mode 100644
index 000000000..078f2713d
--- /dev/null
+++ b/data/maps/Route125/map.bin
Binary files differ
diff --git a/data/maps/Route126/border.bin b/data/maps/Route126/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route126/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc
new file mode 100644
index 000000000..c2beee1d8
--- /dev/null
+++ b/data/maps/Route126/connections.inc
@@ -0,0 +1,9 @@
+Route126_MapConnectionsList: @ 8486BBC
+ connection up, 0, ROUTE_124, 0
+ connection right, 0, ROUTE_127, 0
+ connection dive, 0, UNDERWATER_2, 0
+
+Route126_MapConnections: @ 8486BE0
+ .4byte 0x3
+ .4byte Route126_MapConnectionsList
+
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
new file mode 100644
index 000000000..679d16cfe
--- /dev/null
+++ b/data/maps/Route126/header.inc
@@ -0,0 +1,15 @@
+Route126: @ 8482934
+ .4byte Route126_MapAttributes
+ .4byte Route126_MapEvents
+ .4byte Route126_MapScripts
+ .4byte Route126_MapConnections
+ .2byte BGM_DOORO_X3
+ .2byte 42
+ .byte 41
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route126/map.bin b/data/maps/Route126/map.bin
new file mode 100644
index 000000000..2d684cf64
--- /dev/null
+++ b/data/maps/Route126/map.bin
Binary files differ
diff --git a/data/maps/Route127/border.bin b/data/maps/Route127/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route127/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc
new file mode 100644
index 000000000..2b4136c3c
--- /dev/null
+++ b/data/maps/Route127/connections.inc
@@ -0,0 +1,10 @@
+Route127_MapConnectionsList: @ 8486BE8
+ connection up, 0, MOSSDEEP_CITY, 0
+ connection down, 0, ROUTE_128, 0
+ connection left, 0, ROUTE_126, 0
+ connection dive, 0, UNDERWATER_3, 0
+
+Route127_MapConnections: @ 8486C18
+ .4byte 0x4
+ .4byte Route127_MapConnectionsList
+
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
new file mode 100644
index 000000000..2ed691c4d
--- /dev/null
+++ b/data/maps/Route127/header.inc
@@ -0,0 +1,15 @@
+Route127: @ 8482950
+ .4byte Route127_MapAttributes
+ .4byte Route127_MapEvents
+ .4byte Route127_MapScripts
+ .4byte Route127_MapConnections
+ .2byte BGM_DOORO_X3
+ .2byte 43
+ .byte 42
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route127/map.bin b/data/maps/Route127/map.bin
new file mode 100644
index 000000000..fa44f9960
--- /dev/null
+++ b/data/maps/Route127/map.bin
Binary files differ
diff --git a/data/maps/Route128/border.bin b/data/maps/Route128/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route128/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc
new file mode 100644
index 000000000..5355677de
--- /dev/null
+++ b/data/maps/Route128/connections.inc
@@ -0,0 +1,10 @@
+Route128_MapConnectionsList: @ 8486C20
+ connection up, 0, ROUTE_127, 0
+ connection down, 0, ROUTE_129, 0
+ connection right, -40, EVER_GRANDE_CITY, 0
+ connection dive, 0, UNDERWATER_4, 0
+
+Route128_MapConnections: @ 8486C50
+ .4byte 0x4
+ .4byte Route128_MapConnectionsList
+
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
new file mode 100644
index 000000000..976bedb11
--- /dev/null
+++ b/data/maps/Route128/header.inc
@@ -0,0 +1,15 @@
+Route128: @ 848296C
+ .4byte Route128_MapAttributes
+ .4byte Route128_MapEvents
+ .4byte Route128_MapScripts
+ .4byte Route128_MapConnections
+ .2byte BGM_DOORO_X3
+ .2byte 44
+ .byte 43
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route128/map.bin b/data/maps/Route128/map.bin
new file mode 100644
index 000000000..fae8a373e
--- /dev/null
+++ b/data/maps/Route128/map.bin
Binary files differ
diff --git a/data/maps/Route129/border.bin b/data/maps/Route129/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route129/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc
new file mode 100644
index 000000000..f373faff2
--- /dev/null
+++ b/data/maps/Route129/connections.inc
@@ -0,0 +1,9 @@
+Route129_MapConnectionsList: @ 8486C58
+ connection up, 0, ROUTE_128, 0
+ connection left, 0, ROUTE_130, 0
+ connection dive, 0, UNDERWATER_5, 0
+
+Route129_MapConnections: @ 8486C7C
+ .4byte 0x3
+ .4byte Route129_MapConnectionsList
+
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
new file mode 100644
index 000000000..68221e873
--- /dev/null
+++ b/data/maps/Route129/header.inc
@@ -0,0 +1,15 @@
+Route129: @ 8482988
+ .4byte Route129_MapAttributes
+ .4byte Route129_MapEvents
+ .4byte Route129_MapScripts
+ .4byte Route129_MapConnections
+ .2byte BGM_GRANROAD
+ .2byte 45
+ .byte 44
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route129/map.bin b/data/maps/Route129/map.bin
new file mode 100644
index 000000000..8d09787fd
--- /dev/null
+++ b/data/maps/Route129/map.bin
Binary files differ
diff --git a/data/maps/Route130/border.bin b/data/maps/Route130/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route130/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc
new file mode 100644
index 000000000..f4972fa38
--- /dev/null
+++ b/data/maps/Route130/connections.inc
@@ -0,0 +1,8 @@
+Route130_MapConnectionsList: @ 8486C84
+ connection left, 0, ROUTE_131, 0
+ connection right, 0, ROUTE_129, 0
+
+Route130_MapConnections: @ 8486C9C
+ .4byte 0x2
+ .4byte Route130_MapConnectionsList
+
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
new file mode 100644
index 000000000..de1acbc4a
--- /dev/null
+++ b/data/maps/Route130/header.inc
@@ -0,0 +1,15 @@
+Route130: @ 84829A4
+ .4byte Route130_MapAttributes
+ .4byte Route130_MapEvents
+ .4byte Route130_MapScripts
+ .4byte Route130_MapConnections
+ .2byte BGM_GRANROAD
+ .2byte 263
+ .byte 45
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route130/map.bin b/data/maps/Route130/map.bin
new file mode 100644
index 000000000..b06fa74dc
--- /dev/null
+++ b/data/maps/Route130/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppprqkllmqvppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{qklllmqvppppuvq{|||}qt}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqkklmmqvppp}~pyqqqtyppu{{vppyppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~qq{qqqt}qtppXYpppuvppppppuvyypXYpp}~ppppppXYpppppppppppppppppppppPQppp}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQpyypp}~q|ppppppppppPQppppXYppPQpppppppu{q{vpppppppppppppppuvu{qq|pppXYppppppppuvppppyppppppppppXYppppppppXYpppppuvqqqqvpppppppppppppp}~zqqqtppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~pyyyyyuvppppppu{{vpuvpyyyuvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{kmv}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuvyyppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppztppppppp}~pppppppppppppppppppppppp}~PQyyqqtp}~ppppppppppppppppppppppppp}~ppppppppppppppppppppppppppppppppppppppXYpppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppppuvy}~pppppppppppppppppppppppppppppu{{qqqqqqv}~qqtpPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/Route131/border.bin b/data/maps/Route131/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route131/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc
new file mode 100644
index 000000000..4470802dd
--- /dev/null
+++ b/data/maps/Route131/connections.inc
@@ -0,0 +1,8 @@
+Route131_MapConnectionsList: @ 8486CA4
+ connection left, 0, PACIFIDLOG_TOWN, 0
+ connection right, 0, ROUTE_130, 0
+
+Route131_MapConnections: @ 8486CBC
+ .4byte 0x2
+ .4byte Route131_MapConnectionsList
+
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
new file mode 100644
index 000000000..38769c3e3
--- /dev/null
+++ b/data/maps/Route131/header.inc
@@ -0,0 +1,15 @@
+Route131: @ 84829C0
+ .4byte Route131_MapAttributes
+ .4byte Route131_MapEvents
+ .4byte Route131_MapScripts
+ .4byte Route131_MapConnections
+ .2byte BGM_GRANROAD
+ .2byte 47
+ .byte 46
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route131/map.bin b/data/maps/Route131/map.bin
new file mode 100644
index 000000000..096d6e116
--- /dev/null
+++ b/data/maps/Route131/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut|}ppVOOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqqqqt||}qqt}upppVOOOOOOOOOOOOOOOOOVppppppppppppppppp||||||||}qqqt|}t}pppppppVOOOOOOOOOOOOOOOOVpppppppppppppppppqqqqqt|||}qt}pppppppVOOOOOOOOOOOOOOOVppppppppppppppppppqqt||}qqqt|}ppppppppVOOOOOOOOOOOOOOOVpppppppppppppppppp||}qt|||}ppuvppppppVOOOOOOOOOOOOOOVpppppppppppppppppp|}uvpu{vp}~ppppppVOOOOOOOOOOOOOVpppppppppppppppppppZ[ppppp}~pzq|ppppppppppVOOOOOOOOOOOOVpppppppPQpppppppppppXYppppuvppppypppppppuvpVOOOOOOOOOOOOVppuvu{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~pVOOOOOOOOOOOVpuv}~zq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vVOOOOOOOOOOVp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|VOOOOOOOOOVpuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppypVOOOOOOOOVu|pppuvpppuqqvpppppppppppXYppppp}~pppXYppppppuvpVOOOOOOVpzq|ppp}~PQpyyyyPQppppppppppppppppppppuvppppppp}~uvVVVVVVuvypppppXYuvppPQpXYu{pppppppppppppppppp}~u{vpppppp}~ppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppPQppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|pppppXYpp}~ppppppppppppppppppppppppppppppppp}~pppppppPQzqqq|ppppppPQpppPQppppppppppppppppppppppppppppppppppppppppXYyyyppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vppp}~uvpppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvpppp}~ppuqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/Route132/border.bin b/data/maps/Route132/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route132/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc
new file mode 100644
index 000000000..0e18aa2f2
--- /dev/null
+++ b/data/maps/Route132/connections.inc
@@ -0,0 +1,8 @@
+Route132_MapConnectionsList: @ 8486CC4
+ connection left, 0, ROUTE_133, 0
+ connection right, 0, PACIFIDLOG_TOWN, 0
+
+Route132_MapConnections: @ 8486CDC
+ .4byte 0x2
+ .4byte Route132_MapConnectionsList
+
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
new file mode 100644
index 000000000..bcb699543
--- /dev/null
+++ b/data/maps/Route132/header.inc
@@ -0,0 +1,15 @@
+Route132: @ 84829DC
+ .4byte Route132_MapAttributes
+ .4byte Route132_MapEvents
+ .4byte Route132_MapScripts
+ .4byte Route132_MapConnections
+ .2byte BGM_GRANROAD
+ .2byte 48
+ .byte 47
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route132/map.bin b/data/maps/Route132/map.bin
new file mode 100644
index 000000000..3250c0429
--- /dev/null
+++ b/data/maps/Route132/map.bin
Binary files differ
diff --git a/data/maps/Route133/border.bin b/data/maps/Route133/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route133/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc
new file mode 100644
index 000000000..b133d8804
--- /dev/null
+++ b/data/maps/Route133/connections.inc
@@ -0,0 +1,8 @@
+Route133_MapConnectionsList: @ 8486CE4
+ connection left, 0, ROUTE_134, 0
+ connection right, 0, ROUTE_132, 0
+
+Route133_MapConnections: @ 8486CFC
+ .4byte 0x2
+ .4byte Route133_MapConnectionsList
+
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
new file mode 100644
index 000000000..070113974
--- /dev/null
+++ b/data/maps/Route133/header.inc
@@ -0,0 +1,15 @@
+Route133: @ 84829F8
+ .4byte Route133_MapAttributes
+ .4byte Route133_MapEvents
+ .4byte Route133_MapScripts
+ .4byte Route133_MapConnections
+ .2byte BGM_GRANROAD
+ .2byte 49
+ .byte 48
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route133/map.bin b/data/maps/Route133/map.bin
new file mode 100644
index 000000000..1d4e74f73
--- /dev/null
+++ b/data/maps/Route133/map.bin
@@ -0,0 +1 @@
+ppppuvuvPQppppPQppppppuvppppPQPQppppuvPQPQPQpppPQppPQppuvPQuvppppPQPQuvPQuvpppPQPQpp}~}~XYppuvXYPQuvPQ}~PQuvXYXYppPQ}~XYXYXYpuvXYPQXYPQ}~XY}~PQuvXYXY}~XY}~PQpXYXYuvppppppuv}~ppXY}~XYccXY}~ppppPQXYpppppppPQ}~ppXYppXYccppppXY}~cccccpppppXYPQppp}~pppppp}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQcccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2WcccccXYcccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2111_ccccPQccccccccccccccccccccccccccccc^111111111111_ccccccc}~11111111111^WWWW_OgccccXYccccccccccccccccccccfGGN111111111_ccccVF2F2F2F21111^WWWWWWWtyo_cccccccccccccccccccccccccccccfGGN111111_cccc^^W_11111ftyyo11_cccccccccccccccccccVF2F2F2WccccccccccfGN1111_cccV>2f_11^Wtyyyyyo111OGgcccccccccccccccccccc^111?2F2F2WccccccccfGGGGgccc^^WWtyyo1111111OGgccccccccccccccccccfN11111?2F2F2WcccccccccccccV>2f1111111OGGgcccccu{{{{{{{{{{{{tccfN1111111?2F2F2Wccccccccccc^1ftyyyyo1OGGGGGgcccu{{{{tccfN111111111?2F2F2Wccccccccc^1nyyo111111_ccccccccutyyyyyyyyyy{tccfN11111111111?2F2F2Wccccccccccc^1111111OGGGgcccccu{{tyy$1$1$1$1$1$1$1$1$1$1yyy|ccfN1111111111111_cccccccccccfGN1111Ogccccccccccccu{tyyy$1111111$1$111111$1$1$1tccccfGGGGGGGGGGGGGgccccccccccfGGGGgcccccccccccccztyo11111111111111nytcccccccccccccccccccPQcccccccccccccccccccccccccc}~ppp}y~cccccccccccccccccccXYcccccccccccccccccccccccccccppppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccccPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{tPQXYccXYcPQPQXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYppppputyyyyytyyyyy~XYcccccccXYXYppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{to1111n1111?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{tyyo111111no111111?2WccpppppppppppPQXYO1O1O1O1O11_cccccccccuv}~llllcccccccccccpputo11111^_111111^_111_cppppppppppppXYO1O1O1O1O1O1O11_ccccccccc}~llllccccccccccccccc}yyyo11111no1111111fg^_1_ccpppppppppppPQO1O1O1O1O1O1O11_cccccccccclllccccccccccccccccccccc^1111^_111111111nofg1_cccppppppppppXYO1O1O1O1O1O1O11_ccccccccccccccccccccccccccccccccccfGN11fg1111111111no1_cccccppppppccPQO1O1O1O1O1O11_cccccccccccccccccccccccccccccccccccc^11no1111OGGGN1111OgcccccccppPQccXYPQO1O1O1O11_cccccccccc\\\cccccccccccccccccccccccfN11111OGgcccfGGGGgccccccccccXYccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfN111OgccccccccccccccccccccccccccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYppccuvccccccccccuvpp}~XYccccccPQccccPQpppppPQuvccccccccccpppuvppPQuv}~ppppppppppPQPQ}~ccccccuvPQ}~ppppuvccccccXYuvPQXYpppppXY}~PQccccppPQuvp}~PQXY}~PQppuvppppPQXYXYppPQPQuv}~XYpppppp}~uvuvPQuv}~XYpPQuvPQuvppXYPQuvuvXY}~PQpXYppppXYuv}~PQuvXYppppppXYXY}~pppppppppppp}~}~XY}~pppppXY}~XY}~ppppXY}~}~ppppXYppppppppp}~ppXY}~pppppp \ No newline at end of file
diff --git a/data/maps/Route134/border.bin b/data/maps/Route134/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/Route134/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc
new file mode 100644
index 000000000..8429378e4
--- /dev/null
+++ b/data/maps/Route134/connections.inc
@@ -0,0 +1,8 @@
+Route134_MapConnectionsList: @ 8486D04
+ connection left, 0, SLATEPORT_CITY, 0
+ connection right, 0, ROUTE_133, 0
+
+Route134_MapConnections: @ 8486D1C
+ .4byte 0x2
+ .4byte Route134_MapConnectionsList
+
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
new file mode 100644
index 000000000..4dac7fca7
--- /dev/null
+++ b/data/maps/Route134/header.inc
@@ -0,0 +1,15 @@
+Route134: @ 8482A14
+ .4byte Route134_MapAttributes
+ .4byte Route134_MapEvents
+ .4byte Route134_MapScripts
+ .4byte Route134_MapConnections
+ .2byte BGM_GRANROAD
+ .2byte 50
+ .byte 49
+ .byte 0
+ .byte 2
+ .byte 6
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Route134/map.bin b/data/maps/Route134/map.bin
new file mode 100644
index 000000000..7b78a2d3c
--- /dev/null
+++ b/data/maps/Route134/map.bin
Binary files differ
diff --git a/data/maps/RustboroCity/border.bin b/data/maps/RustboroCity/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/RustboroCity/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc
new file mode 100644
index 000000000..01e5aff35
--- /dev/null
+++ b/data/maps/RustboroCity/connections.inc
@@ -0,0 +1,9 @@
+RustboroCity_MapConnectionsList: @ 8486758
+ connection up, 0, ROUTE_115, 0
+ connection down, 0, ROUTE_104, 0
+ connection right, 0, ROUTE_116, 0
+
+RustboroCity_MapConnections: @ 848677C
+ .4byte 0x3
+ .4byte RustboroCity_MapConnectionsList
+
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
new file mode 100644
index 000000000..cdff5a143
--- /dev/null
+++ b/data/maps/RustboroCity/header.inc
@@ -0,0 +1,15 @@
+RustboroCity: @ 848250C
+ .4byte RustboroCity_MapAttributes
+ .4byte RustboroCity_MapEvents
+ .4byte RustboroCity_MapScripts
+ .4byte RustboroCity_MapConnections
+ .2byte BGM_GOTOWN
+ .2byte 4
+ .byte 10
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/RustboroCity/map.bin b/data/maps/RustboroCity/map.bin
new file mode 100644
index 000000000..06736e47e
--- /dev/null
+++ b/data/maps/RustboroCity/map.bin
Binary files differ
diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/maps/RustboroCity_CuttersHouse/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_CuttersHouse/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
new file mode 100644
index 000000000..95ce57873
--- /dev/null
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_CuttersHouse: @ 8483478
+ .4byte RustboroCity_CuttersHouse_MapAttributes
+ .4byte RustboroCity_CuttersHouse_MapEvents
+ .4byte RustboroCity_CuttersHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 98
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/maps/RustboroCity_CuttersHouse/map.bin
new file mode 100644
index 000000000..5515d00cf
--- /dev/null
+++ b/data/maps/RustboroCity_CuttersHouse/map.bin
@@ -0,0 +1 @@
+yzfg8898x88no@@A@VW33v3w3+3+3+3+33^3_3+3{3|3|3}3,3,3,3,3,3,3+33>2>23,3,3,3j7k7E3+33>2>23,3,3D3r7s7E3+33333,3,3,3,3,3,3F3G3,3,3,3,3,3,3,3,3,3N7O7,3,3,3LM,3,3,3,3 \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/maps/RustboroCity_DevonCorp_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
new file mode 100644
index 000000000..68391354e
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_1F: @ 8483344
+ .4byte RustboroCity_DevonCorp_1F_MapAttributes
+ .4byte RustboroCity_DevonCorp_1F_MapEvents
+ .4byte RustboroCity_DevonCorp_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 92
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/maps/RustboroCity_DevonCorp_1F/map.bin
new file mode 100644
index 000000000..09f86a742
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_1F/map.bin
@@ -0,0 +1 @@
+33333333333333333333333333333333333333333333333333333333333333333333333333333333322333333333333 \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/maps/RustboroCity_DevonCorp_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
new file mode 100644
index 000000000..83a317006
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_2F: @ 8483360
+ .4byte RustboroCity_DevonCorp_2F_MapAttributes
+ .4byte RustboroCity_DevonCorp_2F_MapEvents
+ .4byte RustboroCity_DevonCorp_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 93
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/maps/RustboroCity_DevonCorp_2F/map.bin
new file mode 100644
index 000000000..03985c572
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/map.bin
@@ -0,0 +1 @@
+33333333333333333333333333333333333337773377337733773333377333733333333333333333333333333333333333377337733773333333333333333333333 \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/maps/RustboroCity_DevonCorp_3F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc
new file mode 100644
index 000000000..4c40570f6
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_3F: @ 848337C
+ .4byte RustboroCity_DevonCorp_3F_MapAttributes
+ .4byte RustboroCity_DevonCorp_3F_MapEvents
+ .4byte RustboroCity_DevonCorp_3F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 269
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/maps/RustboroCity_DevonCorp_3F/map.bin
new file mode 100644
index 000000000..5a55ee4ab
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/map.bin
@@ -0,0 +1 @@
+IJK33333333Q3R3S3333333333333333333333333332333HC333B33333PC333C33233C333C33333333333333333333333333333333333 \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/maps/RustboroCity_Flat1_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc
new file mode 100644
index 000000000..b3bba8806
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat1_1F: @ 8483424
+ .4byte RustboroCity_Flat1_1F_MapAttributes
+ .4byte RustboroCity_Flat1_1F_MapEvents
+ .4byte RustboroCity_Flat1_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 313
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/maps/RustboroCity_Flat1_1F/map.bin
new file mode 100644
index 000000000..017298e71
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_1F/map.bin
@@ -0,0 +1 @@
+8()*:888:8x88:H0 2B@@@B@VWBP3+3+3+3+3+3+3+3+3+33^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,332H6I623+3p7q7E3,3,3,3,33>2P6Q623F3G3,3,3,3,3,3,3333333N7O7,3,3,3,3LM,3,3,3,3,3,3 \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/maps/RustboroCity_Flat1_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
new file mode 100644
index 000000000..2f17773b4
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat1_2F: @ 8483440
+ .4byte RustboroCity_Flat1_2F_MapAttributes
+ .4byte RustboroCity_Flat1_2F_MapEvents
+ .4byte RustboroCity_Flat1_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 314
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/maps/RustboroCity_Flat1_2F/map.bin
new file mode 100644
index 000000000..936907d32
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_2F/map.bin
@@ -0,0 +1 @@
+8()*:888:8888:@02B@@@BT7UIB+3+3+3+3+3+3+3+3+3\3?3]3Q3+3+3,3,3,3,3,3,3,3,3,3,3,3,3,3+3D3~777E3,3{|||},3,3+3,3777E3,3:2!7/3,3,3+3G3G3,3,3,3,333,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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc
new file mode 100644
index 000000000..933ce6a3c
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_1F: @ 84834B0
+ .4byte RustboroCity_Flat2_1F_MapAttributes
+ .4byte RustboroCity_Flat2_1F_MapEvents
+ .4byte RustboroCity_Flat2_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 294
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/maps/RustboroCity_Flat2_1F/map.bin
new file mode 100644
index 000000000..0f6829f9c
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_1F/map.bin
Binary files differ
diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/maps/RustboroCity_Flat2_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
new file mode 100644
index 000000000..aa2176400
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_2F: @ 84834CC
+ .4byte RustboroCity_Flat2_2F_MapAttributes
+ .4byte RustboroCity_Flat2_2F_MapEvents
+ .4byte RustboroCity_Flat2_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 295
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/maps/RustboroCity_Flat2_2F/map.bin
new file mode 100644
index 000000000..9f3750fb4
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_2F/map.bin
Binary files differ
diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/maps/RustboroCity_Flat2_3F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
new file mode 100644
index 000000000..c173ac577
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_Flat2_3F: @ 84834E8
+ .4byte RustboroCity_Flat2_3F_MapAttributes
+ .4byte RustboroCity_Flat2_3F_MapEvents
+ .4byte RustboroCity_Flat2_3F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 296
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/maps/RustboroCity_Flat2_3F/map.bin
new file mode 100644
index 000000000..2112fe799
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_3F/map.bin
Binary files differ
diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/maps/RustboroCity_Gym/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/RustboroCity_Gym/border.bin
Binary files differ
diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc
new file mode 100644
index 000000000..0eedfdd09
--- /dev/null
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_Gym: @ 8483398
+ .4byte RustboroCity_Gym_MapAttributes
+ .4byte RustboroCity_Gym_MapEvents
+ .4byte RustboroCity_Gym_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 94
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/maps/RustboroCity_Gym/map.bin
new file mode 100644
index 000000000..4451674a7
--- /dev/null
+++ b/data/maps/RustboroCity_Gym/map.bin
@@ -0,0 +1,2 @@
+ '226 2
+2 2 6222226222622722222222222222222222222#/22 !!!!!!"#22()))))"#2272022,2.22 "#222#/2 "/2 "#22212(*2 "#2()*222-242%"#222.222(!!"#2 "/2272()"#2 $5222322 "+2()*/2(*/2(*227222272227222222222222222&/22222&/222272220027222 \ No newline at end of file
diff --git a/data/maps/RustboroCity_House1/border.bin b/data/maps/RustboroCity_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc
new file mode 100644
index 000000000..c07cc459a
--- /dev/null
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_House1: @ 848345C
+ .4byte RustboroCity_House1_MapAttributes
+ .4byte RustboroCity_House1_MapEvents
+ .4byte RustboroCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 97
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_House1/map.bin b/data/maps/RustboroCity_House1/map.bin
new file mode 100644
index 000000000..a14fc0405
--- /dev/null
+++ b/data/maps/RustboroCity_House1/map.bin
@@ -0,0 +1 @@
+888188::88888CJK@@BB@TUICN7R3S363+3+3+3+3+3\3]3Q3N7+3,3,3,3,3,3,3,3{3|3|3}3,3+3,3D3~777E3,33>2>23,3+3,3D3777,3,33333,3F3,3,3,3,3,3,3,3,3,3,3,3G3N7,3,3,3,3LM,3,3,3,3,3O7 \ No newline at end of file
diff --git a/data/maps/RustboroCity_House2/border.bin b/data/maps/RustboroCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/RustboroCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc
new file mode 100644
index 000000000..14dabb2e8
--- /dev/null
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_House2: @ 8483494
+ .4byte RustboroCity_House2_MapAttributes
+ .4byte RustboroCity_House2_MapEvents
+ .4byte RustboroCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 96
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_House2/map.bin b/data/maps/RustboroCity_House2/map.bin
new file mode 100644
index 000000000..5a53bbc77
--- /dev/null
+++ b/data/maps/RustboroCity_House2/map.bin
@@ -0,0 +1 @@
+yz89888819fgIA@@JKAno33Q3+3+3+3R3S363+3v3w3+3,3,3{3|3|3|3|3}3,3,3,3+3,3,332H^23,3,3,3+3,3,332PQ23,3,3,3+3,3,3333333,3,3,3F3,3,3,3,3,3,3,3,3,3,3G3N,3,3,3,3LM,3,3,3,3O \ No newline at end of file
diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc
new file mode 100644
index 000000000..6d1c4dfd4
--- /dev/null
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_House3: @ 8483504
+ .4byte RustboroCity_House3_MapAttributes
+ .4byte RustboroCity_House3_MapEvents
+ .4byte RustboroCity_House3_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOTOWN
+ .2byte 96
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc
new file mode 100644
index 000000000..28751a53f
--- /dev/null
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_Mart: @ 8483408
+ .4byte RustboroCity_Mart_MapAttributes
+ .4byte RustboroCity_Mart_MapEvents
+ .4byte RustboroCity_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..0069de670
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_PokemonCenter_1F: @ 84833D0
+ .4byte RustboroCity_PokemonCenter_1F_MapAttributes
+ .4byte RustboroCity_PokemonCenter_1F_MapEvents
+ .4byte RustboroCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..328472b06
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_PokemonCenter_2F: @ 84833EC
+ .4byte RustboroCity_PokemonCenter_2F_MapAttributes
+ .4byte RustboroCity_PokemonCenter_2F_MapEvents
+ .4byte RustboroCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/maps/RustboroCity_PokemonSchool/border.bin
new file mode 100644
index 000000000..8f857616b
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc
new file mode 100644
index 000000000..03b02a3fa
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -0,0 +1,15 @@
+RustboroCity_PokemonSchool: @ 84833B4
+ .4byte RustboroCity_PokemonSchool_MapAttributes
+ .4byte RustboroCity_PokemonSchool_MapEvents
+ .4byte RustboroCity_PokemonSchool_MapScripts
+ .4byte 0x0
+ .2byte BGM_P_SCHOOL
+ .2byte 95
+ .byte 10
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/maps/RustboroCity_PokemonSchool/map.bin
new file mode 100644
index 000000000..3f3b183d3
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/map.bin
Binary files differ
diff --git a/data/maps/RusturfTunnel/border.bin b/data/maps/RusturfTunnel/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/RusturfTunnel/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
new file mode 100644
index 000000000..95a3c66e7
--- /dev/null
+++ b/data/maps/RusturfTunnel/header.inc
@@ -0,0 +1,15 @@
+RusturfTunnel: @ 8483F30
+ .4byte RusturfTunnel_MapAttributes
+ .4byte RusturfTunnel_MapEvents
+ .4byte RusturfTunnel_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 129
+ .byte 60
+ .byte 0
+ .byte 6
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/RusturfTunnel/map.bin b/data/maps/RusturfTunnel/map.bin
new file mode 100644
index 000000000..87ce9bc73
--- /dev/null
+++ b/data/maps/RusturfTunnel/map.bin
@@ -0,0 +1,2 @@
+3!43!!!4222222@<A@<<<A22222222222222222222222222222222222222222222222222222222222222222                 
+2222222223!!4222222222234@<<A3422222222222@A@A22222222222 PQR   3!422         @<A2223!!4      "22222222234@<<A342222222222   "@A   @A2222222222222 "  2222222222222      2222     PQR  342222            @A2222            222   PQR  3!4        3!4@<A           @<A \ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/border.bin b/data/maps/SSTidalCorridor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SSTidalCorridor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
new file mode 100644
index 000000000..48ef241d3
--- /dev/null
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -0,0 +1,15 @@
+SSTidalCorridor: @ 8484F0C
+ .4byte SSTidalCorridor_MapAttributes
+ .4byte SSTidalCorridor_MapEvents
+ .4byte SSTidalCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_BOAT
+ .2byte 277
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SSTidalCorridor/map.bin b/data/maps/SSTidalCorridor/map.bin
new file mode 100644
index 000000000..f8cf1725d
--- /dev/null
+++ b/data/maps/SSTidalCorridor/map.bin
@@ -0,0 +1 @@
+2222222222222222 6222222222222222222201111111111222222011111111112222220111111111122222201111111111222222%#$"#$"#$"#&22222-+6{*+6{*+6{*+622222222222222222222 22222222222222222 \ No newline at end of file
diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/maps/SSTidalLowerDeck/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
new file mode 100644
index 000000000..b872e0cf8
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -0,0 +1,15 @@
+SSTidalLowerDeck: @ 8484F28
+ .4byte SSTidalLowerDeck_MapAttributes
+ .4byte SSTidalLowerDeck_MapEvents
+ .4byte SSTidalLowerDeck_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_BOAT
+ .2byte 278
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/maps/SSTidalLowerDeck/map.bin
new file mode 100644
index 000000000..059ce30fe
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/map.bin
@@ -0,0 +1 @@
+22222222 22 22 22 2 2 22 2222 2222 22222 2 2 22222222 222 2222 2 2 22222 2 22222 2 2222222222222222 2 22 2 2 2 2 2 2 2 2 2 2 2 2 2 2222222222 222 222 2 22222 2662222222 2 \ No newline at end of file
diff --git a/data/maps/SSTidalRooms/border.bin b/data/maps/SSTidalRooms/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SSTidalRooms/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc
new file mode 100644
index 000000000..94af1030f
--- /dev/null
+++ b/data/maps/SSTidalRooms/header.inc
@@ -0,0 +1,15 @@
+SSTidalRooms: @ 8484F44
+ .4byte SSTidalRooms_MapAttributes
+ .4byte SSTidalRooms_MapEvents
+ .4byte SSTidalRooms_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_BOAT
+ .2byte 279
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SSTidalRooms/map.bin b/data/maps/SSTidalRooms/map.bin
new file mode 100644
index 000000000..6103ad0c2
--- /dev/null
+++ b/data/maps/SSTidalRooms/map.bin
@@ -0,0 +1 @@
+6@kcmE@kcmE@kc''@kcmE7>HsuMHsuMHs////uM?>PQ:2;2;2TUPQ:2;2;2TUPQ:2;2;2;2;2;2;2;2TU?>XY=28282\]XY=28282\]XY=282828282828282\]?>:;2<28282;2;2:;2<28282;2;2:2;2<282828282w682828282;2;2?>=2828282828282w68282VW8282=282`2VWa282=28282828282a2?>=2828282VW82=282`2^_a282=282`2^_a282=282828282VW?>=28282`2^_b=2828282828282=2828282b8282=2828282`2^_?6@klvlmElvllCDE@lvlvmE@kv'vmE7>Hst~tuMt~ttKij/t~t~uMHs~/~//?>PQ:2;2;2TU:2;2;2;2;2qr66;2;2;2TUPQ:2;2;2;2|2?>XY=28282\]=2VW8282yz828282\]XY=2VppW?>:;2<28282;2|2=2^_a282;256=282828282;2;2h;2<2^xx_?>=2828282828282=2828282828282=2828282828282=28282`2828282?>=2828282828282=2828282828282=2828282828282=2828282828282?>=28282de8282=28282de8282=28282de8282=28282de8282? \ No newline at end of file
diff --git a/data/maps/SafariZone_North/border.bin b/data/maps/SafariZone_North/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/SafariZone_North/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc
new file mode 100644
index 000000000..c2052ea07
--- /dev/null
+++ b/data/maps/SafariZone_North/connections.inc
@@ -0,0 +1,9 @@
+SafariZone_North_MapConnectionsList: @ 8486E18
+ connection left, 0, SAFARI_ZONE_NORTHWEST, 0
+ connection down, 0, SAFARI_ZONE_SOUTH, 0
+ connection right, 0, SAFARI_ZONE_NORTHEAST, 0
+
+SafariZone_North_MapConnections: @ 8486E3C
+ .4byte 0x3
+ .4byte SafariZone_North_MapConnectionsList
+
diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc
new file mode 100644
index 000000000..76b8f7152
--- /dev/null
+++ b/data/maps/SafariZone_North/header.inc
@@ -0,0 +1,15 @@
+SafariZone_North: @ 8485158
+ .4byte SafariZone_North_MapAttributes
+ .4byte SafariZone_North_MapEvents
+ .4byte SafariZone_North_MapScripts
+ .4byte SafariZone_North_MapConnections
+ .2byte BGM_SAFARI
+ .2byte 239
+ .byte 57
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SafariZone_North/map.bin b/data/maps/SafariZone_North/map.bin
new file mode 100644
index 000000000..4f5296815
--- /dev/null
+++ b/data/maps/SafariZone_North/map.bin
Binary files differ
diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/maps/SafariZone_Northeast/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/SafariZone_Northeast/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc
new file mode 100644
index 000000000..c23dd3e4c
--- /dev/null
+++ b/data/maps/SafariZone_Northeast/connections.inc
@@ -0,0 +1,8 @@
+SafariZone_Northeast_MapConnectionsList: @ 8486E90
+ connection left, 0, SAFARI_ZONE_NORTH, 0
+ connection down, 0, SAFARI_ZONE_SOUTHEAST, 0
+
+SafariZone_Northeast_MapConnections: @ 8486EA8
+ .4byte 0x2
+ .4byte SafariZone_Northeast_MapConnectionsList
+
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
new file mode 100644
index 000000000..714277457
--- /dev/null
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -0,0 +1,15 @@
+SafariZone_Northeast: @ 848528C
+ .4byte SafariZone_Northeast_MapAttributes
+ .4byte SafariZone_Northeast_MapEvents
+ .4byte SafariZone_Northeast_MapScripts
+ .4byte SafariZone_Northeast_MapConnections
+ .2byte BGM_SAFARI
+ .2byte 394
+ .byte 57
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/maps/SafariZone_Northeast/map.bin
new file mode 100644
index 000000000..9a8803a6a
--- /dev/null
+++ b/data/maps/SafariZone_Northeast/map.bin
Binary files differ
diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/maps/SafariZone_Northwest/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/SafariZone_Northwest/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc
new file mode 100644
index 000000000..9a466f082
--- /dev/null
+++ b/data/maps/SafariZone_Northwest/connections.inc
@@ -0,0 +1,8 @@
+SafariZone_Northwest_MapConnectionsList: @ 8486DF8
+ connection right, 0, SAFARI_ZONE_NORTH, 0
+ connection down, 0, SAFARI_ZONE_SOUTHWEST, 0
+
+SafariZone_Northwest_MapConnections: @ 8486E10
+ .4byte 0x2
+ .4byte SafariZone_Northwest_MapConnectionsList
+
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
new file mode 100644
index 000000000..508e33d1c
--- /dev/null
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -0,0 +1,15 @@
+SafariZone_Northwest: @ 848513C
+ .4byte SafariZone_Northwest_MapAttributes
+ .4byte SafariZone_Northwest_MapEvents
+ .4byte SafariZone_Northwest_MapScripts
+ .4byte SafariZone_Northwest_MapConnections
+ .2byte BGM_SAFARI
+ .2byte 238
+ .byte 57
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/maps/SafariZone_Northwest/map.bin
new file mode 100644
index 000000000..1825a1c92
--- /dev/null
+++ b/data/maps/SafariZone_Northwest/map.bin
Binary files differ
diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/maps/SafariZone_RestHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SafariZone_RestHouse/border.bin
Binary files differ
diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
new file mode 100644
index 000000000..855f01fcc
--- /dev/null
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -0,0 +1,15 @@
+SafariZone_RestHouse: @ 8485270
+ .4byte SafariZone_RestHouse_MapAttributes
+ .4byte SafariZone_RestHouse_MapEvents
+ .4byte SafariZone_RestHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_SAFARI
+ .2byte 329
+ .byte 57
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/maps/SafariZone_RestHouse/map.bin
new file mode 100644
index 000000000..c57c99c7b
--- /dev/null
+++ b/data/maps/SafariZone_RestHouse/map.bin
@@ -0,0 +1 @@
+        $2$2$2$2$2$2$2$2$2$292#24266<2#2#2#2#292#24266<2#2#2#2#292#2#2#2#2#2#2#2#2#292#2#2 #2#2#2#2#2 \ No newline at end of file
diff --git a/data/maps/SafariZone_South/border.bin b/data/maps/SafariZone_South/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/SafariZone_South/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc
new file mode 100644
index 000000000..79ba1a010
--- /dev/null
+++ b/data/maps/SafariZone_South/connections.inc
@@ -0,0 +1,9 @@
+SafariZone_South_MapConnectionsList: @ 8486E64
+ connection up, 0, SAFARI_ZONE_NORTH, 0
+ connection left, 0, SAFARI_ZONE_SOUTHWEST, 0
+ connection right, 0, SAFARI_ZONE_SOUTHEAST, 0
+
+SafariZone_South_MapConnections: @ 8486E88
+ .4byte 0x3
+ .4byte SafariZone_South_MapConnectionsList
+
diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc
new file mode 100644
index 000000000..5d122f051
--- /dev/null
+++ b/data/maps/SafariZone_South/header.inc
@@ -0,0 +1,15 @@
+SafariZone_South: @ 8485190
+ .4byte SafariZone_South_MapAttributes
+ .4byte SafariZone_South_MapEvents
+ .4byte SafariZone_South_MapScripts
+ .4byte SafariZone_South_MapConnections
+ .2byte BGM_SAFARI
+ .2byte 241
+ .byte 57
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SafariZone_South/map.bin b/data/maps/SafariZone_South/map.bin
new file mode 100644
index 000000000..50497b503
--- /dev/null
+++ b/data/maps/SafariZone_South/map.bin
Binary files differ
diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/maps/SafariZone_Southeast/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc
new file mode 100644
index 000000000..4855182e9
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/connections.inc
@@ -0,0 +1,8 @@
+SafariZone_Southeast_MapConnectionsList: @ 8486EB0
+ connection left, 0, SAFARI_ZONE_SOUTH, 0
+ connection up, 0, SAFARI_ZONE_NORTHEAST, 0
+
+SafariZone_Southeast_MapConnections: @ 8486EC8
+ .4byte 0x2
+ .4byte SafariZone_Southeast_MapConnectionsList
+
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
new file mode 100644
index 000000000..363185203
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -0,0 +1,15 @@
+SafariZone_Southeast: @ 84852A8
+ .4byte SafariZone_Southeast_MapAttributes
+ .4byte SafariZone_Southeast_MapEvents
+ .4byte SafariZone_Southeast_MapScripts
+ .4byte SafariZone_Southeast_MapConnections
+ .2byte BGM_SAFARI
+ .2byte 395
+ .byte 57
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/maps/SafariZone_Southeast/map.bin
new file mode 100644
index 000000000..a778b8797
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/map.bin
Binary files differ
diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/maps/SafariZone_Southwest/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/SafariZone_Southwest/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc
new file mode 100644
index 000000000..936a1dc82
--- /dev/null
+++ b/data/maps/SafariZone_Southwest/connections.inc
@@ -0,0 +1,8 @@
+SafariZone_Southwest_MapConnectionsList: @ 8486E44
+ connection up, 0, SAFARI_ZONE_NORTHWEST, 0
+ connection right, 0, SAFARI_ZONE_SOUTH, 0
+
+SafariZone_Southwest_MapConnections: @ 8486E5C
+ .4byte 0x2
+ .4byte SafariZone_Southwest_MapConnectionsList
+
diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc
new file mode 100644
index 000000000..df20045e8
--- /dev/null
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -0,0 +1,15 @@
+SafariZone_Southwest: @ 8485174
+ .4byte SafariZone_Southwest_MapAttributes
+ .4byte SafariZone_Southwest_MapEvents
+ .4byte SafariZone_Southwest_MapScripts
+ .4byte SafariZone_Southwest_MapConnections
+ .2byte BGM_SAFARI
+ .2byte 240
+ .byte 57
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/maps/SafariZone_Southwest/map.bin
new file mode 100644
index 000000000..0074b6e55
--- /dev/null
+++ b/data/maps/SafariZone_Southwest/map.bin
Binary files differ
diff --git a/data/maps/ScorchedSlab/border.bin b/data/maps/ScorchedSlab/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ScorchedSlab/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
new file mode 100644
index 000000000..35c7edf64
--- /dev/null
+++ b/data/maps/ScorchedSlab/header.inc
@@ -0,0 +1,15 @@
+ScorchedSlab: @ 84846BC
+ .4byte ScorchedSlab_MapAttributes
+ .4byte ScorchedSlab_MapEvents
+ .4byte ScorchedSlab_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 311
+ .byte 80
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ScorchedSlab/map.bin b/data/maps/ScorchedSlab/map.bin
new file mode 100644
index 000000000..edbd982ee
--- /dev/null
+++ b/data/maps/ScorchedSlab/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222ppppppppppppppppppppppppppppppppppppppppppppppppppppGG^^^^GGG          $G \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/maps/SeafloorCavern_Entrance/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
new file mode 100644
index 000000000..3a3345b39
--- /dev/null
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Entrance: @ 84841B4
+ .4byte SeafloorCavern_Entrance_MapAttributes
+ .4byte SeafloorCavern_Entrance_MapEvents
+ .4byte SeafloorCavern_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 147
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/maps/SeafloorCavern_Entrance/map.bin
new file mode 100644
index 000000000..f41e6e77d
--- /dev/null
+++ b/data/maps/SeafloorCavern_Entrance/map.bin
@@ -0,0 +1,11 @@
+3  $1$1$1$1$1 $1$1$1$1$1$1$1$1$1  $1$1$1$1$1$1$1$1$1 $1$1$1$1$1$1$1$1$1$1$1$1  $1$1$1$1$1$1$1$1$1$1$1$1 
+ $1$1$1$1$1$1$1$1$1$1$1$1$1$1$1
+ $1$1$1$1$111111$1$1$1$1$1
+ $1$1$1111111111$1$1$1
+ $1$111111111111$1$1
+ $1111111$1
+ 111ppppp11$1
+ 11ppppppp11
+ 11ppppppppp11
+ 11ppppppppp11
+1ppVVVVppppVVpVV \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/maps/SeafloorCavern_Room1/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
new file mode 100644
index 000000000..ac61c156a
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room1: @ 84841D0
+ .4byte SeafloorCavern_Room1_MapAttributes
+ .4byte SeafloorCavern_Room1_MapEvents
+ .4byte SeafloorCavern_Room1_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 148
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/maps/SeafloorCavern_Room1/map.bin
new file mode 100644
index 000000000..57cd82f78
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room1/map.bin
@@ -0,0 +1 @@
+222322222222222222222222222222222222222622222226222222222222222222222222222222222222226666222222266662222<22266666222662222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/maps/SeafloorCavern_Room2/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
new file mode 100644
index 000000000..2e2a6c1a1
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room2: @ 84841EC
+ .4byte SeafloorCavern_Room2_MapAttributes
+ .4byte SeafloorCavern_Room2_MapEvents
+ .4byte SeafloorCavern_Room2_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 149
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/maps/SeafloorCavern_Room2/map.bin
new file mode 100644
index 000000000..72a064870
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room2/map.bin
@@ -0,0 +1,7 @@
+ 33 22222
+ 2222222222
+2222
+ 2222
+ 222222222
+ 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
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
new file mode 100644
index 000000000..234f0a1a5
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room3: @ 8484208
+ .4byte SeafloorCavern_Room3_MapAttributes
+ .4byte SeafloorCavern_Room3_MapEvents
+ .4byte SeafloorCavern_Room3_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 150
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/maps/SeafloorCavern_Room3/map.bin
new file mode 100644
index 000000000..01d18c73c
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room3/map.bin
@@ -0,0 +1 @@
+6666666666636666662222266666622222666222222666622222222666222222666222622222262222226222222222222222222222222222222222222QQQM2222222222222222226666666 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/maps/SeafloorCavern_Room4/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
new file mode 100644
index 000000000..4aaf9b62e
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room4: @ 8484224
+ .4byte SeafloorCavern_Room4_MapAttributes
+ .4byte SeafloorCavern_Room4_MapEvents
+ .4byte SeafloorCavern_Room4_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 151
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/maps/SeafloorCavern_Room4/map.bin
new file mode 100644
index 000000000..928749c95
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room4/map.bin
@@ -0,0 +1 @@
+3362222222622222226LQQM22262222222292222222222229222222222222222222666222222222222223222222229222222222229222222LQQQM2222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/maps/SeafloorCavern_Room5/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
new file mode 100644
index 000000000..992d9d1c8
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room5: @ 8484240
+ .4byte SeafloorCavern_Room5_MapAttributes
+ .4byte SeafloorCavern_Room5_MapEvents
+ .4byte SeafloorCavern_Room5_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 152
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/maps/SeafloorCavern_Room5/map.bin
new file mode 100644
index 000000000..386430fe4
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/map.bin
@@ -0,0 +1 @@
+32222222222222222222222222222222222222222222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/maps/SeafloorCavern_Room6/border.bin
new file mode 100644
index 000000000..a00c39057
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/border.bin
@@ -0,0 +1 @@
+~~~~ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
new file mode 100644
index 000000000..765350afe
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room6: @ 848425C
+ .4byte SeafloorCavern_Room6_MapAttributes
+ .4byte SeafloorCavern_Room6_MapEvents
+ .4byte SeafloorCavern_Room6_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 153
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/maps/SeafloorCavern_Room6/map.bin
new file mode 100644
index 000000000..452263326
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room6/map.bin
@@ -0,0 +1 @@
+z2xzzy2y2y2y2xxzzy2y2y2y2pxxzzy2y2y2y2ppppppppppppxxzzy2y2y2y2ppppvvvpppxxzzpppu~~~wppxxzzppppppp}ppxxzzppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppppxxzzppppppxxzzpppppppppppppxxzzppppppppppxxzzpppppppppppppxxzzpppppppppxxzzpppppppppxxzzppppppppppxxzzpppppppppppvvvvzzpppppo2o2o2vpvv~~~~vvvvvvvvvz~22~2x~vvv~~~~~~~~~~~~~~~~~~~~~~~~~ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/maps/SeafloorCavern_Room7/border.bin
new file mode 100644
index 000000000..a00c39057
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room7/border.bin
@@ -0,0 +1 @@
+~~~~ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
new file mode 100644
index 000000000..e19e0081b
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room7: @ 8484278
+ .4byte SeafloorCavern_Room7_MapAttributes
+ .4byte SeafloorCavern_Room7_MapEvents
+ .4byte SeafloorCavern_Room7_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 154
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/maps/SeafloorCavern_Room7/map.bin
new file mode 100644
index 000000000..7fa1d903d
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room7/map.bin
@@ -0,0 +1 @@
+z2~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2y2y2y2y2y2x~6~6~6~6~6~6~6~6~6xzzy2y2y2y2y2xzzpppxxzzpppppppppppppppppxxzzppxxzzpppppppppppppppxxzzppxxzzppppppppppppppxxzzpppppppxxzzpppppppppppppppxxzzpppppxxzzpppppppppppxxzzpppppppppppxxzzpppxxzzpppppppppppppxxzzpppppppppppppxxzzpppxxz66q2ypppppppppppppxxzy6z6y2pppppppppppppxxzy6z6y2q2q2q2q2q2yppppppppxxz66y2y2y2y2y2y2ppppppppxxzzy22y2y2sy2tppppppppxxvvvvvvvvvv \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/maps/SeafloorCavern_Room8/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
new file mode 100644
index 000000000..1c4837e72
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room8: @ 8484294
+ .4byte SeafloorCavern_Room8_MapAttributes
+ .4byte SeafloorCavern_Room8_MapEvents
+ .4byte SeafloorCavern_Room8_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 155
+ .byte 68
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/maps/SeafloorCavern_Room8/map.bin
new file mode 100644
index 000000000..e70e95b47
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room8/map.bin
@@ -0,0 +1 @@
+632222222222222222222222222222222222LQM22222222222 \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/maps/SeafloorCavern_Room9/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
new file mode 100644
index 000000000..bee6c2698
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room9: @ 84842B0
+ .4byte SeafloorCavern_Room9_MapAttributes
+ .4byte SeafloorCavern_Room9_MapEvents
+ .4byte SeafloorCavern_Room9_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 156
+ .byte 68
+ .byte 0
+ .byte 6
+ .byte 4
+ .2byte 0
+ .byte 14
+ .byte 0
+
diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/maps/SeafloorCavern_Room9/map.bin
new file mode 100644
index 000000000..252112ac2
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  222 222    2222222 2222222222 2222222    # 222    #2222 #  2222      2222 #    2222  222 # OO 222OOOO222pNOOOONp222ppNNNNpp22222pppppppp22222 ppppppppp22222222#2s2lpppppppp222222222#2lpppppjs2s2$222222222#2s2s2s2s2s2$22222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/maps/SealedChamber_InnerRoom/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/maps/SealedChamber_InnerRoom/border.bin
Binary files differ
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
new file mode 100644
index 000000000..a2909fc7b
--- /dev/null
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -0,0 +1,15 @@
+SealedChamber_InnerRoom: @ 84846A0
+ .4byte SealedChamber_InnerRoom_MapAttributes
+ .4byte SealedChamber_InnerRoom_MapEvents
+ .4byte SealedChamber_InnerRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_MABOROSI
+ .2byte 304
+ .byte 78
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/maps/SealedChamber_InnerRoom/map.bin
new file mode 100644
index 000000000..823fa5fab
--- /dev/null
+++ b/data/maps/SealedChamber_InnerRoom/map.bin
@@ -0,0 +1 @@
+222222222222777222222222222222222222222222222222222222722222722222222222222222222222222222222222222222222222222722222222272222222222222222222222222222222222222222222222222722222722222222222222 \ No newline at end of file
diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/maps/SealedChamber_OuterRoom/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/maps/SealedChamber_OuterRoom/border.bin
Binary files differ
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
new file mode 100644
index 000000000..e9b20d93a
--- /dev/null
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -0,0 +1,15 @@
+SealedChamber_OuterRoom: @ 8484684
+ .4byte SealedChamber_OuterRoom_MapAttributes
+ .4byte SealedChamber_OuterRoom_MapEvents
+ .4byte SealedChamber_OuterRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_MABOROSI
+ .2byte 284
+ .byte 78
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/maps/SealedChamber_OuterRoom/map.bin
new file mode 100644
index 000000000..bf1482f97
--- /dev/null
+++ b/data/maps/SealedChamber_OuterRoom/map.bin
@@ -0,0 +1,11 @@
+`*+,a)2324)222222222222222222222222222222   
+2   
+2 
+555255525222222222222222   
+2   
+2 
+555255525222222222222222   
+2   
+222255525552222222222222222222   
+2   
+222255525552222222222222222222222222222222222VVV2222222222VGV22222$ggggg_____ggggg#$                 #$$                 ## \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/maps/SecretBase_BlueCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
new file mode 100644
index 000000000..ec497b053
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave1: @ 8484AC8
+ .4byte SecretBase_BlueCave1_MapAttributes
+ .4byte SecretBase_BlueCave1_MapEvents
+ .4byte SecretBase_BlueCave1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 199
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/maps/SecretBase_BlueCave1/map.bin
new file mode 100644
index 000000000..371b2a8d5
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave1/map.bin
@@ -0,0 +1,50 @@
+6
+2
+2
+2
+2
+2   6
+2
+22
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26 
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/maps/SecretBase_BlueCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
new file mode 100644
index 000000000..455db2db0
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave2: @ 8484B70
+ .4byte SecretBase_BlueCave2_MapAttributes
+ .4byte SecretBase_BlueCave2_MapEvents
+ .4byte SecretBase_BlueCave2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 205
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/maps/SecretBase_BlueCave2/map.bin
new file mode 100644
index 000000000..4993e5b65
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave2/map.bin
@@ -0,0 +1,57 @@
+  62
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+2
+2
+2
+22
+2
+2
+26  \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/maps/SecretBase_BlueCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
new file mode 100644
index 000000000..77b59cd5e
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave3: @ 8484C18
+ .4byte SecretBase_BlueCave3_MapAttributes
+ .4byte SecretBase_BlueCave3_MapEvents
+ .4byte SecretBase_BlueCave3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 211
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/maps/SecretBase_BlueCave3/map.bin
new file mode 100644
index 000000000..968aade07
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave3/map.bin
@@ -0,0 +1,51 @@
+ 
+2
+2
+2
+22
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2 
+2
+2  
+2
+2  
+2
+222
+2
+2
+2
+2 
+2  
+2 
+2  
+2
+2
+22
+2  
+2
+2  
+2 6
+222  
+2
+22
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/maps/SecretBase_BlueCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
new file mode 100644
index 000000000..db27e5889
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BlueCave4: @ 8484CC0
+ .4byte SecretBase_BlueCave4_MapAttributes
+ .4byte SecretBase_BlueCave4_MapEvents
+ .4byte SecretBase_BlueCave4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 217
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/maps/SecretBase_BlueCave4/map.bin
new file mode 100644
index 000000000..631ac0f81
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave4/map.bin
@@ -0,0 +1,57 @@
+ 
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+22  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2 6
+2
+2"6  #6  2 
+2   6
+22  
+2
+2
+2  
+22
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/maps/SecretBase_BrownCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
new file mode 100644
index 000000000..8da685a13
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave1: @ 8484AAC
+ .4byte SecretBase_BrownCave1_MapAttributes
+ .4byte SecretBase_BrownCave1_MapEvents
+ .4byte SecretBase_BrownCave1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 198
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/maps/SecretBase_BrownCave1/map.bin
new file mode 100644
index 000000000..56d3436ca
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave1/map.bin
@@ -0,0 +1,54 @@
+6
+2
+2
+2
+2
+2
+2
+2  
+2 6
+2
+22
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/maps/SecretBase_BrownCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
new file mode 100644
index 000000000..08f93827a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave2: @ 8484B54
+ .4byte SecretBase_BrownCave2_MapAttributes
+ .4byte SecretBase_BrownCave2_MapEvents
+ .4byte SecretBase_BrownCave2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 204
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/maps/SecretBase_BrownCave2/map.bin
new file mode 100644
index 000000000..184896975
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave2/map.bin
@@ -0,0 +1,56 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2 6  
+26
+2
+2
+2
+2
+2
+22
+2  
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2
+2 2 6
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/maps/SecretBase_BrownCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
new file mode 100644
index 000000000..5515ea8c5
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave3: @ 8484BFC
+ .4byte SecretBase_BrownCave3_MapAttributes
+ .4byte SecretBase_BrownCave3_MapEvents
+ .4byte SecretBase_BrownCave3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 210
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/maps/SecretBase_BrownCave3/map.bin
new file mode 100644
index 000000000..d9967522a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave3/map.bin
@@ -0,0 +1,69 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+26
+2
+2
+2 66
+2
+2
+2  
+2
+2
+2 6  
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2  
+2
+2
+2
+2 
+2
+2
+2  
+2
+2
+2
+2  2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+22
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/maps/SecretBase_BrownCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
new file mode 100644
index 000000000..d90a89a5f
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -0,0 +1,15 @@
+SecretBase_BrownCave4: @ 8484CA4
+ .4byte SecretBase_BrownCave4_MapAttributes
+ .4byte SecretBase_BrownCave4_MapEvents
+ .4byte SecretBase_BrownCave4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 216
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/maps/SecretBase_BrownCave4/map.bin
new file mode 100644
index 000000000..8b5a763c4
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave4/map.bin
@@ -0,0 +1,70 @@
+  62
+2
+2
+2
+2
+2
+2
+2"6
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2#6
+2
+2  
+2
+2
+2
+2  
+2
+2
+2  
+2  
+2
+2
+2 
+2  
+2
+2
+2  
+2
+2
+2
+22
+2  
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+22
+2  
+2
+2
+2
+2
+2
+2   
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/maps/SecretBase_RedCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_RedCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
new file mode 100644
index 000000000..46fc40ff0
--- /dev/null
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave1: @ 8484A90
+ .4byte SecretBase_RedCave1_MapAttributes
+ .4byte SecretBase_RedCave1_MapEvents
+ .4byte SecretBase_RedCave1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 197
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/maps/SecretBase_RedCave1/map.bin
new file mode 100644
index 000000000..ce666b57d
--- /dev/null
+++ b/data/maps/SecretBase_RedCave1/map.bin
@@ -0,0 +1,51 @@
+
+2
+2
+2
+2
+2
+2
+2   6
+2
+2
+2
+2
+2
+2
+2 6 
+2
+2
+2
+2
+2
+2
+2
+26 
+2
+2
+2
+2
+2
+22
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 6
+2
+22
+2
+2
+26  \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/maps/SecretBase_RedCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_RedCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
new file mode 100644
index 000000000..073a4f6ce
--- /dev/null
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave2: @ 8484B38
+ .4byte SecretBase_RedCave2_MapAttributes
+ .4byte SecretBase_RedCave2_MapEvents
+ .4byte SecretBase_RedCave2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 203
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/maps/SecretBase_RedCave2/map.bin
new file mode 100644
index 000000000..4fa03acfe
--- /dev/null
+++ b/data/maps/SecretBase_RedCave2/map.bin
@@ -0,0 +1,42 @@
+ 
+22
+2  
+2
+2
+2  
+2
+2
+2 
+2
+2
+2  2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2 6 
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2 
+2
+2
+26
+26 
+2  2   \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/maps/SecretBase_RedCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_RedCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
new file mode 100644
index 000000000..d8748e2f7
--- /dev/null
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave3: @ 8484BE0
+ .4byte SecretBase_RedCave3_MapAttributes
+ .4byte SecretBase_RedCave3_MapEvents
+ .4byte SecretBase_RedCave3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 209
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/maps/SecretBase_RedCave3/map.bin
new file mode 100644
index 000000000..0528e565d
--- /dev/null
+++ b/data/maps/SecretBase_RedCave3/map.bin
@@ -0,0 +1,47 @@
+ 
+2
+22
+2   6
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2
+2 6
+2
+2
+2
+2  
+2
+2
+2
+2
+222
+22
+2
+2
+2
+2  
+2
+2
+2
+2
+26
+2
+2
+2
+2  
+2
+22
+2
+2 6
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/maps/SecretBase_RedCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
new file mode 100644
index 000000000..2ae9e38f6
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -0,0 +1,15 @@
+SecretBase_RedCave4: @ 8484C88
+ .4byte SecretBase_RedCave4_MapAttributes
+ .4byte SecretBase_RedCave4_MapEvents
+ .4byte SecretBase_RedCave4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 215
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/maps/SecretBase_RedCave4/map.bin
new file mode 100644
index 000000000..526763290
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/map.bin
@@ -0,0 +1,56 @@
+ 
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2 "66 #6 2  
+2
+2
+2
+22
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2 6 
+22
+2
+2
+2
+2 6  
+2
+2
+2  \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/maps/SecretBase_Shrub1/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
new file mode 100644
index 000000000..0998b2f0d
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub1: @ 8484B1C
+ .4byte SecretBase_Shrub1_MapAttributes
+ .4byte SecretBase_Shrub1_MapEvents
+ .4byte SecretBase_Shrub1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 202
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/maps/SecretBase_Shrub1/map.bin
new file mode 100644
index 000000000..4b566cc1b
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/map.bin
@@ -0,0 +1,53 @@
+ 
+2
+2 
+2
+2
+2
+2  
+2
+2 6
+22
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/maps/SecretBase_Shrub2/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Shrub2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
new file mode 100644
index 000000000..1223a4105
--- /dev/null
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub2: @ 8484BC4
+ .4byte SecretBase_Shrub2_MapAttributes
+ .4byte SecretBase_Shrub2_MapEvents
+ .4byte SecretBase_Shrub2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 208
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/maps/SecretBase_Shrub2/map.bin
new file mode 100644
index 000000000..8cb88cc44
--- /dev/null
+++ b/data/maps/SecretBase_Shrub2/map.bin
@@ -0,0 +1,57 @@
+  6
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+22  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+22
+2
+2
+2
+2
+2  \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/maps/SecretBase_Shrub3/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Shrub3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
new file mode 100644
index 000000000..9d5a06e39
--- /dev/null
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub3: @ 8484C6C
+ .4byte SecretBase_Shrub3_MapAttributes
+ .4byte SecretBase_Shrub3_MapEvents
+ .4byte SecretBase_Shrub3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 214
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/maps/SecretBase_Shrub3/map.bin
new file mode 100644
index 000000000..d51aeea21
--- /dev/null
+++ b/data/maps/SecretBase_Shrub3/map.bin
@@ -0,0 +1,65 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2 
+2 
+2  
+2
+2
+2
+22
+2 6
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+22
+2
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/maps/SecretBase_Shrub4/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
new file mode 100644
index 000000000..5fcd719b9
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Shrub4: @ 8484D14
+ .4byte SecretBase_Shrub4_MapAttributes
+ .4byte SecretBase_Shrub4_MapEvents
+ .4byte SecretBase_Shrub4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 220
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/maps/SecretBase_Shrub4/map.bin
new file mode 100644
index 000000000..8a4cf836d
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/map.bin
@@ -0,0 +1,69 @@
+ 
+2
+2"6
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2#6
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2 
+2
+2
+2  
+2
+22
+2
+2   6
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2
+2  2
+2
+2
+2  
+2
+2
+2
+2
+2 
+22
+2  
+2
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/maps/SecretBase_Tree1/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Tree1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
new file mode 100644
index 000000000..c5142cdba
--- /dev/null
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree1: @ 8484B00
+ .4byte SecretBase_Tree1_MapAttributes
+ .4byte SecretBase_Tree1_MapEvents
+ .4byte SecretBase_Tree1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 201
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/maps/SecretBase_Tree1/map.bin
new file mode 100644
index 000000000..907f1486a
--- /dev/null
+++ b/data/maps/SecretBase_Tree1/map.bin
@@ -0,0 +1,56 @@
+
+2
+22
+2
+2
+2
+2  
+2 6
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+26
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/maps/SecretBase_Tree2/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
new file mode 100644
index 000000000..bcb5e0f23
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree2: @ 8484BA8
+ .4byte SecretBase_Tree2_MapAttributes
+ .4byte SecretBase_Tree2_MapEvents
+ .4byte SecretBase_Tree2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 207
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/maps/SecretBase_Tree2/map.bin
new file mode 100644
index 000000000..c2e5698b0
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/map.bin
@@ -0,0 +1,48 @@
+ 
+2
+22
+2  
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+2
+2 6 
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2 
+2
+2
+2
+2  
+2
+2
+2
+2  
+2
+2
+26
+26 
+2  2   \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/maps/SecretBase_Tree3/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Tree3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
new file mode 100644
index 000000000..66dfc9803
--- /dev/null
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree3: @ 8484C50
+ .4byte SecretBase_Tree3_MapAttributes
+ .4byte SecretBase_Tree3_MapEvents
+ .4byte SecretBase_Tree3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 213
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/maps/SecretBase_Tree3/map.bin
new file mode 100644
index 000000000..b6ae04b00
--- /dev/null
+++ b/data/maps/SecretBase_Tree3/map.bin
@@ -0,0 +1,63 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6 2
+2
+2
+2
+2
+2
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2 
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2 
+2
+2
+2  2 
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/maps/SecretBase_Tree4/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/SecretBase_Tree4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
new file mode 100644
index 000000000..8d4d0f3df
--- /dev/null
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -0,0 +1,15 @@
+SecretBase_Tree4: @ 8484CF8
+ .4byte SecretBase_Tree4_MapAttributes
+ .4byte SecretBase_Tree4_MapEvents
+ .4byte SecretBase_Tree4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 219
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/maps/SecretBase_Tree4/map.bin
new file mode 100644
index 000000000..b3b381d9e
--- /dev/null
+++ b/data/maps/SecretBase_Tree4/map.bin
@@ -0,0 +1,77 @@
+ 
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2 
+2
+2 
+2
+2
+2
+2
+2 "6  
+2
+2
+2
+2 #6 "6  2 #6  
+2 6
+2
+2
+2
+2
+222  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+22
+2
+26  \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/maps/SecretBase_YellowCave1/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
new file mode 100644
index 000000000..c4df84edf
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave1: @ 8484AE4
+ .4byte SecretBase_YellowCave1_MapAttributes
+ .4byte SecretBase_YellowCave1_MapEvents
+ .4byte SecretBase_YellowCave1_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 200
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/maps/SecretBase_YellowCave1/map.bin
new file mode 100644
index 000000000..1301e7317
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave1/map.bin
@@ -0,0 +1,57 @@
+ 
+2
+22
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 6  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+22
+2
+2  \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/maps/SecretBase_YellowCave2/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
new file mode 100644
index 000000000..a690ef3fe
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave2: @ 8484B8C
+ .4byte SecretBase_YellowCave2_MapAttributes
+ .4byte SecretBase_YellowCave2_MapEvents
+ .4byte SecretBase_YellowCave2_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 206
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/maps/SecretBase_YellowCave2/map.bin
new file mode 100644
index 000000000..e18cb47c6
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave2/map.bin
@@ -0,0 +1,56 @@
+ 2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+26
+2  
+2
+2
+2
+2
+2
+2
+2  
+2 
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2  
+2  
+2
+2
+2
+2
+2
+2 6  
+2  
+2
+2
+2
+2
+2
+2
+2  2   \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/maps/SecretBase_YellowCave3/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
new file mode 100644
index 000000000..60176b1e3
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave3: @ 8484C34
+ .4byte SecretBase_YellowCave3_MapAttributes
+ .4byte SecretBase_YellowCave3_MapEvents
+ .4byte SecretBase_YellowCave3_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 212
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/maps/SecretBase_YellowCave3/map.bin
new file mode 100644
index 000000000..b7d80a0ab
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave3/map.bin
@@ -0,0 +1,63 @@
+ 
+2
+2
+2  
+2
+2  
+2
+2
+2  
+2
+2  
+2
+2
+2  
+2
+2 
+2
+2
+2  
+2
+2 6
+2
+2
+22
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+266
+2
+2
+22
+2
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/maps/SecretBase_YellowCave4/border.bin
new file mode 100644
index 000000000..5c0908a6a
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
new file mode 100644
index 000000000..75a76dd44
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -0,0 +1,15 @@
+SecretBase_YellowCave4: @ 8484CDC
+ .4byte SecretBase_YellowCave4_MapAttributes
+ .4byte SecretBase_YellowCave4_MapEvents
+ .4byte SecretBase_YellowCave4_MapScripts
+ .4byte 0x0
+ .2byte BGM_MACHI_S3
+ .2byte 218
+ .byte 86
+ .byte 0
+ .byte 0
+ .byte 9
+ .2byte 0
+ .byte 12
+ .byte 8
+
diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/maps/SecretBase_YellowCave4/map.bin
new file mode 100644
index 000000000..d3c3e0204
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/map.bin
@@ -0,0 +1,80 @@
+ 
+2
+2
+2
+2
+2
+2
+2
+2"6
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2#6
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2  
+2
+2  
+2
+2  
+2
+2 
+2
+2  
+2
+2 6
+2
+2
+22
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2
+2  
+2
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+2
+2
+2
+2
+2 
+2
+2
+22
+2
+2
+2   \ No newline at end of file
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/maps/ShoalCave_HighTideEntranceRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
new file mode 100644
index 000000000..f542d0700
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -0,0 +1,15 @@
+ShoalCave_HighTideEntranceRoom: @ 8484438
+ .4byte ShoalCave_HighTideEntranceRoom_MapAttributes
+ .4byte ShoalCave_HighTideEntranceRoom_MapEvents
+ .4byte ShoalCave_HighTideEntranceRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 168
+ .byte 67
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/maps/ShoalCave_HighTideEntranceRoom/map.bin
new file mode 100644
index 000000000..0e4b88c8f
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.bin
@@ -0,0 +1 @@
+      2222222222222222822222222222222222|z22822222222222222222|pppppz22@QQQQQ22222pppppz222222222222|pppppz222222222222|ppppppppppppp2222222|pppppppppppppz22pppppppppppppppppppz22|pppppppppppppppppppz22|pppppppppppppppppppppppz22|pppppppppppppppppppppppz22|pppppppppppp11111111112C22]C]CUCUCUCUC^pppppp1111111111122BBBBBB|pppppp1111111111m#222BBBBB|pppppp11111222BBB2ppppppppppp11111    BBB|ppppppppppp11111BBB|pppppppppppppp111mn#  BBB|pppppppppppppp111BBB2ppppppppppppp111BBB1111111111111111111  BBB1111111111111111111   BBB1111111111111111111BBB1111111111111111111BBB#BnBnBnBnBnBnBo111111111111BBBBBBBBBB111111111111#         "111111111111111111u211111        " nnnnnXYZnnnn   "                                                                         \ No newline at end of file
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/maps/ShoalCave_HighTideInnerRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideInnerRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
new file mode 100644
index 000000000..7c4a7184c
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -0,0 +1,15 @@
+ShoalCave_HighTideInnerRoom: @ 8484454
+ .4byte ShoalCave_HighTideInnerRoom_MapAttributes
+ .4byte ShoalCave_HighTideInnerRoom_MapEvents
+ .4byte ShoalCave_HighTideInnerRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 169
+ .byte 67
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/maps/ShoalCave_HighTideInnerRoom/map.bin
new file mode 100644
index 000000000..c540a4008
--- /dev/null
+++ b/data/maps/ShoalCave_HighTideInnerRoom/map.bin
@@ -0,0 +1 @@
+BBBBBBBBBBB22222BBBBBBBBBBB22222BBBBBBBBBBBBBBBBppppppppppppppppppppppppBBBBBBBBBBppppppppppppppppppppppppBBBBBBBBBB[32ppppppppppppppppppppppppBBB22ppp111111111111111111111RRRRR[SRBBB22ppp111111111111111111111RRRRRRBBB22pppmnRnRnRnRnRnRnRnRnRnRnRo111111112BBB2pppR[S  B B B B B B B"#R Ro11BBBpppRRBBBBBBBRR11pppppppppBBBpppppRRBBBBBBBRR11pppppppppBBBpppppRRBBBBRR11pppppppppBBBpppppBBBBRR1111111111111BBBppppp111BBBBRR1111111111111BBBpppppppBBBBRR111111mnRnRnRnRnRnR#RBBBppppppppppBBBBRR111111RRRRR[SRBBBBBBBBBBBRR111111RRRRRRRBBBBBBBBBBB111111RRRRRRRppppppppppB2111111RRRR111pppppppBBBBBB1111RRRR#RnRnRnRnRnRopppppppBBBBBBpppppRRRRRRRRRRppppp11BBBBBBpppppppppRRRRRRRpppppmn#     "pppppppppRRRRRRR1111111111   pppppppppRRRRRRR1111111111pppppppppRRRRRRR1111111111     "11111111111RRRRRRR#RnRnRnRnRnRnRnRnRnRnR#R11111111111RRRRRRRRRRRRRRRRRRR##nnnnnnnnnn1#RRRRRRRRRRRRRRRR<RRRR#        "RR<RRR#          XYZ  ## XYZ ##         "#   "#      "#       ##      ##                                     # \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/maps/ShoalCave_LowTideEntranceRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
new file mode 100644
index 000000000..6065466dc
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideEntranceRoom: @ 84843C8
+ .4byte ShoalCave_LowTideEntranceRoom_MapAttributes
+ .4byte ShoalCave_LowTideEntranceRoom_MapEvents
+ .4byte ShoalCave_LowTideEntranceRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 164
+ .byte 67
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/maps/ShoalCave_LowTideEntranceRoom/map.bin
new file mode 100644
index 000000000..1cf7c87f2
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.bin
@@ -0,0 +1,3 @@
+      2222222222222222822222222222222222   22822222222222222222222@QQQQQ2222222222222222222222222222222222222222i22222222222222222222222222222222222222222222222222222222222222222222222222222222222222           22#     
+2222 2222222222222#B B B B B B
+22222222222222222BBBBBB22222222222222p#222BBBBBB2222222222222BBBB2222h222222   #BBB22222222222222BBB222222222222p # #BBB222222222222222BBB#            #222BBB#2 222222222222222222 #BBB2222222222222222222  #BBB2222222222222222222BBB2222222222211112222BBB#B B B B B B Bq222111111222BBBBBBBBBB222111111222#         "221111111122221111u211122#       "#     XYZ    ## "#               ##                    ##                               # \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/maps/ShoalCave_LowTideIceRoom/border.bin
new file mode 100644
index 000000000..206bd63f8
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideIceRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
new file mode 100644
index 000000000..10f4aff16
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideIceRoom: @ 84847D4
+ .4byte ShoalCave_LowTideIceRoom_MapAttributes
+ .4byte ShoalCave_LowTideIceRoom_MapEvents
+ .4byte ShoalCave_LowTideIceRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 328
+ .byte 67
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/maps/ShoalCave_LowTideIceRoom/map.bin
new file mode 100644
index 000000000..222f1f26c
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideIceRoom/map.bin
@@ -0,0 +1 @@
+{|{|3333~33~33333}333333333}333333333}3~333323333333|33333~33333333333xyCyCyCz33~}333xCCCC3333|333CCCCww|3xyCCCCCC33333333CCCCCC33333333CCC~CC33333333c|CCC33333333233CCC333~333333}CCCCz333333}333CCCCCyCz333333~3CC~CC}3333z333C}CCCCCz333z33|CCCCC3333333CCCCC3333333|CCC333{3}3}33CCC333{}333333333333333333333333333333233333333333~23333}3233333yyz33~3333333333yyyyyz3333333yyyyyyy \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/maps/ShoalCave_LowTideInnerRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideInnerRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
new file mode 100644
index 000000000..5b9972258
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideInnerRoom: @ 84843E4
+ .4byte ShoalCave_LowTideInnerRoom_MapAttributes
+ .4byte ShoalCave_LowTideInnerRoom_MapEvents
+ .4byte ShoalCave_LowTideInnerRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 165
+ .byte 67
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/maps/ShoalCave_LowTideInnerRoom/map.bin
new file mode 100644
index 000000000..87df28cf4
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideInnerRoom/map.bin
@@ -0,0 +1,2 @@
+BBBBBBBBBBB22222BBBBBBBBBBBBB22222BBBBBBBBBBBBBBBBBBRRRRRRRRRRRRRRRRRRRRRRRRBBBBBBBBBBRRRRRRRRRRRRRRRRRRRRRZSRRBBBBBBBBBB[32RRRRRRRRRRRRRRRRRRRRRRRRBBB22RRR 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2#2RRRRR[SRBBB22RRR222222222222222222222RRRRRRRBBB22RRR  R R R R R R R R R R R"22222222BBB2RRRR[S  B B B B B B B"#R R"222BBBRRRRRBBBBBBBRR222BBBRRRRRRRBBBBBBBRR222222222BBBRRRRRRRBBBBRR22#       #BBBRRRRRBBBBRR22#2 2 2 2 2 2 2 2 2 2#2BBB   BBBBRR2222222222222BBB2222BBBBRR222222  R R R R R R#RBBB22222222BBBBRR222222RRRRR[SRBBBBBBBBBBBBBBBRR222222RRRRRRRBBBBBBBBBBBBBBBRR222222RRRRRRR22222222B222222RRRRR#   
+2222BBBBBB   2RRRR#R R R R#R R1 2"22 #BBBBBB22RRRRRRRRRR22Z3  #BBBBBB2222222RRRRRRR222  #     "2222222RRRRRRR2222#  #  #2222222RRRRRRR2222#2 2 2 2 2#22222222RRRRRRR2222222222     "#    XYZ#RRRRRRR R R R R R R R R R R R#R#         #RRRRRRRRRRRRRRRRRRR##       1 R R R#RRRRRRRRRRRRRRRR<RRRR#        "RRRRR<RRR#          XYZ  ##    XYZ ##         "#   "#      "#       ##      ##                                     # \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/maps/ShoalCave_LowTideLowerRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideLowerRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
new file mode 100644
index 000000000..d2c2bcac6
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideLowerRoom: @ 848441C
+ .4byte ShoalCave_LowTideLowerRoom_MapAttributes
+ .4byte ShoalCave_LowTideLowerRoom_MapEvents
+ .4byte ShoalCave_LowTideLowerRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 167
+ .byte 67
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/maps/ShoalCave_LowTideLowerRoom/map.bin
new file mode 100644
index 000000000..04bf2baf3
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideLowerRoom/map.bin
@@ -0,0 +1,4 @@
+222222222222Z322222222222222222222222222222222HQQQQQ  6 6 6 
+2222222222922222 6 6 6
+2222222222222292222222XYZ              
+222#                "222222222222XYZ#6 6 6#6#   ##6 6 6 6 6#6 \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/maps/ShoalCave_LowTideStairsRoom/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideStairsRoom/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
new file mode 100644
index 000000000..035ab6dcb
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideStairsRoom: @ 8484400
+ .4byte ShoalCave_LowTideStairsRoom_MapAttributes
+ .4byte ShoalCave_LowTideStairsRoom_MapEvents
+ .4byte ShoalCave_LowTideStairsRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_M_DUNGON
+ .2byte 166
+ .byte 67
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/maps/ShoalCave_LowTideStairsRoom/map.bin
new file mode 100644
index 000000000..f2b56644d
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideStairsRoom/map.bin
@@ -0,0 +1 @@
+             1     22222262 2626222222622222622262222222Z322222222222222266222222222222#                     \ No newline at end of file
diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/maps/SingleBattleColosseum/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SingleBattleColosseum/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
new file mode 100644
index 000000000..b4844d42f
--- /dev/null
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -0,0 +1,15 @@
+SingleBattleColosseum: @ 8484D30
+ .4byte SingleBattleColosseum_MapAttributes
+ .4byte SingleBattleColosseum_MapEvents
+ .4byte SingleBattleColosseum_MapScripts
+ .4byte 0x0
+ .2byte BGM_RAINBOW
+ .2byte 221
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 8
+
diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/maps/SingleBattleColosseum/map.bin
new file mode 100644
index 000000000..1f66ab707
--- /dev/null
+++ b/data/maps/SingleBattleColosseum/map.bin
@@ -0,0 +1 @@
+hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_22L2M22222M2N2222U2T2U2U2b2c2U2U2V2U222U2`2U2U2d2e2U2U2a2U222U2T2U2U2f2g2U2U2V2U222U2\2]2]2]2]2]2]2^2U22!2!2 \ No newline at end of file
diff --git a/data/maps/SkyPillar_1F/border.bin b/data/maps/SkyPillar_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SkyPillar_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
new file mode 100644
index 000000000..937aafc96
--- /dev/null
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_1F: @ 8484764
+ .4byte SkyPillar_1F_MapAttributes
+ .4byte SkyPillar_1F_MapEvents
+ .4byte SkyPillar_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 322
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SkyPillar_1F/map.bin b/data/maps/SkyPillar_1F/map.bin
new file mode 100644
index 000000000..1eb299c49
--- /dev/null
+++ b/data/maps/SkyPillar_1F/map.bin
@@ -0,0 +1 @@
+''''''''';<=''/////////CD2E//222222222222222222222222222222222222222289999:2222222@AAAAB222222AAAAAA22222AAAAAA222222AAAAAA222222IMMMMJ2222222222222222222222222222222222"2#222222 \ No newline at end of file
diff --git a/data/maps/SkyPillar_2F/border.bin b/data/maps/SkyPillar_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SkyPillar_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
new file mode 100644
index 000000000..cec94c7a2
--- /dev/null
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_2F: @ 8484780
+ .4byte SkyPillar_2F_MapAttributes
+ .4byte SkyPillar_2F_MapEvents
+ .4byte SkyPillar_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 323
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SkyPillar_2F/map.bin b/data/maps/SkyPillar_2F/map.bin
new file mode 100644
index 000000000..8ec9bf213
--- /dev/null
+++ b/data/maps/SkyPillar_2F/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SkyPillar_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
new file mode 100644
index 000000000..5dd2b53b3
--- /dev/null
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_3F: @ 848479C
+ .4byte SkyPillar_3F_MapAttributes
+ .4byte SkyPillar_3F_MapEvents
+ .4byte SkyPillar_3F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 324
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SkyPillar_3F/map.bin b/data/maps/SkyPillar_3F/map.bin
new file mode 100644
index 000000000..d6c76d48c
--- /dev/null
+++ b/data/maps/SkyPillar_3F/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CL2E/CD2E/CD2E/2222222222222222222222222222222222222289999:2222222@AAAAB222222AAAAAA2222222AAAAAA2222222AAAAAA2222222IMMMMJ222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SkyPillar_4F/border.bin b/data/maps/SkyPillar_4F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SkyPillar_4F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
new file mode 100644
index 000000000..9e89a6177
--- /dev/null
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_4F: @ 84847B8
+ .4byte SkyPillar_4F_MapAttributes
+ .4byte SkyPillar_4F_MapEvents
+ .4byte SkyPillar_4F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 325
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SkyPillar_4F/map.bin b/data/maps/SkyPillar_4F/map.bin
new file mode 100644
index 000000000..02e82bb4f
--- /dev/null
+++ b/data/maps/SkyPillar_4F/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SkyPillar_5F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
new file mode 100644
index 000000000..363e2a52e
--- /dev/null
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_5F: @ 84847F0
+ .4byte SkyPillar_5F_MapAttributes
+ .4byte SkyPillar_5F_MapEvents
+ .4byte SkyPillar_5F_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 330
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SkyPillar_5F/map.bin b/data/maps/SkyPillar_5F/map.bin
new file mode 100644
index 000000000..b8cd541d5
--- /dev/null
+++ b/data/maps/SkyPillar_5F/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CL2E////CD2E//22222622262222226222226222222228999999:622622@AAAAAAB622262AAAAAAAA226222AAAAAAAA222222AAAAAAAA22222AAAAAAAA262222AAAAAAAA62222IMMMMMMJ22222222222222622622222222222 \ No newline at end of file
diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/maps/SkyPillar_Entrance/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/SkyPillar_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
new file mode 100644
index 000000000..5db53ba25
--- /dev/null
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_Entrance: @ 848472C
+ .4byte SkyPillar_Entrance_MapAttributes
+ .4byte SkyPillar_Entrance_MapEvents
+ .4byte SkyPillar_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 320
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/maps/SkyPillar_Entrance/map.bin
new file mode 100644
index 000000000..b215b86ef
--- /dev/null
+++ b/data/maps/SkyPillar_Entrance/map.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/SkyPillar_Outside/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
new file mode 100644
index 000000000..fc7ed3110
--- /dev/null
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_Outside: @ 8484748
+ .4byte SkyPillar_Outside_MapAttributes
+ .4byte SkyPillar_Outside_MapEvents
+ .4byte SkyPillar_Outside_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 321
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/maps/SkyPillar_Outside/map.bin
new file mode 100644
index 000000000..01b78d554
--- /dev/null
+++ b/data/maps/SkyPillar_Outside/map.bin
@@ -0,0 +1 @@
+ppppppppppr6666t5pppppppppppppppr66!1!1666tppppppppppr66!1!1!166!1!1!1!1ustppppppprs!1!1!1!1666!1!1uqutppppprss!1!1!1!1!1666!1!1uquuypppxsss!1!1!16666!1uquupppss{!1$1$12222226uquupppssqs$1$1$1$12222222ut}uppps{s$1$1$1$1$1$12222222t}uquppp{ss$1$1$1$1$1$1$122uququpppss{$1$1$1$1$1$1qqu2uququppppssqs$1$1$1$1$1sqqqu2uqut}pppps{{$1$1$1$1{|d|}2ut}uqppPQ{{{$1$1$10t}ut}ppXY{{{$1$1$1$1$1$14$1$1ut}upppppp{{s$1$1$1$1$1$1$1$1t}ut}ppPQppppsqs{$1$1$14$1t|}quuppXYppppPesq{{4$1$1t}qt|}upPQppppppXm{q{{|||}qt}t|}pXYppppPQp{q{|}qupppppppXYpp{|0|}ppppppppppPQpp$1$1$1$1$1Z[ppppppppppXYppppp$1$1$1$1$1pXYu{{{tp \ No newline at end of file
diff --git a/data/maps/SkyPillar_Top/border.bin b/data/maps/SkyPillar_Top/border.bin
new file mode 100644
index 000000000..e9d1c658c
--- /dev/null
+++ b/data/maps/SkyPillar_Top/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
new file mode 100644
index 000000000..3169183ed
--- /dev/null
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -0,0 +1,15 @@
+SkyPillar_Top: @ 848480C
+ .4byte SkyPillar_Top_MapAttributes
+ .4byte SkyPillar_Top_MapEvents
+ .4byte SkyPillar_Top_MapScripts
+ .4byte 0x0
+ .2byte BGM_TOZAN
+ .2byte 331
+ .byte 85
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 12
+ .byte 0
+
diff --git a/data/maps/SkyPillar_Top/map.bin b/data/maps/SkyPillar_Top/map.bin
new file mode 100644
index 000000000..d87f50f30
--- /dev/null
+++ b/data/maps/SkyPillar_Top/map.bin
@@ -0,0 +1 @@
+d2d2d26d2d2d26d2d2d26666666d2d2d26d2d2d26d26664274242426427742742777427424277674242742424274274274277666427777774242424242767424242777766767666424277766767666642427774242424277777426427764242424242424264277777642427774277427424242426742427426742427774242424242424242424267667774242426642424242424242424242426426642''''''''''m22n';<='''''''''//////////j22k/CL2E/////////5252525252525252525252525252525252676774242424242424242426427777677677424242424242424274276[[[[[[[[[[[[[[[[[[[[[[[[[[[ \ No newline at end of file
diff --git a/data/maps/SlateportCity/border.bin b/data/maps/SlateportCity/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/SlateportCity/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc
new file mode 100644
index 000000000..d8544954a
--- /dev/null
+++ b/data/maps/SlateportCity/connections.inc
@@ -0,0 +1,9 @@
+SlateportCity_MapConnectionsList: @ 84866F4
+ connection up, 0, ROUTE_110, 0
+ connection down, 0, ROUTE_109, 0
+ connection right, 0, ROUTE_134, 0
+
+SlateportCity_MapConnections: @ 8486718
+ .4byte 0x3
+ .4byte SlateportCity_MapConnectionsList
+
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
new file mode 100644
index 000000000..36ac643e4
--- /dev/null
+++ b/data/maps/SlateportCity/header.inc
@@ -0,0 +1,15 @@
+SlateportCity: @ 84824D4
+ .4byte SlateportCity_MapAttributes
+ .4byte SlateportCity_MapEvents
+ .4byte SlateportCity_MapScripts
+ .4byte SlateportCity_MapConnections
+ .2byte BGM_FINECITY
+ .2byte 2
+ .byte 8
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SlateportCity/map.bin b/data/maps/SlateportCity/map.bin
new file mode 100644
index 000000000..163beb4e8
--- /dev/null
+++ b/data/maps/SlateportCity/map.bin
Binary files differ
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
new file mode 100644
index 000000000..c5f983ce1
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_BattleTentBattleRoom: @ 848314C
+ .4byte SlateportCity_BattleTentBattleRoom_MapAttributes
+ .4byte SlateportCity_BattleTentBattleRoom_MapEvents
+ .4byte SlateportCity_BattleTentBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 386
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc
new file mode 100644
index 000000000..0ae84307c
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_BattleTentCorridor: @ 8483130
+ .4byte SlateportCity_BattleTentCorridor_MapAttributes
+ .4byte SlateportCity_BattleTentCorridor_MapEvents
+ .4byte SlateportCity_BattleTentCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 385
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc
new file mode 100644
index 000000000..2e35d23c4
--- /dev/null
+++ b/data/maps/SlateportCity_BattleTentLobby/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_BattleTentLobby: @ 8483114
+ .4byte SlateportCity_BattleTentLobby_MapAttributes
+ .4byte SlateportCity_BattleTentLobby_MapEvents
+ .4byte SlateportCity_BattleTentLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 384
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/maps/SlateportCity_Harbor/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc
new file mode 100644
index 000000000..7f932a556
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_Harbor: @ 84831D8
+ .4byte SlateportCity_Harbor_MapAttributes
+ .4byte SlateportCity_Harbor_MapEvents
+ .4byte SlateportCity_Harbor_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 88
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/maps/SlateportCity_Harbor/map.bin
new file mode 100644
index 000000000..c77c1edfb
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/map.bin
@@ -0,0 +1 @@
+!!!!!!!!!!!!!!!!!!!!!!!!222MNNNNNNNNNNNNNNNNNNNN222Gqqqqqqqqqqqqqqqqqqqq222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222Gqppppppppppppppppppp222hVVW[3[3UVVVVVVVF77VVVV222222222%222%222%22`77776*622222222222222222`77777722222222222222222`*6*6*6*677222222222222222`(6(6(6(677 \ No newline at end of file
diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc
new file mode 100644
index 000000000..049d9de6c
--- /dev/null
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_House1: @ 8483168
+ .4byte SlateportCity_House1_MapAttributes
+ .4byte SlateportCity_House1_MapEvents
+ .4byte SlateportCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 80
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
new file mode 100644
index 000000000..f09479db2
--- /dev/null
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_House2: @ 84831F4
+ .4byte SlateportCity_House2_MapAttributes
+ .4byte SlateportCity_House2_MapEvents
+ .4byte SlateportCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 60
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc
new file mode 100644
index 000000000..f9db75bdd
--- /dev/null
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_Mart: @ 8483248
+ .4byte SlateportCity_Mart_MapAttributes
+ .4byte SlateportCity_Mart_MapEvents
+ .4byte SlateportCity_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/maps/SlateportCity_OceanicMuseum_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/border.bin
Binary files differ
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
new file mode 100644
index 000000000..3c55de12c
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_OceanicMuseum_1F: @ 84831A0
+ .4byte SlateportCity_OceanicMuseum_1F_MapAttributes
+ .4byte SlateportCity_OceanicMuseum_1F_MapEvents
+ .4byte SlateportCity_OceanicMuseum_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FUNE_KAN
+ .2byte 86
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/maps/SlateportCity_OceanicMuseum_1F/map.bin
new file mode 100644
index 000000000..f18b01e49
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.bin
@@ -0,0 +1,2 @@
+]W&'&'   ^_ ./ ./    22222222262722627222222222 2222222222222!222!2222(C222222222222)6C22)6C2222K22"2#2#2$222"2#2#2$22K222K222 222U6H6I6V6C22U6I636V6C222!2222(C22>6D22>6C22>6D22>6C222)6C2222K22`6C22`6
+ `6C22`6C2222K2 \ No newline at end of file
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/maps/SlateportCity_OceanicMuseum_2F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/border.bin
Binary files differ
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
new file mode 100644
index 000000000..c1e082d69
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_OceanicMuseum_2F: @ 84831BC
+ .4byte SlateportCity_OceanicMuseum_2F_MapAttributes
+ .4byte SlateportCity_OceanicMuseum_2F_MapEvents
+ .4byte SlateportCity_OceanicMuseum_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FUNE_KAN
+ .2byte 87
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/maps/SlateportCity_OceanicMuseum_2F/map.bin
new file mode 100644
index 000000000..1fa2cdc18
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.bin
@@ -0,0 +1 @@
+ac %       bd%   22M2N2N2O22222-222222222C2289@,C22225C2S2T22S2T22 22C222334C22222K2[\2[\2(C2C22E2F2F2G2K2222222222222K2C22*01,C2222222Q2R2222 22C222334C2222222YZC222(C2C222222K222222222K2222K2 \ No newline at end of file
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..e12c994c1
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_PokemonCenter_1F: @ 8483210
+ .4byte SlateportCity_PokemonCenter_1F_MapAttributes
+ .4byte SlateportCity_PokemonCenter_1F_MapEvents
+ .4byte SlateportCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..2a810add5
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_PokemonCenter_2F: @ 848322C
+ .4byte SlateportCity_PokemonCenter_2F_MapAttributes
+ .4byte SlateportCity_PokemonCenter_2F_MapEvents
+ .4byte SlateportCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/maps/SlateportCity_PokemonFanClub/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonFanClub/border.bin
Binary files differ
diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc
new file mode 100644
index 000000000..ac7230cd2
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_PokemonFanClub: @ 8483184
+ .4byte SlateportCity_PokemonFanClub_MapAttributes
+ .4byte SlateportCity_PokemonFanClub_MapEvents
+ .4byte SlateportCity_PokemonFanClub_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 85
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/maps/SlateportCity_PokemonFanClub/map.bin
new file mode 100644
index 000000000..effff6653
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonFanClub/map.bin
Binary files differ
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/maps/SlateportCity_SternsShipyard_1F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
new file mode 100644
index 000000000..baa482aa3
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_SternsShipyard_1F: @ 84830DC
+ .4byte SlateportCity_SternsShipyard_1F_MapAttributes
+ .4byte SlateportCity_SternsShipyard_1F_MapEvents
+ .4byte SlateportCity_SternsShipyard_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 81
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/maps/SlateportCity_SternsShipyard_1F/map.bin
new file mode 100644
index 000000000..036f5ce26
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_1F/map.bin
@@ -0,0 +1,7 @@
+!
+!012! #!$!"!!"2222
+)28292:2)22)2)2)2)2)2)2)2)2222222  2 2 2 2 2 2 2 2&2)2)2)2)22A2B22222?)2)2)2'IJ2222
+G$[\3456 )2)2)2''2222   O)2cd;<=>2)2)2)2/7A2B222)2)2k2l2CDEF)2)2)2)2)2)2IJ2222 )2)2)2)2K2LMN2)2)2)2)2)2)22222222)2)2)253)2UV)2)2)2)2)2)2)2A2B222222)2)2(2_2(2*2*253)2)2)2)2)22IJ22222)2(2_2(2(2(2_2)2)2)2'222222
+'2(2W(2(2(2W)2)2)2'''222222
+/'(2(2(2(2(2)2)2)2//7222222
+77/)2)2)2)2)2)2)2)2)2)2)2 \ No newline at end of file
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/maps/SlateportCity_SternsShipyard_2F/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
new file mode 100644
index 000000000..e3fe0fa27
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -0,0 +1,15 @@
+SlateportCity_SternsShipyard_2F: @ 84830F8
+ .4byte SlateportCity_SternsShipyard_2F_MapAttributes
+ .4byte SlateportCity_SternsShipyard_2F_MapEvents
+ .4byte SlateportCity_SternsShipyard_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_FINECITY
+ .2byte 82
+ .byte 8
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/maps/SlateportCity_SternsShipyard_2F/map.bin
new file mode 100644
index 000000000..d10ed2ac2
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_2F/map.bin
@@ -0,0 +1 @@
+!!!$#! !!$! !!22222222222222222222222222  22  22@2B2A2B2222222222HJIJ2222PQQQQQQR222222222`cd;<=>2A2B2@2B22222`klCDEF2IJHJ2222`))KLMN222222222`)5)UV)2A2B2@2B22222`(W2(**52IJHJ222`(W2(((W2222222222hiiiij222222222222%2%2222222222222222222222 \ No newline at end of file
diff --git a/data/maps/SootopolisCity/border.bin b/data/maps/SootopolisCity/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/maps/SootopolisCity/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SootopolisCity/connections.inc b/data/maps/SootopolisCity/connections.inc
new file mode 100644
index 000000000..230f56b2e
--- /dev/null
+++ b/data/maps/SootopolisCity/connections.inc
@@ -0,0 +1,6 @@
+SootopolisCity_MapConnectionsList:: @ 84867F0
+ @ empty
+
+SootopolisCity_MapConnections:: @ 84867F0
+ .4byte 0
+ .4byte SootopolisCity_MapConnectionsList
diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc
new file mode 100644
index 000000000..b0bc91968
--- /dev/null
+++ b/data/maps/SootopolisCity/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity: @ 848257C
+ .4byte SootopolisCity_MapAttributes
+ .4byte SootopolisCity_MapEvents
+ .4byte SootopolisCity_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 8
+ .byte 14
+ .byte 0
+ .byte 2
+ .byte 2
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SootopolisCity/map.bin b/data/maps/SootopolisCity/map.bin
new file mode 100644
index 000000000..ff03ebc3b
--- /dev/null
+++ b/data/maps/SootopolisCity/map.bin
@@ -0,0 +1,12 @@
+222922222922222229KLM929222222 
+  222222222 
+ 2222 
+ 22%7'222222KLM2222 
+  
+ U22-?/22@AAAB Z2222#$_222222 222222222222222222 22KLM22+,_22D2E2222222222222222222222@AAAAAAAB2 @AAF2G\22222222222@AF22GAAAB22D222%6'2bD2c22222222222bD2E2c2222922->/22D2222222222222D2AAAAAB22222222222D2E2D2 
+ D2E2D2E222222222222222222222D2E226222222 222822D2E22222222222229222222222222222222@AF22GAAAAAAAAB2222222222T 
+ B22222222bD2E2cQR[RS22TA 
+ 222228222222;2222^#$222D2E2222222 !2"2^2#$22222222^+,222D2E222222()2)2)2*222^2+,2222 
+  
+ KLM^22222222222n22o0q0q0q022222^22222D2E2 2 ^22222222222bD2E2cq06q06q022^2222D2E2%7'2%7']AAAB2222D2q0q0q0q0q0q06q06q0q0q0^222222222-?/2AAB-?/2D2E222D2q0q0q0q0q0q0q0q0q0q0q0q0q0q0]AB222222222222222222222q0q0q0q0q0q0q0q0q0q0q0q0q0q0D2E2KLM22222KLMD2E2222q0q0t||||||||||TB222 2222222KL22TYZB22D2E2ty}s^2222222222222 22^22222q0q0t}yyyyyyyy{y^222222222%6'22^222k6l6l6m6q0q0uyyyyyyyyyys^2222222 22222->/22^2222220123q0q0uyyyyyyyyyyyyys]AAB22222222AAAAB]AAAAB89:;q0q0uyyyyyyys{|}~2222222222ABwq0q0uyyyyysTPQRS2222D22222222222222q0q0uyyyyys^XYZ[222222222222222222222222222q0q0uyyyyys^abvD2E222222KLM22222D2E2q0q0q0uy01110yys^22222222222222TYZB2222q0q0q0q0q0q0uy000000010yys^22222222222922222^2222q0q0q0q0q0q0t}y00000010yys]B22@AF22 22222^2222q0tD2E2yzy00000000yysD2E2N22 
+ 2222^2222222q0r0000yy00000000yy{yyyD2E2N222]B2222q0r0000yyyy04000pN222222222tyyz0yyyyyyyyyyyyyyy00000pV@AAAAAAB2qtyyz0000yyyyyyyyyyyyyyyyyyyy00000p2qqr0000000yyyyyyyyyyyyyyyyyyyy000xyyyyqqq2qqr0000000yyyyyyyyyyyyyyyyyyyyyy00000000x2qqr000000000yyyyyyyyyyyyyyyyyyyyyy000000000pq2qqr000000000yyyyyyyyyyyyyyyyyyyyyy000011pq2qqr00000001100yyyyyyyyyyyyyyyyyyyyyyyyy0000pqq2qr000000000yyyyyyyyyyyyyyyyyyyyyyyyy0000pqqiiij000yyyyyyyyyyyyyyyyyyyyyyyyypqqij0yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyypr0yyyyyyyyyyyyyyyyyyyyyyyyyyyyyy`ii0i0i00iijyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyqqqqqryyyyyyyyyyyyyyyyyyyyyyyyiiiiiiqryyyyyyyyyyyyyyyyyyyyyyyyqqqqqqqryyyyyyyyyyyyyyyiiiiqqqqryyyyyyyyyyyqqqqqqqryyyyyyyyyqqqqqiiiiyyiiqqqqqqiiiiiiiiiiiiiiiiiqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/maps/SootopolisCity_Gym_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/border.bin
Binary files differ
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
new file mode 100644
index 000000000..dbe7528ea
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_1F: @ 8483A28
+ .4byte SootopolisCity_Gym_1F_MapAttributes
+ .4byte SootopolisCity_Gym_1F_MapEvents
+ .4byte SootopolisCity_Gym_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 109
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/maps/SootopolisCity_Gym_1F/map.bin
new file mode 100644
index 000000000..dd52448c9
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/map.bin
Binary files differ
diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/maps/SootopolisCity_Gym_B1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_B1F/border.bin
Binary files differ
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
new file mode 100644
index 000000000..1e9618d01
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_B1F: @ 8483A44
+ .4byte SootopolisCity_Gym_B1F_MapAttributes
+ .4byte SootopolisCity_Gym_B1F_MapEvents
+ .4byte SootopolisCity_Gym_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_GIM
+ .2byte 110
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 1
+
diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/maps/SootopolisCity_Gym_B1F/map.bin
new file mode 100644
index 000000000..58410408f
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_B1F/map.bin
@@ -0,0 +1 @@
+%&&&&&&&&&&&&&&&'-%             '/-]2222222222222^/-]2222222222222^/-]2222222222222^/5]2222222222222^7&57&..-%        '/..-]222222222^/-]222222222^/&&5]222222222^7&&&&&5=7&&&....-.%  './....-]222^/&&&&5]222^7&&&&&&&&&&]222^&&&&&&...%&&&&&&'...-%      '/-]222222^/-]2222222^/-]2222222^/-]2222222^/ \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/maps/SootopolisCity_House1/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SootopolisCity_House1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc
new file mode 100644
index 000000000..eb3dd5484
--- /dev/null
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House1: @ 8483AB4
+ .4byte SootopolisCity_House1_MapAttributes
+ .4byte SootopolisCity_House1_MapEvents
+ .4byte SootopolisCity_House1_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 307
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/maps/SootopolisCity_House1/map.bin
new file mode 100644
index 000000000..43f11b194
--- /dev/null
+++ b/data/maps/SootopolisCity_House1/map.bin
@@ -0,0 +1 @@
+023333332332772333327723333333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/maps/SootopolisCity_House2/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SootopolisCity_House2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc
new file mode 100644
index 000000000..2a3d57175
--- /dev/null
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House2: @ 8483AD0
+ .4byte SootopolisCity_House2_MapAttributes
+ .4byte SootopolisCity_House2_MapEvents
+ .4byte SootopolisCity_House2_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 308
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/maps/SootopolisCity_House2/map.bin
new file mode 100644
index 000000000..632e1e36a
--- /dev/null
+++ b/data/maps/SootopolisCity_House2/map.bin
@@ -0,0 +1 @@
+vw62223336333277233333772333333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/maps/SootopolisCity_House3/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/SootopolisCity_House3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc
new file mode 100644
index 000000000..b4171f3c0
--- /dev/null
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House3: @ 8483AEC
+ .4byte SootopolisCity_House3_MapAttributes
+ .4byte SootopolisCity_House3_MapEvents
+ .4byte SootopolisCity_House3_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 309
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/maps/SootopolisCity_House3/map.bin
new file mode 100644
index 000000000..8bbd6c517
--- /dev/null
+++ b/data/maps/SootopolisCity_House3/map.bin
@@ -0,0 +1 @@
+62233322333333337723333377333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc
new file mode 100644
index 000000000..ee68a0a91
--- /dev/null
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House4: @ 8483B08
+ .4byte SootopolisCity_House4_MapAttributes
+ .4byte SootopolisCity_House4_MapEvents
+ .4byte SootopolisCity_House4_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 307
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc
new file mode 100644
index 000000000..6a7380b8c
--- /dev/null
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House5: @ 8483B24
+ .4byte SootopolisCity_House5_MapAttributes
+ .4byte SootopolisCity_House5_MapEvents
+ .4byte SootopolisCity_House5_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 308
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc
new file mode 100644
index 000000000..f870ecd91
--- /dev/null
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House6: @ 8483B40
+ .4byte SootopolisCity_House6_MapAttributes
+ .4byte SootopolisCity_House6_MapEvents
+ .4byte SootopolisCity_House6_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 309
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc
new file mode 100644
index 000000000..f36b89b46
--- /dev/null
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_House7: @ 8483B5C
+ .4byte SootopolisCity_House7_MapAttributes
+ .4byte SootopolisCity_House7_MapEvents
+ .4byte SootopolisCity_House7_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 307
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin b/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin
Binary files differ
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
new file mode 100644
index 000000000..29e492dcd
--- /dev/null
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_LotadAndSeedotHouse: @ 8483B78
+ .4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes
+ .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents
+ .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 297
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin
new file mode 100644
index 000000000..ffeea7269
--- /dev/null
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin
@@ -0,0 +1 @@
+XX``22333366333773333327723333333333333 333 \ No newline at end of file
diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc
new file mode 100644
index 000000000..fab473720
--- /dev/null
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Mart: @ 8483A98
+ .4byte SootopolisCity_Mart_MapAttributes
+ .4byte SootopolisCity_Mart_MapEvents
+ .4byte SootopolisCity_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin b/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin
Binary files differ
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
new file mode 100644
index 000000000..05d5d727d
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MysteryEventsHouse_1F: @ 8483B94
+ .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes
+ .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents
+ .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 439
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin
new file mode 100644
index 000000000..a9b17a746
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin
Binary files differ
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
new file mode 100644
index 000000000..603fdcc70
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0
+ .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes
+ .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents
+ .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_RUNECITY
+ .2byte 440
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin
new file mode 100644
index 000000000..558e1584e
--- /dev/null
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin
@@ -0,0 +1,2 @@
+ 
+        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
new file mode 100644
index 000000000..bc0c30b7f
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_PokemonCenter_1F: @ 8483A60
+ .4byte SootopolisCity_PokemonCenter_1F_MapAttributes
+ .4byte SootopolisCity_PokemonCenter_1F_MapEvents
+ .4byte SootopolisCity_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..465bf4c74
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+SootopolisCity_PokemonCenter_2F: @ 8483A7C
+ .4byte SootopolisCity_PokemonCenter_2F_MapAttributes
+ .4byte SootopolisCity_PokemonCenter_2F_MapEvents
+ .4byte SootopolisCity_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 14
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/maps/SouthernIsland_Exterior/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc
new file mode 100644
index 000000000..e2d44b2ff
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -0,0 +1,15 @@
+SouthernIsland_Exterior: @ 8485238
+ .4byte SouthernIsland_Exterior_MapAttributes
+ .4byte SouthernIsland_Exterior_MapEvents
+ .4byte SouthernIsland_Exterior_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 290
+ .byte 73
+ .byte 0
+ .byte 0
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/maps/SouthernIsland_Exterior/map.bin
new file mode 100644
index 000000000..8c2c2df4a
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/map.bin
@@ -0,0 +1 @@
+qss444444444444444444444440uuuuqss444444444444444444444444t}uuuqss444444444444444444444444uquuuqss444444444444444444444444uquuuqss444444444447744444444444ut}uuqss444444444443344444444444uuquuss04444444444334444444444t}ut}uss{|444444440004444444444uquut}s{qs444444440000440000004ut}uu{sqs444444440000000444000uuquups{s044444444000004444400uuquups{s{64444444400044444t00zuquup{s{44p0444444444t6666z000ut}upssq{|{||444444tz4444t00yzuqupssqqq{44{666|||}tyyyyz0000ut}ps{|||44x444tz0000000t|}upsqqqq{||xyyyz0000000000t}qt}pp{||qqqqs0000000000t||||}t|}pp{||q{|||||00|||}t}pppppp{|]^0^0_}ppppppppppp]^0^0_ppppppppppppppppppppUV0V0V02^0^0_qpppppppppppppppppppppppp]^0^0^0^0^0^0_qppppppppppppppppppppppppSTTV3W3TTUqpppppppppppppppppppppppp[\\\\\\]qppppppppppppppppppppppppqqqqqqqqqpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/maps/SouthernIsland_Interior/border.bin
new file mode 100644
index 000000000..03bcafef1
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
new file mode 100644
index 000000000..dae14dddc
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -0,0 +1,15 @@
+SouthernIsland_Interior: @ 8485254
+ .4byte SouthernIsland_Interior_MapAttributes
+ .4byte SouthernIsland_Interior_MapEvents
+ .4byte SouthernIsland_Interior_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN02
+ .2byte 291
+ .byte 73
+ .byte 0
+ .byte 11
+ .byte 3
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/maps/SouthernIsland_Interior/map.bin
new file mode 100644
index 000000000..db1e4b153
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/map.bin
@@ -0,0 +1 @@
+000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000011000000000000001111001112211 \ No newline at end of file
diff --git a/data/maps/TerraCave_End/border.bin b/data/maps/TerraCave_End/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/TerraCave_End/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc
new file mode 100644
index 000000000..8297d8e34
--- /dev/null
+++ b/data/maps/TerraCave_End/header.inc
@@ -0,0 +1,15 @@
+TerraCave_End: @ 8484A3C
+ .4byte TerraCave_End_MapAttributes
+ .4byte TerraCave_End_MapEvents
+ .4byte TerraCave_End_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 409
+ .byte 205
+ .byte 0
+ .byte 6
+ .byte 4
+ .2byte 0
+ .byte 14
+ .byte 0
+
diff --git a/data/maps/TerraCave_End/map.bin b/data/maps/TerraCave_End/map.bin
new file mode 100644
index 000000000..93121190d
--- /dev/null
+++ b/data/maps/TerraCave_End/map.bin
@@ -0,0 +1,9 @@
+ 
+ 222
+
+ 222
+  222222222222
+ 2222222
+ 2222222
+  22222222222222
+  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
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/TerraCave_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc
new file mode 100644
index 000000000..72b3327cd
--- /dev/null
+++ b/data/maps/TerraCave_Entrance/header.inc
@@ -0,0 +1,15 @@
+TerraCave_Entrance: @ 8484A20
+ .4byte TerraCave_Entrance_MapAttributes
+ .4byte TerraCave_Entrance_MapEvents
+ .4byte TerraCave_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 408
+ .byte 205
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/TerraCave_Entrance/map.bin b/data/maps/TerraCave_Entrance/map.bin
new file mode 100644
index 000000000..a8108c2ca
--- /dev/null
+++ b/data/maps/TerraCave_Entrance/map.bin
@@ -0,0 +1,33 @@
+  3
+  222
+
+  222222
+
+ 222
+
+  2222
+ 2
+
+ 2222
+ 2
+
+  222222
+ 2
+
+ 22 2
+
+  222
+
+  22
+ 22222
+
+   2222
+22222
+
+   2222
+222222
+   222222222
+   2222222222
+ 222
+   2222222222222
+ 2222222222222 2222222 222  \ No newline at end of file
diff --git a/data/maps/TradeCenter/border.bin b/data/maps/TradeCenter/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/TradeCenter/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
new file mode 100644
index 000000000..ac6089b68
--- /dev/null
+++ b/data/maps/TradeCenter/header.inc
@@ -0,0 +1,15 @@
+TradeCenter: @ 8484D4C
+ .4byte TradeCenter_MapAttributes
+ .4byte TradeCenter_MapEvents
+ .4byte TradeCenter_MapScripts
+ .4byte 0x0
+ .2byte BGM_RAINBOW
+ .2byte 222
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/TradeCenter/map.bin b/data/maps/TradeCenter/map.bin
new file mode 100644
index 000000000..7e592dbe6
--- /dev/null
+++ b/data/maps/TradeCenter/map.bin
@@ -0,0 +1,2 @@
+017456742389?<=  >?<:;@AGDE((FGDBCHI2.2222222.2J2KP22
+2 2 2 22222SPQ2+22222+2R2SP2222222222SXY222#2$2%2&222Z2[,2-2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_1F/border.bin b/data/maps/TrainerHill_1F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/TrainerHill_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc
new file mode 100644
index 000000000..ab6263ebf
--- /dev/null
+++ b/data/maps/TrainerHill_1F/header.inc
@@ -0,0 +1,15 @@
+TrainerHill_1F: @ 84857E8
+ .4byte TrainerHill_1F_MapAttributes
+ .4byte TrainerHill_1F_MapEvents
+ .4byte TrainerHill_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 415
+ .byte 212
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/TrainerHill_1F/map.bin b/data/maps/TrainerHill_1F/map.bin
new file mode 100644
index 000000000..d72e84a5c
--- /dev/null
+++ b/data/maps/TrainerHill_1F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2       12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_2F/border.bin b/data/maps/TrainerHill_2F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/TrainerHill_2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc
new file mode 100644
index 000000000..3751d7207
--- /dev/null
+++ b/data/maps/TrainerHill_2F/header.inc
@@ -0,0 +1,15 @@
+TrainerHill_2F: @ 8485804
+ .4byte TrainerHill_2F_MapAttributes
+ .4byte TrainerHill_2F_MapEvents
+ .4byte TrainerHill_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 416
+ .byte 212
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/TrainerHill_2F/map.bin b/data/maps/TrainerHill_2F/map.bin
new file mode 100644
index 000000000..8b78fd0b4
--- /dev/null
+++ b/data/maps/TrainerHill_2F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_3F/border.bin b/data/maps/TrainerHill_3F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/TrainerHill_3F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc
new file mode 100644
index 000000000..edbe1db0e
--- /dev/null
+++ b/data/maps/TrainerHill_3F/header.inc
@@ -0,0 +1,15 @@
+TrainerHill_3F: @ 8485820
+ .4byte TrainerHill_3F_MapAttributes
+ .4byte TrainerHill_3F_MapEvents
+ .4byte TrainerHill_3F_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 417
+ .byte 212
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/TrainerHill_3F/map.bin b/data/maps/TrainerHill_3F/map.bin
new file mode 100644
index 000000000..5280752f4
--- /dev/null
+++ b/data/maps/TrainerHill_3F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_4F/border.bin b/data/maps/TrainerHill_4F/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/TrainerHill_4F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc
new file mode 100644
index 000000000..de5b03b69
--- /dev/null
+++ b/data/maps/TrainerHill_4F/header.inc
@@ -0,0 +1,15 @@
+TrainerHill_4F: @ 848583C
+ .4byte TrainerHill_4F_MapAttributes
+ .4byte TrainerHill_4F_MapEvents
+ .4byte TrainerHill_4F_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 418
+ .byte 212
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/TrainerHill_4F/map.bin b/data/maps/TrainerHill_4F/map.bin
new file mode 100644
index 000000000..3a285b7f8
--- /dev/null
+++ b/data/maps/TrainerHill_4F/map.bin
@@ -0,0 +1,2 @@
+'  2/(282929292/(8292929212;2;2;2
+12;2;2;212;2;2;2      12;2;2;212;2;2;292928292:2;2;2;212;2;2;2;2;2929292:2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;212;2;2;2;2;2;2;2;2;2;2;2;2;2;2 \ No newline at end of file
diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc
new file mode 100644
index 000000000..30ea4f5c4
--- /dev/null
+++ b/data/maps/TrainerHill_Elevator/header.inc
@@ -0,0 +1,15 @@
+TrainerHill_Elevator: @ 8485ADC
+ .4byte TrainerHill_Elevator_MapAttributes
+ .4byte TrainerHill_Elevator_MapEvents
+ .4byte TrainerHill_Elevator_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 266
+ .byte 212
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/TrainerHill_Entrance/border.bin b/data/maps/TrainerHill_Entrance/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/TrainerHill_Entrance/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc
new file mode 100644
index 000000000..3c43ad0ba
--- /dev/null
+++ b/data/maps/TrainerHill_Entrance/header.inc
@@ -0,0 +1,15 @@
+TrainerHill_Entrance: @ 84857CC
+ .4byte TrainerHill_Entrance_MapAttributes
+ .4byte TrainerHill_Entrance_MapEvents
+ .4byte TrainerHill_Entrance_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 414
+ .byte 212
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/TrainerHill_Entrance/map.bin b/data/maps/TrainerHill_Entrance/map.bin
new file mode 100644
index 000000000..fc00c0a5f
--- /dev/null
+++ b/data/maps/TrainerHill_Entrance/map.bin
@@ -0,0 +1,2 @@
+ !:;7<!'()BC3D)/(8335333/(O3N313M3L3/(K73J/(937393/(7373R73/&!!!ST"P373Q3*!!!#$%UV73)))+,-.   33I73H33 33533A3534
+393353353353@3130353353353353373031303130313031303130313031303130313631303130313031303130313031303130313037333313031303130313031303133331363   0313031303130313031303   03730313031303130313000313031303130313 \ No newline at end of file
diff --git a/data/maps/TrainerHill_Roof/border.bin b/data/maps/TrainerHill_Roof/border.bin
new file mode 100644
index 000000000..064786e8c
--- /dev/null
+++ b/data/maps/TrainerHill_Roof/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc
new file mode 100644
index 000000000..f00fc60bd
--- /dev/null
+++ b/data/maps/TrainerHill_Roof/header.inc
@@ -0,0 +1,15 @@
+TrainerHill_Roof: @ 8485858
+ .4byte TrainerHill_Roof_MapAttributes
+ .4byte TrainerHill_Roof_MapEvents
+ .4byte TrainerHill_Roof_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 419
+ .byte 212
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 4
+ .byte 0
+
diff --git a/data/maps/TrainerHill_Roof/map.bin b/data/maps/TrainerHill_Roof/map.bin
new file mode 100644
index 000000000..815ec1067
--- /dev/null
+++ b/data/maps/TrainerHill_Roof/map.bin
@@ -0,0 +1 @@
+XYajjZggd\]`ajjjZgggdehijjjZggglmggggggpqrijZglstuggggggkkkkkkxyz^_bvw{|}kkkkkkkkkkkkk33fg[~k3kkkkkkkkkkk3k3k3n3oc3k3k3k3kkkkkkkkk3k3k3k3k3k3k3k3k3k3k3kkkkkkkkkkk3k3k3k3k3k3k3k3k3k3k3kkkkkkkkkkkkk3k3k3k3k3k3k3k3k3k3k3kkkkkk3k33333333k33kW \ No newline at end of file
diff --git a/data/maps/Underwater1/border.bin b/data/maps/Underwater1/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater1/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc
new file mode 100644
index 000000000..6215c5e88
--- /dev/null
+++ b/data/maps/Underwater1/connections.inc
@@ -0,0 +1,8 @@
+Underwater1_MapConnectionsList: @ 8486D38
+ connection down, 0, UNDERWATER_2, 0
+ connection emerge, 0, ROUTE_124, 0
+
+Underwater1_MapConnections: @ 8486D50
+ .4byte 0x2
+ .4byte Underwater1_MapConnectionsList
+
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
new file mode 100644
index 000000000..22466247a
--- /dev/null
+++ b/data/maps/Underwater1/header.inc
@@ -0,0 +1,15 @@
+Underwater1: @ 8482A30
+ .4byte Underwater1_MapAttributes
+ .4byte Underwater1_MapEvents
+ .4byte Underwater1_MapScripts
+ .4byte Underwater1_MapConnections
+ .2byte BGM_DEEPDEEP
+ .2byte 274
+ .byte 50
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater1/map.bin b/data/maps/Underwater1/map.bin
new file mode 100644
index 000000000..230e3dcd2
--- /dev/null
+++ b/data/maps/Underwater1/map.bin
@@ -0,0 +1,17 @@
+2222222222222222222222222222222222222222222222222222222222222222222222# 22
+"##~222222222222222222222222222222222#  "#####~22222222222}####### 22
+||~22###~22222222#  "22######~2222222222222222222222222222222222222222222222222222}|||| 22
+"22222222222#  "22222222222222222222222222222222222222222222222222#|~222222222222222222#~2222#||~2222222222222222222#|||||||||||~222#~22222#~2222222222222#~2222222222#|||# 22
+"22#  "222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222# 22
+"22}"2222222222222222222y2y222222222222y2y222222222222222# 22
+""~22222222222222222222222#  "222222222222}|"22222222222222222222222222# 22
+|||"2222222222222222222#  "2222"~222222222}|"222# 22
+""|~22222}|"22}|#  ""|||||"22222222222222222222222222222222222222222222222222}||~2222222222222222}"22222222# 22
+"2222"~2222222#  "222222}""|~}"2222222}""|||||22222222222222# 22
+"2222#  "222222"~22222222"~222222222"~22z222
+"22222222222222y2y22222222222222222#~22# 22
+"||||~222222222222#  "#|~2222222222222222222222222222222#|~2222222222222# 22
+"||||||# 22
+"222#  "#  "22222222}"222222222222222
+ "# 22
+"#  " \ No newline at end of file
diff --git a/data/maps/Underwater2/border.bin b/data/maps/Underwater2/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater2/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc
new file mode 100644
index 000000000..20ef02321
--- /dev/null
+++ b/data/maps/Underwater2/connections.inc
@@ -0,0 +1,9 @@
+Underwater2_MapConnectionsList: @ 8486D6C
+ connection up, 0, UNDERWATER_1, 0
+ connection right, 0, UNDERWATER_3, 0
+ connection emerge, 0, ROUTE_126, 0
+
+Underwater2_MapConnections: @ 8486D90
+ .4byte 0x3
+ .4byte Underwater2_MapConnectionsList
+
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
new file mode 100644
index 000000000..21e0953f1
--- /dev/null
+++ b/data/maps/Underwater2/header.inc
@@ -0,0 +1,15 @@
+Underwater2: @ 8482A4C
+ .4byte Underwater2_MapAttributes
+ .4byte Underwater2_MapEvents
+ .4byte Underwater2_MapScripts
+ .4byte Underwater2_MapConnections
+ .2byte BGM_DEEPDEEP
+ .2byte 51
+ .byte 51
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater2/map.bin b/data/maps/Underwater2/map.bin
new file mode 100644
index 000000000..0c6377c30
--- /dev/null
+++ b/data/maps/Underwater2/map.bin
@@ -0,0 +1,35 @@
+2222222222222222222222222222222222222222222222222222222z222x2#~6y2y222}||||||||||||||##||||#2222222222222222222222222#       22222222222/# 222222222222222222
+    222222222222222222222#  22222222222222222222222# 22222222222222222222222222# 2222222222222222222222222222222222222222222222222
+    22222222222222222222222222222222
+" #  222/2222222 222222222222222222222 "#/#   "# 22222
+"222222222222222222222##     " "2222222222222222222222/ "222222
+  222222222222222222
+  22222222222222222/  2222222222/2222222222222/#  22222# 222222222222222222222222
+"#22/2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+"2222222222222222222222222222222222222222222222222# 22222222222222222
+   2222222222222222222222222222222222222222
+   "#     22222222222222222222222222222222222
+ " /#           22222222222222/2222222222
+"/ " #/#  22222222/2222222222222
+ " " "# /#/# 2222222222222222222
+ " "/ "#/#/# 2222222222222222222
+" "/ "#/## 2222222222
+"222222
+" " "#/#/# 22222# 222/2222222 "/ "### 22222#/222222222
+" "##22222222222222 " "#/# 2222222222222## 2222## 2
+"22222
+  "/2222/# "/222222 "##2222#22222222222#2222222/### 2222/2222222//622222/222222
+ 22222222222/22222#222222/222222222222/222222#2222222222222//2222222222222
+"22222222222222222222//62222222/# 2222222/2222222/ "2222222/2222222
+"## 2222222/222222
+" "22222222222222/222222222/222222
+"/ "# 222222222/22222222222222222//2222222 "222222222222//2222222
+"#/# 22222222222222efg2222222222/ "##   222222222222222222mno2222222222222222222 #  222222222222222222222222222222222222222222
+" "222222 /#  222222222222222222222222222222222222222
+"2222222##    22222222222222222222222222222222
+  " "6222222222/# 222222222222222222222222222222
+"/62222z222x22##  2222222222222222222222222
+  " "622}~2y2y22} #   22222222222222222222
+ "622 |||| ##   222222222222222
+ "/ "622/#  2222222
+     "622##       "/ "62222// "6222222#"222222|~22222 ||||   \ No newline at end of file
diff --git a/data/maps/Underwater3/border.bin b/data/maps/Underwater3/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater3/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc
new file mode 100644
index 000000000..30ab15908
--- /dev/null
+++ b/data/maps/Underwater3/connections.inc
@@ -0,0 +1,9 @@
+Underwater3_MapConnectionsList: @ 8486D98
+ connection emerge, 0, ROUTE_127, 0
+ connection left, 0, UNDERWATER_2, 0
+ connection down, 0, UNDERWATER_4, 0
+
+Underwater3_MapConnections: @ 8486DBC
+ .4byte 0x3
+ .4byte Underwater3_MapConnectionsList
+
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
new file mode 100644
index 000000000..29e20952f
--- /dev/null
+++ b/data/maps/Underwater3/header.inc
@@ -0,0 +1,15 @@
+Underwater3: @ 8482A68
+ .4byte Underwater3_MapAttributes
+ .4byte Underwater3_MapEvents
+ .4byte Underwater3_MapScripts
+ .4byte Underwater3_MapConnections
+ .2byte BGM_DEEPDEEP
+ .2byte 52
+ .byte 52
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater3/map.bin b/data/maps/Underwater3/map.bin
new file mode 100644
index 000000000..fc5c331a5
--- /dev/null
+++ b/data/maps/Underwater3/map.bin
@@ -0,0 +1 @@
+66666666666666666666666666666666666666666666666666666666666666&666666666666.66666666666662222;2;2666666666666662222;2;2;2;2666666666662222@2C2C2A26666666666222222<2P2Q2:266666666666222222<2T2R:266666666666222222<2T2R:26666666666662z222x22@2G2T2R2:266666666666@2A222y2y22}#@2G2P2\2R2B2A266666666666@2D2B2A2#######<2P2\2V2Z2Q2:266666666666?2P2Q2B2:2<2K2L2V2V2R2B2A266666666666?2W2]2Q2:23242T2V2V2R2S2:266666666666?2W2S2U2:2# ?2K2L2V2Z2Q2:266666666666?2W2S2U2:23242T2V2V2R2:26666666666?2Y2O2U2B2A2## ?2K2K2L2R2:26666666666I242W2U2S2:2#32422L2R2:26666666666  ?2W2]2Q2:2## 422L2R2:26666666666?2Y2O2U2:2#3242L2R2:2666666666I242W2U2B2A2## 42T2R2:26666666666  ?2W2U2S2:2#42T2R2:2666666666?2W2]2Q2:242T2R20 66666666?2W2S2U2:2;242T2R2866666666?2Y2O2U2B2A242T2R28 "666666666   I242W2U2S2:2;242T2R28 "666666666  ?2W2]2Q2:2@2C2A222###!a6`"  666666666?2W2S2U2:2?2S2:22222###" "666666666?2W2S2U2B2A2?2S2:2222222 66666666?2W2S2U2S2:2?2S2B2A2222222 "66666666?2W2S2U2S2:23242S2:2#~z222x2}# "66666666?2W2S2U2S2:2@2A2# ?2S2B2A22y2y22 "# "66666666?2W2S2]2Q2:2?2B2A2?2S2S2:22222##666666666?2W2P2Q2U2:2?2S2:2?22S2:2#~222666666666?2W2T2R2U2:2?2S2:2?2S2S2:2   #~22&#"666666666@2A2?2W2T2R2U2:2?2S2B2A2?2S2S2:2#~2.# "666666666<2:2?2W2T2R2U2:2@2D2P2Q2:2?2S2S2:2222222#  666666666@22B2A2?2W2T2R2U2:2?2P2_2U2:2@2D2S2S2:2#~2222}##"666666666@2222:2?2W2T2R2U2:2?2W2S2U2:2?2S2S22232#######666666666<2222B2A2?2W2T2R2U2:2;2?2W2S2U2:2?2S2S2:2" "666666666<2222S2:2;2?2W2T2R2U2B2A2?2W2S2U2:2;2?2S2S2:266666666I242T2Z2Q2:2@2G2W2T2R2U2S2:2?2W2S2U2B2A2@2D2S2S2:2#"66666666# ?2Y2L2R2B2A2?2S2W2T2R2]2Q2:2?2K2O2U2S2:2?2S2S2S2:266666666I242T2Z2Q2:2?2P2_2T2Z2Q2U2:23242T2U2S2:2?2S2S22232226666666 6# ?2Y2L2R2:2?2W2S2T2V2R2U2:2  ?2T2U22232?2S2S2:2"  222266666666I242T2R2:2?2W2P2\2V2R2U2:2;2?2T2U2:2 ?2S22232  22222266 66666# ?2T2R2B2A2?2W2T2V2V2R2U2B2A2?2T2U2:2@2D2S2:2"22222266666666?2T2Z2Q2:2?2W2T2V2V2R2U2S2:2?2T2U2:2?2S2S2:2  222222266666#?2Y2L2R2:2?2W2T2V2V2R2]2Q2:2?2T2U2:2@2D2S22232222z222x2266666#66I242T2R2B2A2>2?2T2Y2L2V2Z2Q2U2:2>2?2T2U2:2?2S2S2:2"  2222y2y22}#666666666# ?2T2R2S2:2>2?2Y2O2T2V2V2R2U2:2>2>2@2D2T2U2:2@2D2S2S2:2  22222226666666?2T2Z2Q2:2>2?2S2W2Y2L2V2R2U2B2A2>2<22_2U2:2?2S2S22232  2222222}#666666#66#6?2T2V2R2:2>2?2S2Y2O2T2V2R2]2Q2B2C2D2T2M2K2:2?2S2S2:2" "2222222}#666666666?2T2V2R2:2>2I242S2W2T2V2Z2Q2U2S2S22_2U22232?2S22232 "222222266666#6666#?2Y2L2R2:2>2>2?2S2W2T2V2V2R2U2S2S2T2S2U2:2"?2S2:2"#6#~z222x22}|6666666#I242T2R2:2>2>2?2S2W2T2V2V2R2]2^2^2_2S2U2:2?2S2:2 """2y2y2226666#666#66# ?2T2R2:2# >2I242W2Y2L2V2Z2Q2S2S2S2M2K2:2?2S20" #~22}|#666666666?2T2R20" >2>2?2Y2O2T2V2V2Z2Q2S2M2K2S2:2#!!"  #622666666666##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?2W2T2R22U2:2666666666#>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2R2S2U2:2666666666>2?2W2T2Z22U2: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
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc
new file mode 100644
index 000000000..61880749b
--- /dev/null
+++ b/data/maps/Underwater4/connections.inc
@@ -0,0 +1,8 @@
+Underwater4_MapConnectionsList: @ 8486DC4
+ connection up, 0, UNDERWATER_3, 0
+ connection emerge, 0, ROUTE_128, 0
+
+Underwater4_MapConnections: @ 8486DDC
+ .4byte 0x2
+ .4byte Underwater4_MapConnectionsList
+
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
new file mode 100644
index 000000000..f7b962a3c
--- /dev/null
+++ b/data/maps/Underwater4/header.inc
@@ -0,0 +1,15 @@
+Underwater4: @ 8482A84
+ .4byte Underwater4_MapAttributes
+ .4byte Underwater4_MapEvents
+ .4byte Underwater4_MapScripts
+ .4byte Underwater4_MapConnections
+ .2byte BGM_DEEPDEEP
+ .2byte 53
+ .byte 53
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater4/map.bin b/data/maps/Underwater4/map.bin
new file mode 100644
index 000000000..23f987681
--- /dev/null
+++ b/data/maps/Underwater4/map.bin
@@ -0,0 +1 @@
+666666666  >2?2W2T2V2R2U2:2666666666>2?2W2T2V2R2U2:2666666666>2?2W2K2L2R2U2:2666666666# ?2K2O2T2R2U2:2666666666 3242W2T2R2U2:2666666666 "# ?2W2T2R2U2:2 66666666#?2W2T2R2U2:2#666666666 "?2W2T2R2U2B2A2 666 666666?2W2T2R2]2Q2B2C2C2C2A2 # #6666666666?2W2T2Z2Q2]2[2[2[2Q2B2C2C2C2A2 #   #6666666666#)aV2V2Z2[2[2[2Q2]2[2[2[2Q2:2;2;2;2  666666666 6 6aV2V2V2V2V2Z2[2[2[2Q2U2B2A2@2C2C2C2C2C2C2C2C2C28 666666666##))))))aV2V2R2]2Q2B2C2A2@2C2C2D2P2[2[2[2[2[2[2[2[28666666666 #)))a]2[2Q2B2C2C2C2C2D2P2[2[2_2P2[2[2[2[2[2[2`#666666 66666666 "#a[2]2[2[2[2[2[2[2_2P2[2[2\2V2V2V2V2`)"66666666666666##a[2[2[2[2[2[2[2[2\2V2V2`))))"66666666666666#aV2V2V2V2V2V2V2V2`)"66666666666d2V2V2V2V2V2`)"@2C2A2 6666 6666666666@2C2C2A2<2L2V2V2V2`" @2D22B2C2A26666666 6666666<222:2<2T2L2V2b28 " #<2P2[2[2Q2B2C2C2C2C2C2A26666666666666@2A2## 12:2@2D2T2T2J20 #1W2P2Q2]2[2[2[2[2[2Q2B2C2A2666666666666666@2D2B2A2" !""<2P2_2T2R28#aT2Z2[2[2[2[2[2Q2]2[2Q2B2C26666 66666666666<2P2Q2:2<2T2P2V2R28#aV2V2V2V2V2V2Z2[2[2]2[2`"666666666666666<2T2R2:2<2T2T2V2R28#)aV2V2V2V2`))))"666666666666666#1T2R2B2A2@2D2T2T2V2R28#))))"666666666666666#aZ2Q2B2C2A2efg@2C2D2P2_2T2V2R28  6666666666666666#aZ2[2Q2B2C2A2mn2o@2D2P2[2_2P2V2`)"# 6666666666666666#aQ2]2[2Q2B2C2C2C2A2;2;2;2;2;2<2P2_2P2[2`)" # "#6666666666666666#)aQ2]2[2[2[2Q2B2C2C2C2C2C2D2T2P2V2` "6666666666666666#))a[2Q2]2[2[2[2[2[2[2[2_2T2` "6666666666666666 #aZ2[2[2[2[2[2[2[2[2[2b2 6666666666666666 "##)aV2V2V2V2V2V2V2J2:2 " "666666666666666 d2V2V2V2V2V2J2U2:2 " "6666666666666666@2D2L2V2V2V2V2R2U2B2A2 " "6666666 666666666#<2P2_2L2V2V2V2R2]2Q2B2C2C2C2C2C2C2C2C2A2 6666666666666666#<2T2P2\2V2`)))a[2[2[2[2[2[2[2[2Q2:26666666666666666#@2D2T2`))"#))a[2[2[2[2`))"6666666666666666# @2C2C2D2P2`" #))))" "66666666666666666""# )))))" "#66666666666666666#"#" \ No newline at end of file
diff --git a/data/maps/Underwater5/border.bin b/data/maps/Underwater5/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater5/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc
new file mode 100644
index 000000000..6eafa49d6
--- /dev/null
+++ b/data/maps/Underwater5/connections.inc
@@ -0,0 +1,7 @@
+Underwater5_MapConnectionsList: @ 8486DE4
+ connection emerge, 0, ROUTE_129, 0
+
+Underwater5_MapConnections: @ 8486DF0
+ .4byte 0x1
+ .4byte Underwater5_MapConnectionsList
+
diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc
new file mode 100644
index 000000000..5eb11436f
--- /dev/null
+++ b/data/maps/Underwater5/header.inc
@@ -0,0 +1,15 @@
+Underwater5: @ 8482AA0
+ .4byte Underwater5_MapAttributes
+ .4byte Underwater5_MapEvents
+ .4byte Underwater5_MapScripts
+ .4byte Underwater5_MapConnections
+ .2byte BGM_DEEPDEEP
+ .2byte 412
+ .byte 208
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater5/map.bin b/data/maps/Underwater5/map.bin
new file mode 100644
index 000000000..902f0dbdc
--- /dev/null
+++ b/data/maps/Underwater5/map.bin
@@ -0,0 +1 @@
+& . 2222222 #222}#~2 #222222}#2 "22}#222222222}#222222}#222222222}#22}"##22222}#222222222222}"#222222222222#222222222222}"# """#222z222x2222}"# ""222222y2y22222 ""2222############222222 ""&222222.2222222#22222222222z222x22222222222222y2y22}"##""""""""""""""""#  # " " "  "############ \ No newline at end of file
diff --git a/data/maps/Underwater6/border.bin b/data/maps/Underwater6/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater6/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc
new file mode 100644
index 000000000..4d2960b36
--- /dev/null
+++ b/data/maps/Underwater6/connections.inc
@@ -0,0 +1,7 @@
+Underwater6_MapConnectionsList: @ 8486D24
+ connection emerge, 0, ROUTE_105, 0
+
+Underwater6_MapConnections: @ 8486D30
+ .4byte 0x1
+ .4byte Underwater6_MapConnectionsList
+
diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc
new file mode 100644
index 000000000..b67c27d7c
--- /dev/null
+++ b/data/maps/Underwater6/header.inc
@@ -0,0 +1,15 @@
+Underwater6: @ 8482ABC
+ .4byte Underwater6_MapAttributes
+ .4byte Underwater6_MapEvents
+ .4byte Underwater6_MapScripts
+ .4byte Underwater6_MapConnections
+ .2byte BGM_DEEPDEEP
+ .2byte 410
+ .byte 206
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater6/map.bin b/data/maps/Underwater6/map.bin
new file mode 100644
index 000000000..92bd56031
--- /dev/null
+++ b/data/maps/Underwater6/map.bin
@@ -0,0 +1 @@
+&/.222/2222222222222/22222222}##222222222}##2222222222222222}##2222/#~222222#~22#2222222222222222222222222222222222#~2222222/###222222222222222z222x222222222y2y2222222222222222222####"""##########"""""""""""""""                                # ##   22222 222222 222222 ## ##222222   #~z222x22 #~y2y222#~222 ~22 ~22  #222   222 2}## &2 .2 2222222  #~222222 #~22222#~2222 ####"""    #  ##  # #  # ######"" \ No newline at end of file
diff --git a/data/maps/Underwater7/border.bin b/data/maps/Underwater7/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater7/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc
new file mode 100644
index 000000000..16d0e47e5
--- /dev/null
+++ b/data/maps/Underwater7/connections.inc
@@ -0,0 +1,7 @@
+Underwater7_MapConnectionsList: @ 8486D58
+ connection emerge, 0, ROUTE_125, 0
+
+Underwater7_MapConnections: @ 8486D64
+ .4byte 0x1
+ .4byte Underwater7_MapConnectionsList
+
diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc
new file mode 100644
index 000000000..942b0cad2
--- /dev/null
+++ b/data/maps/Underwater7/header.inc
@@ -0,0 +1,15 @@
+Underwater7: @ 8482AD8
+ .4byte Underwater7_MapAttributes
+ .4byte Underwater7_MapEvents
+ .4byte Underwater7_MapScripts
+ .4byte Underwater7_MapConnections
+ .2byte BGM_DEEPDEEP
+ .2byte 411
+ .byte 207
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater7/map.bin b/data/maps/Underwater7/map.bin
new file mode 100644
index 000000000..660f585ae
--- /dev/null
+++ b/data/maps/Underwater7/map.bin
@@ -0,0 +1 @@
+9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV9<?WTVVVVVVV&9<?WTVVVVVVV.9<?WTVVVVVVV22222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV22222222222222222229<?WTVVVVVVV222222222222222222}#9<?WTVVVVVVV2222222222222222}"#2222229<?WTVVVVVVV22222222222222222222229<?WTVVVVVVV2z222x222}#########2222229<?WTVVVVVVV22y2y22222222229<?WTVVVVVVV#########2z222x229<?WTVVVVVVV22y2y2229<?WTVVVVVVV #2222229<?WTVVVVVVV 2222229<?WTVVVVVVV#2222229<?WTVVVVVVV2}~2229<?WTVVVVVVV2222229<?WTVVVVVVV#22222}~2229<?WTVVVVVVV "&222222229<?WTVVVVVVV#.22222222229<?WTVVVVVVV #222222222222222229<?WTVVVVVVV222222222222222229<?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
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater_MarineCave/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc
new file mode 100644
index 000000000..d995a2dec
--- /dev/null
+++ b/data/maps/Underwater_MarineCave/header.inc
@@ -0,0 +1,15 @@
+Underwater_MarineCave: @ 84849CC
+ .4byte Underwater_MarineCave_MapAttributes
+ .4byte Underwater_MarineCave_MapEvents
+ .4byte Underwater_MarineCave_MapScripts
+ .4byte 0x0
+ .2byte BGM_DAN01
+ .2byte 406
+ .byte 204
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater_MarineCave/map.bin b/data/maps/Underwater_MarineCave/map.bin
new file mode 100644
index 000000000..1904f4757
--- /dev/null
+++ b/data/maps/Underwater_MarineCave/map.bin
@@ -0,0 +1 @@
+(((((((2$(2"""""+,-""""" \ No newline at end of file
diff --git a/data/maps/Underwater_Route134/border.bin b/data/maps/Underwater_Route134/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater_Route134/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
new file mode 100644
index 000000000..461804c39
--- /dev/null
+++ b/data/maps/Underwater_Route134/header.inc
@@ -0,0 +1,15 @@
+Underwater_Route134: @ 848464C
+ .4byte Underwater_Route134_MapAttributes
+ .4byte Underwater_Route134_MapEvents
+ .4byte Underwater_Route134_MapScripts
+ .4byte 0x0
+ .2byte BGM_DEEPDEEP
+ .2byte 282
+ .byte 79
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater_Route134/map.bin b/data/maps/Underwater_Route134/map.bin
new file mode 100644
index 000000000..77bdd37aa
--- /dev/null
+++ b/data/maps/Underwater_Route134/map.bin
@@ -0,0 +1,2 @@
+(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2### # (2(2$(2(2(2
+""""# +,-  " \ No newline at end of file
diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/maps/Underwater_SeafloorCavern/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater_SeafloorCavern/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
new file mode 100644
index 000000000..88cb213b5
--- /dev/null
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -0,0 +1,15 @@
+Underwater_SeafloorCavern: @ 8484198
+ .4byte Underwater_SeafloorCavern_MapAttributes
+ .4byte Underwater_SeafloorCavern_MapEvents
+ .4byte Underwater_SeafloorCavern_MapScripts
+ .4byte 0x0
+ .2byte BGM_DEEPDEEP
+ .2byte 146
+ .byte 69
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/maps/Underwater_SeafloorCavern/map.bin
new file mode 100644
index 000000000..4cacc495e
--- /dev/null
+++ b/data/maps/Underwater_SeafloorCavern/map.bin
@@ -0,0 +1,2 @@
+6666(22222(2(2(2(2(2(2(2(2### (2(2$(2(2(2
+"""# +,-  " \ No newline at end of file
diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/maps/Underwater_SealedChamber/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater_SealedChamber/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
new file mode 100644
index 000000000..a066b9b35
--- /dev/null
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -0,0 +1,15 @@
+Underwater_SealedChamber: @ 8484668
+ .4byte Underwater_SealedChamber_MapAttributes
+ .4byte Underwater_SealedChamber_MapEvents
+ .4byte Underwater_SealedChamber_MapScripts
+ .4byte 0x0
+ .2byte BGM_DEEPDEEP
+ .2byte 283
+ .byte 79
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/maps/Underwater_SealedChamber/map.bin
new file mode 100644
index 000000000..5ac0b4a73
--- /dev/null
+++ b/data/maps/Underwater_SealedChamber/map.bin
@@ -0,0 +1 @@
+efgmno22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  2222222#222222222222222222222  222222222222#2222222  222222222222#2222222  222222222222222222222222#222222  22222222222222222222222222222222222222222222     2222222222222222222222222222222p2222222222C2C2C2222222222222S2S2S2222222# 22222S2S2S22222 "#            " \ No newline at end of file
diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/maps/Underwater_SootopolisCity/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/Underwater_SootopolisCity/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
new file mode 100644
index 000000000..a9b7d47ef
--- /dev/null
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -0,0 +1,15 @@
+Underwater_SootopolisCity: @ 8483F4C
+ .4byte Underwater_SootopolisCity_MapAttributes
+ .4byte Underwater_SootopolisCity_MapEvents
+ .4byte Underwater_SootopolisCity_MapScripts
+ .4byte 0x0
+ .2byte BGM_DEEPDEEP
+ .2byte 130
+ .byte 54
+ .byte 0
+ .byte 14
+ .byte 5
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/maps/Underwater_SootopolisCity/map.bin
new file mode 100644
index 000000000..71346ab72
--- /dev/null
+++ b/data/maps/Underwater_SootopolisCity/map.bin
@@ -0,0 +1,2 @@
+(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2(2### # (2(2(2$(2(2(2(2(2
+""""#  +,-    " \ No newline at end of file
diff --git a/data/maps/UnionRoom/border.bin b/data/maps/UnionRoom/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/UnionRoom/border.bin
Binary files differ
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
new file mode 100644
index 000000000..d4394409b
--- /dev/null
+++ b/data/maps/UnionRoom/header.inc
@@ -0,0 +1,15 @@
+UnionRoom: @ 8485120
+ .4byte UnionRoom_MapAttributes
+ .4byte UnionRoom_MapEvents
+ .4byte UnionRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_RAINBOW
+ .2byte 393
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 8
+
diff --git a/data/maps/UnionRoom/map.bin b/data/maps/UnionRoom/map.bin
new file mode 100644
index 000000000..cb1b009c3
--- /dev/null
+++ b/data/maps/UnionRoom/map.bin
@@ -0,0 +1,11 @@
+(   #
+
+
+
+
+
+
+
+
+
+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
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/UnknownMap_08417FC4/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08417FC4/map.bin b/data/maps/UnknownMap_08417FC4/map.bin
new file mode 100644
index 000000000..17a14a8d5
--- /dev/null
+++ b/data/maps/UnknownMap_08417FC4/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp00000000000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000 0 0 0000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000 0 0 0 0 0 0 0 0000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppps00000 0 0 0 0 0 0 0 0 0 000rpppppppppppppppppppppppppppppppppppppppppppppppppppppppp000000 0 0 0 0 0 0 0 0 0 0 00000ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp000000 0 0 0 0 0 0 0 0 0 0 0 00000ppppPQpppppppppppppppppppppprqkllmqvppppuvppppPQprs000000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vXYrss0000000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{qklllmqvppppuvq{|||}qt}~pppppzq|}sss00000000004400 0 0 0 0 01110uuu~p}~pzqqqkklmmqvppp}~pyqqqtyppu{{vppyfsss00000000000444400 0 0 00000uuugppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|puvppfsss000000000004444440 000000uuuguv}~qq{qqqt}qtppXYpppuvppppppuvyyp}~ppfss{|||00000000444444400t|||}uug}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQppppfs{s000000000444444400ut}ugppppPQpyypp}~q|ppppppppppPQppppXYppuvf{ss000000000044444400uut}gppppXYppppppppuvppppyppppppppppXYpppppppp}~nss{|||0000004444t|||}uutopuvppppppppppp}~ppppppppppppppppppppppppuvpp1$1$1$1s{{||0000t||}t}ur$1$1$11p}~pppppuvppppppppppppuvpppppppppppppppp}~pp111$1{{{|22|}t}t}r$1$1$11pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp111$1{{22}t}t$1$1$11ppppppppppppppppppppuvppztppppppp}~pppppppp111$1$1$1"10x{22}tz00 1$1$1$111pppppppppppppppppppp}~pppppppppppppppppppp111$1"10000x22z00000 1$1$111pppppppppppppppppppppppppppppppppppppppppppppp111$1$1100000000000000000001$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp111$1$1!11000000000000000011$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1!11100000000000111$1$1$1$1111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1$1"100000000011$1$1$1$1$1$11111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1111111111$1$1$1$1$1$1$1$111pppppppppPQpppppppuvpppppppppppppppppppppppppppppp1111$1$1$1$1$1$1$1$1$1$1$1$1$1$111111111ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp11111$1$1$1$1$1$1$1$1$1$1$1$11111ppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppp11111111111111111111ppppppppppppppu{{qqqqqqv}~qqtpPQppppppppppppppppppppppppppppppppuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08428450/border.bin b/data/maps/UnknownMap_08428450/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_08428450/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08428450/map.bin b/data/maps/UnknownMap_08428450/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/maps/UnknownMap_08428450/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_084294C4/border.bin b/data/maps/UnknownMap_084294C4/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084294C4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084294C4/map.bin b/data/maps/UnknownMap_084294C4/map.bin
new file mode 100644
index 000000000..37f05b971
--- /dev/null
+++ b/data/maps/UnknownMap_084294C4/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_084294E8/border.bin b/data/maps/UnknownMap_084294E8/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084294E8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084294E8/map.bin b/data/maps/UnknownMap_084294E8/map.bin
new file mode 100644
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/maps/UnknownMap_084294E8/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E6C0/border.bin b/data/maps/UnknownMap_0843E6C0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6C0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E6C0/map.bin b/data/maps/UnknownMap_0843E6C0/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6C0/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E6E4/border.bin b/data/maps/UnknownMap_0843E6E4/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6E4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E6E4/map.bin b/data/maps/UnknownMap_0843E6E4/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E6E4/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E708/border.bin b/data/maps/UnknownMap_0843E708/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E708/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E708/map.bin b/data/maps/UnknownMap_0843E708/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E708/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E72C/border.bin b/data/maps/UnknownMap_0843E72C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E72C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E72C/map.bin b/data/maps/UnknownMap_0843E72C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E72C/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E750/border.bin b/data/maps/UnknownMap_0843E750/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E750/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E750/map.bin b/data/maps/UnknownMap_0843E750/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E750/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E774/border.bin b/data/maps/UnknownMap_0843E774/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E774/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E774/map.bin b/data/maps/UnknownMap_0843E774/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E774/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E798/border.bin b/data/maps/UnknownMap_0843E798/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E798/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E798/map.bin b/data/maps/UnknownMap_0843E798/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E798/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E7BC/border.bin b/data/maps/UnknownMap_0843E7BC/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7BC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E7BC/map.bin b/data/maps/UnknownMap_0843E7BC/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7BC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E7E0/border.bin b/data/maps/UnknownMap_0843E7E0/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7E0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E7E0/map.bin b/data/maps/UnknownMap_0843E7E0/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E7E0/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E804/border.bin b/data/maps/UnknownMap_0843E804/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E804/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E804/map.bin b/data/maps/UnknownMap_0843E804/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E804/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E828/border.bin b/data/maps/UnknownMap_0843E828/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E828/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E828/map.bin b/data/maps/UnknownMap_0843E828/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E828/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E84C/border.bin b/data/maps/UnknownMap_0843E84C/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E84C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E84C/map.bin b/data/maps/UnknownMap_0843E84C/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E84C/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E870/border.bin b/data/maps/UnknownMap_0843E870/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E870/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E870/map.bin b/data/maps/UnknownMap_0843E870/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E870/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0843E894/border.bin b/data/maps/UnknownMap_0843E894/border.bin
new file mode 100644
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_0843E894/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0843E894/map.bin b/data/maps/UnknownMap_0843E894/map.bin
new file mode 100644
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_0843E894/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08447028/border.bin b/data/maps/UnknownMap_08447028/border.bin
new file mode 100644
index 000000000..9e4b3fb7a
--- /dev/null
+++ b/data/maps/UnknownMap_08447028/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08447028/map.bin b/data/maps/UnknownMap_08447028/map.bin
new file mode 100644
index 000000000..028da0526
--- /dev/null
+++ b/data/maps/UnknownMap_08447028/map.bin
@@ -0,0 +1,3 @@
+22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 662222222222222222222222222 
+2266662BBBB2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222
+IIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22 22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845A394/border.bin b/data/maps/UnknownMap_0845A394/border.bin
new file mode 100644
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/UnknownMap_0845A394/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845A394/map.bin b/data/maps/UnknownMap_0845A394/map.bin
new file mode 100644
index 000000000..fd294d9b6
--- /dev/null
+++ b/data/maps/UnknownMap_0845A394/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_0845D470/border.bin b/data/maps/UnknownMap_0845D470/border.bin
new file mode 100644
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/UnknownMap_0845D470/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845D470/map.bin b/data/maps/UnknownMap_0845D470/map.bin
new file mode 100644
index 000000000..cd136de41
--- /dev/null
+++ b/data/maps/UnknownMap_0845D470/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut|}ppp{qs{$14$1$1$1$14$1$1uuqupppppppppppppqqqqqqqqt||}qqt}uppppp{{s$1$1$1$1$1$1$1$1t}ut}ppppppppppppp||||||||}qqqt|}t}pppppppppsqs{$1$1$14$1t|}quupppppppppppppqqqqqt|||}qt}pppppppppPesq{{4$1$1t}qt|}uppppppppppppppqqt||}qqqt|}ppppppppppXm{q{{|||}qt}t|}pppppppppppppp||}qt|||}ppuvpppppPQp{q{|}qupppppppppppppp|}uvpu{vp}~pppppXYpp{|0|}ppppppppppppppppZ[ppppp}~pzq|pppppppppPQpp$1$1$1$1$1Z[ppppPQpppppppppppXYppppuvppppypppppppuvXYppppp$1$1$1$1$1pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~ppppppppuvyq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppy}~ppuvpppppu|ppppppppuqqvpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|ppppppppyyyyPQppppppppppppppppppppuvpppppppppppppppppuvypppppppuvppPQpXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~ppXYpppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppPQppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|pppppXYpp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|ppppppPQpppPQppppppppppppppppppppppp}~pppppppppppppppppyyyppppppXYpppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYpuvpppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vppp}~uvpppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvpppp}~ppuqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845ECB4/border.bin b/data/maps/UnknownMap_0845ECB4/border.bin
new file mode 100644
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/UnknownMap_0845ECB4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0845ECB4/map.bin b/data/maps/UnknownMap_0845ECB4/map.bin
new file mode 100644
index 000000000..ec344933f
--- /dev/null
+++ b/data/maps/UnknownMap_0845ECB4/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  222 222    2222222 2222222222 2222222    # 222    #2222 #  2222     2222 #    2222 efg  222 # esdrfg 222efsd_ddrfg222qdd_d__ddp222qd______dp22222es_d____d_p22222 qdd______dp22222222#2#2bdd_d_d_dp222222222#2b_d_d_`a3a3#222222222#2a3a3a3a3a3#22222222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_08469200/border.bin b/data/maps/UnknownMap_08469200/border.bin
new file mode 100644
index 000000000..c07869a9f
--- /dev/null
+++ b/data/maps/UnknownMap_08469200/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08469200/map.bin b/data/maps/UnknownMap_08469200/map.bin
new file mode 100644
index 000000000..67085fd37
--- /dev/null
+++ b/data/maps/UnknownMap_08469200/map.bin
@@ -0,0 +1,12 @@
+222922222922222229KLM929222222 
+  222222222 
+ 2222 
+ 22%7'222222KLM2222 
+  
+ U22-?/22@AAAB Z2222#$_222222 222222222222222222 22KLM22+,_22D2E2222222222222222222222@AAAAAAAB2 @AAF2G\22222222222@AF22GAAAB22D222%6'2bD2c22222222222bD2E2c2222922->/22D2222222222222D2AAAAAB22222222222D2E2D2 
+ D2E2D2E222222222222222222222D2E226222222 222822D2E22222222222229222222222222222222@AF22GAAAAAAAAB2222222222T 
+ B22222222bD2E2cQR[RS22TA 
+ 222228222222;2222^#$222D2E2222222 !2"2^2#$22222222^+,222D2E222222()2)2)2*222^2+,2222 
+  
+ KLM^22222222222n22o0q0q0q022222^22222D2E2 2 ^22222222222bD2E2cq06q06q022^2222D2E2%7'2%7']AAAB2222D2q0q0q0q0q0q06q06q0q0q0^222222222-?/2AAB-?/2D2E222D2q0q0q0q0q0q0q0q0q0q0q0q0q0q0]AB222222222222222222222q0q0q0q0q0q0q0q0q0q0q0q0q0q0D2E2KLM22222KLMD2E2222q0q0t||||||||||TB222 2222222KL22TYZB22D2E2ty}s^2222222222222 22^22222q0q0t}{y^222222222%6'22^222k6l6l6m6q0q0us^2222222 22222->/22^2222220123q0q0us]AAB22222222AAAAB]AAAAB89:;q0q0us{|}~2222222222ABwq0q0usTPQRS2222D22222222222222q0q0us^XYZ[222222222222222222222222222q0q0us^abvD2E222222KLM22222D2E2q0q0q0u01110s^22222222222222TYZB2222q0q0q0q0q0q0u000000010s^22222222222922222^2222q0q0q0q0q0q0t}00000010s]B22@AF22 22222^2222q0tD2E2yz00000000sD2E2N22 
+ 2222^2222222q0r000000000000{yyyD2E2N222]B2222q0r000004000pN222222222tyyz000000pV@AAAAAAB2qtyyz000000000p2qqr0000000000xyyyyqqq2qqr000000000000000x2qqr000000000000000000pq2qqr000000000000011pq2qqr000000011000000pqq2qr0000000000000pqqiiij000pqqij0pr0i0i0i0i00iijqqqqqrqrqqqqqqqrqqqqrqqqqqqqrqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq \ No newline at end of file
diff --git a/data/maps/UnknownMap_084693AC/border.bin b/data/maps/UnknownMap_084693AC/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/UnknownMap_084693AC/border.bin
Binary files differ
diff --git a/data/maps/UnknownMap_084693AC/map.bin b/data/maps/UnknownMap_084693AC/map.bin
new file mode 100644
index 000000000..a179d8997
--- /dev/null
+++ b/data/maps/UnknownMap_084693AC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08470BD8/border.bin b/data/maps/UnknownMap_08470BD8/border.bin
new file mode 100644
index 000000000..4531975c7
--- /dev/null
+++ b/data/maps/UnknownMap_08470BD8/border.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08470BD8/map.bin b/data/maps/UnknownMap_08470BD8/map.bin
new file mode 100644
index 000000000..0f7bbb958
--- /dev/null
+++ b/data/maps/UnknownMap_08470BD8/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08480DAC/border.bin b/data/maps/UnknownMap_08480DAC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_08480DAC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08480DAC/map.bin b/data/maps/UnknownMap_08480DAC/map.bin
new file mode 100644
index 000000000..d1277f280
--- /dev/null
+++ b/data/maps/UnknownMap_08480DAC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08480F54/border.bin b/data/maps/UnknownMap_08480F54/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_08480F54/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08480F54/map.bin b/data/maps/UnknownMap_08480F54/map.bin
new file mode 100644
index 000000000..f0d9c299c
--- /dev/null
+++ b/data/maps/UnknownMap_08480F54/map.bin
@@ -0,0 +1 @@
+''''''''';<=''/////////CD2E//222222222222222222222222222222222222222222222289999:22222222@AAAAB22222222AAAAAA22222222AAAAAA22222222AAAAAA22222222IMMMMJ22222222222222222222222222222222222222"2#2222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_084810FC/border.bin b/data/maps/UnknownMap_084810FC/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084810FC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084810FC/map.bin b/data/maps/UnknownMap_084810FC/map.bin
new file mode 100644
index 000000000..908158cf4
--- /dev/null
+++ b/data/maps/UnknownMap_084810FC/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084812A4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084812A4/map.bin b/data/maps/UnknownMap_084812A4/map.bin
new file mode 100644
index 000000000..d033bc4d2
--- /dev/null
+++ b/data/maps/UnknownMap_084812A4/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//CL2E/CD2E/CD2E/222222222222222222222222222222222222222289999:22222222@AAAAA22222222AAAAAA22222222AAAAAA22222222AAAAAA22222222IMMMMJ2222222222222222222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_0848144C/border.bin b/data/maps/UnknownMap_0848144C/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_0848144C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_0848144C/map.bin b/data/maps/UnknownMap_0848144C/map.bin
new file mode 100644
index 000000000..eeccae9ae
--- /dev/null
+++ b/data/maps/UnknownMap_0848144C/map.bin
@@ -0,0 +1 @@
+'';<=';<=';<='//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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_084815F4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_084815F4/map.bin b/data/maps/UnknownMap_084815F4/map.bin
new file mode 100644
index 000000000..8507a4932
--- /dev/null
+++ b/data/maps/UnknownMap_084815F4/map.bin
@@ -0,0 +1 @@
+'';<='''';<=''//CL2E////CD2E//22222222262222222222226222222228999999:222222@AAAAAAB222222AAAAAAAA222222AAAAAAAA222222AAAAAAAA222222AAAAAAAA222222AAAAAAAA222222IMMMMMMJ2222222222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481B24/border.bin b/data/maps/UnknownMap_08481B24/border.bin
new file mode 100644
index 000000000..e9d1c658c
--- /dev/null
+++ b/data/maps/UnknownMap_08481B24/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481B24/map.bin b/data/maps/UnknownMap_08481B24/map.bin
new file mode 100644
index 000000000..2a47bca91
--- /dev/null
+++ b/data/maps/UnknownMap_08481B24/map.bin
@@ -0,0 +1 @@
+d2d2d26d2d2d26d2d2d26666666d2d2d26d2d2d26d24242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242''''''''''m22n';<='''''''''//////////j22k/CL2E/////////52525252525252525252525252525252525252424242424242424242424242424242424242424242424242424242424242424242424242424242[[[[[[[[[[[[[[[[[[[[[[[[[[[ \ No newline at end of file
diff --git a/data/maps/UnknownMap_08481DBC/border.bin b/data/maps/UnknownMap_08481DBC/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/UnknownMap_08481DBC/border.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08481DBC/map.bin b/data/maps/UnknownMap_08481DBC/map.bin
new file mode 100644
index 000000000..603f55c93
--- /dev/null
+++ b/data/maps/UnknownMap_08481DBC/map.bin
@@ -0,0 +1,2 @@
+'
+  +/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
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_25_29/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
new file mode 100644
index 000000000..5d41f19b4
--- /dev/null
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_29: @ 8484DBC
+ .4byte UnknownMap_25_29_MapAttributes
+ .4byte UnknownMap_25_29_MapEvents
+ .4byte UnknownMap_25_29_MapScripts
+ .4byte 0x0
+ .2byte BGM_NIBI
+ .2byte 226
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/maps/UnknownMap_25_29/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/maps/UnknownMap_25_29/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/maps/UnknownMap_25_30/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_25_30/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
new file mode 100644
index 000000000..eeda527bb
--- /dev/null
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_30: @ 8484DD8
+ .4byte UnknownMap_25_30_MapAttributes
+ .4byte UnknownMap_25_30_MapEvents
+ .4byte UnknownMap_25_30_MapScripts
+ .4byte 0x0
+ .2byte BGM_NIBI
+ .2byte 227
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/maps/UnknownMap_25_30/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/maps/UnknownMap_25_30/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/maps/UnknownMap_25_31/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_25_31/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
new file mode 100644
index 000000000..8a81bc212
--- /dev/null
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_31: @ 8484DF4
+ .4byte UnknownMap_25_31_MapAttributes
+ .4byte UnknownMap_25_31_MapEvents
+ .4byte UnknownMap_25_31_MapScripts
+ .4byte 0x0
+ .2byte BGM_NIBI
+ .2byte 228
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/maps/UnknownMap_25_31/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/maps/UnknownMap_25_31/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/maps/UnknownMap_25_32/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_25_32/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
new file mode 100644
index 000000000..1feace438
--- /dev/null
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_32: @ 8484E10
+ .4byte UnknownMap_25_32_MapAttributes
+ .4byte UnknownMap_25_32_MapEvents
+ .4byte UnknownMap_25_32_MapScripts
+ .4byte 0x0
+ .2byte BGM_NIBI
+ .2byte 229
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/maps/UnknownMap_25_32/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/maps/UnknownMap_25_32/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/maps/UnknownMap_25_33/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_25_33/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
new file mode 100644
index 000000000..8e8ee5f5a
--- /dev/null
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_33: @ 8484E2C
+ .4byte UnknownMap_25_33_MapAttributes
+ .4byte UnknownMap_25_33_MapEvents
+ .4byte UnknownMap_25_33_MapScripts
+ .4byte 0x0
+ .2byte BGM_NIBI
+ .2byte 230
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/maps/UnknownMap_25_33/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/maps/UnknownMap_25_33/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/maps/UnknownMap_25_34/border.bin
new file mode 100644
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
new file mode 100644
index 000000000..c259c8ce4
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -0,0 +1,15 @@
+UnknownMap_25_34: @ 8484E48
+ .4byte UnknownMap_25_34_MapAttributes
+ .4byte UnknownMap_25_34_MapEvents
+ .4byte UnknownMap_25_34_MapScripts
+ .4byte 0x0
+ .2byte BGM_NIBI
+ .2byte 231
+ .byte 87
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/maps/UnknownMap_25_34/map.bin
new file mode 100644
index 000000000..5fc1e81ec
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/map.bin
@@ -0,0 +1 @@
+  \ No newline at end of file
diff --git a/data/maps/VerdanturfTown/border.bin b/data/maps/VerdanturfTown/border.bin
new file mode 100644
index 000000000..864ac15fa
--- /dev/null
+++ b/data/maps/VerdanturfTown/border.bin
Binary files differ
diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc
new file mode 100644
index 000000000..0e2abd0af
--- /dev/null
+++ b/data/maps/VerdanturfTown/connections.inc
@@ -0,0 +1,8 @@
+VerdanturfTown_MapConnectionsList: @ 8486694
+ connection up, -80, ROUTE_116, 0
+ connection right, 0, ROUTE_117, 0
+
+VerdanturfTown_MapConnections: @ 84866AC
+ .4byte 0x2
+ .4byte VerdanturfTown_MapConnectionsList
+
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
new file mode 100644
index 000000000..e722ba29a
--- /dev/null
+++ b/data/maps/VerdanturfTown/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown: @ 8482640
+ .4byte VerdanturfTown_MapAttributes
+ .4byte VerdanturfTown_MapEvents
+ .4byte VerdanturfTown_MapScripts
+ .4byte VerdanturfTown_MapConnections
+ .2byte BGM_GOMACHI0
+ .2byte 15
+ .byte 5
+ .byte 0
+ .byte 2
+ .byte 1
+ .2byte 0
+ .byte 13
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown/map.bin b/data/maps/VerdanturfTown/map.bin
new file mode 100644
index 000000000..8ed6ea56b
--- /dev/null
+++ b/data/maps/VerdanturfTown/map.bin
Binary files differ
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin b/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin
new file mode 100644
index 000000000..9afd13cdc
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin
Binary files differ
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
new file mode 100644
index 000000000..77d136446
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_BattleTentBattleRoom: @ 8482E90
+ .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes
+ .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents
+ .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 387
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin
new file mode 100644
index 000000000..c405aabfc
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin
Binary files differ
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
new file mode 100644
index 000000000..6446f1eff
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_BattleTentCorridor: @ 8482E74
+ .4byte VerdanturfTown_BattleTentCorridor_MapAttributes
+ .4byte VerdanturfTown_BattleTentCorridor_MapEvents
+ .4byte VerdanturfTown_BattleTentCorridor_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 385
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
new file mode 100644
index 000000000..90cdc086f
--- /dev/null
+++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_BattleTentLobby: @ 8482E58
+ .4byte VerdanturfTown_BattleTentLobby_MapAttributes
+ .4byte VerdanturfTown_BattleTentLobby_MapEvents
+ .4byte VerdanturfTown_BattleTentLobby_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 384
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
new file mode 100644
index 000000000..2879abaee
--- /dev/null
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_FriendshipRatersHouse: @ 8482F1C
+ .4byte VerdanturfTown_FriendshipRatersHouse_MapAttributes
+ .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
+ .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOMACHI0
+ .2byte 60
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc
new file mode 100644
index 000000000..00697e511
--- /dev/null
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_House: @ 8482F38
+ .4byte VerdanturfTown_House_MapAttributes
+ .4byte VerdanturfTown_House_MapEvents
+ .4byte VerdanturfTown_House_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOMACHI0
+ .2byte 59
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc
new file mode 100644
index 000000000..4180e5487
--- /dev/null
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_Mart: @ 8482EAC
+ .4byte VerdanturfTown_Mart_MapAttributes
+ .4byte VerdanturfTown_Mart_MapEvents
+ .4byte VerdanturfTown_Mart_MapScripts
+ .4byte 0x0
+ .2byte BGM_FRIENDLY
+ .2byte 63
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
new file mode 100644
index 000000000..6cb39c856
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_PokemonCenter_1F: @ 8482EC8
+ .4byte VerdanturfTown_PokemonCenter_1F_MapAttributes
+ .4byte VerdanturfTown_PokemonCenter_1F_MapEvents
+ .4byte VerdanturfTown_PokemonCenter_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 61
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
new file mode 100644
index 000000000..70d6bd938
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_PokemonCenter_2F: @ 8482EE4
+ .4byte VerdanturfTown_PokemonCenter_2F_MapAttributes
+ .4byte VerdanturfTown_PokemonCenter_2F_MapEvents
+ .4byte VerdanturfTown_PokemonCenter_2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_POKECEN
+ .2byte 62
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/maps/VerdanturfTown_WandasHouse/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/VerdanturfTown_WandasHouse/border.bin
Binary files differ
diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc
new file mode 100644
index 000000000..65faba437
--- /dev/null
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_WandasHouse: @ 8482F00
+ .4byte VerdanturfTown_WandasHouse_MapAttributes
+ .4byte VerdanturfTown_WandasHouse_MapEvents
+ .4byte VerdanturfTown_WandasHouse_MapScripts
+ .4byte 0x0
+ .2byte BGM_GOMACHI0
+ .2byte 76
+ .byte 5
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/maps/VerdanturfTown_WandasHouse/map.bin
new file mode 100644
index 000000000..95d14d3c4
--- /dev/null
+++ b/data/maps/VerdanturfTown_WandasHouse/map.bin
Binary files differ
diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/maps/VictoryRoad_1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc
new file mode 100644
index 000000000..a3e196501
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -0,0 +1,15 @@
+VictoryRoad_1F: @ 8484374
+ .4byte VictoryRoad_1F_MapAttributes
+ .4byte VictoryRoad_1F_MapEvents
+ .4byte VictoryRoad_1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 163
+ .byte 70
+ .byte 0
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/maps/VictoryRoad_1F/map.bin
new file mode 100644
index 000000000..a78316ef9
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/map.bin
@@ -0,0 +1,10 @@
+2222222222622222222222'222222222226222    XYZ #   
+222         #222        #F222222222222BBBBBBBBBBBB2222BBBBBBBBBBBBBB2222BBBBBBBBBBBBBB#  #
+222222     
+BBBBBBBBBBBB  B B B"22222#BBBBBBBBBBBBBBBBBBB B B B B"BBBBBBBBBBBBBBBBBBBBBBBBBB22222BB2222222BB222222222222BB222222222222222222222222222BB22222222222222222222222BB222     
+2222222222222222222222BBBBBBB B B B"22222222222222222222222BBBBBBBBBB22     
+2222   
+2222222222  B B BBBBBB B"22L6Q6M6222P6BBBBBBBBB2222222222222228#2222222222222222222228#
+222222222222222222228222222222222222222     
+2228222222222222222222  B B B"2228#   #22222222BBBBBBBB B B B"22222222222222#22BBBBBBBBBBB222222222222222 #B2222282222222222   ###B222228222222222#  B B#B#BB22222222222@QI22222222  ## #  B#BBBBBB22222'62222222822222222  B B B B B B#BBBBBBBB#   
+2262222222822     #              ##   "#     XYZ   # #      #            ## "#               #   #  ##"#                      ##                            # \ No newline at end of file
diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/maps/VictoryRoad_B1F/border.bin
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/VictoryRoad_B1F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc
new file mode 100644
index 000000000..827ada340
--- /dev/null
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -0,0 +1,15 @@
+VictoryRoad_B1F: @ 8484390
+ .4byte VictoryRoad_B1F_MapAttributes
+ .4byte VictoryRoad_B1F_MapEvents
+ .4byte VictoryRoad_B1F_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 285
+ .byte 70
+ .byte 1
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/maps/VictoryRoad_B1F/map.bin
new file mode 100644
index 000000000..c1ea2f657
--- /dev/null
+++ b/data/maps/VictoryRoad_B1F/map.bin
@@ -0,0 +1,25 @@
+BBBBBBBBB2222222BBBB2222222P22222222#
+222BBBB2  
+2282222222222 
+222#
+222BBBB222R2222  
+2#222#
+22 #BBBB2222222   
+2# #22#2#BBBBB#
+2  
+22  B B B BBBBB B B B B
+2fBBBf#"2222BBBBBBBBBBBB2BBBBB2222222222222BfBB#    
+2#2222222#"#  "2222222222P2222222222#"2222222  
+22228222# 
+22222 ##       ## 
+228222#  
+22  B B#B #22R222 #B B B BBBBBBBB222222622#   
+22BBBBBBBBBBB2222222222222222222BBB22222222222222 #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
new file mode 100644
index 000000000..423a0732e
--- /dev/null
+++ b/data/maps/VictoryRoad_B2F/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc
new file mode 100644
index 000000000..45576de02
--- /dev/null
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -0,0 +1,15 @@
+VictoryRoad_B2F: @ 84843AC
+ .4byte VictoryRoad_B2F_MapAttributes
+ .4byte VictoryRoad_B2F_MapEvents
+ .4byte VictoryRoad_B2F_MapScripts
+ .4byte 0x0
+ .2byte BGM_C_ROAD
+ .2byte 286
+ .byte 70
+ .byte 1
+ .byte 0
+ .byte 4
+ .2byte 0
+ .byte 15
+ .byte 0
+
diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/maps/VictoryRoad_B2F/map.bin
new file mode 100644
index 000000000..24c4f646a
--- /dev/null
+++ b/data/maps/VictoryRoad_B2F/map.bin
@@ -0,0 +1 @@
+2{{{{{{{{{{{{{{{{{{{{{{2222{{{{{{{{{{{{{{{{{{{{{{22222222{{{{{{{{{{{{{{{{{{{{{{222222222{{{{{TUUUV{{{{{{{{{{{{22222222222W3W3W3y{W3W3W3W3W3W3W3W3y{{{222  "22222222222{22222222W3W3y{ #B22#B"222222222222{222222222222{222222222222222{22222222222{222222222222222222222Z[tuv222222222{222XY{{{{{{{{22222222222tuv{{PQ{{{{{{{22222222{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222UUUUV{{{{{{{{{TUUUUUUUUUUV{{  2#2222222#     "V{{{TUUUU         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B BBBBBBBB222222222BBBBBBBBB B B B B#BBBBBBBBBBBBBB2222BBBBBBBBBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222222222222222222222222222222222222262222222222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
new file mode 100644
index 000000000..c3c2a8d31
--- /dev/null
+++ b/data/maps/_assets.inc
@@ -0,0 +1,7606 @@
+ .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/_groups.inc b/data/maps/_groups.inc
new file mode 100644
index 000000000..f7fc7be89
--- /dev/null
+++ b/data/maps/_groups.inc
@@ -0,0 +1,623 @@
+gMapGroup0: @ 8485D60
+ .4byte PetalburgCity
+ .4byte SlateportCity
+ .4byte MauvilleCity
+ .4byte RustboroCity
+ .4byte FortreeCity
+ .4byte LilycoveCity
+ .4byte MossdeepCity
+ .4byte SootopolisCity
+ .4byte EverGrandeCity
+ .4byte LittlerootTown
+ .4byte OldaleTown
+ .4byte DewfordTown
+ .4byte LavaridgeTown
+ .4byte FallarborTown
+ .4byte VerdanturfTown
+ .4byte PacifidlogTown
+ .4byte Route101
+ .4byte Route102
+ .4byte Route103
+ .4byte Route104
+ .4byte Route105
+ .4byte Route106
+ .4byte Route107
+ .4byte Route108
+ .4byte Route109
+ .4byte Route110
+ .4byte Route111
+ .4byte Route112
+ .4byte Route113
+ .4byte Route114
+ .4byte Route115
+ .4byte Route116
+ .4byte Route117
+ .4byte Route118
+ .4byte Route119
+ .4byte Route120
+ .4byte Route121
+ .4byte Route122
+ .4byte Route123
+ .4byte Route124
+ .4byte Route125
+ .4byte Route126
+ .4byte Route127
+ .4byte Route128
+ .4byte Route129
+ .4byte Route130
+ .4byte Route131
+ .4byte Route132
+ .4byte Route133
+ .4byte Route134
+ .4byte Underwater1
+ .4byte Underwater2
+ .4byte Underwater3
+ .4byte Underwater4
+ .4byte Underwater5
+ .4byte Underwater6
+ .4byte Underwater7
+
+gMapGroup1: @ 8485E44
+ .4byte LittlerootTown_BrendansHouse_1F
+ .4byte LittlerootTown_BrendansHouse_2F
+ .4byte LittlerootTown_MaysHouse_1F
+ .4byte LittlerootTown_MaysHouse_2F
+ .4byte LittlerootTown_ProfessorBirchsLab
+
+gMapGroup2: @ 8485E58
+ .4byte OldaleTown_House1
+ .4byte OldaleTown_House2
+ .4byte OldaleTown_PokemonCenter_1F
+ .4byte OldaleTown_PokemonCenter_2F
+ .4byte OldaleTown_Mart
+
+gMapGroup3: @ 8485E6C
+ .4byte DewfordTown_House1
+ .4byte DewfordTown_PokemonCenter_1F
+ .4byte DewfordTown_PokemonCenter_2F
+ .4byte DewfordTown_Gym
+ .4byte DewfordTown_Hall
+ .4byte DewfordTown_House2
+
+gMapGroup4: @ 8485E84
+ .4byte LavaridgeTown_HerbShop
+ .4byte LavaridgeTown_Gym_1F
+ .4byte LavaridgeTown_Gym_B1F
+ .4byte LavaridgeTown_House
+ .4byte LavaridgeTown_Mart
+ .4byte LavaridgeTown_PokemonCenter_1F
+ .4byte LavaridgeTown_PokemonCenter_2F
+
+gMapGroup5: @ 8485EA0
+ .4byte FallarborTown_Mart
+ .4byte FallarborTown_BattleTentLobby
+ .4byte FallarborTown_BattleTentCorridor
+ .4byte FallarborTown_BattleTentBattleRoom
+ .4byte FallarborTown_PokemonCenter_1F
+ .4byte FallarborTown_PokemonCenter_2F
+ .4byte FallarborTown_House1
+ .4byte FallarborTown_House2
+
+gMapGroup6: @ 8485EC0
+ .4byte VerdanturfTown_BattleTentLobby
+ .4byte VerdanturfTown_BattleTentCorridor
+ .4byte VerdanturfTown_BattleTentBattleRoom
+ .4byte VerdanturfTown_Mart
+ .4byte VerdanturfTown_PokemonCenter_1F
+ .4byte VerdanturfTown_PokemonCenter_2F
+ .4byte VerdanturfTown_WandasHouse
+ .4byte VerdanturfTown_FriendshipRatersHouse
+ .4byte VerdanturfTown_House
+
+gMapGroup7: @ 8485EE4
+ .4byte PacifidlogTown_PokemonCenter_1F
+ .4byte PacifidlogTown_PokemonCenter_2F
+ .4byte PacifidlogTown_House1
+ .4byte PacifidlogTown_House2
+ .4byte PacifidlogTown_House3
+ .4byte PacifidlogTown_House4
+ .4byte PacifidlogTown_House5
+
+gMapGroup8: @ 8485F00
+ .4byte PetalburgCity_WallysHouse
+ .4byte PetalburgCity_Gym
+ .4byte PetalburgCity_House1
+ .4byte PetalburgCity_House2
+ .4byte PetalburgCity_PokemonCenter_1F
+ .4byte PetalburgCity_PokemonCenter_2F
+ .4byte PetalburgCity_Mart
+
+gMapGroup9: @ 8485F1C
+ .4byte SlateportCity_SternsShipyard_1F
+ .4byte SlateportCity_SternsShipyard_2F
+ .4byte SlateportCity_BattleTentLobby
+ .4byte SlateportCity_BattleTentCorridor
+ .4byte SlateportCity_BattleTentBattleRoom
+ .4byte SlateportCity_House1
+ .4byte SlateportCity_PokemonFanClub
+ .4byte SlateportCity_OceanicMuseum_1F
+ .4byte SlateportCity_OceanicMuseum_2F
+ .4byte SlateportCity_Harbor
+ .4byte SlateportCity_House2
+ .4byte SlateportCity_PokemonCenter_1F
+ .4byte SlateportCity_PokemonCenter_2F
+ .4byte SlateportCity_Mart
+
+gMapGroup10: @ 8485F54
+ .4byte MauvilleCity_Gym
+ .4byte MauvilleCity_BikeShop
+ .4byte MauvilleCity_House1
+ .4byte MauvilleCity_GameCorner
+ .4byte MauvilleCity_House2
+ .4byte MauvilleCity_PokemonCenter_1F
+ .4byte MauvilleCity_PokemonCenter_2F
+ .4byte MauvilleCity_Mart
+
+gMapGroup11: @ 8485F74
+ .4byte RustboroCity_DevonCorp_1F
+ .4byte RustboroCity_DevonCorp_2F
+ .4byte RustboroCity_DevonCorp_3F
+ .4byte RustboroCity_Gym
+ .4byte RustboroCity_PokemonSchool
+ .4byte RustboroCity_PokemonCenter_1F
+ .4byte RustboroCity_PokemonCenter_2F
+ .4byte RustboroCity_Mart
+ .4byte RustboroCity_Flat1_1F
+ .4byte RustboroCity_Flat1_2F
+ .4byte RustboroCity_House1
+ .4byte RustboroCity_CuttersHouse
+ .4byte RustboroCity_House2
+ .4byte RustboroCity_Flat2_1F
+ .4byte RustboroCity_Flat2_2F
+ .4byte RustboroCity_Flat2_3F
+ .4byte RustboroCity_House3
+
+gMapGroup12: @ 8485FB8
+ .4byte FortreeCity_House1
+ .4byte FortreeCity_Gym
+ .4byte FortreeCity_PokemonCenter_1F
+ .4byte FortreeCity_PokemonCenter_2F
+ .4byte FortreeCity_Mart
+ .4byte FortreeCity_House2
+ .4byte FortreeCity_House3
+ .4byte FortreeCity_House4
+ .4byte FortreeCity_House5
+ .4byte FortreeCity_DecorationShop
+
+gMapGroup13: @ 8485FE0
+ .4byte LilycoveCity_CoveLilyMotel_1F
+ .4byte LilycoveCity_CoveLilyMotel_2F
+ .4byte LilycoveCity_LilycoveMuseum_1F
+ .4byte LilycoveCity_LilycoveMuseum_2F
+ .4byte LilycoveCity_ContestLobby
+ .4byte LilycoveCity_ContestHall
+ .4byte LilycoveCity_PokemonCenter_1F
+ .4byte LilycoveCity_PokemonCenter_2F
+ .4byte LilycoveCity_UnusedMart
+ .4byte LilycoveCity_PokemonTrainerFanClub
+ .4byte LilycoveCity_Harbor
+ .4byte LilycoveCity_MoveDeletersHouse
+ .4byte LilycoveCity_House1
+ .4byte LilycoveCity_House2
+ .4byte LilycoveCity_House3
+ .4byte LilycoveCity_House4
+ .4byte LilycoveCity_DepartmentStore_1F
+ .4byte LilycoveCity_DepartmentStore_2F
+ .4byte LilycoveCity_DepartmentStore_3F
+ .4byte LilycoveCity_DepartmentStore_4F
+ .4byte LilycoveCity_DepartmentStore_5F
+ .4byte LilycoveCity_DepartmentStoreRooftop
+ .4byte LilycoveCity_DepartmentStoreElevator
+
+gMapGroup14: @ 848603C
+ .4byte MossdeepCity_Gym
+ .4byte MossdeepCity_House1
+ .4byte MossdeepCity_House2
+ .4byte MossdeepCity_PokemonCenter_1F
+ .4byte MossdeepCity_PokemonCenter_2F
+ .4byte MossdeepCity_Mart
+ .4byte MossdeepCity_House3
+ .4byte MossdeepCity_StevensHouse
+ .4byte MossdeepCity_House4
+ .4byte MossdeepCity_SpaceCenter_1F
+ .4byte MossdeepCity_SpaceCenter_2F
+ .4byte MossdeepCity_GameCorner_1F
+ .4byte MossdeepCity_GameCorner_B1F
+
+gMapGroup15: @ 8486070
+ .4byte SootopolisCity_Gym_1F
+ .4byte SootopolisCity_Gym_B1F
+ .4byte SootopolisCity_PokemonCenter_1F
+ .4byte SootopolisCity_PokemonCenter_2F
+ .4byte SootopolisCity_Mart
+ .4byte SootopolisCity_House1
+ .4byte SootopolisCity_House2
+ .4byte SootopolisCity_House3
+ .4byte SootopolisCity_House4
+ .4byte SootopolisCity_House5
+ .4byte SootopolisCity_House6
+ .4byte SootopolisCity_House7
+ .4byte SootopolisCity_LotadAndSeedotHouse
+ .4byte SootopolisCity_MysteryEventsHouse_1F
+ .4byte SootopolisCity_MysteryEventsHouse_B1F
+
+gMapGroup16: @ 84860AC
+ .4byte EverGrandeCity_SidneysRoom
+ .4byte EverGrandeCity_PhoebesRoom
+ .4byte EverGrandeCity_GlaciasRoom
+ .4byte EverGrandeCity_DrakesRoom
+ .4byte EverGrandeCity_ChampionsRoom
+ .4byte EverGrandeCity_Hall1
+ .4byte EverGrandeCity_Hall2
+ .4byte EverGrandeCity_Hall3
+ .4byte EverGrandeCity_Hall4
+ .4byte EverGrandeCity_Hall5
+ .4byte EverGrandeCity_PokemonLeague_1F
+ .4byte EverGrandeCity_HallOfFame
+ .4byte EverGrandeCity_PokemonCenter_1F
+ .4byte EverGrandeCity_PokemonCenter_2F
+ .4byte EverGrandeCity_PokemonLeague_2F
+
+gMapGroup17: @ 84860E8
+ .4byte Route104_MrBrineysHouse
+ .4byte Route104_PrettyPetalFlowerShop
+
+gMapGroup18: @ 84860F0
+ .4byte Route111_WinstrateFamilysHouse
+ .4byte Route111_OldLadysRestStop
+
+gMapGroup19: @ 84860F8
+ .4byte Route112_CableCarStation
+ .4byte MtChimney_CableCarStation
+
+gMapGroup20: @ 8486100
+ .4byte Route114_FossilManiacsHouse
+ .4byte Route114_FossilManiacsTunnel
+ .4byte Route114_LanettesHouse
+
+gMapGroup21: @ 848610C
+ .4byte Route116_TunnelersRestHouse
+
+gMapGroup22: @ 8486110
+ .4byte Route117_PokemonDayCare
+
+gMapGroup23: @ 8486114
+ .4byte Route121_SafariZoneEntrance
+
+gMapGroup24: @ 8486118
+ .4byte MeteorFalls_1F_1R
+ .4byte MeteorFalls_1F_2R
+ .4byte MeteorFalls_B1F_1R
+ .4byte MeteorFalls_B1F_2R
+ .4byte RusturfTunnel
+ .4byte Underwater_SootopolisCity
+ .4byte DesertRuins
+ .4byte GraniteCave_1F
+ .4byte GraniteCave_B1F
+ .4byte GraniteCave_B2F
+ .4byte GraniteCave_StevensRoom
+ .4byte PetalburgWoods
+ .4byte MtChimney
+ .4byte JaggedPass
+ .4byte FieryPath
+ .4byte MtPyre_1F
+ .4byte MtPyre_2F
+ .4byte MtPyre_3F
+ .4byte MtPyre_4F
+ .4byte MtPyre_5F
+ .4byte MtPyre_6F
+ .4byte MtPyre_Exterior
+ .4byte MtPyre_Summit
+ .4byte AquaHideout_1F
+ .4byte AquaHideout_B1F
+ .4byte AquaHideout_B2F
+ .4byte Underwater_SeafloorCavern
+ .4byte SeafloorCavern_Entrance
+ .4byte SeafloorCavern_Room1
+ .4byte SeafloorCavern_Room2
+ .4byte SeafloorCavern_Room3
+ .4byte SeafloorCavern_Room4
+ .4byte SeafloorCavern_Room5
+ .4byte SeafloorCavern_Room6
+ .4byte SeafloorCavern_Room7
+ .4byte SeafloorCavern_Room8
+ .4byte SeafloorCavern_Room9
+ .4byte CaveOfOrigin_Entrance
+ .4byte CaveOfOrigin_1F
+ .4byte CaveOfOrigin_UnusedRubySapphireMap1
+ .4byte CaveOfOrigin_UnusedRubySapphireMap2
+ .4byte CaveOfOrigin_UnusedRubySapphireMap3
+ .4byte CaveOfOrigin_B1F
+ .4byte VictoryRoad_1F
+ .4byte VictoryRoad_B1F
+ .4byte VictoryRoad_B2F
+ .4byte ShoalCave_LowTideEntranceRoom
+ .4byte ShoalCave_LowTideInnerRoom
+ .4byte ShoalCave_LowTideStairsRoom
+ .4byte ShoalCave_LowTideLowerRoom
+ .4byte ShoalCave_HighTideEntranceRoom
+ .4byte ShoalCave_HighTideInnerRoom
+ .4byte NewMauville_Entrance
+ .4byte NewMauville_Inside
+ .4byte AbandonedShip_Deck
+ .4byte AbandonedShip_Corridors_1F
+ .4byte AbandonedShip_Rooms_1F
+ .4byte AbandonedShip_Corridors_B1F
+ .4byte AbandonedShip_Rooms_B1F
+ .4byte AbandonedShip_Rooms2_B1F
+ .4byte AbandonedShip_Underwater1
+ .4byte AbandonedShip_Room_B1F
+ .4byte AbandonedShip_Rooms2_1F
+ .4byte AbandonedShip_CaptainsOffice
+ .4byte AbandonedShip_Underwater2
+ .4byte AbandonedShip_HiddenFloorCorridors
+ .4byte AbandonedShip_HiddenFloorRooms
+ .4byte IslandCave
+ .4byte AncientTomb
+ .4byte Underwater_Route134
+ .4byte Underwater_SealedChamber
+ .4byte SealedChamber_OuterRoom
+ .4byte SealedChamber_InnerRoom
+ .4byte ScorchedSlab
+ .4byte AquaHideout_UnusedRubyMap1
+ .4byte AquaHideout_UnusedRubyMap2
+ .4byte AquaHideout_UnusedRubyMap3
+ .4byte SkyPillar_Entrance
+ .4byte SkyPillar_Outside
+ .4byte SkyPillar_1F
+ .4byte SkyPillar_2F
+ .4byte SkyPillar_3F
+ .4byte SkyPillar_4F
+ .4byte ShoalCave_LowTideIceRoom
+ .4byte SkyPillar_5F
+ .4byte SkyPillar_Top
+ .4byte MagmaHideout_1F
+ .4byte MagmaHideout_2F_1R
+ .4byte MagmaHideout_2F_2R
+ .4byte MagmaHideout_3F_1R
+ .4byte MagmaHideout_3F_2R
+ .4byte MagmaHideout_4F
+ .4byte MagmaHideout_3F_3R
+ .4byte MagmaHideout_2F_3R
+ .4byte MirageTower_1F
+ .4byte MirageTower_2F
+ .4byte MirageTower_3F
+ .4byte MirageTower_4F
+ .4byte DesertUnderpass
+ .4byte ArtisanCave_B1F
+ .4byte ArtisanCave_1F
+ .4byte Underwater_MarineCave
+ .4byte MarineCave_Entrance
+ .4byte MarineCave_End
+ .4byte TerraCave_Entrance
+ .4byte TerraCave_End
+ .4byte AlteringCave
+ .4byte MeteorFalls_StevensCave
+
+gMapGroup25: @ 84862C8
+ .4byte SecretBase_RedCave1
+ .4byte SecretBase_BrownCave1
+ .4byte SecretBase_BlueCave1
+ .4byte SecretBase_YellowCave1
+ .4byte SecretBase_Tree1
+ .4byte SecretBase_Shrub1
+ .4byte SecretBase_RedCave2
+ .4byte SecretBase_BrownCave2
+ .4byte SecretBase_BlueCave2
+ .4byte SecretBase_YellowCave2
+ .4byte SecretBase_Tree2
+ .4byte SecretBase_Shrub2
+ .4byte SecretBase_RedCave3
+ .4byte SecretBase_BrownCave3
+ .4byte SecretBase_BlueCave3
+ .4byte SecretBase_YellowCave3
+ .4byte SecretBase_Tree3
+ .4byte SecretBase_Shrub3
+ .4byte SecretBase_RedCave4
+ .4byte SecretBase_BrownCave4
+ .4byte SecretBase_BlueCave4
+ .4byte SecretBase_YellowCave4
+ .4byte SecretBase_Tree4
+ .4byte SecretBase_Shrub4
+ .4byte SingleBattleColosseum
+ .4byte TradeCenter
+ .4byte RecordCorner
+ .4byte DoubleBattleColosseum
+ .4byte LinkContestRoom1
+ .4byte UnknownMap_25_29
+ .4byte UnknownMap_25_30
+ .4byte UnknownMap_25_31
+ .4byte UnknownMap_25_32
+ .4byte UnknownMap_25_33
+ .4byte UnknownMap_25_34
+ .4byte LinkContestRoom2
+ .4byte LinkContestRoom3
+ .4byte LinkContestRoom4
+ .4byte LinkContestRoom5
+ .4byte LinkContestRoom6
+ .4byte InsideOfTruck
+ .4byte SSTidalCorridor
+ .4byte SSTidalLowerDeck
+ .4byte SSTidalRooms
+ .4byte BattlePyramidSquare01
+ .4byte BattlePyramidSquare02
+ .4byte BattlePyramidSquare03
+ .4byte BattlePyramidSquare04
+ .4byte BattlePyramidSquare05
+ .4byte BattlePyramidSquare06
+ .4byte BattlePyramidSquare07
+ .4byte BattlePyramidSquare08
+ .4byte BattlePyramidSquare09
+ .4byte BattlePyramidSquare10
+ .4byte BattlePyramidSquare11
+ .4byte BattlePyramidSquare12
+ .4byte BattlePyramidSquare13
+ .4byte BattlePyramidSquare14
+ .4byte BattlePyramidSquare15
+ .4byte BattlePyramidSquare16
+ .4byte UnionRoom
+
+gMapGroup26: @ 84863BC
+ .4byte SafariZone_Northwest
+ .4byte SafariZone_North
+ .4byte SafariZone_Southwest
+ .4byte SafariZone_South
+ .4byte BattleFrontier_OutsideWest
+ .4byte BattleFrontier_BattleTowerLobby
+ .4byte BattleFrontier_BattleTowerElevator
+ .4byte BattleFrontier_BattleTowerCorridor
+ .4byte BattleFrontier_BattleTowerBattleRoom
+ .4byte SouthernIsland_Exterior
+ .4byte SouthernIsland_Interior
+ .4byte SafariZone_RestHouse
+ .4byte SafariZone_Northeast
+ .4byte SafariZone_Southeast
+ .4byte BattleFrontier_OutsideEast
+ .4byte BattleFrontier_BattleTowerMultiBattleRoom
+ .4byte BattleFrontier_BattleTowerCorridor2
+ .4byte BattleFrontier_BattleTowerBattleRoom2
+ .4byte BattleFrontier_BattleDomeLobby
+ .4byte BattleFrontier_BattleDomeCorridor
+ .4byte BattleFrontier_BattleDomePreBattleRoom
+ .4byte BattleFrontier_BattleDomeBattleRoom
+ .4byte BattleFrontier_BattlePalaceLobby
+ .4byte BattleFrontier_BattlePalaceCorridor
+ .4byte BattleFrontier_BattlePalaceBattleRoom
+ .4byte BattleFrontier_BattlePyramidLobby
+ .4byte BattleFrontier_BattlePyramidEmptySquare
+ .4byte BattleFrontier_BattlePyramidTop
+ .4byte BattleFrontier_BattleArenaLobby
+ .4byte BattleFrontier_BattleArenaCorridor
+ .4byte BattleFrontier_BattleArenaBattleRoom
+ .4byte BattleFrontier_BattleFactoryLobby
+ .4byte BattleFrontier_BattleFactoryPreBattleRoom
+ .4byte BattleFrontier_BattleFactoryBattleRoom
+ .4byte BattleFrontier_BattlePikeLobby
+ .4byte BattleFrontier_BattlePikeCorridor
+ .4byte BattleFrontier_BattlePikeThreePathRoom
+ .4byte BattleFrontier_BattlePikeRandomRoom1
+ .4byte BattleFrontier_BattlePikeRandomRoom2
+ .4byte BattleFrontier_BattlePikeRandomRoom3
+ .4byte BattleFrontier_RankingHall
+ .4byte BattleFrontier_Lounge1
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner
+ .4byte BattleFrontier_Lounge2
+ .4byte BattleFrontier_Lounge3
+ .4byte BattleFrontier_Lounge4
+ .4byte BattleFrontier_ScottsHouse
+ .4byte BattleFrontier_Lounge5
+ .4byte BattleFrontier_Lounge6
+ .4byte BattleFrontier_Lounge7
+ .4byte BattleFrontier_ReceptionGate
+ .4byte BattleFrontier_Lounge8
+ .4byte BattleFrontier_Lounge9
+ .4byte BattleFrontier_PokemonCenter_1F
+ .4byte BattleFrontier_PokemonCenter_2F
+ .4byte BattleFrontier_Mart
+ .4byte FarawayIsland_Entrance
+ .4byte FarawayIsland_Interior
+ .4byte BirthIsland_Exterior
+ .4byte BirthIsland_Harbor
+ .4byte TrainerHill_Entrance
+ .4byte TrainerHill_1F
+ .4byte TrainerHill_2F
+ .4byte TrainerHill_3F
+ .4byte TrainerHill_4F
+ .4byte TrainerHill_Roof
+ .4byte NavelRock_Exterior
+ .4byte NavelRock_Harbor
+ .4byte NavelRock_Entrance
+ .4byte NavelRock_B1F
+ .4byte NavelRock_Fork
+ .4byte NavelRock_Up1
+ .4byte NavelRock_Up2
+ .4byte NavelRock_Up3
+ .4byte NavelRock_Up4
+ .4byte NavelRock_Top
+ .4byte NavelRock_Down01
+ .4byte NavelRock_Down02
+ .4byte NavelRock_Down03
+ .4byte NavelRock_Down04
+ .4byte NavelRock_Down05
+ .4byte NavelRock_Down06
+ .4byte NavelRock_Down07
+ .4byte NavelRock_Down08
+ .4byte NavelRock_Down09
+ .4byte NavelRock_Down10
+ .4byte NavelRock_Down11
+ .4byte NavelRock_Bottom
+ .4byte TrainerHill_Elevator
+
+gMapGroup27: @ 8486520
+ .4byte Route104_Prototype
+ .4byte Route104_PrototypePrettyPetalFlowerShop
+
+gMapGroup28: @ 8486528
+ .4byte Route109_SeashoreHouse
+
+gMapGroup29: @ 848652C
+ .4byte Route110_TrickHouseEntrance
+ .4byte Route110_TrickHouseEnd
+ .4byte Route110_TrickHouseCorridor
+ .4byte Route110_TrickHousePuzzle1
+ .4byte Route110_TrickHousePuzzle2
+ .4byte Route110_TrickHousePuzzle3
+ .4byte Route110_TrickHousePuzzle4
+ .4byte Route110_TrickHousePuzzle5
+ .4byte Route110_TrickHousePuzzle6
+ .4byte Route110_TrickHousePuzzle7
+ .4byte Route110_TrickHousePuzzle8
+ .4byte Route110_SeasideCyclingRoadEntrance1
+ .4byte Route110_SeasideCyclingRoadEntrance2
+
+gMapGroup30: @ 8486560
+ .4byte Route113_GlassWorkshop
+
+gMapGroup31: @ 8486564
+ .4byte Route123_BerryMastersHouse
+
+gMapGroup32: @ 8486568
+ .4byte Route119_WeatherInstitute_1F
+ .4byte Route119_WeatherInstitute_2F
+ .4byte Route119_House
+
+gMapGroup33: @ 8486574
+ .4byte Route124_DivingTreasureHuntersHouse
+
+ .align 2
+gMapGroups:: @ 8486578
+ .4byte gMapGroup0
+ .4byte gMapGroup1
+ .4byte gMapGroup2
+ .4byte gMapGroup3
+ .4byte gMapGroup4
+ .4byte gMapGroup5
+ .4byte gMapGroup6
+ .4byte gMapGroup7
+ .4byte gMapGroup8
+ .4byte gMapGroup9
+ .4byte gMapGroup10
+ .4byte gMapGroup11
+ .4byte gMapGroup12
+ .4byte gMapGroup13
+ .4byte gMapGroup14
+ .4byte gMapGroup15
+ .4byte gMapGroup16
+ .4byte gMapGroup17
+ .4byte gMapGroup18
+ .4byte gMapGroup19
+ .4byte gMapGroup20
+ .4byte gMapGroup21
+ .4byte gMapGroup22
+ .4byte gMapGroup23
+ .4byte gMapGroup24
+ .4byte gMapGroup25
+ .4byte gMapGroup26
+ .4byte gMapGroup27
+ .4byte gMapGroup28
+ .4byte gMapGroup29
+ .4byte gMapGroup30
+ .4byte gMapGroup31
+ .4byte gMapGroup32
+ .4byte gMapGroup33
+
diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc
new file mode 100644
index 000000000..ef25ba2b5
--- /dev/null
+++ b/data/maps/attributes_table.inc
@@ -0,0 +1,444 @@
+ .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/connections.inc b/data/maps/connections.inc
new file mode 100644
index 000000000..a95024921
--- /dev/null
+++ b/data/maps/connections.inc
@@ -0,0 +1,65 @@
+ .include "data/maps/LittlerootTown/connections.inc"
+ .include "data/maps/OldaleTown/connections.inc"
+ .include "data/maps/DewfordTown/connections.inc"
+ .include "data/maps/LavaridgeTown/connections.inc"
+ .include "data/maps/FallarborTown/connections.inc"
+ .include "data/maps/VerdanturfTown/connections.inc"
+ .include "data/maps/PacifidlogTown/connections.inc"
+ .include "data/maps/PetalburgCity/connections.inc"
+ .include "data/maps/SlateportCity/connections.inc"
+ .include "data/maps/MauvilleCity/connections.inc"
+ .include "data/maps/RustboroCity/connections.inc"
+ .include "data/maps/FortreeCity/connections.inc"
+ .include "data/maps/LilycoveCity/connections.inc"
+ .include "data/maps/MossdeepCity/connections.inc"
+ .include "data/maps/SootopolisCity/connections.inc"
+ .include "data/maps/EverGrandeCity/connections.inc"
+ .include "data/maps/Route101/connections.inc"
+ .include "data/maps/Route102/connections.inc"
+ .include "data/maps/Route103/connections.inc"
+ .include "data/maps/Route104/connections.inc"
+ .include "data/maps/Route105/connections.inc"
+ .include "data/maps/Route106/connections.inc"
+ .include "data/maps/Route107/connections.inc"
+ .include "data/maps/Route108/connections.inc"
+ .include "data/maps/Route109/connections.inc"
+ .include "data/maps/Route110/connections.inc"
+ .include "data/maps/Route111/connections.inc"
+ .include "data/maps/Route112/connections.inc"
+ .include "data/maps/Route113/connections.inc"
+ .include "data/maps/Route114/connections.inc"
+ .include "data/maps/Route115/connections.inc"
+ .include "data/maps/Route116/connections.inc"
+ .include "data/maps/Route117/connections.inc"
+ .include "data/maps/Route118/connections.inc"
+ .include "data/maps/Route119/connections.inc"
+ .include "data/maps/Route120/connections.inc"
+ .include "data/maps/Route121/connections.inc"
+ .include "data/maps/Route122/connections.inc"
+ .include "data/maps/Route123/connections.inc"
+ .include "data/maps/Route124/connections.inc"
+ .include "data/maps/Route125/connections.inc"
+ .include "data/maps/Route126/connections.inc"
+ .include "data/maps/Route127/connections.inc"
+ .include "data/maps/Route128/connections.inc"
+ .include "data/maps/Route129/connections.inc"
+ .include "data/maps/Route130/connections.inc"
+ .include "data/maps/Route131/connections.inc"
+ .include "data/maps/Route132/connections.inc"
+ .include "data/maps/Route133/connections.inc"
+ .include "data/maps/Route134/connections.inc"
+ .include "data/maps/Underwater6/connections.inc"
+ .include "data/maps/Underwater1/connections.inc"
+ .include "data/maps/Underwater7/connections.inc"
+ .include "data/maps/Underwater2/connections.inc"
+ .include "data/maps/Underwater3/connections.inc"
+ .include "data/maps/Underwater4/connections.inc"
+ .include "data/maps/Underwater5/connections.inc"
+ .include "data/maps/SafariZone_Northwest/connections.inc"
+ .include "data/maps/SafariZone_North/connections.inc"
+ .include "data/maps/SafariZone_Southwest/connections.inc"
+ .include "data/maps/SafariZone_South/connections.inc"
+ .include "data/maps/SafariZone_Northeast/connections.inc"
+ .include "data/maps/SafariZone_Southeast/connections.inc"
+ .include "data/maps/BattleFrontier_OutsideWest/connections.inc"
+ .include "data/maps/BattleFrontier_OutsideEast/connections.inc"
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc
new file mode 100644
index 000000000..b2bc10ebb
--- /dev/null
+++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc
@@ -0,0 +1,11 @@
+AbandonedShip_CaptainsOffice_MapObjects: @ 8536A5C
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0
+
+AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
+ warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK
+ warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK
+
+AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C
+ map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc
new file mode 100644
index 000000000..a2b3b906f
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Corridors_1F.inc
@@ -0,0 +1,21 @@
+AbandonedShip_Corridors_1F_MapObjects: @ 85366C0
+ object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0
+
+AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
+ warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK
+ warp_def 8, 11, 3, 2, ABANDONED_SHIP_DECK
+ warp_def 0, 11, 3, 3, ABANDONED_SHIP_DECK
+ warp_def 1, 11, 3, 3, ABANDONED_SHIP_DECK
+ warp_def 11, 9, 3, 0, ABANDONED_SHIP_ROOMS_1F
+ warp_def 14, 9, 3, 3, ABANDONED_SHIP_ROOMS_1F
+ warp_def 11, 3, 3, 2, ABANDONED_SHIP_ROOMS_1F
+ warp_def 14, 3, 3, 4, ABANDONED_SHIP_ROOMS_1F
+ warp_def 3, 9, 3, 0, ABANDONED_SHIP_ROOMS_2_1F
+ warp_def 16, 2, 3, 7, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 5, 2, 3, 6, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F
+
+AbandonedShip_Corridors_1F_MapEvents:: @ 8536750
+ map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc
new file mode 100644
index 000000000..637e658ce
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc
@@ -0,0 +1,20 @@
+AbandonedShip_Corridors_B1F_MapObjects: @ 8536808
+ object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0
+
+AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
+ warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F
+ warp_def 3, 4, 3, 0, ABANDONED_SHIP_ROOMS_2_B1F
+ warp_def 5, 7, 3, 0, ABANDONED_SHIP_ROOMS_B1F
+ warp_def 8, 7, 3, 1, ABANDONED_SHIP_ROOMS_B1F
+ warp_def 11, 7, 3, 2, ABANDONED_SHIP_ROOMS_B1F
+ warp_def 11, 4, 3, 0, ABANDONED_SHIP_ROOM_B1F
+ warp_def 0, 2, 3, 10, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 8, 2, 3, 9, ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
+ bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8
+
+AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
+ map_events AbandonedShip_Corridors_B1F_MapObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
+
diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc
new file mode 100644
index 000000000..ca01ccec8
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Deck.inc
@@ -0,0 +1,10 @@
+AbandonedShip_Deck_MapWarps: @ 8536684
+ warp_def 13, 15, 3, 0, ROUTE_108
+ warp_def 14, 15, 3, 0, ROUTE_108
+ warp_def 13, 9, 3, 1, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 8, 9, 3, 2, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 12, 5, 3, 0, ABANDONED_SHIP_CAPTAINS_OFFICE
+
+AbandonedShip_Deck_MapEvents:: @ 85366AC
+ map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
new file mode 100644
index 000000000..3bff54076
--- /dev/null
+++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
@@ -0,0 +1,17 @@
+AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
+ warp_def 3, 8, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+ warp_def 6, 8, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+ warp_def 9, 8, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+ warp_def 3, 3, 3, 6, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+ warp_def 6, 3, 3, 7, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+ warp_def 9, 3, 3, 8, ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
+
+AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
+ bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
+ bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
+ bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
+ bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
+
+AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
+ map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents
+
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
new file mode 100644
index 000000000..21a4370ce
--- /dev/null
+++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
@@ -0,0 +1,32 @@
+AbandonedShip_HiddenFloorRooms_MapObjects: @ 8536B40
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0
+
+AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
+ warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 7, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 21, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 22, 14, 3, 1, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 36, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 37, 14, 3, 2, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 6, 1, 3, 3, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 21, 1, 3, 4, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+ warp_def 36, 1, 3, 5, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+
+AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
+ bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0
+ bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0
+ bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0
+ bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0
+ bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+ bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+ bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+ bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+ bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+ bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+
+AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
+ map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
+
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc
new file mode 100644
index 000000000..d22e24bde
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Room_B1F.inc
@@ -0,0 +1,10 @@
+AbandonedShip_Room_B1F_MapObjects: @ 853697C
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0
+
+AbandonedShip_Room_B1F_MapWarps: @ 8536994
+ warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Room_B1F_MapEvents:: @ 85369A4
+ map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc
new file mode 100644
index 000000000..ac5f57a53
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc
@@ -0,0 +1,15 @@
+AbandonedShip_Rooms2_1F_MapObjects: @ 85369B8
+ object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0
+ object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0
+
+AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
+ warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 5, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48
+ map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
new file mode 100644
index 000000000..08846936a
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
@@ -0,0 +1,13 @@
+AbandonedShip_Rooms2_B1F_MapObjects: @ 85368F4
+ object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0
+
+AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
+ warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 5, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 13, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944
+ map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc
new file mode 100644
index 000000000..7e358ef75
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Rooms_1F.inc
@@ -0,0 +1,17 @@
+AbandonedShip_Rooms_1F_MapObjects: @ 8536764
+ object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0
+ object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0
+
+AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
+ warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 5, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 4, 1, 3, 6, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 13, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 13, 1, 3, 7, ABANDONED_SHIP_CORRIDORS_1F
+ warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4
+ map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc
new file mode 100644
index 000000000..4627c4ab7
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc
@@ -0,0 +1,12 @@
+AbandonedShip_Rooms_B1F_MapObjects: @ 8536898
+ object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0
+
+AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
+ warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 13, 1, 3, 3, ABANDONED_SHIP_CORRIDORS_B1F
+ warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0
+ map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc
new file mode 100644
index 000000000..a92bed422
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Underwater1.inc
@@ -0,0 +1,7 @@
+AbandonedShip_Underwater1_MapWarps: @ 8536958
+ warp_def 3, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2
+ warp_def 4, 7, 3, 0, ABANDONED_SHIP_UNDERWATER_2
+
+AbandonedShip_Underwater1_MapEvents:: @ 8536968
+ map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/events/AbandonedShip_Underwater2.inc
new file mode 100644
index 000000000..de84626f3
--- /dev/null
+++ b/data/maps/events/AbandonedShip_Underwater2.inc
@@ -0,0 +1,6 @@
+AbandonedShip_Underwater2_MapWarps: @ 8536AB0
+ warp_def 3, 1, 3, 0, ABANDONED_SHIP_UNDERWATER_1
+
+AbandonedShip_Underwater2_MapEvents:: @ 8536AB8
+ map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AlteringCave.inc b/data/maps/events/AlteringCave.inc
new file mode 100644
index 000000000..296076932
--- /dev/null
+++ b/data/maps/events/AlteringCave.inc
@@ -0,0 +1,6 @@
+AlteringCave_MapWarps: @ 8537894
+ warp_def 18, 22, 0, 0, ROUTE_103
+
+AlteringCave_MapEvents:: @ 853789C
+ map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc
new file mode 100644
index 000000000..667ab3876
--- /dev/null
+++ b/data/maps/events/AncientTomb.inc
@@ -0,0 +1,16 @@
+AncientTomb_MapObjects: @ 8536CDC
+ object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0
+
+AncientTomb_MapWarps: @ 8536CF4
+ warp_def 8, 29, 3, 0, ROUTE_120
+ warp_def 8, 20, 0, 2, ANCIENT_TOMB
+ warp_def 8, 11, 3, 1, ANCIENT_TOMB
+
+AncientTomb_MapBGEvents: @ 8536D0C
+ bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033
+ bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050
+ bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050
+
+AncientTomb_MapEvents:: @ 8536D30
+ map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
+
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc
new file mode 100644
index 000000000..4c418b286
--- /dev/null
+++ b/data/maps/events/AquaHideout_1F.inc
@@ -0,0 +1,13 @@
+AquaHideout_1F_MapObjects: @ 8535304
+ object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0
+ object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0
+ object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0
+
+AquaHideout_1F_MapWarps: @ 853534C
+ warp_def 13, 27, 1, 6, LILYCOVE_CITY
+ warp_def 14, 27, 1, 6, LILYCOVE_CITY
+ warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F
+
+AquaHideout_1F_MapEvents:: @ 8535364
+ map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc
new file mode 100644
index 000000000..b62157d6f
--- /dev/null
+++ b/data/maps/events/AquaHideout_B1F.inc
@@ -0,0 +1,41 @@
+AquaHideout_B1F_MapObjects: @ 8535378
+ object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0
+ object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0
+ object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0
+ object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0
+ object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0
+
+AquaHideout_B1F_MapWarps: @ 8535450
+ warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F
+ warp_def 18, 1, 3, 0, AQUA_HIDEOUT_B2F
+ warp_def 12, 1, 3, 1, AQUA_HIDEOUT_B2F
+ warp_def 3, 3, 3, 2, AQUA_HIDEOUT_B2F
+ warp_def 31, 4, 3, 7, AQUA_HIDEOUT_B1F
+ warp_def 27, 4, 3, 8, AQUA_HIDEOUT_B1F
+ warp_def 20, 4, 3, 10, AQUA_HIDEOUT_B1F
+ warp_def 27, 12, 3, 4, AQUA_HIDEOUT_B1F
+ warp_def 3, 15, 3, 5, AQUA_HIDEOUT_B1F
+ warp_def 3, 20, 3, 12, AQUA_HIDEOUT_B1F
+ warp_def 32, 19, 3, 6, AQUA_HIDEOUT_B1F
+ warp_def 23, 10, 3, 22, AQUA_HIDEOUT_B1F
+ warp_def 45, 3, 3, 9, AQUA_HIDEOUT_B1F
+ warp_def 42, 5, 3, 18, AQUA_HIDEOUT_B1F
+ warp_def 45, 5, 3, 12, AQUA_HIDEOUT_B1F
+ warp_def 48, 5, 3, 16, AQUA_HIDEOUT_B1F
+ warp_def 42, 9, 3, 15, AQUA_HIDEOUT_B1F
+ warp_def 45, 9, 3, 20, AQUA_HIDEOUT_B1F
+ warp_def 48, 9, 3, 13, AQUA_HIDEOUT_B1F
+ warp_def 42, 13, 3, 24, AQUA_HIDEOUT_B1F
+ warp_def 45, 13, 3, 17, AQUA_HIDEOUT_B1F
+ warp_def 48, 13, 3, 12, AQUA_HIDEOUT_B1F
+ warp_def 42, 17, 3, 11, AQUA_HIDEOUT_B1F
+ warp_def 45, 17, 3, 17, AQUA_HIDEOUT_B1F
+ warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F
+
+AquaHideout_B1F_MapEvents:: @ 8535518
+ map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc
new file mode 100644
index 000000000..8a338a2bb
--- /dev/null
+++ b/data/maps/events/AquaHideout_B2F.inc
@@ -0,0 +1,27 @@
+AquaHideout_B2F_MapObjects: @ 853552C
+ object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0
+ object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0
+ object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0
+ object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0
+ object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0
+
+AquaHideout_B2F_MapWarps: @ 85355BC
+ warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F
+ warp_def 12, 1, 3, 2, AQUA_HIDEOUT_B1F
+ warp_def 3, 3, 3, 3, AQUA_HIDEOUT_B1F
+ warp_def 31, 8, 3, 5, AQUA_HIDEOUT_B2F
+ warp_def 8, 8, 3, 8, AQUA_HIDEOUT_B2F
+ warp_def 5, 8, 3, 3, AQUA_HIDEOUT_B2F
+ warp_def 18, 13, 3, 7, AQUA_HIDEOUT_B2F
+ warp_def 12, 13, 3, 6, AQUA_HIDEOUT_B2F
+ warp_def 31, 17, 3, 4, AQUA_HIDEOUT_B2F
+ warp_def 32, 20, 3, 4, AQUA_HIDEOUT_B1F
+
+AquaHideout_B2F_MapCoordEvents: @ 853560C
+ coord_event 28, 17, 3, 0, VAR_0x4001, 0, 0, AquaHideout_B2F_EventScript_233DE5
+ coord_event 28, 16, 3, 0, VAR_0x4001, 0, 0, AquaHideout_B2F_EventScript_233DE5
+
+AquaHideout_B2F_MapEvents:: @ 853562C
+ map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap1.inc b/data/maps/events/AquaHideout_UnusedRubyMap1.inc
new file mode 100644
index 000000000..45663b68f
--- /dev/null
+++ b/data/maps/events/AquaHideout_UnusedRubyMap1.inc
@@ -0,0 +1,3 @@
+AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC
+ map_events 0x0, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap2.inc b/data/maps/events/AquaHideout_UnusedRubyMap2.inc
new file mode 100644
index 000000000..6f53de284
--- /dev/null
+++ b/data/maps/events/AquaHideout_UnusedRubyMap2.inc
@@ -0,0 +1,3 @@
+AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0
+ map_events 0x0, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/AquaHideout_UnusedRubyMap3.inc b/data/maps/events/AquaHideout_UnusedRubyMap3.inc
new file mode 100644
index 000000000..8a23a3786
--- /dev/null
+++ b/data/maps/events/AquaHideout_UnusedRubyMap3.inc
@@ -0,0 +1,3 @@
+AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4
+ map_events 0x0, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc
new file mode 100644
index 000000000..148408aa9
--- /dev/null
+++ b/data/maps/events/ArtisanCave_1F.inc
@@ -0,0 +1,10 @@
+ArtisanCave_1F_MapObjects: @ 8537774
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0
+
+ArtisanCave_1F_MapWarps: @ 853778C
+ warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F
+
+ArtisanCave_1F_MapEvents:: @ 853779C
+ map_events ArtisanCave_1F_MapObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc
new file mode 100644
index 000000000..38a978c9b
--- /dev/null
+++ b/data/maps/events/ArtisanCave_B1F.inc
@@ -0,0 +1,16 @@
+ArtisanCave_B1F_MapObjects: @ 8537708
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0
+
+ArtisanCave_B1F_MapWarps: @ 8537720
+ warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 38, 5, 0, 1, ARTISAN_CAVE_1F
+
+ArtisanCave_B1F_MapBGEvents: @ 8537730
+ bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0
+ bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0
+ bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0
+ bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0
+
+ArtisanCave_B1F_MapEvents:: @ 8537760
+ map_events ArtisanCave_B1F_MapObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
new file mode 100644
index 000000000..fee53156b
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
@@ -0,0 +1,14 @@
+BattleFrontier_BattleArenaBattleRoom_MapObjects: @ 853C8EC
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
+ map_events BattleFrontier_BattleArenaBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
new file mode 100644
index 000000000..d35c35ad0
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleArenaCorridor_MapObjects: @ 853C8C0
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
+ map_events BattleFrontier_BattleArenaCorridor_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc
new file mode 100644
index 000000000..ec84dfb77
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc
@@ -0,0 +1,17 @@
+BattleFrontier_BattleArenaLobby_MapObjects: @ 853C814
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0
+
+BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
+ warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
+ bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092
+ bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA
+
+BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
+ map_events BattleFrontier_BattleArenaLobby_MapObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
new file mode 100644
index 000000000..3f0429bf2
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
@@ -0,0 +1,20 @@
+BattleFrontier_BattleDomeBattleRoom_MapObjects: @ 853C1C4
+ object_event 1, MAP_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
+ map_events BattleFrontier_BattleDomeBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
new file mode 100644
index 000000000..61b6e019d
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
@@ -0,0 +1,10 @@
+BattleFrontier_BattleDomeCorridor_MapObjects: @ 853C14C
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
+ warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174
+ map_events BattleFrontier_BattleDomeCorridor_MapObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc
new file mode 100644
index 000000000..09ebc903c
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc
@@ -0,0 +1,21 @@
+BattleFrontier_BattleDomeLobby_MapObjects: @ 853C068
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0
+
+BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
+ warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 12, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
+ bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52
+ bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84
+ bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B
+ bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34
+
+BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
+ map_events BattleFrontier_BattleDomeLobby_MapObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
new file mode 100644
index 000000000..6d8a8abe8
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
@@ -0,0 +1,10 @@
+BattleFrontier_BattleDomePreBattleRoom_MapObjects: @ 853C188
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
+ warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0
+ map_events BattleFrontier_BattleDomePreBattleRoom_MapObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
new file mode 100644
index 000000000..65ce8b684
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
@@ -0,0 +1,13 @@
+BattleFrontier_BattleFactoryBattleRoom_MapObjects: @ 853CADC
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 8, 255, 0, 0, 5, 11, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
+ map_events BattleFrontier_BattleFactoryBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
new file mode 100644
index 000000000..e9f54cb50
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
@@ -0,0 +1,20 @@
+BattleFrontier_BattleFactoryLobby_MapObjects: @ 853C9D8
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0
+
+BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
+ warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 10, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
+ bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
+ bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
+ bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839
+
+BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
+ map_events BattleFrontier_BattleFactoryLobby_MapObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
new file mode 100644
index 000000000..de03d5945
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleFactoryPreBattleRoom_MapObjects: @ 853CAB0
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
+ map_events BattleFrontier_BattleFactoryPreBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
new file mode 100644
index 000000000..1314bbb40
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
@@ -0,0 +1,14 @@
+BattleFrontier_BattlePalaceBattleRoom_MapObjects: @ 853C4FC
+ object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
+ warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
+ warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
+
+BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584
+ map_events BattleFrontier_BattlePalaceBattleRoom_MapObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
new file mode 100644
index 000000000..dc86a54b8
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
@@ -0,0 +1,18 @@
+BattleFrontier_BattlePalaceCorridor_MapObjects: @ 853C420
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
+ warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
+ warp_def 9, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
+ warp_def 6, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
+ warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
+
+BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8
+ map_events BattleFrontier_BattlePalaceCorridor_MapObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
new file mode 100644
index 000000000..890d545ae
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
@@ -0,0 +1,21 @@
+BattleFrontier_BattlePalaceLobby_MapObjects: @ 853C340
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0
+
+BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
+ warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 13, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 5, 4, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
+
+BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
+ bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
+ bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
+ bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
+
+BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
+ map_events BattleFrontier_BattlePalaceLobby_MapObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
new file mode 100644
index 000000000..2e6b8ecc7
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattlePikeCorridor_MapObjects: @ 853CC54
+ object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
+ map_events BattleFrontier_BattlePikeCorridor_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc
new file mode 100644
index 000000000..4580d0358
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc
@@ -0,0 +1,18 @@
+BattleFrontier_BattlePikeLobby_MapObjects: @ 853CBB0
+ object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0
+
+BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
+ warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 4, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 6, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
+ bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80
+ bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
+
+BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
+ map_events BattleFrontier_BattlePikeLobby_MapObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
new file mode 100644
index 000000000..40d5db12b
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
@@ -0,0 +1,16 @@
+BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54
+ object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0
+
+BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
+ coord_event 4, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
+ coord_event 3, 6, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+ coord_event 3, 7, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+ coord_event 4, 6, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+ coord_event 5, 6, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+ coord_event 4, 7, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+ coord_event 5, 7, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+
+BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
+ map_events BattleFrontier_BattlePikeRandomRoom1_MapObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
new file mode 100644
index 000000000..078882617
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattlePikeRandomRoom2_MapObjects: @ 853CE08
+ object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
+ map_events BattleFrontier_BattlePikeRandomRoom2_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc
new file mode 100644
index 000000000..d2988ab50
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc
@@ -0,0 +1,12 @@
+BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
+ coord_event 4, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
+ coord_event 3, 18, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
+ coord_event 4, 18, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
+ coord_event 5, 18, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
+ coord_event 3, 19, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
+ coord_event 4, 19, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
+ coord_event 5, 19, 3, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
+
+BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4
+ map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
new file mode 100644
index 000000000..9345b5819
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
@@ -0,0 +1,18 @@
+BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80
+ object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0
+
+BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
+ coord_event 2, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
+ coord_event 6, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
+ coord_event 10, 3, 3, 0, VAR_0x4001, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
+ coord_event 5, 10, 0, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+ coord_event 6, 10, 0, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+ coord_event 6, 9, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+ coord_event 5, 9, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+ coord_event 7, 9, 3, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+ coord_event 7, 10, 0, 0, VAR_0x4003, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+
+BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
+ map_events BattleFrontier_BattlePikeThreePathRoom_MapObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
new file mode 100644
index 000000000..5e5a23fa4
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
@@ -0,0 +1,19 @@
+BattleFrontier_BattlePointExchangeServiceCorner_MapObjects: @ 853D018
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0
+
+BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
+ warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 6, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108
+ map_events BattleFrontier_BattlePointExchangeServiceCorner_MapObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
new file mode 100644
index 000000000..aba4f907d
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
@@ -0,0 +1,21 @@
+BattleFrontier_BattlePyramidEmptySquare_MapObjects: @ 853C62C
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
+ map_events BattleFrontier_BattlePyramidEmptySquare_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
new file mode 100644
index 000000000..eb56352ed
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
@@ -0,0 +1,16 @@
+BattleFrontier_BattlePyramidLobby_MapObjects: @ 853C598
+ object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0
+
+BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
+ warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
+ bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42
+ bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95
+
+BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
+ map_events BattleFrontier_BattlePyramidLobby_MapObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc
new file mode 100644
index 000000000..d06650789
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattlePyramidTop.inc
@@ -0,0 +1,10 @@
+BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0
+ object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
+ coord_event 17, 9, 4, 0, VAR_0x4002, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
+
+BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
+ map_events BattleFrontier_BattlePyramidTop_MapObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
new file mode 100644
index 000000000..c9b46f8ca
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
@@ -0,0 +1,12 @@
+BattleFrontier_BattleTowerBattleRoom_MapObjects: @ 853B7D0
+ object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
+ warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
+ warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
+
+BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828
+ map_events BattleFrontier_BattleTowerBattleRoom_MapObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
new file mode 100644
index 000000000..afab09840
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
@@ -0,0 +1,11 @@
+BattleFrontier_BattleTowerBattleRoom2_MapObjects: @ 853BFC4
+ object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
+ object_event 5, 255, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, 254, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
+ map_events BattleFrontier_BattleTowerBattleRoom2_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
new file mode 100644
index 000000000..75d51fb28
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleTowerCorridor_MapObjects: @ 853B7A4
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
+ map_events BattleFrontier_BattleTowerCorridor_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
new file mode 100644
index 000000000..083b877ab
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
@@ -0,0 +1,9 @@
+BattleFrontier_BattleTowerCorridor2_MapObjects: @ 853BF50
+ object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, 254, 0, 0, 14, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
+ map_events BattleFrontier_BattleTowerCorridor2_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc
new file mode 100644
index 000000000..4f2a32d89
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleTowerElevator.inc
@@ -0,0 +1,6 @@
+BattleFrontier_BattleTowerElevator_MapObjects: @ 853B778
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790
+ map_events BattleFrontier_BattleTowerElevator_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc
new file mode 100644
index 000000000..35f6e6bca
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc
@@ -0,0 +1,26 @@
+BattleFrontier_BattleTowerLobby_MapObjects: @ 853B638
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0
+ object_event 6, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0
+ object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0
+
+BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710
+ warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 13, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 6, 1, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM
+
+BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728
+ bg_event 4, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFC7
+ bg_event 8, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFE0
+ bg_event 12, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFF9
+ bg_event 16, 5, 0, 1, 0, BattleFrontier_BattleTowerLobby_EventScript_23F012
+ bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE
+
+BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764
+ map_events BattleFrontier_BattleTowerLobby_MapObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
new file mode 100644
index 000000000..0292088de
--- /dev/null
+++ b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
@@ -0,0 +1,14 @@
+BattleFrontier_BattleTowerMultiBattleRoom_MapObjects: @ 853BE64
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0
+ object_event 8, 246, 0, 0, 15, 13, 3, 15, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864, 0, 0
+ object_event 9, 247, 0, 0, 4, 12, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865, 0, 0
+
+BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
+ map_events BattleFrontier_BattleTowerMultiBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc
new file mode 100644
index 000000000..748d86b6c
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge1.inc
@@ -0,0 +1,11 @@
+BattleFrontier_Lounge1_MapObjects: @ 853CFB4
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0
+
+BattleFrontier_Lounge1_MapWarps: @ 853CFFC
+ warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge1_MapEvents:: @ 853D004
+ map_events BattleFrontier_Lounge1_MapObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc
new file mode 100644
index 000000000..c31e86ab6
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge2.inc
@@ -0,0 +1,14 @@
+BattleFrontier_Lounge2_MapObjects: @ 853D11C
+ object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0
+
+BattleFrontier_Lounge2_MapWarps: @ 853D194
+ warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Lounge2_MapEvents:: @ 853D1A4
+ map_events BattleFrontier_Lounge2_MapObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc
new file mode 100644
index 000000000..0655cea90
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge3.inc
@@ -0,0 +1,13 @@
+BattleFrontier_Lounge3_MapObjects: @ 853D1B8
+ object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0
+
+BattleFrontier_Lounge3_MapWarps: @ 853D230
+ warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge3_MapEvents:: @ 853D238
+ map_events BattleFrontier_Lounge3_MapObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc
new file mode 100644
index 000000000..ae4e7c4b7
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge4.inc
@@ -0,0 +1,11 @@
+BattleFrontier_Lounge4_MapObjects: @ 853D24C
+ object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0
+
+BattleFrontier_Lounge4_MapWarps: @ 853D294
+ warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Lounge4_MapEvents:: @ 853D29C
+ map_events BattleFrontier_Lounge4_MapObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc
new file mode 100644
index 000000000..cc8759d1d
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge5.inc
@@ -0,0 +1,13 @@
+BattleFrontier_Lounge5_MapObjects: @ 853D2EC
+ object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0
+
+BattleFrontier_Lounge5_MapWarps: @ 853D34C
+ warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge5_MapEvents:: @ 853D35C
+ map_events BattleFrontier_Lounge5_MapObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc
new file mode 100644
index 000000000..b2aa2b93f
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge6.inc
@@ -0,0 +1,9 @@
+BattleFrontier_Lounge6_MapObjects: @ 853D370
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0
+
+BattleFrontier_Lounge6_MapWarps: @ 853D388
+ warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge6_MapEvents:: @ 853D390
+ map_events BattleFrontier_Lounge6_MapObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc
new file mode 100644
index 000000000..43cb50ddf
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge7.inc
@@ -0,0 +1,12 @@
+BattleFrontier_Lounge7_MapObjects: @ 853D3A4
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0
+
+BattleFrontier_Lounge7_MapWarps: @ 853D404
+ warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Lounge7_MapEvents:: @ 853D40C
+ map_events BattleFrontier_Lounge7_MapObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc
new file mode 100644
index 000000000..0420a702f
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge8.inc
@@ -0,0 +1,11 @@
+BattleFrontier_Lounge8_MapObjects: @ 853D4BC
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0
+
+BattleFrontier_Lounge8_MapWarps: @ 853D504
+ warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge8_MapEvents:: @ 853D50C
+ map_events BattleFrontier_Lounge8_MapObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc
new file mode 100644
index 000000000..ff96fc94f
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Lounge9.inc
@@ -0,0 +1,10 @@
+BattleFrontier_Lounge9_MapObjects: @ 853D520
+ object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BattleFrontier_Lounge9_MapWarps: @ 853D538
+ warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge9_MapEvents:: @ 853D548
+ map_events BattleFrontier_Lounge9_MapObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc
new file mode 100644
index 000000000..5ce69f2ee
--- /dev/null
+++ b/data/maps/events/BattleFrontier_Mart.inc
@@ -0,0 +1,13 @@
+BattleFrontier_Mart_MapObjects: @ 853D68C
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0
+
+BattleFrontier_Mart_MapWarps: @ 853D6EC
+ warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_Mart_MapEvents:: @ 853D6FC
+ map_events BattleFrontier_Mart_MapObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc
new file mode 100644
index 000000000..a99a7fcf0
--- /dev/null
+++ b/data/maps/events/BattleFrontier_OutsideEast.inc
@@ -0,0 +1,57 @@
+BattleFrontier_OutsideEast_MapObjects: @ 853BB10
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0
+ object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0
+
+BattleFrontier_OutsideEast_MapWarps: @ 853BD80
+ warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY
+ warp_def 39, 29, 0, 0, BATTLE_FRONTIER_BATTLE_ARENA_LOBBY
+ warp_def 45, 56, 0, 0, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY
+ warp_def 58, 14, 0, 0, BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY
+ warp_def 35, 12, 3, 0, BATTLE_FRONTIER_RANKING_HALL
+ warp_def 4, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_1
+ warp_def 10, 28, 0, 0, BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER
+ warp_def 22, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_5
+ warp_def 5, 8, 0, 0, BATTLE_FRONTIER_LOUNGE_6
+ warp_def 65, 31, 0, 0, BATTLE_FRONTIER_LOUNGE_3
+ warp_def 14, 51, 0, 0, BATTLE_FRONTIER_LOUNGE_8
+ warp_def 21, 45, 0, 0, BATTLE_FRONTIER_LOUNGE_9
+ warp_def 3, 51, 0, 0, BATTLE_FRONTIER_POKEMON_CENTER_1F
+ warp_def 28, 7, 0, 0, ARTISAN_CAVE_1F
+
+BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0
+ bg_event 13, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C43
+ bg_event 43, 56, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C4C
+ bg_event 36, 34, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C55
+ bg_event 62, 15, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C5E
+ bg_event 7, 29, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DD7
+ bg_event 32, 13, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DCE
+ bg_event 4, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
+ bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73
+
+BattleFrontier_OutsideEast_MapEvents:: @ 853BE50
+ map_events BattleFrontier_OutsideEast_MapObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc
new file mode 100644
index 000000000..e6f2eef7d
--- /dev/null
+++ b/data/maps/events/BattleFrontier_OutsideWest.inc
@@ -0,0 +1,49 @@
+BattleFrontier_OutsideWest_MapObjects: @ 853B350
+ object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0
+
+BattleFrontier_OutsideWest_MapWarps: @ 853B590
+ warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY
+ warp_def 19, 17, 0, 0, BATTLE_FRONTIER_BATTLE_DOME_LOBBY
+ warp_def 11, 38, 0, 0, BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY
+ warp_def 45, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_2
+ warp_def 51, 51, 0, 0, BATTLE_FRONTIER_MART
+ warp_def 44, 5, 0, 0, BATTLE_FRONTIER_SCOTTS_HOUSE
+ warp_def 53, 44, 0, 0, BATTLE_FRONTIER_LOUNGE_4
+ warp_def 5, 20, 0, 0, BATTLE_FRONTIER_LOUNGE_7
+ warp_def 26, 65, 0, 0, BATTLE_FRONTIER_RECEPTION_GATE
+ warp_def 26, 61, 0, 1, BATTLE_FRONTIER_RECEPTION_GATE
+ warp_def 39, 55, 0, 0, ARTISAN_CAVE_B1F
+
+BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8
+ bg_event 15, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4E2
+ bg_event 45, 30, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4F4
+ bg_event 16, 43, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D4EB
+ bg_event 52, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
+ bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A
+
+BattleFrontier_OutsideWest_MapEvents:: @ 853B624
+ map_events BattleFrontier_OutsideWest_MapObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
new file mode 100644
index 000000000..0a8974135
--- /dev/null
+++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
@@ -0,0 +1,15 @@
+BattleFrontier_PokemonCenter_1F_MapObjects: @ 853D55C
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0
+
+BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
+ warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 6, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F
+
+BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC
+ map_events BattleFrontier_PokemonCenter_1F_MapObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
new file mode 100644
index 000000000..44d40453f
--- /dev/null
+++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+BattleFrontier_PokemonCenter_2F_MapObjects: @ 853D600
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660
+ warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678
+ map_events BattleFrontier_PokemonCenter_2F_MapObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc
new file mode 100644
index 000000000..853f83ab7
--- /dev/null
+++ b/data/maps/events/BattleFrontier_RankingHall.inc
@@ -0,0 +1,26 @@
+BattleFrontier_RankingHall_MapObjects: @ 853CEB8
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0
+
+BattleFrontier_RankingHall_MapWarps: @ 853CF00
+ warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST
+ warp_def 27, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_RankingHall_MapBGEvents: @ 853CF10
+ bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA
+ bg_event 23, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4B6
+ bg_event 26, 5, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4C2
+ bg_event 29, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4CE
+ bg_event 42, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4DA
+ bg_event 46, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4E6
+ bg_event 10, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4F2
+ bg_event 8, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4FE
+ bg_event 6, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E50A
+ bg_event 44, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E516
+ bg_event 16, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E538
+ bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541
+
+BattleFrontier_RankingHall_MapEvents:: @ 853CFA0
+ map_events BattleFrontier_RankingHall_MapObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents
+
diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc
new file mode 100644
index 000000000..641723257
--- /dev/null
+++ b/data/maps/events/BattleFrontier_ReceptionGate.inc
@@ -0,0 +1,14 @@
+BattleFrontier_ReceptionGate_MapObjects: @ 853D420
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0
+
+BattleFrontier_ReceptionGate_MapWarps: @ 853D498
+ warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8
+ map_events BattleFrontier_ReceptionGate_MapObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc
new file mode 100644
index 000000000..fd9f2f522
--- /dev/null
+++ b/data/maps/events/BattleFrontier_ScottsHouse.inc
@@ -0,0 +1,10 @@
+BattleFrontier_ScottsHouse_MapObjects: @ 853D2B0
+ object_event 1, MAP_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0
+
+BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8
+ warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
+ warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST
+
+BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8
+ map_events BattleFrontier_ScottsHouse_MapObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc
new file mode 100644
index 000000000..f3c260243
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare01.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare01_MapObjects: @ 853A460
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare01_MapEvents:: @ 853A508
+ map_events BattlePyramidSquare01_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc
new file mode 100644
index 000000000..790fb67a0
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare02.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare02_MapObjects: @ 853A51C
+ object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare02_MapEvents:: @ 853A5C4
+ map_events BattlePyramidSquare02_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc
new file mode 100644
index 000000000..a8c8c59a7
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare03.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare03_MapObjects: @ 853A5D8
+ object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare03_MapEvents:: @ 853A680
+ map_events BattlePyramidSquare03_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc
new file mode 100644
index 000000000..ca836e2b5
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare04.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare04_MapObjects: @ 853A694
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare04_MapEvents:: @ 853A73C
+ map_events BattlePyramidSquare04_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc
new file mode 100644
index 000000000..0486f6283
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare05.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare05_MapObjects: @ 853A750
+ object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare05_MapEvents:: @ 853A7F8
+ map_events BattlePyramidSquare05_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc
new file mode 100644
index 000000000..65d2f2576
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare06.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare06_MapObjects: @ 853A80C
+ object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare06_MapEvents:: @ 853A8B4
+ map_events BattlePyramidSquare06_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc
new file mode 100644
index 000000000..9a71e2a0b
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare07.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare07_MapObjects: @ 853A8C8
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare07_MapEvents:: @ 853A970
+ map_events BattlePyramidSquare07_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc
new file mode 100644
index 000000000..52a8d4911
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare08.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare08_MapObjects: @ 853A984
+ object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare08_MapEvents:: @ 853AA2C
+ map_events BattlePyramidSquare08_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc
new file mode 100644
index 000000000..bc90aa649
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare09.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare09_MapObjects: @ 853AA40
+ object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare09_MapEvents:: @ 853AAE8
+ map_events BattlePyramidSquare09_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc
new file mode 100644
index 000000000..013cd7be6
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare10.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare10_MapObjects: @ 853AAFC
+ object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare10_MapEvents:: @ 853ABA4
+ map_events BattlePyramidSquare10_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc
new file mode 100644
index 000000000..96dc118e5
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare11.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare11_MapObjects: @ 853ABB8
+ object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare11_MapEvents:: @ 853AC60
+ map_events BattlePyramidSquare11_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc
new file mode 100644
index 000000000..10b301d6c
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare12.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare12_MapObjects: @ 853AC74
+ object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare12_MapEvents:: @ 853AD1C
+ map_events BattlePyramidSquare12_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc
new file mode 100644
index 000000000..0a83a5441
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare13.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare13_MapObjects: @ 853AD30
+ object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare13_MapEvents:: @ 853ADD8
+ map_events BattlePyramidSquare13_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc
new file mode 100644
index 000000000..599219cf1
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare14.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare14_MapObjects: @ 853ADEC
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare14_MapEvents:: @ 853AE94
+ map_events BattlePyramidSquare14_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc
new file mode 100644
index 000000000..ef92bec9a
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare15.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare15_MapObjects: @ 853AEA8
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare15_MapEvents:: @ 853AF50
+ map_events BattlePyramidSquare15_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc
new file mode 100644
index 000000000..1d7e44f70
--- /dev/null
+++ b/data/maps/events/BattlePyramidSquare16.inc
@@ -0,0 +1,12 @@
+BattlePyramidSquare16_MapObjects: @ 853AF64
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
+
+BattlePyramidSquare16_MapEvents:: @ 853B00C
+ map_events BattlePyramidSquare16_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc
new file mode 100644
index 000000000..457d86314
--- /dev/null
+++ b/data/maps/events/BirthIsland_Exterior.inc
@@ -0,0 +1,10 @@
+BirthIsland_Exterior_MapObjects: @ 853D7DC
+ object_event 1, MAP_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0
+ object_event 2, MAP_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0
+
+BirthIsland_Exterior_MapWarps: @ 853D80C
+ warp_def 15, 24, 0, 0, BIRTH_ISLAND_HARBOR
+
+BirthIsland_Exterior_MapEvents:: @ 853D814
+ map_events BirthIsland_Exterior_MapObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc
new file mode 100644
index 000000000..e035d2f44
--- /dev/null
+++ b/data/maps/events/BirthIsland_Harbor.inc
@@ -0,0 +1,10 @@
+BirthIsland_Harbor_MapObjects: @ 853D828
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+BirthIsland_Harbor_MapWarps: @ 853D858
+ warp_def 8, 2, 0, 0, BIRTH_ISLAND_EXTERIOR
+
+BirthIsland_Harbor_MapEvents:: @ 853D860
+ map_events BirthIsland_Harbor_MapObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc
new file mode 100644
index 000000000..8dfdb78d0
--- /dev/null
+++ b/data/maps/events/CaveOfOrigin_1F.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_1F_MapWarps: @ 8535D40
+ warp_def 11, 17, 3, 1, CAVE_OF_ORIGIN_ENTRANCE
+ warp_def 14, 5, 3, 0, CAVE_OF_ORIGIN_B1F
+
+CaveOfOrigin_1F_MapEvents:: @ 8535D50
+ map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc
new file mode 100644
index 000000000..9c6cc18c6
--- /dev/null
+++ b/data/maps/events/CaveOfOrigin_B1F.inc
@@ -0,0 +1,9 @@
+CaveOfOrigin_B1F_MapObjects: @ 8535DD0
+ object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0
+
+CaveOfOrigin_B1F_MapWarps: @ 8535DE8
+ warp_def 9, 3, 3, 1, CAVE_OF_ORIGIN_1F
+
+CaveOfOrigin_B1F_MapEvents:: @ 8535DF0
+ map_events CaveOfOrigin_B1F_MapObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc
new file mode 100644
index 000000000..96946936b
--- /dev/null
+++ b/data/maps/events/CaveOfOrigin_Entrance.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_Entrance_MapWarps: @ 8535D1C
+ warp_def 9, 20, 3, 3, SOOTOPOLIS_CITY
+ warp_def 9, 5, 3, 0, CAVE_OF_ORIGIN_1F
+
+CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C
+ map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc
new file mode 100644
index 000000000..f60a5e1a2
--- /dev/null
+++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64
+ warp_def 13, 5, 3, 1, CAVE_OF_ORIGIN_1F
+ warp_def 5, 11, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2
+
+CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74
+ map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc
new file mode 100644
index 000000000..256b6179e
--- /dev/null
+++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88
+ warp_def 5, 10, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1
+ warp_def 8, 14, 3, 0, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3
+
+CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98
+ map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc
new file mode 100644
index 000000000..87a99e5d2
--- /dev/null
+++ b/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc
@@ -0,0 +1,7 @@
+CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC
+ warp_def 7, 14, 3, 1, CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2
+ warp_def 12, 6, 3, 0, CAVE_OF_ORIGIN_B1F
+
+CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC
+ map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc
new file mode 100644
index 000000000..4a78cae40
--- /dev/null
+++ b/data/maps/events/DesertRuins.inc
@@ -0,0 +1,16 @@
+DesertRuins_MapObjects: @ 8534354
+ object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0
+
+DesertRuins_MapWarps: @ 853436C
+ warp_def 8, 29, 3, 1, ROUTE_111
+ warp_def 8, 20, 0, 2, DESERT_RUINS
+ warp_def 8, 11, 3, 1, DESERT_RUINS
+
+DesertRuins_MapBGEvents: @ 8534384
+ bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_22D9DB
+ bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8
+ bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8
+
+DesertRuins_MapEvents:: @ 85343A8
+ map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
+
diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc
new file mode 100644
index 000000000..cb5c06874
--- /dev/null
+++ b/data/maps/events/DesertUnderpass.inc
@@ -0,0 +1,9 @@
+DesertUnderpass_MapObjects: @ 85376D4
+ object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0
+
+DesertUnderpass_MapWarps: @ 85376EC
+ warp_def 10, 12, 0, 2, ROUTE_114_FOSSIL_MANIACS_TUNNEL
+
+DesertUnderpass_MapEvents:: @ 85376F4
+ map_events DesertUnderpass_MapObjects, DesertUnderpass_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc
new file mode 100644
index 000000000..3a4e95de9
--- /dev/null
+++ b/data/maps/events/DewfordTown.inc
@@ -0,0 +1,24 @@
+DewfordTown_MapObjects: @ 8527964
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0
+ object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0
+ object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0
+
+DewfordTown_MapWarps: @ 85279DC
+ warp_def 3, 3, 0, 0, DEWFORD_TOWN_HALL
+ warp_def 2, 10, 0, 0, DEWFORD_TOWN_POKEMON_CENTER_1F
+ warp_def 8, 17, 0, 0, DEWFORD_TOWN_GYM
+ warp_def 17, 14, 0, 0, DEWFORD_TOWN_HOUSE_1
+ warp_def 8, 8, 0, 0, DEWFORD_TOWN_HOUSE_2
+
+DewfordTown_MapBGEvents: @ 8527A04
+ bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_1E95BA
+ bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_1E95C3
+ bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_271E73
+ bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_271E73
+ bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC
+
+DewfordTown_MapEvents:: @ 8527A40
+ map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
+
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc
new file mode 100644
index 000000000..e9a6b6477
--- /dev/null
+++ b/data/maps/events/DewfordTown_Gym.inc
@@ -0,0 +1,23 @@
+DewfordTown_Gym_MapObjects: @ 852DB34
+ object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0
+
+DewfordTown_Gym_MapWarps: @ 852DBF4
+ warp_def 5, 27, 0, 2, DEWFORD_TOWN
+ warp_def 6, 27, 0, 2, DEWFORD_TOWN
+
+DewfordTown_Gym_MapBGEvents: @ 852DC04
+ bg_event 4, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9A2
+ bg_event 7, 23, 3, 1, 0, DewfordTown_Gym_EventScript_1FC9B2
+ bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9A2
+ bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2
+
+DewfordTown_Gym_MapEvents:: @ 852DC34
+ map_events DewfordTown_Gym_MapObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
+
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc
new file mode 100644
index 000000000..f5af1fc3c
--- /dev/null
+++ b/data/maps/events/DewfordTown_Hall.inc
@@ -0,0 +1,22 @@
+DewfordTown_Hall_MapObjects: @ 852DC48
+ object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0
+
+DewfordTown_Hall_MapWarps: @ 852DD20
+ warp_def 5, 8, 0, 0, DEWFORD_TOWN
+ warp_def 6, 8, 0, 0, DEWFORD_TOWN
+
+DewfordTown_Hall_MapBGEvents: @ 852DD30
+ bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD590
+ bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0
+
+DewfordTown_Hall_MapEvents:: @ 852DD48
+ map_events DewfordTown_Hall_MapObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
+
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc
new file mode 100644
index 000000000..1990975c5
--- /dev/null
+++ b/data/maps/events/DewfordTown_House1.inc
@@ -0,0 +1,12 @@
+DewfordTown_House1_MapObjects: @ 852D9C8
+ object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0
+
+DewfordTown_House1_MapWarps: @ 852DA10
+ warp_def 3, 7, 0, 3, DEWFORD_TOWN
+ warp_def 4, 7, 0, 3, DEWFORD_TOWN
+
+DewfordTown_House1_MapEvents:: @ 852DA20
+ map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc
new file mode 100644
index 000000000..b487372f6
--- /dev/null
+++ b/data/maps/events/DewfordTown_House2.inc
@@ -0,0 +1,11 @@
+DewfordTown_House2_MapObjects: @ 852DD5C
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0
+
+DewfordTown_House2_MapWarps: @ 852DD8C
+ warp_def 3, 8, 0, 4, DEWFORD_TOWN
+ warp_def 4, 8, 0, 4, DEWFORD_TOWN
+
+DewfordTown_House2_MapEvents:: @ 852DD9C
+ map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
new file mode 100644
index 000000000..c393ed795
--- /dev/null
+++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
@@ -0,0 +1,13 @@
+DewfordTown_PokemonCenter_1F_MapObjects: @ 852DA34
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0
+
+DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C
+ warp_def 7, 8, 3, 1, DEWFORD_TOWN
+ warp_def 6, 8, 3, 1, DEWFORD_TOWN
+ warp_def 1, 6, 4, 0, DEWFORD_TOWN_POKEMON_CENTER_2F
+
+DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94
+ map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
new file mode 100644
index 000000000..437441e08
--- /dev/null
+++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+DewfordTown_PokemonCenter_2F_MapObjects: @ 852DAA8
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08
+ warp_def 1, 6, 4, 2, DEWFORD_TOWN_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20
+ map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc
new file mode 100644
index 000000000..401daaaf5
--- /dev/null
+++ b/data/maps/events/DoubleBattleColosseum.inc
@@ -0,0 +1,15 @@
+DoubleBattleColosseum_MapWarps: @ 8539E88
+ warp_def 5, 8, 3, 127, NONE
+ warp_def 6, 8, 3, 127, NONE
+ warp_def 7, 8, 3, 127, NONE
+ warp_def 8, 8, 3, 127, NONE
+
+DoubleBattleColosseum_MapCoordEvents: @ 8539EA8
+ coord_event 3, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277388
+ coord_event 3, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773BE
+ coord_event 10, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773A3
+ coord_event 10, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773D9
+
+DoubleBattleColosseum_MapEvents:: @ 8539EE8
+ map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc
new file mode 100644
index 000000000..47fec07ea
--- /dev/null
+++ b/data/maps/events/EverGrandeCity.inc
@@ -0,0 +1,29 @@
+EverGrandeCity_MapWarps: @ 8527588
+ warp_def 18, 5, 0, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+ warp_def 27, 48, 0, 0, EVER_GRANDE_CITY_POKEMON_CENTER_1F
+ warp_def 18, 41, 0, 0, VICTORY_ROAD_1F
+ warp_def 18, 27, 0, 1, VICTORY_ROAD_1F
+
+EverGrandeCity_MapCoordEvents: @ 85275A8
+ coord_event 17, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 16, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 18, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 19, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 20, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 21, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 22, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 23, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 24, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 25, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+ coord_event 26, 58, 1, 0, VAR_0x4001, 0, 0, EverGrandeCity_EventScript_1E7D46
+
+EverGrandeCity_MapBGEvents: @ 8527658
+ bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_1E7D2B
+ bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73
+ bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_1E7D34
+ bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_1E7D3D
+ bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_271E73
+
+EverGrandeCity_MapEvents:: @ 8527694
+ map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents
+
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
new file mode 100644
index 000000000..e5fbb81c1
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
@@ -0,0 +1,12 @@
+EverGrandeCity_ChampionsRoom_MapObjects: @ 8533700
+ object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0
+ object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0
+
+EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
+ warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_HALL_4
+ warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_OF_FAME
+
+EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758
+ map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc
new file mode 100644
index 000000000..2db37957d
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_DrakesRoom_MapObjects: @ 85336C4
+ object_event 1, MAP_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0
+
+EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC
+ warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_3
+ warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_4
+
+EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC
+ map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
new file mode 100644
index 000000000..7d97a2bc6
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_GlaciasRoom_MapObjects: @ 8533688
+ object_event 1, MAP_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0
+
+EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0
+ warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_2
+ warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_3
+
+EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0
+ map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/events/EverGrandeCity_Hall1.inc
new file mode 100644
index 000000000..8f9e791a8
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_Hall1.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall1_MapWarps: @ 853376C
+ warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM
+ warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_PHOEBES_ROOM
+ warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM
+ warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_SIDNEYS_ROOM
+
+EverGrandeCity_Hall1_MapEvents:: @ 853378C
+ map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/events/EverGrandeCity_Hall2.inc
new file mode 100644
index 000000000..c9426ceea
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_Hall2.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall2_MapWarps: @ 85337A0
+ warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM
+ warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_GLACIAS_ROOM
+ warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM
+ warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_PHOEBES_ROOM
+
+EverGrandeCity_Hall2_MapEvents:: @ 85337C0
+ map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/events/EverGrandeCity_Hall3.inc
new file mode 100644
index 000000000..68f506d00
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_Hall3.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall3_MapWarps: @ 85337D4
+ warp_def 5, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM
+ warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_DRAKES_ROOM
+ warp_def 4, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM
+ warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_GLACIAS_ROOM
+
+EverGrandeCity_Hall3_MapEvents:: @ 85337F4
+ map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/events/EverGrandeCity_Hall4.inc
new file mode 100644
index 000000000..4e7c4f7e6
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_Hall4.inc
@@ -0,0 +1,7 @@
+EverGrandeCity_Hall4_MapWarps: @ 8533808
+ warp_def 5, 33, 3, 1, EVER_GRANDE_CITY_DRAKES_ROOM
+ warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_CHAMPIONS_ROOM
+
+EverGrandeCity_Hall4_MapEvents:: @ 8533818
+ map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/events/EverGrandeCity_Hall5.inc
new file mode 100644
index 000000000..69fa9a629
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_Hall5.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_Hall5_MapWarps: @ 853382C
+ warp_def 5, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+ warp_def 5, 2, 0, 0, EVER_GRANDE_CITY_SIDNEYS_ROOM
+ warp_def 4, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+ warp_def 6, 12, 3, 2, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+
+EverGrandeCity_Hall5_MapEvents:: @ 853384C
+ map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc
new file mode 100644
index 000000000..18ed3ebdb
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_HallOfFame.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_HallOfFame_MapObjects: @ 85338FC
+ object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+EverGrandeCity_HallOfFame_MapWarps: @ 8533914
+ warp_def 7, 11, 3, 1, EVER_GRANDE_CITY_CHAMPIONS_ROOM
+
+EverGrandeCity_HallOfFame_MapEvents:: @ 853391C
+ map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
new file mode 100644
index 000000000..471bae1fc
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_PhoebesRoom_MapObjects: @ 853364C
+ object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0
+
+EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664
+ warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_1
+ warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_2
+
+EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674
+ map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..28491f59b
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonCenter_1F_MapObjects: @ 8533930
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0
+
+EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990
+ warp_def 7, 8, 3, 1, EVER_GRANDE_CITY
+ warp_def 6, 8, 3, 1, EVER_GRANDE_CITY
+ warp_def 1, 6, 4, 0, EVER_GRANDE_CITY_POKEMON_CENTER_2F
+
+EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8
+ map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..d34c8082f
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonCenter_2F_MapObjects: @ 85339BC
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C
+ warp_def 1, 6, 4, 2, EVER_GRANDE_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34
+ map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
new file mode 100644
index 000000000..ee368c6e1
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
@@ -0,0 +1,16 @@
+EverGrandeCity_PokemonLeague_1F_MapObjects: @ 8533860
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0
+
+EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
+ warp_def 9, 11, 3, 0, EVER_GRANDE_CITY
+ warp_def 10, 11, 3, 0, EVER_GRANDE_CITY
+ warp_def 9, 1, 3, 0, EVER_GRANDE_CITY_HALL_5
+ warp_def 10, 1, 3, 0, EVER_GRANDE_CITY_HALL_5
+ warp_def 1, 7, 4, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_2F
+
+EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8
+ map_events EverGrandeCity_PokemonLeague_1F_MapObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
new file mode 100644
index 000000000..499aad196
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonLeague_2F_MapObjects: @ 8533A48
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0
+
+EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8
+ warp_def 1, 6, 4, 4, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0
+ map_events EverGrandeCity_PokemonLeague_2F_MapObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc
new file mode 100644
index 000000000..9ff3d40cb
--- /dev/null
+++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc
@@ -0,0 +1,10 @@
+EverGrandeCity_SidneysRoom_MapObjects: @ 8533610
+ object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0
+
+EverGrandeCity_SidneysRoom_MapWarps: @ 8533628
+ warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_5
+ warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_1
+
+EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638
+ map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc
new file mode 100644
index 000000000..28dab394b
--- /dev/null
+++ b/data/maps/events/FallarborTown.inc
@@ -0,0 +1,26 @@
+FallarborTown_MapObjects: @ 8527BE0
+ object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0
+
+FallarborTown_MapWarps: @ 8527C40
+ warp_def 15, 15, 0, 0, FALLARBOR_TOWN_MART
+ warp_def 8, 7, 0, 0, FALLARBOR_TOWN_BATTLE_TENT_LOBBY
+ warp_def 14, 7, 0, 0, FALLARBOR_TOWN_POKEMON_CENTER_1F
+ warp_def 6, 17, 0, 0, FALLARBOR_TOWN_HOUSE_1
+ warp_def 1, 6, 0, 0, FALLARBOR_TOWN_HOUSE_2
+
+FallarborTown_MapBGEvents: @ 8527C68
+ bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_271E6A
+ bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_271E73
+ bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_1EB250
+ bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_271E73
+ bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_1EB259
+ bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_271E6A
+ bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_1EB262
+ bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0
+
+FallarborTown_MapEvents:: @ 8527CC8
+ map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
+
diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
new file mode 100644
index 000000000..bed082ccb
--- /dev/null
+++ b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
@@ -0,0 +1,8 @@
+FallarborTown_BattleTentBattleRoom_MapObjects: @ 852E444
+ object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C
+ map_events FallarborTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc
new file mode 100644
index 000000000..023ef7f0b
--- /dev/null
+++ b/data/maps/events/FallarborTown_BattleTentCorridor.inc
@@ -0,0 +1,6 @@
+FallarborTown_BattleTentCorridor_MapObjects: @ 852E418
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430
+ map_events FallarborTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc
new file mode 100644
index 000000000..6c0d25020
--- /dev/null
+++ b/data/maps/events/FallarborTown_BattleTentLobby.inc
@@ -0,0 +1,17 @@
+FallarborTown_BattleTentLobby_MapObjects: @ 852E370
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0
+
+FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8
+ warp_def 6, 9, 0, 1, FALLARBOR_TOWN
+ warp_def 7, 9, 0, 1, FALLARBOR_TOWN
+
+FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8
+ bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F
+
+FallarborTown_BattleTentLobby_MapEvents:: @ 852E404
+ map_events FallarborTown_BattleTentLobby_MapObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents
+
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc
new file mode 100644
index 000000000..971236802
--- /dev/null
+++ b/data/maps/events/FallarborTown_House1.inc
@@ -0,0 +1,11 @@
+FallarborTown_House1_MapObjects: @ 852E5B8
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0
+
+FallarborTown_House1_MapWarps: @ 852E5E8
+ warp_def 3, 8, 0, 3, FALLARBOR_TOWN
+ warp_def 4, 8, 0, 3, FALLARBOR_TOWN
+
+FallarborTown_House1_MapEvents:: @ 852E5F8
+ map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc
new file mode 100644
index 000000000..058c4c5af
--- /dev/null
+++ b/data/maps/events/FallarborTown_House2.inc
@@ -0,0 +1,10 @@
+FallarborTown_House2_MapObjects: @ 852E60C
+ object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0
+
+FallarborTown_House2_MapWarps: @ 852E624
+ warp_def 3, 7, 0, 4, FALLARBOR_TOWN
+ warp_def 4, 7, 0, 4, FALLARBOR_TOWN
+
+FallarborTown_House2_MapEvents:: @ 852E634
+ map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc
new file mode 100644
index 000000000..a59da4c66
--- /dev/null
+++ b/data/maps/events/FallarborTown_Mart.inc
@@ -0,0 +1,14 @@
+FallarborTown_Mart_MapObjects: @ 852E2D4
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0
+
+FallarborTown_Mart_MapWarps: @ 852E34C
+ warp_def 3, 7, 0, 0, FALLARBOR_TOWN
+ warp_def 4, 7, 0, 0, FALLARBOR_TOWN
+
+FallarborTown_Mart_MapEvents:: @ 852E35C
+ map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
new file mode 100644
index 000000000..19421411e
--- /dev/null
+++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
@@ -0,0 +1,14 @@
+FallarborTown_PokemonCenter_1F_MapObjects: @ 852E4A0
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0
+
+FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
+ warp_def 7, 8, 3, 2, FALLARBOR_TOWN
+ warp_def 6, 8, 3, 2, FALLARBOR_TOWN
+ warp_def 1, 6, 4, 0, FALLARBOR_TOWN_POKEMON_CENTER_2F
+
+FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518
+ map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
new file mode 100644
index 000000000..408ecf9db
--- /dev/null
+++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+FallarborTown_PokemonCenter_2F_MapObjects: @ 852E52C
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C
+ warp_def 1, 6, 4, 2, FALLARBOR_TOWN_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4
+ map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc
new file mode 100644
index 000000000..cd321124f
--- /dev/null
+++ b/data/maps/events/FarawayIsland_Entrance.inc
@@ -0,0 +1,19 @@
+FarawayIsland_Entrance_MapObjects: @ 853D710
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+FarawayIsland_Entrance_MapWarps: @ 853D740
+ warp_def 22, 7, 3, 0, FARAWAY_ISLAND_INTERIOR
+ warp_def 23, 7, 3, 1, FARAWAY_ISLAND_INTERIOR
+
+FarawayIsland_Entrance_MapCoordEvents: @ 853D750
+ coord_event 9, 18, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98
+ coord_event 10, 20, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C9D
+ coord_event 22, 9, 3, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267C98
+
+FarawayIsland_Entrance_MapBGEvents: @ 853D780
+ bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1
+
+FarawayIsland_Entrance_MapEvents:: @ 853D78C
+ map_events FarawayIsland_Entrance_MapObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents
+
diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc
new file mode 100644
index 000000000..6f13ca36e
--- /dev/null
+++ b/data/maps/events/FarawayIsland_Interior.inc
@@ -0,0 +1,10 @@
+FarawayIsland_Interior_MapObjects: @ 853D7A0
+ object_event 1, MAP_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0
+
+FarawayIsland_Interior_MapWarps: @ 853D7B8
+ warp_def 12, 19, 0, 0, FARAWAY_ISLAND_ENTRANCE
+ warp_def 13, 19, 0, 1, FARAWAY_ISLAND_ENTRANCE
+
+FarawayIsland_Interior_MapEvents:: @ 853D7C8
+ map_events FarawayIsland_Interior_MapObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
new file mode 100644
index 000000000..cd360a75f
--- /dev/null
+++ b/data/maps/events/FieryPath.inc
@@ -0,0 +1,17 @@
+FieryPath_MapObjects: @ 8534C80
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0
+ object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0
+ object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0
+ object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0
+ object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0
+ object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0
+ object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0
+ object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0
+
+FieryPath_MapWarps: @ 8534D40
+ warp_def 26, 36, 3, 4, ROUTE_112
+ warp_def 26, 4, 3, 5, ROUTE_112
+
+FieryPath_MapEvents:: @ 8534D50
+ map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc
new file mode 100644
index 000000000..03ff20df1
--- /dev/null
+++ b/data/maps/events/FortreeCity.inc
@@ -0,0 +1,31 @@
+FortreeCity_MapObjects: @ 8526B9C
+ object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0
+
+FortreeCity_MapWarps: @ 8526C44
+ warp_def 5, 6, 0, 0, FORTREE_CITY_POKEMON_CENTER_1F
+ warp_def 10, 3, 0, 0, FORTREE_CITY_HOUSE_1
+ warp_def 22, 11, 0, 0, FORTREE_CITY_GYM
+ warp_def 4, 14, 0, 0, FORTREE_CITY_MART
+ warp_def 17, 3, 0, 0, FORTREE_CITY_HOUSE_2
+ warp_def 25, 3, 0, 0, FORTREE_CITY_HOUSE_3
+ warp_def 32, 2, 0, 0, FORTREE_CITY_HOUSE_4
+ warp_def 12, 13, 0, 0, FORTREE_CITY_HOUSE_5
+ warp_def 37, 13, 0, 0, FORTREE_CITY_DECORATION_SHOP
+
+FortreeCity_MapBGEvents: @ 8526C8C
+ bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_1E2602
+ bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_271E73
+ bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_271E6A
+ bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_1E260B
+ bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_271E73
+ bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A
+
+FortreeCity_MapEvents:: @ 8526CD4
+ map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
+
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc
new file mode 100644
index 000000000..7c25059bf
--- /dev/null
+++ b/data/maps/events/FortreeCity_DecorationShop.inc
@@ -0,0 +1,13 @@
+FortreeCity_DecorationShop_MapObjects: @ 85310B0
+ object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0
+
+FortreeCity_DecorationShop_MapWarps: @ 8531110
+ warp_def 3, 5, 0, 8, FORTREE_CITY
+ warp_def 4, 5, 0, 8, FORTREE_CITY
+
+FortreeCity_DecorationShop_MapEvents:: @ 8531120
+ map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc
new file mode 100644
index 000000000..6e3904b88
--- /dev/null
+++ b/data/maps/events/FortreeCity_Gym.inc
@@ -0,0 +1,21 @@
+FortreeCity_Gym_MapObjects: @ 8530C98
+ object_event 1, MAP_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0
+
+FortreeCity_Gym_MapWarps: @ 8530D58
+ warp_def 15, 24, 0, 2, FORTREE_CITY
+ warp_def 16, 24, 0, 2, FORTREE_CITY
+
+FortreeCity_Gym_MapBGEvents: @ 8530D68
+ bg_event 14, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216751
+ bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761
+
+FortreeCity_Gym_MapEvents:: @ 8530D80
+ map_events FortreeCity_Gym_MapObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
+
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc
new file mode 100644
index 000000000..d1eecfdef
--- /dev/null
+++ b/data/maps/events/FortreeCity_House1.inc
@@ -0,0 +1,12 @@
+FortreeCity_House1_MapObjects: @ 8530C2C
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0
+
+FortreeCity_House1_MapWarps: @ 8530C74
+ warp_def 3, 5, 0, 1, FORTREE_CITY
+ warp_def 4, 5, 0, 1, FORTREE_CITY
+
+FortreeCity_House1_MapEvents:: @ 8530C84
+ map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc
new file mode 100644
index 000000000..c54b42a6d
--- /dev/null
+++ b/data/maps/events/FortreeCity_House2.inc
@@ -0,0 +1,11 @@
+FortreeCity_House2_MapObjects: @ 8530F30
+ object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0
+
+FortreeCity_House2_MapWarps: @ 8530F60
+ warp_def 3, 5, 0, 4, FORTREE_CITY
+ warp_def 4, 5, 0, 4, FORTREE_CITY
+
+FortreeCity_House2_MapEvents:: @ 8530F70
+ map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc
new file mode 100644
index 000000000..7be159493
--- /dev/null
+++ b/data/maps/events/FortreeCity_House3.inc
@@ -0,0 +1,11 @@
+FortreeCity_House3_MapObjects: @ 8530F84
+ object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0
+
+FortreeCity_House3_MapWarps: @ 8530FB4
+ warp_def 3, 5, 0, 5, FORTREE_CITY
+ warp_def 4, 5, 0, 5, FORTREE_CITY
+
+FortreeCity_House3_MapEvents:: @ 8530FC4
+ map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc
new file mode 100644
index 000000000..d24c12520
--- /dev/null
+++ b/data/maps/events/FortreeCity_House4.inc
@@ -0,0 +1,12 @@
+FortreeCity_House4_MapObjects: @ 8530FD8
+ object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0
+
+FortreeCity_House4_MapWarps: @ 8531020
+ warp_def 3, 5, 0, 6, FORTREE_CITY
+ warp_def 4, 5, 0, 6, FORTREE_CITY
+
+FortreeCity_House4_MapEvents:: @ 8531030
+ map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc
new file mode 100644
index 000000000..3520e7249
--- /dev/null
+++ b/data/maps/events/FortreeCity_House5.inc
@@ -0,0 +1,12 @@
+FortreeCity_House5_MapObjects: @ 8531044
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0
+
+FortreeCity_House5_MapWarps: @ 853108C
+ warp_def 3, 5, 0, 7, FORTREE_CITY
+ warp_def 4, 5, 0, 7, FORTREE_CITY
+
+FortreeCity_House5_MapEvents:: @ 853109C
+ map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc
new file mode 100644
index 000000000..acb1e9471
--- /dev/null
+++ b/data/maps/events/FortreeCity_Mart.inc
@@ -0,0 +1,13 @@
+FortreeCity_Mart_MapObjects: @ 8530EAC
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0
+
+FortreeCity_Mart_MapWarps: @ 8530F0C
+ warp_def 3, 7, 0, 3, FORTREE_CITY
+ warp_def 4, 7, 0, 3, FORTREE_CITY
+
+FortreeCity_Mart_MapEvents:: @ 8530F1C
+ map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..922e825c7
--- /dev/null
+++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
@@ -0,0 +1,14 @@
+FortreeCity_PokemonCenter_1F_MapObjects: @ 8530D94
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0
+
+FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4
+ warp_def 7, 8, 3, 0, FORTREE_CITY
+ warp_def 6, 8, 3, 0, FORTREE_CITY
+ warp_def 1, 6, 4, 0, FORTREE_CITY_POKEMON_CENTER_2F
+
+FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C
+ map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..e5a3f1ac4
--- /dev/null
+++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+FortreeCity_PokemonCenter_2F_MapObjects: @ 8530E20
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80
+ warp_def 1, 6, 4, 2, FORTREE_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98
+ map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc
new file mode 100644
index 000000000..1bad3837f
--- /dev/null
+++ b/data/maps/events/GraniteCave_1F.inc
@@ -0,0 +1,13 @@
+GraniteCave_1F_MapObjects: @ 85343BC
+ object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0
+
+GraniteCave_1F_MapWarps: @ 85343EC
+ warp_def 37, 12, 3, 0, ROUTE_106
+ warp_def 35, 3, 3, 0, GRANITE_CAVE_B1F
+ warp_def 17, 11, 3, 1, GRANITE_CAVE_B1F
+ warp_def 5, 10, 3, 0, GRANITE_CAVE_STEVENS_ROOM
+
+GraniteCave_1F_MapEvents:: @ 853440C
+ map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc
new file mode 100644
index 000000000..f5981fcbe
--- /dev/null
+++ b/data/maps/events/GraniteCave_B1F.inc
@@ -0,0 +1,15 @@
+GraniteCave_B1F_MapObjects: @ 8534420
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0
+
+GraniteCave_B1F_MapWarps: @ 8534438
+ warp_def 25, 13, 3, 1, GRANITE_CAVE_1F
+ warp_def 4, 21, 3, 2, GRANITE_CAVE_1F
+ warp_def 29, 13, 3, 0, GRANITE_CAVE_B2F
+ warp_def 28, 21, 3, 1, GRANITE_CAVE_B2F
+ warp_def 8, 5, 3, 2, GRANITE_CAVE_B2F
+ warp_def 12, 3, 3, 3, GRANITE_CAVE_B2F
+ warp_def 29, 2, 3, 4, GRANITE_CAVE_B2F
+
+GraniteCave_B1F_MapEvents:: @ 8534470
+ map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc
new file mode 100644
index 000000000..ebc9467f4
--- /dev/null
+++ b/data/maps/events/GraniteCave_B2F.inc
@@ -0,0 +1,25 @@
+GraniteCave_B2F_MapObjects: @ 8534484
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0
+ object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0
+ object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0
+ object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0
+ object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0
+ object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0
+ object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0
+ object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0
+
+GraniteCave_B2F_MapWarps: @ 853455C
+ warp_def 29, 13, 3, 2, GRANITE_CAVE_B1F
+ warp_def 28, 21, 3, 3, GRANITE_CAVE_B1F
+ warp_def 8, 5, 3, 4, GRANITE_CAVE_B1F
+ warp_def 12, 3, 3, 5, GRANITE_CAVE_B1F
+ warp_def 29, 2, 3, 6, GRANITE_CAVE_B1F
+
+GraniteCave_B2F_MapBGEvents: @ 8534584
+ bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0
+ bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0
+
+GraniteCave_B2F_MapEvents:: @ 853459C
+ map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
+
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc
new file mode 100644
index 000000000..eca46cd79
--- /dev/null
+++ b/data/maps/events/GraniteCave_StevensRoom.inc
@@ -0,0 +1,9 @@
+GraniteCave_StevensRoom_MapObjects: @ 85345B0
+ object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0
+
+GraniteCave_StevensRoom_MapWarps: @ 85345C8
+ warp_def 7, 3, 3, 3, GRANITE_CAVE_1F
+
+GraniteCave_StevensRoom_MapEvents:: @ 85345D0
+ map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
new file mode 100644
index 000000000..3e888ec44
--- /dev/null
+++ b/data/maps/events/InsideOfTruck.inc
@@ -0,0 +1,25 @@
+InsideOfTruck_MapObjects: @ 853A078
+ object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
+
+InsideOfTruck_MapWarps: @ 853A0C0
+ warp_def 4, 1, 0, 127, NONE
+ warp_def 4, 2, 0, 127, NONE
+ warp_def 4, 3, 0, 127, NONE
+
+InsideOfTruck_MapCoordEvents: @ 853A0D8
+ coord_event 3, 1, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
+ coord_event 3, 2, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
+ coord_event 3, 3, 3, 0, VAR_0x4092, 0, 0, InsideOfTruck_EventScript_23BF04
+
+InsideOfTruck_MapBGEvents: @ 853A108
+ bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+ bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+ bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+ bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+ bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C
+
+InsideOfTruck_MapEvents:: @ 853A144
+ map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
+
diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc
new file mode 100644
index 000000000..094852c5a
--- /dev/null
+++ b/data/maps/events/IslandCave.inc
@@ -0,0 +1,16 @@
+IslandCave_MapObjects: @ 8536C74
+ object_event 1, MAP_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0
+
+IslandCave_MapWarps: @ 8536C8C
+ warp_def 8, 29, 3, 0, ROUTE_105
+ warp_def 8, 20, 0, 2, ISLAND_CAVE
+ warp_def 8, 11, 3, 1, ISLAND_CAVE
+
+IslandCave_MapBGEvents: @ 8536CA4
+ bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_238EEF
+ bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_238F1D
+ bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D
+
+IslandCave_MapEvents:: @ 8536CC8
+ map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
+
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc
new file mode 100644
index 000000000..cc862fed1
--- /dev/null
+++ b/data/maps/events/JaggedPass.inc
@@ -0,0 +1,35 @@
+JaggedPass_MapObjects: @ 8534AE4
+ object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0
+ object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0
+ object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0
+
+JaggedPass_MapWarps: @ 8534B8C
+ warp_def 14, 40, 3, 2, ROUTE_112
+ warp_def 15, 40, 3, 3, ROUTE_112
+ warp_def 13, 5, 3, 2, MT_CHIMNEY
+ warp_def 14, 5, 3, 3, MT_CHIMNEY
+ warp_def 16, 18, 0, 0, MAGMA_HIDEOUT_1F
+
+JaggedPass_MapCoordEvents: @ 8534BB4
+ coord_event 13, 15, 3, 0, 2, 0, 0, 0x0
+ coord_event 21, 12, 3, 0, 8, 0, 0, 0x0
+ coord_event 14, 15, 3, 0, 2, 0, 0, 0x0
+ coord_event 18, 17, 3, 0, 2, 0, 0, 0x0
+ coord_event 22, 19, 3, 0, 2, 0, 0, 0x0
+ coord_event 21, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+ coord_event 22, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+ coord_event 21, 20, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+ coord_event 14, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+ coord_event 13, 15, 3, 0, VAR_0x40C8, 1, 0, JaggedPass_EventScript_2306BB
+
+JaggedPass_MapBGEvents: @ 8534C54
+ bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0
+ bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0
+
+JaggedPass_MapEvents:: @ 8534C6C
+ map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
+
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc
new file mode 100644
index 000000000..0e16fc60c
--- /dev/null
+++ b/data/maps/events/LavaridgeTown.inc
@@ -0,0 +1,35 @@
+LavaridgeTown_MapObjects: @ 8527A54
+ object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0
+ object_event 8, MAP_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0
+ object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0
+
+LavaridgeTown_MapWarps: @ 8527B2C
+ warp_def 12, 15, 0, 0, LAVARIDGE_TOWN_HERB_SHOP
+ warp_def 5, 15, 0, 0, LAVARIDGE_TOWN_GYM_1F
+ warp_def 15, 5, 0, 0, LAVARIDGE_TOWN_MART
+ warp_def 9, 6, 0, 0, LAVARIDGE_TOWN_POKEMON_CENTER_1F
+ warp_def 16, 15, 0, 0, LAVARIDGE_TOWN_HOUSE
+ warp_def 9, 2, 3, 3, LAVARIDGE_TOWN_POKEMON_CENTER_1F
+
+LavaridgeTown_MapCoordEvents: @ 8527B5C
+ coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA6FA
+
+LavaridgeTown_MapBGEvents: @ 8527B6C
+ bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_1EA7B7
+ bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_1EA7AE
+ bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A
+ bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_1EA7A5
+ bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73
+ bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_271E6A
+ bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_271E73
+ bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0
+
+LavaridgeTown_MapEvents:: @ 8527BCC
+ map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
+
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc
new file mode 100644
index 000000000..a67522cb8
--- /dev/null
+++ b/data/maps/events/LavaridgeTown_Gym_1F.inc
@@ -0,0 +1,43 @@
+LavaridgeTown_Gym_1F_MapObjects: @ 852DE1C
+ object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0
+
+LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC
+ warp_def 13, 18, 3, 1, LAVARIDGE_TOWN
+ warp_def 14, 18, 3, 1, LAVARIDGE_TOWN
+ warp_def 10, 18, 3, 0, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 8, 9, 3, 2, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 5, 14, 3, 3, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 0, 17, 3, 1, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 5, 9, 3, 5, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 2, 15, 3, 6, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 3, 14, 3, 7, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 1, 14, 3, 8, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 0, 10, 3, 9, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 3, 10, 3, 10, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 0, 6, 3, 11, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 3, 6, 3, 12, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 5, 6, 3, 13, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 2, 3, 3, 14, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 5, 2, 3, 15, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 7, 2, 3, 16, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 8, 6, 3, 17, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 10, 6, 3, 18, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 4, 16, 0, 20, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 12, 3, 3, 19, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 14, 6, 3, 21, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 13, 17, 3, 22, LAVARIDGE_TOWN_GYM_B1F
+ warp_def 12, 12, 3, 23, LAVARIDGE_TOWN_GYM_B1F
+
+LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C
+ bg_event 10, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE98B
+ bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B
+
+LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94
+ map_events LavaridgeTown_Gym_1F_MapObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
+
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc
new file mode 100644
index 000000000..0c0c4adaa
--- /dev/null
+++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc
@@ -0,0 +1,35 @@
+LavaridgeTown_Gym_B1F_MapObjects: @ 852DFA8
+ object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0
+
+LavaridgeTown_Gym_B1F_MapWarps: @ 852E008
+ warp_def 10, 18, 3, 2, LAVARIDGE_TOWN_GYM_1F
+ warp_def 0, 17, 3, 6, LAVARIDGE_TOWN_GYM_1F
+ warp_def 8, 9, 3, 3, LAVARIDGE_TOWN_GYM_1F
+ warp_def 5, 14, 3, 5, LAVARIDGE_TOWN_GYM_1F
+ warp_def 4, 18, 3, 4, LAVARIDGE_TOWN_GYM_1F
+ warp_def 5, 9, 3, 7, LAVARIDGE_TOWN_GYM_1F
+ warp_def 2, 15, 3, 8, LAVARIDGE_TOWN_GYM_1F
+ warp_def 3, 14, 3, 9, LAVARIDGE_TOWN_GYM_1F
+ warp_def 1, 14, 3, 10, LAVARIDGE_TOWN_GYM_1F
+ warp_def 0, 10, 3, 11, LAVARIDGE_TOWN_GYM_1F
+ warp_def 3, 10, 3, 12, LAVARIDGE_TOWN_GYM_1F
+ warp_def 0, 6, 3, 13, LAVARIDGE_TOWN_GYM_1F
+ warp_def 3, 6, 3, 14, LAVARIDGE_TOWN_GYM_1F
+ warp_def 5, 6, 3, 15, LAVARIDGE_TOWN_GYM_1F
+ warp_def 2, 3, 3, 16, LAVARIDGE_TOWN_GYM_1F
+ warp_def 5, 2, 3, 17, LAVARIDGE_TOWN_GYM_1F
+ warp_def 7, 2, 3, 18, LAVARIDGE_TOWN_GYM_1F
+ warp_def 8, 6, 3, 19, LAVARIDGE_TOWN_GYM_1F
+ warp_def 10, 6, 3, 20, LAVARIDGE_TOWN_GYM_1F
+ warp_def 12, 3, 3, 22, LAVARIDGE_TOWN_GYM_1F
+ warp_def 4, 16, 3, 21, LAVARIDGE_TOWN_GYM_1F
+ warp_def 14, 6, 3, 23, LAVARIDGE_TOWN_GYM_1F
+ warp_def 13, 17, 3, 24, LAVARIDGE_TOWN_GYM_1F
+ warp_def 12, 12, 3, 25, LAVARIDGE_TOWN_GYM_1F
+
+LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8
+ map_events LavaridgeTown_Gym_B1F_MapObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc
new file mode 100644
index 000000000..76b5ac368
--- /dev/null
+++ b/data/maps/events/LavaridgeTown_HerbShop.inc
@@ -0,0 +1,12 @@
+LavaridgeTown_HerbShop_MapObjects: @ 852DDB0
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0
+
+LavaridgeTown_HerbShop_MapWarps: @ 852DDF8
+ warp_def 3, 7, 0, 0, LAVARIDGE_TOWN
+ warp_def 4, 7, 0, 0, LAVARIDGE_TOWN
+
+LavaridgeTown_HerbShop_MapEvents:: @ 852DE08
+ map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc
new file mode 100644
index 000000000..82ae945b4
--- /dev/null
+++ b/data/maps/events/LavaridgeTown_House.inc
@@ -0,0 +1,12 @@
+LavaridgeTown_House_MapObjects: @ 852E0DC
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0
+
+LavaridgeTown_House_MapWarps: @ 852E124
+ warp_def 3, 7, 0, 4, LAVARIDGE_TOWN
+ warp_def 4, 7, 0, 4, LAVARIDGE_TOWN
+
+LavaridgeTown_House_MapEvents:: @ 852E134
+ map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc
new file mode 100644
index 000000000..db9c02f5e
--- /dev/null
+++ b/data/maps/events/LavaridgeTown_Mart.inc
@@ -0,0 +1,12 @@
+LavaridgeTown_Mart_MapObjects: @ 852E148
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0
+
+LavaridgeTown_Mart_MapWarps: @ 852E190
+ warp_def 3, 7, 0, 2, LAVARIDGE_TOWN
+ warp_def 4, 7, 0, 2, LAVARIDGE_TOWN
+
+LavaridgeTown_Mart_MapEvents:: @ 852E1A0
+ map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
new file mode 100644
index 000000000..11ed52f9a
--- /dev/null
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
@@ -0,0 +1,15 @@
+LavaridgeTown_PokemonCenter_1F_MapObjects: @ 852E1B4
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0
+
+LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214
+ warp_def 7, 8, 3, 3, LAVARIDGE_TOWN
+ warp_def 6, 8, 3, 3, LAVARIDGE_TOWN
+ warp_def 1, 6, 4, 0, LAVARIDGE_TOWN_POKEMON_CENTER_2F
+ warp_def 2, 1, 0, 5, LAVARIDGE_TOWN
+
+LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234
+ map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
new file mode 100644
index 000000000..dc0acec14
--- /dev/null
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_PokemonCenter_2F_MapObjects: @ 852E248
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8
+ warp_def 1, 6, 4, 2, LAVARIDGE_TOWN_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0
+ map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc
new file mode 100644
index 000000000..63aed18f8
--- /dev/null
+++ b/data/maps/events/LilycoveCity.inc
@@ -0,0 +1,58 @@
+LilycoveCity_MapObjects: @ 8526CE8
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0
+ object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0
+ object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0
+ object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0
+ object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0
+ object_event 15, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0
+ object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0
+ object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0
+
+LilycoveCity_MapWarps: @ 8526EF8
+ warp_def 27, 6, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_1F
+ warp_def 37, 24, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_1F
+ warp_def 24, 14, 0, 0, LILYCOVE_CITY_POKEMON_CENTER_1F
+ warp_def 11, 5, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+ warp_def 23, 24, 0, 0, LILYCOVE_CITY_CONTEST_LOBBY
+ warp_def 39, 14, 0, 1, LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB
+ warp_def 70, 5, 1, 0, AQUA_HIDEOUT_1F
+ warp_def 36, 6, 0, 0, LILYCOVE_CITY_MOVE_DELETERS_HOUSE
+ warp_def 42, 6, 0, 0, LILYCOVE_CITY_HOUSE_1
+ warp_def 55, 15, 0, 0, LILYCOVE_CITY_HOUSE_2
+ warp_def 11, 22, 0, 0, LILYCOVE_CITY_HOUSE_3
+ warp_def 12, 14, 0, 0, LILYCOVE_CITY_HOUSE_4
+ warp_def 12, 32, 0, 0, LILYCOVE_CITY_HARBOR
+ warp_def 12, 5, 0, 1, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+
+LilycoveCity_MapBGEvents: @ 8526F68
+ bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D1A
+ bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_271E73
+ bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_1E2D6B
+ bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_271E73
+ bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_1E2CFF
+ bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D08
+ bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_1E2D11
+ bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_1E2D44
+ bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_1E2D62
+ bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_1E2D74
+ bg_event 36, 31, 3, 7, 0, ITEM_HEART_SCALE, 27, 0
+ bg_event 61, 7, 0, 7, 0, ITEM_PP_UP, 43, 0
+ bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0
+
+LilycoveCity_MapEvents:: @ 8527004
+ map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
+
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc
new file mode 100644
index 000000000..15501ebfd
--- /dev/null
+++ b/data/maps/events/LilycoveCity_ContestHall.inc
@@ -0,0 +1,51 @@
+LilycoveCity_ContestHall_MapObjects: @ 8531850
+ object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0
+ object_event 27, MAP_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0
+ object_event 29, MAP_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0
+ object_event 30, MAP_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0
+ object_event 31, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0
+ object_event 32, MAP_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0
+
+LilycoveCity_ContestHall_MapWarps: @ 8531B50
+ warp_def 19, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY
+ warp_def 30, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY
+ warp_def 20, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY
+ warp_def 31, 32, 0, 3, LILYCOVE_CITY_CONTEST_LOBBY
+
+LilycoveCity_ContestHall_MapBGEvents: @ 8531B70
+ bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733
+ bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C
+ bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745
+ bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B745
+ bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B733
+ bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C
+
+LilycoveCity_ContestHall_MapEvents:: @ 8531BB8
+ map_events LilycoveCity_ContestHall_MapObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
+
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc
new file mode 100644
index 000000000..6fc324f76
--- /dev/null
+++ b/data/maps/events/LilycoveCity_ContestLobby.inc
@@ -0,0 +1,50 @@
+LilycoveCity_ContestLobby_MapObjects: @ 8531534
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0
+ object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0
+ object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0
+ object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0
+ object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0
+ object_event 19, MAP_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0
+ object_event 20, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0
+ object_event 21, MAP_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0
+ object_event 22, MAP_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0
+ object_event 23, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0
+ object_event 24, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0
+ object_event 25, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0
+
+LilycoveCity_ContestLobby_MapWarps: @ 853178C
+ warp_def 14, 11, 0, 4, LILYCOVE_CITY
+ warp_def 15, 11, 0, 4, LILYCOVE_CITY
+ warp_def 9, 1, 0, 0, LILYCOVE_CITY_CONTEST_HALL
+ warp_def 21, 1, 0, 1, LILYCOVE_CITY_CONTEST_HALL
+
+LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
+ bg_event 23, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_294055
+ bg_event 23, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293E1E
+ bg_event 23, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A753
+ bg_event 25, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A75A
+ bg_event 27, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A761
+ bg_event 30, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A77A
+ bg_event 3, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A73E
+ bg_event 5, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A745
+ bg_event 7, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A74C
+ bg_event 27, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293C3E
+ bg_event 27, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293D4D
+ bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784
+
+LilycoveCity_ContestLobby_MapEvents:: @ 853183C
+ map_events LilycoveCity_ContestLobby_MapObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
+
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
new file mode 100644
index 000000000..11d501116
--- /dev/null
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_1F_MapObjects: @ 8531134
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0
+
+LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C
+ warp_def 5, 8, 0, 1, LILYCOVE_CITY
+ warp_def 6, 8, 0, 1, LILYCOVE_CITY
+ warp_def 2, 1, 0, 0, LILYCOVE_CITY_COVE_LILY_MOTEL_2F
+
+LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164
+ coord_event 10, 2, 3, 0, VAR_0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211
+
+LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174
+ map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
new file mode 100644
index 000000000..dfc0d3bd0
--- /dev/null
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
@@ -0,0 +1,15 @@
+LilycoveCity_CoveLilyMotel_2F_MapObjects: @ 8531188
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0
+ object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0
+ object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0
+ object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0
+
+LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230
+ warp_def 2, 1, 0, 2, LILYCOVE_CITY_COVE_LILY_MOTEL_1F
+
+LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238
+ map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
new file mode 100644
index 000000000..6c572ce4d
--- /dev/null
+++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
@@ -0,0 +1,10 @@
+LilycoveCity_DepartmentStoreElevator_MapObjects: @ 85324B0
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0
+
+LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8
+ warp_def 1, 5, 3, 127, NONE
+ warp_def 2, 5, 3, 127, NONE
+
+LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8
+ map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
new file mode 100644
index 000000000..eb0ee1a96
--- /dev/null
+++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
@@ -0,0 +1,16 @@
+LilycoveCity_DepartmentStoreRooftop_MapObjects: @ 853241C
+ object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0
+
+LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C
+ warp_def 13, 3, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_5F
+
+LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484
+ bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
+ bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
+
+LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C
+ map_events LilycoveCity_DepartmentStoreRooftop_MapObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
+
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
new file mode 100644
index 000000000..10fb7f16e
--- /dev/null
+++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
@@ -0,0 +1,20 @@
+LilycoveCity_DepartmentStore_1F_MapObjects: @ 853208C
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0
+
+LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C
+ warp_def 8, 7, 0, 0, LILYCOVE_CITY
+ warp_def 9, 7, 0, 0, LILYCOVE_CITY
+ warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_2F
+ warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C
+ bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D
+
+LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148
+ map_events LilycoveCity_DepartmentStore_1F_MapObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
+
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
new file mode 100644
index 000000000..95c4daee0
--- /dev/null
+++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_2F_MapObjects: @ 853215C
+ object_event 1, MAP_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0
+
+LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4
+ warp_def 16, 1, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_1F
+ warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_3F
+ warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC
+ map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
new file mode 100644
index 000000000..d51060bba
--- /dev/null
+++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_3F_MapObjects: @ 8532200
+ object_event 1, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0
+
+LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278
+ warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_2F
+ warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_4F
+ warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290
+ map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
new file mode 100644
index 000000000..4b2f0f00c
--- /dev/null
+++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
@@ -0,0 +1,15 @@
+LilycoveCity_DepartmentStore_4F_MapObjects: @ 85322A4
+ object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0
+
+LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C
+ warp_def 16, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_3F
+ warp_def 13, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_5F
+ warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334
+ map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
new file mode 100644
index 000000000..f459b4764
--- /dev/null
+++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
@@ -0,0 +1,17 @@
+LilycoveCity_DepartmentStore_5F_MapObjects: @ 8532348
+ object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0
+
+LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0
+ warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_4F
+ warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+ warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
+
+LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408
+ map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc
new file mode 100644
index 000000000..f2088e9d2
--- /dev/null
+++ b/data/maps/events/LilycoveCity_Harbor.inc
@@ -0,0 +1,14 @@
+LilycoveCity_Harbor_MapObjects: @ 8531E1C
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0
+ object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0
+ object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0
+ object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0
+
+LilycoveCity_Harbor_MapWarps: @ 8531E94
+ warp_def 11, 14, 0, 12, LILYCOVE_CITY
+ warp_def 12, 14, 0, 12, LILYCOVE_CITY
+
+LilycoveCity_Harbor_MapEvents:: @ 8531EA4
+ map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc
new file mode 100644
index 000000000..1edca4904
--- /dev/null
+++ b/data/maps/events/LilycoveCity_House1.inc
@@ -0,0 +1,11 @@
+LilycoveCity_House1_MapObjects: @ 8531EF4
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0
+
+LilycoveCity_House1_MapWarps: @ 8531F24
+ warp_def 3, 8, 0, 8, LILYCOVE_CITY
+ warp_def 4, 8, 0, 8, LILYCOVE_CITY
+
+LilycoveCity_House1_MapEvents:: @ 8531F34
+ map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc
new file mode 100644
index 000000000..2321844fa
--- /dev/null
+++ b/data/maps/events/LilycoveCity_House2.inc
@@ -0,0 +1,10 @@
+LilycoveCity_House2_MapObjects: @ 8531F48
+ object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0
+
+LilycoveCity_House2_MapWarps: @ 8531F60
+ warp_def 2, 7, 0, 9, LILYCOVE_CITY
+ warp_def 3, 7, 0, 9, LILYCOVE_CITY
+
+LilycoveCity_House2_MapEvents:: @ 8531F70
+ map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc
new file mode 100644
index 000000000..05b36263a
--- /dev/null
+++ b/data/maps/events/LilycoveCity_House3.inc
@@ -0,0 +1,15 @@
+LilycoveCity_House3_MapObjects: @ 8531F84
+ object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0
+
+LilycoveCity_House3_MapWarps: @ 8532014
+ warp_def 3, 7, 0, 10, LILYCOVE_CITY
+ warp_def 4, 7, 0, 10, LILYCOVE_CITY
+
+LilycoveCity_House3_MapEvents:: @ 8532024
+ map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc
new file mode 100644
index 000000000..9212c1e0e
--- /dev/null
+++ b/data/maps/events/LilycoveCity_House4.inc
@@ -0,0 +1,11 @@
+LilycoveCity_House4_MapObjects: @ 8532038
+ object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0
+
+LilycoveCity_House4_MapWarps: @ 8532068
+ warp_def 3, 8, 0, 11, LILYCOVE_CITY
+ warp_def 4, 8, 0, 11, LILYCOVE_CITY
+
+LilycoveCity_House4_MapEvents:: @ 8532078
+ map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
new file mode 100644
index 000000000..36b9b5ac2
--- /dev/null
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
@@ -0,0 +1,38 @@
+LilycoveCity_LilycoveMuseum_1F_MapObjects: @ 853124C
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0
+ object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0
+ object_event 8, MAP_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0
+ object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0
+ object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0
+
+LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C
+ warp_def 9, 13, 0, 3, LILYCOVE_CITY
+ warp_def 10, 13, 0, 13, LILYCOVE_CITY
+ warp_def 16, 1, 0, 0, LILYCOVE_CITY_LILYCOVE_MUSEUM_2F
+
+LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354
+ bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
+ bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
+ bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
+ bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
+ bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
+ bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
+ bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
+ bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA
+ bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
+ bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8
+ bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+ bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
+ bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
+ bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+ bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3
+ bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+
+LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414
+ map_events LilycoveCity_LilycoveMuseum_1F_MapObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
+
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
new file mode 100644
index 000000000..829db7b36
--- /dev/null
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
@@ -0,0 +1,26 @@
+LilycoveCity_LilycoveMuseum_2F_MapObjects: @ 8531428
+ object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0
+
+LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488
+ warp_def 13, 1, 0, 2, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+
+LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490
+ bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
+ bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
+ bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
+ bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
+ bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
+ bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
+ bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
+ bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
+ bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
+ bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
+ bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
+ bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
+
+LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520
+ map_events LilycoveCity_LilycoveMuseum_2F_MapObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
+
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
new file mode 100644
index 000000000..1b5f4bda5
--- /dev/null
+++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
@@ -0,0 +1,10 @@
+LilycoveCity_MoveDeletersHouse_MapObjects: @ 8531EB8
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0
+
+LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0
+ warp_def 3, 7, 0, 7, LILYCOVE_CITY
+ warp_def 4, 7, 0, 7, LILYCOVE_CITY
+
+LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0
+ map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..ba8988b96
--- /dev/null
+++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
@@ -0,0 +1,15 @@
+LilycoveCity_PokemonCenter_1F_MapObjects: @ 8531BCC
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0
+
+LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
+ warp_def 7, 8, 3, 2, LILYCOVE_CITY
+ warp_def 6, 8, 3, 2, LILYCOVE_CITY
+ warp_def 1, 6, 4, 0, LILYCOVE_CITY_POKEMON_CENTER_2F
+
+LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C
+ map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..024b56427
--- /dev/null
+++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+LilycoveCity_PokemonCenter_2F_MapObjects: @ 8531C70
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0
+ warp_def 1, 6, 4, 2, LILYCOVE_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8
+ map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
new file mode 100644
index 000000000..886927d3e
--- /dev/null
+++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
@@ -0,0 +1,18 @@
+LilycoveCity_PokemonTrainerFanClub_MapObjects: @ 8531D20
+ object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0
+ object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0
+ object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0
+ object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0
+ object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0
+
+LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8
+ warp_def 6, 13, 0, 5, LILYCOVE_CITY
+ warp_def 5, 13, 0, 5, LILYCOVE_CITY
+
+LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08
+ map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc
new file mode 100644
index 000000000..9affe49bd
--- /dev/null
+++ b/data/maps/events/LilycoveCity_UnusedMart.inc
@@ -0,0 +1,7 @@
+LilycoveCity_UnusedMart_MapWarps: @ 8531CFC
+ warp_def 3, 7, 0, 0, LILYCOVE_CITY
+ warp_def 4, 7, 0, 0, LILYCOVE_CITY
+
+LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C
+ map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc
new file mode 100644
index 000000000..248ca948d
--- /dev/null
+++ b/data/maps/events/LinkContestRoom1.inc
@@ -0,0 +1,18 @@
+LinkContestRoom1_MapObjects: @ 8539EFC
+ object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 7, 246, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 8, 247, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 9, 248, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 10, 249, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 11, 250, 0, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0
+ object_event 14, MAP_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+LinkContestRoom1_MapEvents:: @ 853A064
diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/events/LinkContestRoom2.inc
new file mode 100644
index 000000000..89cb251d5
--- /dev/null
+++ b/data/maps/events/LinkContestRoom2.inc
@@ -0,0 +1 @@
+LinkContestRoom2_MapEvents:: @ 853A064
diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/events/LinkContestRoom3.inc
new file mode 100644
index 000000000..1e1b194c6
--- /dev/null
+++ b/data/maps/events/LinkContestRoom3.inc
@@ -0,0 +1 @@
+LinkContestRoom3_MapEvents:: @ 853A064
diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/events/LinkContestRoom4.inc
new file mode 100644
index 000000000..56e608f20
--- /dev/null
+++ b/data/maps/events/LinkContestRoom4.inc
@@ -0,0 +1 @@
+LinkContestRoom4_MapEvents:: @ 853A064
diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/events/LinkContestRoom5.inc
new file mode 100644
index 000000000..90644518e
--- /dev/null
+++ b/data/maps/events/LinkContestRoom5.inc
@@ -0,0 +1 @@
+LinkContestRoom5_MapEvents:: @ 853A064
diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/events/LinkContestRoom6.inc
new file mode 100644
index 000000000..802987a1d
--- /dev/null
+++ b/data/maps/events/LinkContestRoom6.inc
@@ -0,0 +1 @@
+LinkContestRoom6_MapEvents:: @ 853A064
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc
new file mode 100644
index 000000000..763391b09
--- /dev/null
+++ b/data/maps/events/LittlerootTown.inc
@@ -0,0 +1,35 @@
+LittlerootTown_MapObjects: @ 85276A8
+ object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0
+ object_event 5, MAP_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0
+ object_event 6, MAP_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0
+ object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0
+ object_event 8, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0
+
+LittlerootTown_MapWarps: @ 8527768
+ warp_def 14, 8, 0, 1, LITTLEROOT_TOWN_MAYS_HOUSE_1F
+ warp_def 5, 8, 0, 1, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
+ warp_def 7, 16, 0, 0, LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB
+
+LittlerootTown_MapCoordEvents: @ 8527780
+ coord_event 10, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E8091
+ coord_event 11, 1, 3, 0, VAR_0x4050, 0, 0, LittlerootTown_EventScript_1E80EF
+ coord_event 11, 1, 3, 0, VAR_0x4050, 1, 0, LittlerootTown_EventScript_1E811F
+ coord_event 8, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81F9
+ coord_event 9, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E8205
+ coord_event 10, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81E1
+ coord_event 11, 9, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81ED
+ coord_event 10, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81BB
+ coord_event 11, 2, 3, 0, VAR_0x4050, 3, 0, LittlerootTown_EventScript_1E81CE
+
+LittlerootTown_MapBGEvents: @ 8527810
+ bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_1E8151
+ bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_1E815A
+ bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_1E8163
+ bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F
+
+LittlerootTown_MapEvents:: @ 8527840
+ map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
+
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
new file mode 100644
index 000000000..6f6fc9df4
--- /dev/null
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
@@ -0,0 +1,23 @@
+LittlerootTown_BrendansHouse_1F_MapObjects: @ 852D08C
+ object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0
+ object_event 2, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0
+ object_event 3, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0
+ object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0
+ object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0
+ object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0
+
+LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134
+ warp_def 9, 8, 0, 1, LITTLEROOT_TOWN
+ warp_def 8, 8, 0, 1, LITTLEROOT_TOWN
+ warp_def 8, 2, 0, 0, LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
+
+LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C
+ coord_event 8, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3
+ coord_event 7, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE
+ coord_event 8, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA
+ coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6
+
+LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C
+ map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
new file mode 100644
index 000000000..af470cca5
--- /dev/null
+++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
@@ -0,0 +1,30 @@
+LittlerootTown_BrendansHouse_2F_MapObjects: @ 852D1A0
+ object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
+ object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0
+ object_event 16, MAP_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0
+
+LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320
+ warp_def 7, 1, 0, 2, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
+
+LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328
+ bg_event 0, 1, 0, 1, 0, gUnknown_081F860D
+ bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8656
+ bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_292781
+ bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F
+
+LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358
+ map_events LittlerootTown_BrendansHouse_2F_MapObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
+
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
new file mode 100644
index 000000000..68bf13bcd
--- /dev/null
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
@@ -0,0 +1,23 @@
+LittlerootTown_MaysHouse_1F_MapObjects: @ 852D36C
+ object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0
+ object_event 2, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0
+ object_event 3, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0
+ object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0
+ object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0
+ object_event 7, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0
+
+LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414
+ warp_def 1, 8, 0, 0, LITTLEROOT_TOWN
+ warp_def 2, 8, 0, 0, LITTLEROOT_TOWN
+ warp_def 2, 2, 0, 0, LITTLEROOT_TOWN_MAYS_HOUSE_2F
+
+LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C
+ coord_event 2, 8, 0, 0, VAR_0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C
+ coord_event 1, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A67
+ coord_event 2, 4, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A73
+ coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F
+
+LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C
+ map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
new file mode 100644
index 000000000..4d26b70d7
--- /dev/null
+++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
@@ -0,0 +1,30 @@
+LittlerootTown_MaysHouse_2F_MapObjects: @ 852D480
+ object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
+ object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0
+ object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0
+
+LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600
+ warp_def 1, 1, 0, 2, LITTLEROOT_TOWN_MAYS_HOUSE_1F
+
+LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608
+ bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F865F
+ bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F8656
+ bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_29278D
+ bg_event 8, 1, 0, 0, 0, gUnknown_081F9553
+
+LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638
+ map_events LittlerootTown_MaysHouse_2F_MapObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
+
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
new file mode 100644
index 000000000..cd004bcb7
--- /dev/null
+++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
@@ -0,0 +1,32 @@
+LittlerootTown_ProfessorBirchsLab_MapObjects: @ 852D64C
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0
+ object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0
+
+LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC
+ warp_def 6, 12, 0, 2, LITTLEROOT_TOWN
+ warp_def 7, 12, 0, 2, LITTLEROOT_TOWN
+
+LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC
+ bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
+ bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
+ bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
+ bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
+ bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+ bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+ bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+ bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+ bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+ bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+ bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+ bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+ bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+ bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+ bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+
+LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0
+ map_events LittlerootTown_ProfessorBirchsLab_MapObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
+
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc
new file mode 100644
index 000000000..33a8a4aa0
--- /dev/null
+++ b/data/maps/events/MagmaHideout_1F.inc
@@ -0,0 +1,17 @@
+MagmaHideout_1F_MapObjects: @ 85371CC
+ object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0
+ object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0
+ object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0
+ object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0
+
+MagmaHideout_1F_MapWarps: @ 853725C
+ warp_def 10, 34, 3, 4, JAGGED_PASS
+ warp_def 25, 34, 3, 1, MAGMA_HIDEOUT_2F_1R
+ warp_def 31, 3, 0, 1, MAGMA_HIDEOUT_2F_2R
+ warp_def 20, 22, 0, 0, MAGMA_HIDEOUT_2F_3R
+
+MagmaHideout_1F_MapEvents:: @ 853727C
+ map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc
new file mode 100644
index 000000000..4ac6e0fde
--- /dev/null
+++ b/data/maps/events/MagmaHideout_2F_1R.inc
@@ -0,0 +1,14 @@
+MagmaHideout_2F_1R_MapObjects: @ 8537290
+ object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0
+
+MagmaHideout_2F_1R_MapWarps: @ 85372F0
+ warp_def 11, 23, 0, 0, MAGMA_HIDEOUT_2F_2R
+ warp_def 8, 2, 0, 1, MAGMA_HIDEOUT_1F
+ warp_def 17, 33, 3, 2, MAGMA_HIDEOUT_3F_1R
+
+MagmaHideout_2F_1R_MapEvents:: @ 8537308
+ map_events MagmaHideout_2F_1R_MapObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc
new file mode 100644
index 000000000..845da88b2
--- /dev/null
+++ b/data/maps/events/MagmaHideout_2F_2R.inc
@@ -0,0 +1,15 @@
+MagmaHideout_2F_2R_MapObjects: @ 853731C
+ object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0
+
+MagmaHideout_2F_2R_MapWarps: @ 85373AC
+ warp_def 10, 22, 3, 0, MAGMA_HIDEOUT_2F_1R
+ warp_def 36, 4, 0, 2, MAGMA_HIDEOUT_1F
+
+MagmaHideout_2F_2R_MapEvents:: @ 85373BC
+ map_events MagmaHideout_2F_2R_MapObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/events/MagmaHideout_2F_3R.inc
new file mode 100644
index 000000000..3795ef568
--- /dev/null
+++ b/data/maps/events/MagmaHideout_2F_3R.inc
@@ -0,0 +1,7 @@
+MagmaHideout_2F_3R_MapWarps: @ 85375B0
+ warp_def 16, 1, 0, 3, MAGMA_HIDEOUT_1F
+ warp_def 16, 13, 0, 0, MAGMA_HIDEOUT_3F_3R
+
+MagmaHideout_2F_3R_MapEvents:: @ 85375C0
+ map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc
new file mode 100644
index 000000000..07a53f4fb
--- /dev/null
+++ b/data/maps/events/MagmaHideout_3F_1R.inc
@@ -0,0 +1,13 @@
+MagmaHideout_3F_1R_MapObjects: @ 85373D0
+ object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0
+
+MagmaHideout_3F_1R_MapWarps: @ 8537418
+ warp_def 7, 21, 0, 0, MAGMA_HIDEOUT_4F
+ warp_def 21, 9, 0, 0, MAGMA_HIDEOUT_3F_2R
+ warp_def 23, 3, 0, 2, MAGMA_HIDEOUT_2F_1R
+
+MagmaHideout_3F_1R_MapEvents:: @ 8537430
+ map_events MagmaHideout_3F_1R_MapObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc
new file mode 100644
index 000000000..faeacbd12
--- /dev/null
+++ b/data/maps/events/MagmaHideout_3F_2R.inc
@@ -0,0 +1,10 @@
+MagmaHideout_3F_2R_MapObjects: @ 8537444
+ object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0
+
+MagmaHideout_3F_2R_MapWarps: @ 8537474
+ warp_def 12, 15, 0, 1, MAGMA_HIDEOUT_3F_1R
+
+MagmaHideout_3F_2R_MapEvents:: @ 853747C
+ map_events MagmaHideout_3F_2R_MapObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc
new file mode 100644
index 000000000..386696d9c
--- /dev/null
+++ b/data/maps/events/MagmaHideout_3F_3R.inc
@@ -0,0 +1,10 @@
+MagmaHideout_3F_3R_MapObjects: @ 8537574
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0
+
+MagmaHideout_3F_3R_MapWarps: @ 853758C
+ warp_def 16, 1, 0, 1, MAGMA_HIDEOUT_2F_3R
+ warp_def 16, 21, 0, 1, MAGMA_HIDEOUT_4F
+
+MagmaHideout_3F_3R_MapEvents:: @ 853759C
+ map_events MagmaHideout_3F_3R_MapObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc
new file mode 100644
index 000000000..545eeea92
--- /dev/null
+++ b/data/maps/events/MagmaHideout_4F.inc
@@ -0,0 +1,17 @@
+MagmaHideout_4F_MapObjects: @ 8537490
+ object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0
+ object_event 7, MAP_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0
+ object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0
+
+MagmaHideout_4F_MapWarps: @ 8537550
+ warp_def 46, 7, 0, 0, MAGMA_HIDEOUT_3F_1R
+ warp_def 20, 21, 0, 1, MAGMA_HIDEOUT_3F_3R
+
+MagmaHideout_4F_MapEvents:: @ 8537560
+ map_events MagmaHideout_4F_MapObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc
new file mode 100644
index 000000000..385a05193
--- /dev/null
+++ b/data/maps/events/MarineCave_End.inc
@@ -0,0 +1,12 @@
+MarineCave_End_MapObjects: @ 85377E8
+ object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0
+
+MarineCave_End_MapWarps: @ 8537800
+ warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE
+
+MarineCave_End_MapCoordEvents: @ 8537808
+ coord_event 9, 26, 3, 0, VAR_0x4001, 1, 0, MarineCave_End_EventScript_23B01B
+
+MarineCave_End_MapEvents:: @ 8537818
+ map_events MarineCave_End_MapObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/events/MarineCave_Entrance.inc
new file mode 100644
index 000000000..e00290acb
--- /dev/null
+++ b/data/maps/events/MarineCave_Entrance.inc
@@ -0,0 +1,6 @@
+MarineCave_Entrance_MapWarps: @ 85377CC
+ warp_def 14, 1, 3, 0, MARINE_CAVE_END
+
+MarineCave_Entrance_MapEvents:: @ 85377D4
+ map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc
new file mode 100644
index 000000000..c6da0eb61
--- /dev/null
+++ b/data/maps/events/MauvilleCity.inc
@@ -0,0 +1,35 @@
+MauvilleCity_MapObjects: @ 852662C
+ object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0
+ object_event 8, MAP_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0
+ object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0
+ object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0
+
+MauvilleCity_MapWarps: @ 8526734
+ warp_def 8, 5, 0, 0, MAUVILLE_CITY_GYM
+ warp_def 22, 5, 0, 0, MAUVILLE_CITY_POKEMON_CENTER_1F
+ warp_def 35, 5, 0, 0, MAUVILLE_CITY_BIKE_SHOP
+ warp_def 23, 14, 0, 0, MAUVILLE_CITY_MART
+ warp_def 32, 14, 0, 0, MAUVILLE_CITY_HOUSE_1
+ warp_def 8, 13, 0, 0, MAUVILLE_CITY_GAME_CORNER
+ warp_def 19, 14, 0, 0, MAUVILLE_CITY_HOUSE_2
+
+MauvilleCity_MapBGEvents: @ 852676C
+ bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_271E73
+ bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_1DF3E0
+ bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A
+ bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_271E6A
+ bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_271E73
+ bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_1DF3D7
+ bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_1DF3E9
+ bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2
+
+MauvilleCity_MapEvents:: @ 85267CC
+ map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
+
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc
new file mode 100644
index 000000000..e8e3ef7be
--- /dev/null
+++ b/data/maps/events/MauvilleCity_BikeShop.inc
@@ -0,0 +1,15 @@
+MauvilleCity_BikeShop_MapObjects: @ 852FE80
+ object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0
+
+MauvilleCity_BikeShop_MapWarps: @ 852FEB0
+ warp_def 3, 8, 0, 2, MAUVILLE_CITY
+ warp_def 4, 8, 0, 2, MAUVILLE_CITY
+
+MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0
+ bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED3A
+ bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE
+
+MauvilleCity_BikeShop_MapEvents:: @ 852FED8
+ map_events MauvilleCity_BikeShop_MapObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
+
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc
new file mode 100644
index 000000000..1a84504f5
--- /dev/null
+++ b/data/maps/events/MauvilleCity_GameCorner.inc
@@ -0,0 +1,47 @@
+MauvilleCity_GameCorner_MapObjects: @ 852FF28
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0
+
+MauvilleCity_GameCorner_MapWarps: @ 8530048
+ warp_def 11, 10, 3, 5, MAUVILLE_CITY
+ warp_def 12, 10, 3, 5, MAUVILLE_CITY
+
+MauvilleCity_GameCorner_MapBGEvents: @ 8530058
+ bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102D6
+ bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2102F6
+ bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210316
+ bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210336
+ bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210356
+ bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210376
+ bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_210396
+ bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103B6
+ bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_2103D6
+ bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_2103F6
+ bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210416
+ bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_210436
+ bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+ bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+ bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+ bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+ bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+ bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5AB1
+ bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+ bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+ bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+ bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+ bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+ bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF
+
+MauvilleCity_GameCorner_MapEvents:: @ 8530178
+ map_events MauvilleCity_GameCorner_MapObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
+
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc
new file mode 100644
index 000000000..acbbeccef
--- /dev/null
+++ b/data/maps/events/MauvilleCity_Gym.inc
@@ -0,0 +1,26 @@
+MauvilleCity_Gym_MapObjects: @ 852FD5C
+ object_event 1, MAP_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0
+
+MauvilleCity_Gym_MapWarps: @ 852FE04
+ warp_def 4, 20, 0, 0, MAUVILLE_CITY
+ warp_def 5, 20, 0, 0, MAUVILLE_CITY
+
+MauvilleCity_Gym_MapCoordEvents: @ 852FE14
+ coord_event 4, 12, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20E01E
+ coord_event 3, 9, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20E043
+ coord_event 0, 15, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20DFF9
+ coord_event 8, 9, 3, 0, VAR_0x4000, 0, 0, MauvilleCity_Gym_EventScript_20E068
+
+MauvilleCity_Gym_MapBGEvents: @ 852FE54
+ bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E14B
+ bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B
+
+MauvilleCity_Gym_MapEvents:: @ 852FE6C
+ map_events MauvilleCity_Gym_MapObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
+
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc
new file mode 100644
index 000000000..9b30d3119
--- /dev/null
+++ b/data/maps/events/MauvilleCity_House1.inc
@@ -0,0 +1,10 @@
+MauvilleCity_House1_MapObjects: @ 852FEEC
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0
+
+MauvilleCity_House1_MapWarps: @ 852FF04
+ warp_def 3, 7, 0, 4, MAUVILLE_CITY
+ warp_def 4, 7, 0, 4, MAUVILLE_CITY
+
+MauvilleCity_House1_MapEvents:: @ 852FF14
+ map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc
new file mode 100644
index 000000000..5328de49f
--- /dev/null
+++ b/data/maps/events/MauvilleCity_House2.inc
@@ -0,0 +1,10 @@
+MauvilleCity_House2_MapObjects: @ 853018C
+ object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0
+
+MauvilleCity_House2_MapWarps: @ 85301A4
+ warp_def 3, 8, 0, 6, MAUVILLE_CITY
+ warp_def 4, 8, 0, 6, MAUVILLE_CITY
+
+MauvilleCity_House2_MapEvents:: @ 85301B4
+ map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc
new file mode 100644
index 000000000..257d047cd
--- /dev/null
+++ b/data/maps/events/MauvilleCity_Mart.inc
@@ -0,0 +1,12 @@
+MauvilleCity_Mart_MapObjects: @ 8530310
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0
+
+MauvilleCity_Mart_MapWarps: @ 8530358
+ warp_def 3, 7, 0, 3, MAUVILLE_CITY
+ warp_def 4, 7, 0, 3, MAUVILLE_CITY
+
+MauvilleCity_Mart_MapEvents:: @ 8530368
+ map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..725e52ef3
--- /dev/null
+++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
@@ -0,0 +1,15 @@
+MauvilleCity_PokemonCenter_1F_MapObjects: @ 85301C8
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0
+
+MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240
+ warp_def 7, 8, 3, 1, MAUVILLE_CITY
+ warp_def 6, 8, 3, 1, MAUVILLE_CITY
+ warp_def 1, 6, 4, 0, MAUVILLE_CITY_POKEMON_CENTER_2F
+
+MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258
+ map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..9e5cb6e81
--- /dev/null
+++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
@@ -0,0 +1,15 @@
+MauvilleCity_PokemonCenter_2F_MapObjects: @ 853026C
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+ object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0
+
+MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4
+ warp_def 1, 6, 4, 2, MAUVILLE_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC
+ map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc
new file mode 100644
index 000000000..29ecbf043
--- /dev/null
+++ b/data/maps/events/MeteorFalls_1F_1R.inc
@@ -0,0 +1,29 @@
+MeteorFalls_1F_1R_MapObjects: @ 8533F74
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0
+ object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
+ object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
+ object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0
+ object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0
+
+MeteorFalls_1F_1R_MapWarps: @ 8534064
+ warp_def 27, 18, 4, 0, ROUTE_114
+ warp_def 6, 39, 3, 0, ROUTE_115
+ warp_def 10, 3, 3, 0, METEOR_FALLS_1F_2R
+ warp_def 5, 4, 3, 4, METEOR_FALLS_B1F_1R
+ warp_def 26, 28, 3, 5, METEOR_FALLS_B1F_1R
+ warp_def 4, 2, 0, 0, METEOR_FALLS_STEVENS_CAVE
+
+MeteorFalls_1F_1R_MapCoordEvents: @ 8534094
+ coord_event 14, 18, 4, 0, VAR_0x40BF, 0, 0, MeteorFalls_1F_1R_EventScript_22BD5F
+
+MeteorFalls_1F_1R_MapBGEvents: @ 85340A4
+ bg_event 9, 58, 0, 0, 0, 0x0
+
+MeteorFalls_1F_1R_MapEvents:: @ 85340B0
+ map_events MeteorFalls_1F_1R_MapObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
+
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc
new file mode 100644
index 000000000..180b4f722
--- /dev/null
+++ b/data/maps/events/MeteorFalls_1F_2R.inc
@@ -0,0 +1,17 @@
+MeteorFalls_1F_2R_MapObjects: @ 85340C4
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0
+
+MeteorFalls_1F_2R_MapWarps: @ 853410C
+ warp_def 10, 29, 3, 2, METEOR_FALLS_1F_1R
+ warp_def 4, 14, 3, 0, METEOR_FALLS_B1F_1R
+ warp_def 7, 20, 3, 1, METEOR_FALLS_B1F_1R
+ warp_def 21, 23, 3, 2, METEOR_FALLS_B1F_1R
+
+MeteorFalls_1F_2R_MapBGEvents: @ 853412C
+ bg_event 9, 58, 0, 0, 0, 0x0
+
+MeteorFalls_1F_2R_MapEvents:: @ 8534138
+ map_events MeteorFalls_1F_2R_MapObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
+
diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc
new file mode 100644
index 000000000..410dd90c0
--- /dev/null
+++ b/data/maps/events/MeteorFalls_B1F_1R.inc
@@ -0,0 +1,11 @@
+MeteorFalls_B1F_1R_MapWarps: @ 853414C
+ warp_def 5, 6, 4, 1, METEOR_FALLS_1F_2R
+ warp_def 7, 11, 5, 2, METEOR_FALLS_1F_2R
+ warp_def 18, 15, 4, 3, METEOR_FALLS_1F_2R
+ warp_def 17, 3, 3, 0, METEOR_FALLS_B1F_2R
+ warp_def 3, 23, 5, 3, METEOR_FALLS_1F_1R
+ warp_def 20, 36, 3, 4, METEOR_FALLS_1F_1R
+
+MeteorFalls_B1F_1R_MapEvents:: @ 853417C
+ map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc
new file mode 100644
index 000000000..e208273cf
--- /dev/null
+++ b/data/maps/events/MeteorFalls_B1F_2R.inc
@@ -0,0 +1,9 @@
+MeteorFalls_B1F_2R_MapObjects: @ 8534190
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0
+
+MeteorFalls_B1F_2R_MapWarps: @ 85341A8
+ warp_def 5, 15, 3, 3, METEOR_FALLS_B1F_1R
+
+MeteorFalls_B1F_2R_MapEvents:: @ 85341B0
+ map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc
new file mode 100644
index 000000000..e9f3d0db6
--- /dev/null
+++ b/data/maps/events/MeteorFalls_StevensCave.inc
@@ -0,0 +1,9 @@
+MeteorFalls_StevensCave_MapObjects: @ 85378B0
+ object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0
+
+MeteorFalls_StevensCave_MapWarps: @ 85378C8
+ warp_def 10, 29, 3, 5, METEOR_FALLS_1F_1R
+
+MeteorFalls_StevensCave_MapEvents:: @ 85378D0
+ map_events MeteorFalls_StevensCave_MapObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/events/MirageTower_1F.inc
new file mode 100644
index 000000000..5bf9568bb
--- /dev/null
+++ b/data/maps/events/MirageTower_1F.inc
@@ -0,0 +1,7 @@
+MirageTower_1F_MapWarps: @ 85375D4
+ warp_def 10, 14, 3, 3, ROUTE_111
+ warp_def 15, 2, 3, 1, MIRAGE_TOWER_2F
+
+MirageTower_1F_MapEvents:: @ 85375E4
+ map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/events/MirageTower_2F.inc
new file mode 100644
index 000000000..07814433a
--- /dev/null
+++ b/data/maps/events/MirageTower_2F.inc
@@ -0,0 +1,7 @@
+MirageTower_2F_MapWarps: @ 85375F8
+ warp_def 18, 12, 3, 0, MIRAGE_TOWER_3F
+ warp_def 15, 2, 3, 1, MIRAGE_TOWER_1F
+
+MirageTower_2F_MapEvents:: @ 8537608
+ map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc
new file mode 100644
index 000000000..956965d5f
--- /dev/null
+++ b/data/maps/events/MirageTower_3F.inc
@@ -0,0 +1,11 @@
+MirageTower_3F_MapObjects: @ 853761C
+ object_event 1, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0
+ object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0
+
+MirageTower_3F_MapWarps: @ 853764C
+ warp_def 18, 12, 3, 0, MIRAGE_TOWER_2F
+ warp_def 2, 4, 0, 0, MIRAGE_TOWER_4F
+
+MirageTower_3F_MapEvents:: @ 853765C
+ map_events MirageTower_3F_MapObjects, MirageTower_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc
new file mode 100644
index 000000000..1042dc803
--- /dev/null
+++ b/data/maps/events/MirageTower_4F.inc
@@ -0,0 +1,11 @@
+MirageTower_4F_MapObjects: @ 8537670
+ object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0
+ object_event 2, MAP_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0
+ object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0
+
+MirageTower_4F_MapWarps: @ 85376B8
+ warp_def 1, 4, 3, 1, MIRAGE_TOWER_3F
+
+MirageTower_4F_MapEvents:: @ 85376C0
+ map_events MirageTower_4F_MapObjects, MirageTower_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc
new file mode 100644
index 000000000..5d3717531
--- /dev/null
+++ b/data/maps/events/MossdeepCity.inc
@@ -0,0 +1,56 @@
+MossdeepCity_MapObjects: @ 8527018
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
+ object_event 11, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
+ object_event 12, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
+ object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
+ object_event 14, MAP_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0
+ object_event 15, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0
+ object_event 17, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0
+
+MossdeepCity_MapWarps: @ 85271B0
+ warp_def 28, 9, 0, 0, MOSSDEEP_CITY_HOUSE_1
+ warp_def 38, 9, 0, 0, MOSSDEEP_CITY_GYM
+ warp_def 28, 16, 0, 0, MOSSDEEP_CITY_POKEMON_CENTER_1F
+ warp_def 67, 25, 0, 0, MOSSDEEP_CITY_HOUSE_2
+ warp_def 37, 18, 0, 0, MOSSDEEP_CITY_MART
+ warp_def 49, 6, 0, 0, MOSSDEEP_CITY_HOUSE_3
+ warp_def 19, 10, 0, 0, MOSSDEEP_CITY_STEVENS_HOUSE
+ warp_def 18, 16, 0, 1, MOSSDEEP_CITY_HOUSE_4
+ warp_def 64, 15, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_1F
+ warp_def 36, 24, 0, 0, MOSSDEEP_CITY_GAME_CORNER_1F
+
+MossdeepCity_MapCoordEvents: @ 8527200
+ coord_event 25, 25, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38
+ coord_event 26, 25, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38
+ coord_event 32, 27, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38
+ coord_event 33, 27, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_EventScript_1E4B38
+ coord_event 42, 21, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+ coord_event 41, 22, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+ coord_event 41, 23, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+ coord_event 41, 24, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+ coord_event 40, 25, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+ coord_event 40, 26, 5, 0, VAR_0x405D, 1, 0, MossdeepCity_EventScript_1E4B41
+
+MossdeepCity_MapBGEvents: @ 85272A0
+ bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B26
+ bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_1E4B1D
+ bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
+ bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
+ bg_event 66, 16, 0, 0, 0, MossdeepCity_EventScript_1E4B2F
+ bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_271E73
+ bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_271E6A
+ bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14
+
+MossdeepCity_MapEvents:: @ 8527300
+ map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
+
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc
new file mode 100644
index 000000000..c4477a44b
--- /dev/null
+++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc
@@ -0,0 +1,17 @@
+MossdeepCity_GameCorner_1F_MapObjects: @ 8532F40
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0
+
+MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70
+ warp_def 5, 9, 0, 9, MOSSDEEP_CITY
+ warp_def 6, 9, 0, 9, MOSSDEEP_CITY
+ warp_def 2, 0, 0, 0, MOSSDEEP_CITY_GAME_CORNER_B1F
+
+MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88
+ bg_event 3, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B5D
+ bg_event 0, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E9D
+ bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96
+
+MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC
+ map_events MossdeepCity_GameCorner_1F_MapObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
+
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
new file mode 100644
index 000000000..ed9b4f660
--- /dev/null
+++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
@@ -0,0 +1,9 @@
+MossdeepCity_GameCorner_B1F_MapObjects: @ 8532FC0
+ object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8
+ warp_def 3, 1, 0, 2, MOSSDEEP_CITY_GAME_CORNER_1F
+
+MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0
+ map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc
new file mode 100644
index 000000000..cf3e42434
--- /dev/null
+++ b/data/maps/events/MossdeepCity_Gym.inc
@@ -0,0 +1,72 @@
+MossdeepCity_Gym_MapObjects: @ 85324EC
+ object_event 1, MAP_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 27, MAP_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0
+ object_event 29, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 30, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 31, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 32, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0
+ object_event 33, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 34, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 35, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 36, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+MossdeepCity_Gym_MapWarps: @ 853284C
+ warp_def 6, 35, 3, 1, MOSSDEEP_CITY
+ warp_def 7, 35, 3, 1, MOSSDEEP_CITY
+ warp_def 3, 28, 0, 3, MOSSDEEP_CITY_GYM
+ warp_def 1, 23, 3, 2, MOSSDEEP_CITY_GYM
+ warp_def 7, 18, 0, 5, MOSSDEEP_CITY_GYM
+ warp_def 8, 12, 0, 4, MOSSDEEP_CITY_GYM
+ warp_def 9, 18, 0, 7, MOSSDEEP_CITY_GYM
+ warp_def 23, 20, 0, 6, MOSSDEEP_CITY_GYM
+ warp_def 1, 33, 3, 9, MOSSDEEP_CITY_GYM
+ warp_def 20, 24, 0, 8, MOSSDEEP_CITY_GYM
+ warp_def 11, 3, 0, 11, MOSSDEEP_CITY_GYM
+ warp_def 11, 35, 3, 10, MOSSDEEP_CITY_GYM
+ warp_def 13, 32, 0, 13, MOSSDEEP_CITY_GYM
+ warp_def 21, 10, 0, 12, MOSSDEEP_CITY_GYM
+
+MossdeepCity_Gym_MapCoordEvents: @ 85328BC
+ coord_event 2, 21, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C67
+ coord_event 8, 10, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C7D
+ coord_event 6, 7, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C7D
+ coord_event 15, 34, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C93
+ coord_event 23, 24, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220CA9
+ coord_event 23, 21, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220CA9
+ coord_event 8, 6, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220CBF
+ coord_event 21, 6, 0, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220AF1
+ coord_event 3, 30, 3, 0, VAR_0x4001, 0, 0, MossdeepCity_Gym_EventScript_220C67
+
+MossdeepCity_Gym_MapBGEvents: @ 853294C
+ bg_event 4, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C33
+ bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43
+
+MossdeepCity_Gym_MapEvents:: @ 8532964
+ map_events MossdeepCity_Gym_MapObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
+
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc
new file mode 100644
index 000000000..c83a09c5c
--- /dev/null
+++ b/data/maps/events/MossdeepCity_House1.inc
@@ -0,0 +1,11 @@
+MossdeepCity_House1_MapObjects: @ 8532978
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0
+
+MossdeepCity_House1_MapWarps: @ 85329A8
+ warp_def 3, 7, 0, 0, MOSSDEEP_CITY
+ warp_def 4, 7, 0, 0, MOSSDEEP_CITY
+
+MossdeepCity_House1_MapEvents:: @ 85329B8
+ map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc
new file mode 100644
index 000000000..08ab80348
--- /dev/null
+++ b/data/maps/events/MossdeepCity_House2.inc
@@ -0,0 +1,12 @@
+MossdeepCity_House2_MapObjects: @ 85329CC
+ object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0
+
+MossdeepCity_House2_MapWarps: @ 8532A14
+ warp_def 3, 8, 0, 3, MOSSDEEP_CITY
+ warp_def 4, 8, 0, 3, MOSSDEEP_CITY
+
+MossdeepCity_House2_MapEvents:: @ 8532A24
+ map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc
new file mode 100644
index 000000000..21c008770
--- /dev/null
+++ b/data/maps/events/MossdeepCity_House3.inc
@@ -0,0 +1,10 @@
+MossdeepCity_House3_MapObjects: @ 8532BD4
+ object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0
+
+MossdeepCity_House3_MapWarps: @ 8532BEC
+ warp_def 3, 7, 0, 5, MOSSDEEP_CITY
+ warp_def 4, 7, 0, 5, MOSSDEEP_CITY
+
+MossdeepCity_House3_MapEvents:: @ 8532BFC
+ map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc
new file mode 100644
index 000000000..76245850f
--- /dev/null
+++ b/data/maps/events/MossdeepCity_House4.inc
@@ -0,0 +1,12 @@
+MossdeepCity_House4_MapObjects: @ 8532CAC
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0
+
+MossdeepCity_House4_MapWarps: @ 8532CF4
+ warp_def 4, 7, 0, 7, MOSSDEEP_CITY
+ warp_def 3, 7, 0, 7, MOSSDEEP_CITY
+
+MossdeepCity_House4_MapEvents:: @ 8532D04
+ map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc
new file mode 100644
index 000000000..4a49376ba
--- /dev/null
+++ b/data/maps/events/MossdeepCity_Mart.inc
@@ -0,0 +1,13 @@
+MossdeepCity_Mart_MapObjects: @ 8532B50
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0
+
+MossdeepCity_Mart_MapWarps: @ 8532BB0
+ warp_def 3, 7, 0, 4, MOSSDEEP_CITY
+ warp_def 4, 7, 0, 4, MOSSDEEP_CITY
+
+MossdeepCity_Mart_MapEvents:: @ 8532BC0
+ map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..30e5d395c
--- /dev/null
+++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
@@ -0,0 +1,13 @@
+MossdeepCity_PokemonCenter_1F_MapObjects: @ 8532A38
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0
+
+MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80
+ warp_def 7, 8, 3, 2, MOSSDEEP_CITY
+ warp_def 6, 8, 3, 2, MOSSDEEP_CITY
+ warp_def 1, 6, 4, 0, MOSSDEEP_CITY_POKEMON_CENTER_2F
+
+MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98
+ map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..7eda9d522
--- /dev/null
+++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
@@ -0,0 +1,15 @@
+MossdeepCity_PokemonCenter_2F_MapObjects: @ 8532AAC
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0
+
+MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24
+ warp_def 1, 6, 4, 2, MOSSDEEP_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C
+ map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
new file mode 100644
index 000000000..4e2062365
--- /dev/null
+++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
@@ -0,0 +1,21 @@
+MossdeepCity_SpaceCenter_1F_MapObjects: @ 8532D18
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0
+ object_event 10, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0
+ object_event 11, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0
+
+MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20
+ warp_def 7, 9, 0, 8, MOSSDEEP_CITY
+ warp_def 8, 9, 0, 8, MOSSDEEP_CITY
+ warp_def 13, 1, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_2F
+
+MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38
+ map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
new file mode 100644
index 000000000..3de11be87
--- /dev/null
+++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
@@ -0,0 +1,17 @@
+MossdeepCity_SpaceCenter_2F_MapObjects: @ 8532E4C
+ object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0
+
+MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24
+ warp_def 13, 1, 0, 2, MOSSDEEP_CITY_SPACE_CENTER_1F
+
+MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C
+ map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc
new file mode 100644
index 000000000..523088c40
--- /dev/null
+++ b/data/maps/events/MossdeepCity_StevensHouse.inc
@@ -0,0 +1,18 @@
+MossdeepCity_StevensHouse_MapObjects: @ 8532C10
+ object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0
+
+MossdeepCity_StevensHouse_MapWarps: @ 8532C58
+ warp_def 3, 7, 0, 6, MOSSDEEP_CITY
+ warp_def 4, 7, 0, 6, MOSSDEEP_CITY
+
+MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68
+ bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+ bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+ bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+ bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909
+
+MossdeepCity_StevensHouse_MapEvents:: @ 8532C98
+ map_events MossdeepCity_StevensHouse_MapObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
+
diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc
new file mode 100644
index 000000000..5f026066a
--- /dev/null
+++ b/data/maps/events/MtChimney.inc
@@ -0,0 +1,45 @@
+MtChimney_MapObjects: @ 85347C8
+ object_event 1, MAP_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0
+ object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0
+ object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0
+ object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0
+ object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0
+ object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0
+ object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+ object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+ object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0
+ object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+ object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+ object_event 16, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0
+ object_event 17, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0
+ object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+ object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+ object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+ object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+ object_event 22, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0
+ object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
+ object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
+ object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0
+ object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0
+ object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0
+ object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0
+ object_event 29, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0
+ object_event 30, MAP_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0
+
+MtChimney_MapWarps: @ 8534A98
+ warp_def 17, 36, 0, 0, MT_CHIMNEY_CABLE_CAR_STATION
+ warp_def 18, 36, 0, 1, MT_CHIMNEY_CABLE_CAR_STATION
+ warp_def 20, 41, 3, 2, JAGGED_PASS
+ warp_def 21, 41, 3, 3, JAGGED_PASS
+
+MtChimney_MapBGEvents: @ 8534AB8
+ bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_22F0E4
+ bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141
+
+MtChimney_MapEvents:: @ 8534AD0
+ map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
+
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc
new file mode 100644
index 000000000..deb754157
--- /dev/null
+++ b/data/maps/events/MtChimney_CableCarStation.inc
@@ -0,0 +1,11 @@
+MtChimney_CableCarStation_MapObjects: @ 8533CA8
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+MtChimney_CableCarStation_MapWarps: @ 8533CD8
+ warp_def 6, 11, 0, 0, MT_CHIMNEY
+ warp_def 7, 11, 0, 1, MT_CHIMNEY
+
+MtChimney_CableCarStation_MapEvents:: @ 8533CE8
+ map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc
new file mode 100644
index 000000000..5270f92fd
--- /dev/null
+++ b/data/maps/events/MtPyre_1F.inc
@@ -0,0 +1,16 @@
+MtPyre_1F_MapObjects: @ 8534D64
+ object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0
+
+MtPyre_1F_MapWarps: @ 8534DAC
+ warp_def 17, 18, 3, 0, ROUTE_122
+ warp_def 3, 6, 3, 0, MT_PYRE_EXTERIOR
+ warp_def 18, 18, 3, 0, ROUTE_122
+ warp_def 4, 6, 3, 0, MT_PYRE_EXTERIOR
+ warp_def 11, 1, 3, 0, MT_PYRE_2F
+ warp_def 20, 9, 3, 4, MT_PYRE_2F
+
+MtPyre_1F_MapEvents:: @ 8534DDC
+ map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc
new file mode 100644
index 000000000..86659ac47
--- /dev/null
+++ b/data/maps/events/MtPyre_2F.inc
@@ -0,0 +1,20 @@
+MtPyre_2F_MapObjects: @ 8534DF0
+ object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0
+
+MtPyre_2F_MapWarps: @ 8534EB0
+ warp_def 2, 1, 3, 4, MT_PYRE_1F
+ warp_def 10, 1, 3, 0, MT_PYRE_3F
+ warp_def 10, 12, 3, 4, MT_PYRE_3F
+ warp_def 6, 12, 3, 5, MT_PYRE_3F
+ warp_def 11, 9, 3, 5, MT_PYRE_1F
+
+MtPyre_2F_MapEvents:: @ 8534ED8
+ map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc
new file mode 100644
index 000000000..96dcae630
--- /dev/null
+++ b/data/maps/events/MtPyre_3F.inc
@@ -0,0 +1,17 @@
+MtPyre_3F_MapObjects: @ 8534EEC
+ object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0
+
+MtPyre_3F_MapWarps: @ 8534F4C
+ warp_def 10, 1, 3, 1, MT_PYRE_2F
+ warp_def 2, 1, 3, 1, MT_PYRE_4F
+ warp_def 9, 10, 3, 4, MT_PYRE_4F
+ warp_def 1, 12, 3, 5, MT_PYRE_4F
+ warp_def 10, 12, 3, 2, MT_PYRE_2F
+ warp_def 6, 12, 3, 3, MT_PYRE_2F
+
+MtPyre_3F_MapEvents:: @ 8534F7C
+ map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc
new file mode 100644
index 000000000..2792fa422
--- /dev/null
+++ b/data/maps/events/MtPyre_4F.inc
@@ -0,0 +1,15 @@
+MtPyre_4F_MapObjects: @ 8534F90
+ object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0
+
+MtPyre_4F_MapWarps: @ 8534FC0
+ warp_def 10, 1, 3, 1, MT_PYRE_5F
+ warp_def 2, 5, 3, 1, MT_PYRE_3F
+ warp_def 12, 10, 3, 3, MT_PYRE_5F
+ warp_def 12, 12, 3, 4, MT_PYRE_5F
+ warp_def 9, 10, 3, 2, MT_PYRE_3F
+ warp_def 2, 12, 3, 3, MT_PYRE_3F
+
+MtPyre_4F_MapEvents:: @ 8534FF0
+ map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc
new file mode 100644
index 000000000..f92f77965
--- /dev/null
+++ b/data/maps/events/MtPyre_5F.inc
@@ -0,0 +1,14 @@
+MtPyre_5F_MapObjects: @ 8535004
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0
+
+MtPyre_5F_MapWarps: @ 8535034
+ warp_def 2, 1, 3, 0, MT_PYRE_6F
+ warp_def 10, 5, 3, 0, MT_PYRE_4F
+ warp_def 1, 10, 3, 1, MT_PYRE_6F
+ warp_def 12, 10, 3, 2, MT_PYRE_4F
+ warp_def 12, 12, 3, 3, MT_PYRE_4F
+
+MtPyre_5F_MapEvents:: @ 853505C
+ map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc
new file mode 100644
index 000000000..be6459981
--- /dev/null
+++ b/data/maps/events/MtPyre_6F.inc
@@ -0,0 +1,12 @@
+MtPyre_6F_MapObjects: @ 8535070
+ object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0
+ object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0
+
+MtPyre_6F_MapWarps: @ 85350B8
+ warp_def 2, 1, 3, 0, MT_PYRE_5F
+ warp_def 1, 10, 3, 2, MT_PYRE_5F
+
+MtPyre_6F_MapEvents:: @ 85350C8
+ map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc
new file mode 100644
index 000000000..5a6101968
--- /dev/null
+++ b/data/maps/events/MtPyre_Exterior.inc
@@ -0,0 +1,23 @@
+MtPyre_Exterior_MapObjects: @ 85350DC
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0
+
+MtPyre_Exterior_MapWarps: @ 853510C
+ warp_def 10, 42, 3, 1, MT_PYRE_1F
+ warp_def 19, 10, 3, 1, MT_PYRE_SUMMIT
+ warp_def 20, 10, 3, 1, MT_PYRE_SUMMIT
+
+MtPyre_Exterior_MapCoordEvents: @ 8535124
+ coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
+ coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
+ coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2
+ coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FF2
+ coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_231FED
+
+MtPyre_Exterior_MapBGEvents: @ 8535174
+ bg_event 9, 8, 0, 7, 0, ITEM_ULTRA_BALL, 29, 0
+ bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0
+
+MtPyre_Exterior_MapEvents:: @ 853518C
+ map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
+
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc
new file mode 100644
index 000000000..261721fb9
--- /dev/null
+++ b/data/maps/events/MtPyre_Summit.inc
@@ -0,0 +1,30 @@
+MtPyre_Summit_MapObjects: @ 85351A0
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0
+ object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0
+ object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0
+ object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0
+
+MtPyre_Summit_MapWarps: @ 8535260
+ warp_def 22, 31, 3, 1, MT_PYRE_EXTERIOR
+ warp_def 23, 31, 3, 1, MT_PYRE_EXTERIOR
+ warp_def 24, 31, 3, 1, MT_PYRE_EXTERIOR
+
+MtPyre_Summit_MapCoordEvents: @ 8535278
+ coord_event 22, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232018
+ coord_event 23, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232024
+ coord_event 24, 7, 3, 0, VAR_0x40B9, 0, 0, MtPyre_Summit_EventScript_232030
+ coord_event 22, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321EC
+ coord_event 23, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_2321F8
+ coord_event 24, 9, 3, 0, VAR_0x40B9, 2, 0, MtPyre_Summit_EventScript_232204
+
+MtPyre_Summit_MapBGEvents: @ 85352D8
+ bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0
+ bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0
+
+MtPyre_Summit_MapEvents:: @ 85352F0
+ map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
+
diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/events/NavelRock_B1F.inc
new file mode 100644
index 000000000..541b11fca
--- /dev/null
+++ b/data/maps/events/NavelRock_B1F.inc
@@ -0,0 +1,7 @@
+NavelRock_B1F_MapWarps: @ 853DA94
+ warp_def 4, 3, 3, 0, NAVEL_ROCK_ENTRANCE
+ warp_def 18, 9, 3, 1, NAVEL_ROCK_FORK
+
+NavelRock_B1F_MapEvents:: @ 853DAA4
+ map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc
new file mode 100644
index 000000000..6de1313e9
--- /dev/null
+++ b/data/maps/events/NavelRock_Bottom.inc
@@ -0,0 +1,9 @@
+NavelRock_Bottom_MapObjects: @ 853DD50
+ object_event 1, MAP_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0
+
+NavelRock_Bottom_MapWarps: @ 853DD68
+ warp_def 14, 19, 0, 0, NAVEL_ROCK_DOWN_11
+
+NavelRock_Bottom_MapEvents:: @ 853DD70
+ map_events NavelRock_Bottom_MapObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/events/NavelRock_Down01.inc
new file mode 100644
index 000000000..b644f47ad
--- /dev/null
+++ b/data/maps/events/NavelRock_Down01.inc
@@ -0,0 +1,7 @@
+NavelRock_Down01_MapWarps: @ 853DBC4
+ warp_def 3, 3, 3, 2, NAVEL_ROCK_FORK
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_02
+
+NavelRock_Down01_MapEvents:: @ 853DBD4
+ map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/events/NavelRock_Down02.inc
new file mode 100644
index 000000000..dfa088f49
--- /dev/null
+++ b/data/maps/events/NavelRock_Down02.inc
@@ -0,0 +1,7 @@
+NavelRock_Down02_MapWarps: @ 853DBE8
+ warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_01
+ warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_03
+
+NavelRock_Down02_MapEvents:: @ 853DBF8
+ map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/events/NavelRock_Down03.inc
new file mode 100644
index 000000000..723bc8934
--- /dev/null
+++ b/data/maps/events/NavelRock_Down03.inc
@@ -0,0 +1,7 @@
+NavelRock_Down03_MapWarps: @ 853DC0C
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_02
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_04
+
+NavelRock_Down03_MapEvents:: @ 853DC1C
+ map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/events/NavelRock_Down04.inc
new file mode 100644
index 000000000..9f5148611
--- /dev/null
+++ b/data/maps/events/NavelRock_Down04.inc
@@ -0,0 +1,7 @@
+NavelRock_Down04_MapWarps: @ 853DC30
+ warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_03
+ warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_05
+
+NavelRock_Down04_MapEvents:: @ 853DC40
+ map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/events/NavelRock_Down05.inc
new file mode 100644
index 000000000..df8981e2a
--- /dev/null
+++ b/data/maps/events/NavelRock_Down05.inc
@@ -0,0 +1,7 @@
+NavelRock_Down05_MapWarps: @ 853DC54
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_04
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_06
+
+NavelRock_Down05_MapEvents:: @ 853DC64
+ map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/events/NavelRock_Down06.inc
new file mode 100644
index 000000000..c32dc9500
--- /dev/null
+++ b/data/maps/events/NavelRock_Down06.inc
@@ -0,0 +1,7 @@
+NavelRock_Down06_MapWarps: @ 853DC78
+ warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_05
+ warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_07
+
+NavelRock_Down06_MapEvents:: @ 853DC88
+ map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/events/NavelRock_Down07.inc
new file mode 100644
index 000000000..35191f0ba
--- /dev/null
+++ b/data/maps/events/NavelRock_Down07.inc
@@ -0,0 +1,7 @@
+NavelRock_Down07_MapWarps: @ 853DC9C
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_06
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_08
+
+NavelRock_Down07_MapEvents:: @ 853DCAC
+ map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/events/NavelRock_Down08.inc
new file mode 100644
index 000000000..a55307cfa
--- /dev/null
+++ b/data/maps/events/NavelRock_Down08.inc
@@ -0,0 +1,7 @@
+NavelRock_Down08_MapWarps: @ 853DCC0
+ warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_07
+ warp_def 3, 3, 3, 0, NAVEL_ROCK_DOWN_09
+
+NavelRock_Down08_MapEvents:: @ 853DCD0
+ map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/events/NavelRock_Down09.inc
new file mode 100644
index 000000000..7816eb358
--- /dev/null
+++ b/data/maps/events/NavelRock_Down09.inc
@@ -0,0 +1,7 @@
+NavelRock_Down09_MapWarps: @ 853DCE4
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_08
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_DOWN_10
+
+NavelRock_Down09_MapEvents:: @ 853DCF4
+ map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/events/NavelRock_Down10.inc
new file mode 100644
index 000000000..20e7ac6cd
--- /dev/null
+++ b/data/maps/events/NavelRock_Down10.inc
@@ -0,0 +1,7 @@
+NavelRock_Down10_MapWarps: @ 853DD08
+ warp_def 5, 5, 3, 1, NAVEL_ROCK_DOWN_09
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_11
+
+NavelRock_Down10_MapEvents:: @ 853DD18
+ map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/events/NavelRock_Down11.inc
new file mode 100644
index 000000000..eea34db90
--- /dev/null
+++ b/data/maps/events/NavelRock_Down11.inc
@@ -0,0 +1,7 @@
+NavelRock_Down11_MapWarps: @ 853DD2C
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_BOTTOM
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_DOWN_10
+
+NavelRock_Down11_MapEvents:: @ 853DD3C
+ map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/events/NavelRock_Entrance.inc
new file mode 100644
index 000000000..9d470a864
--- /dev/null
+++ b/data/maps/events/NavelRock_Entrance.inc
@@ -0,0 +1,7 @@
+NavelRock_Entrance_MapWarps: @ 853DA70
+ warp_def 10, 5, 3, 0, NAVEL_ROCK_B1F
+ warp_def 10, 26, 3, 1, NAVEL_ROCK_EXTERIOR
+
+NavelRock_Entrance_MapEvents:: @ 853DA80
+ map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/events/NavelRock_Exterior.inc
new file mode 100644
index 000000000..57a6d5a6e
--- /dev/null
+++ b/data/maps/events/NavelRock_Exterior.inc
@@ -0,0 +1,7 @@
+NavelRock_Exterior_MapWarps: @ 853DA00
+ warp_def 10, 18, 0, 0, NAVEL_ROCK_HARBOR
+ warp_def 10, 10, 0, 1, NAVEL_ROCK_ENTRANCE
+
+NavelRock_Exterior_MapEvents:: @ 853DA10
+ map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/events/NavelRock_Fork.inc
new file mode 100644
index 000000000..4e3f5a801
--- /dev/null
+++ b/data/maps/events/NavelRock_Fork.inc
@@ -0,0 +1,8 @@
+NavelRock_Fork_MapWarps: @ 853DAB8
+ warp_def 4, 6, 3, 0, NAVEL_ROCK_UP_1
+ warp_def 11, 79, 3, 1, NAVEL_ROCK_B1F
+ warp_def 22, 6, 3, 0, NAVEL_ROCK_DOWN_01
+
+NavelRock_Fork_MapEvents:: @ 853DAD0
+ map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc
new file mode 100644
index 000000000..eab9c8fc6
--- /dev/null
+++ b/data/maps/events/NavelRock_Harbor.inc
@@ -0,0 +1,10 @@
+NavelRock_Harbor_MapObjects: @ 853DA24
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+NavelRock_Harbor_MapWarps: @ 853DA54
+ warp_def 8, 2, 0, 0, NAVEL_ROCK_EXTERIOR
+
+NavelRock_Harbor_MapEvents:: @ 853DA5C
+ map_events NavelRock_Harbor_MapObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc
new file mode 100644
index 000000000..6fb99be16
--- /dev/null
+++ b/data/maps/events/NavelRock_Top.inc
@@ -0,0 +1,15 @@
+NavelRock_Top_MapObjects: @ 853DB74
+ object_event 1, MAP_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0
+
+NavelRock_Top_MapWarps: @ 853DB8C
+ warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4
+
+NavelRock_Top_MapCoordEvents: @ 853DB94
+ coord_event 12, 10, 3, 0, VAR_0x4001, 0, 0, NavelRock_Top_EventScript_26916F
+
+NavelRock_Top_MapBGEvents: @ 853DBA4
+ bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0
+
+NavelRock_Top_MapEvents:: @ 853DBB0
+ map_events NavelRock_Top_MapObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents
+
diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/events/NavelRock_Up1.inc
new file mode 100644
index 000000000..292278a85
--- /dev/null
+++ b/data/maps/events/NavelRock_Up1.inc
@@ -0,0 +1,7 @@
+NavelRock_Up1_MapWarps: @ 853DAE4
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_FORK
+ warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_2
+
+NavelRock_Up1_MapEvents:: @ 853DAF4
+ map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/events/NavelRock_Up2.inc
new file mode 100644
index 000000000..55c4b4315
--- /dev/null
+++ b/data/maps/events/NavelRock_Up2.inc
@@ -0,0 +1,7 @@
+NavelRock_Up2_MapWarps: @ 853DB08
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_1
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_UP_3
+
+NavelRock_Up2_MapEvents:: @ 853DB18
+ map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/events/NavelRock_Up3.inc
new file mode 100644
index 000000000..c67cc7b17
--- /dev/null
+++ b/data/maps/events/NavelRock_Up3.inc
@@ -0,0 +1,7 @@
+NavelRock_Up3_MapWarps: @ 853DB2C
+ warp_def 5, 5, 3, 1, NAVEL_ROCK_UP_2
+ warp_def 3, 3, 3, 0, NAVEL_ROCK_UP_4
+
+NavelRock_Up3_MapEvents:: @ 853DB3C
+ map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/events/NavelRock_Up4.inc
new file mode 100644
index 000000000..c1091ae52
--- /dev/null
+++ b/data/maps/events/NavelRock_Up4.inc
@@ -0,0 +1,7 @@
+NavelRock_Up4_MapWarps: @ 853DB50
+ warp_def 3, 3, 3, 1, NAVEL_ROCK_UP_3
+ warp_def 5, 5, 3, 0, NAVEL_ROCK_TOP
+
+NavelRock_Up4_MapEvents:: @ 853DB60
+ map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc
new file mode 100644
index 000000000..876841b6d
--- /dev/null
+++ b/data/maps/events/NewMauville_Entrance.inc
@@ -0,0 +1,10 @@
+NewMauville_Entrance_MapWarps: @ 8536474
+ warp_def 4, 6, 3, 0, ROUTE_110
+ warp_def 4, 1, 3, 0, NEW_MAUVILLE_INSIDE
+
+NewMauville_Entrance_MapCoordEvents: @ 8536484
+ coord_event 4, 2, 3, 0, VAR_0x40BA, 0, 0, NewMauville_Entrance_EventScript_2372FF
+
+NewMauville_Entrance_MapEvents:: @ 8536494
+ map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
new file mode 100644
index 000000000..74255c763
--- /dev/null
+++ b/data/maps/events/NewMauville_Inside.inc
@@ -0,0 +1,38 @@
+NewMauville_Inside_MapObjects: @ 85364A8
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0
+ object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0
+
+NewMauville_Inside_MapWarps: @ 8536568
+ warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE
+
+NewMauville_Inside_MapCoordEvents: @ 8536570
+ coord_event 30, 38, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459
+ coord_event 18, 36, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471
+ coord_event 4, 26, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459
+ coord_event 16, 22, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459
+ coord_event 25, 18, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471
+ coord_event 2, 11, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471
+ coord_event 6, 11, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459
+ coord_event 13, 10, 3, 0, VAR_0x4001, 0, 0, NewMauville_Inside_EventScript_237459
+ coord_event 17, 10, 3, 0, VAR_0x4002, 0, 0, NewMauville_Inside_EventScript_237471
+ coord_event 33, 6, 3, 0, VAR_0x40BA, 1, 0, NewMauville_Inside_EventScript_237725
+
+NewMauville_Inside_MapBGEvents: @ 8536610
+ bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+ bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+ bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F
+ bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+ bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+ bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+ bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_23778F
+ bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F
+
+NewMauville_Inside_MapEvents:: @ 8536670
+ map_events NewMauville_Inside_MapObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
+
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
new file mode 100644
index 000000000..2f2929eb5
--- /dev/null
+++ b/data/maps/events/OldaleTown.inc
@@ -0,0 +1,28 @@
+OldaleTown_MapObjects: @ 8527854
+ object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0
+
+OldaleTown_MapWarps: @ 85278B4
+ warp_def 5, 7, 0, 0, OLDALE_TOWN_HOUSE_1
+ warp_def 15, 16, 0, 0, OLDALE_TOWN_HOUSE_2
+ warp_def 6, 16, 0, 0, OLDALE_TOWN_POKEMON_CENTER_1F
+ warp_def 14, 6, 0, 0, OLDALE_TOWN_MART
+
+OldaleTown_MapCoordEvents: @ 85278D4
+ coord_event 0, 10, 3, 0, VAR_0x4051, 0, 0, OldaleTown_EventScript_1E903F
+ coord_event 8, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E9086
+ coord_event 9, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90A6
+ coord_event 10, 19, 3, 0, VAR_0x40C7, 1, 0, OldaleTown_EventScript_1E90C6
+
+OldaleTown_MapBGEvents: @ 8527914
+ bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_1E8EEA
+ bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_271E73
+ bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_271E6A
+ bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_271E73
+ bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A
+
+OldaleTown_MapEvents:: @ 8527950
+ map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
+
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc
new file mode 100644
index 000000000..1a8edcbc6
--- /dev/null
+++ b/data/maps/events/OldaleTown_House1.inc
@@ -0,0 +1,10 @@
+OldaleTown_House1_MapObjects: @ 852D7B4
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0
+
+OldaleTown_House1_MapWarps: @ 852D7CC
+ warp_def 3, 8, 0, 0, OLDALE_TOWN
+ warp_def 4, 8, 0, 0, OLDALE_TOWN
+
+OldaleTown_House1_MapEvents:: @ 852D7DC
+ map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc
new file mode 100644
index 000000000..c86bc109c
--- /dev/null
+++ b/data/maps/events/OldaleTown_House2.inc
@@ -0,0 +1,11 @@
+OldaleTown_House2_MapObjects: @ 852D7F0
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0
+
+OldaleTown_House2_MapWarps: @ 852D820
+ warp_def 3, 7, 0, 1, OLDALE_TOWN
+ warp_def 4, 7, 0, 1, OLDALE_TOWN
+
+OldaleTown_House2_MapEvents:: @ 852D830
+ map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc
new file mode 100644
index 000000000..6a58118c8
--- /dev/null
+++ b/data/maps/events/OldaleTown_Mart.inc
@@ -0,0 +1,12 @@
+OldaleTown_Mart_MapObjects: @ 852D95C
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0
+
+OldaleTown_Mart_MapWarps: @ 852D9A4
+ warp_def 3, 7, 0, 3, OLDALE_TOWN
+ warp_def 4, 7, 0, 3, OLDALE_TOWN
+
+OldaleTown_Mart_MapEvents:: @ 852D9B4
+ map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
new file mode 100644
index 000000000..a6e424f27
--- /dev/null
+++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
@@ -0,0 +1,14 @@
+OldaleTown_PokemonCenter_1F_MapObjects: @ 852D844
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0
+
+OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4
+ warp_def 7, 8, 3, 2, OLDALE_TOWN
+ warp_def 6, 8, 3, 2, OLDALE_TOWN
+ warp_def 1, 6, 4, 0, OLDALE_TOWN_POKEMON_CENTER_2F
+
+OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC
+ map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
new file mode 100644
index 000000000..d520c6bcf
--- /dev/null
+++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+OldaleTown_PokemonCenter_2F_MapObjects: @ 852D8D0
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
+ warp_def 1, 6, 4, 2, OLDALE_TOWN_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948
+ map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc
new file mode 100644
index 000000000..1667ccc87
--- /dev/null
+++ b/data/maps/events/PacifidlogTown.inc
@@ -0,0 +1,21 @@
+PacifidlogTown_MapObjects: @ 8527DE8
+ object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0
+
+PacifidlogTown_MapWarps: @ 8527E30
+ warp_def 8, 15, 0, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_1F
+ warp_def 16, 13, 0, 0, PACIFIDLOG_TOWN_HOUSE_1
+ warp_def 3, 22, 0, 0, PACIFIDLOG_TOWN_HOUSE_2
+ warp_def 12, 24, 0, 0, PACIFIDLOG_TOWN_HOUSE_3
+ warp_def 2, 12, 0, 0, PACIFIDLOG_TOWN_HOUSE_4
+ warp_def 17, 21, 0, 0, PACIFIDLOG_TOWN_HOUSE_5
+
+PacifidlogTown_MapBGEvents: @ 8527E60
+ bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73
+ bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_1EBADE
+ bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73
+
+PacifidlogTown_MapEvents:: @ 8527E84
+ map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
+
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc
new file mode 100644
index 000000000..5f2c3b905
--- /dev/null
+++ b/data/maps/events/PacifidlogTown_House1.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House1_MapObjects: @ 852EBA0
+ object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0
+
+PacifidlogTown_House1_MapWarps: @ 852EBD0
+ warp_def 4, 8, 0, 1, PACIFIDLOG_TOWN
+ warp_def 5, 8, 0, 1, PACIFIDLOG_TOWN
+
+PacifidlogTown_House1_MapEvents:: @ 852EBE0
+ map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc
new file mode 100644
index 000000000..743395c72
--- /dev/null
+++ b/data/maps/events/PacifidlogTown_House2.inc
@@ -0,0 +1,12 @@
+PacifidlogTown_House2_MapObjects: @ 852EBF4
+ object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0
+
+PacifidlogTown_House2_MapWarps: @ 852EC3C
+ warp_def 4, 8, 0, 2, PACIFIDLOG_TOWN
+ warp_def 5, 8, 0, 2, PACIFIDLOG_TOWN
+
+PacifidlogTown_House2_MapEvents:: @ 852EC4C
+ map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc
new file mode 100644
index 000000000..85d7c4f53
--- /dev/null
+++ b/data/maps/events/PacifidlogTown_House3.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House3_MapObjects: @ 852EC60
+ object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0
+
+PacifidlogTown_House3_MapWarps: @ 852EC90
+ warp_def 4, 8, 0, 3, PACIFIDLOG_TOWN
+ warp_def 5, 8, 0, 3, PACIFIDLOG_TOWN
+
+PacifidlogTown_House3_MapEvents:: @ 852ECA0
+ map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc
new file mode 100644
index 000000000..b552a566c
--- /dev/null
+++ b/data/maps/events/PacifidlogTown_House4.inc
@@ -0,0 +1,12 @@
+PacifidlogTown_House4_MapObjects: @ 852ECB4
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0
+
+PacifidlogTown_House4_MapWarps: @ 852ECFC
+ warp_def 4, 8, 0, 4, PACIFIDLOG_TOWN
+ warp_def 5, 8, 0, 4, PACIFIDLOG_TOWN
+
+PacifidlogTown_House4_MapEvents:: @ 852ED0C
+ map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc
new file mode 100644
index 000000000..e078fc612
--- /dev/null
+++ b/data/maps/events/PacifidlogTown_House5.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House5_MapObjects: @ 852ED20
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0
+
+PacifidlogTown_House5_MapWarps: @ 852ED50
+ warp_def 4, 8, 0, 5, PACIFIDLOG_TOWN
+ warp_def 5, 8, 0, 5, PACIFIDLOG_TOWN
+
+PacifidlogTown_House5_MapEvents:: @ 852ED60
+ map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
new file mode 100644
index 000000000..3a28af372
--- /dev/null
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
@@ -0,0 +1,15 @@
+PacifidlogTown_PokemonCenter_1F_MapObjects: @ 852EA70
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0
+
+PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8
+ warp_def 7, 8, 3, 0, PACIFIDLOG_TOWN
+ warp_def 6, 8, 3, 0, PACIFIDLOG_TOWN
+ warp_def 1, 6, 4, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_2F
+
+PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00
+ map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
new file mode 100644
index 000000000..2ae1cc480
--- /dev/null
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_PokemonCenter_2F_MapObjects: @ 852EB14
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74
+ warp_def 1, 6, 4, 2, PACIFIDLOG_TOWN_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C
+ map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
new file mode 100644
index 000000000..ad696f7ff
--- /dev/null
+++ b/data/maps/events/PetalburgCity.inc
@@ -0,0 +1,42 @@
+PetalburgCity_MapObjects: @ 8525FD0
+ object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0
+ object_event 2, MAP_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0
+ object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0
+
+PetalburgCity_MapWarps: @ 85260A8
+ warp_def 10, 19, 0, 0, PETALBURG_CITY_HOUSE_1
+ warp_def 7, 5, 0, 0, PETALBURG_CITY_WALLYS_HOUSE
+ warp_def 15, 8, 0, 0, PETALBURG_CITY_GYM
+ warp_def 20, 16, 0, 0, PETALBURG_CITY_POKEMON_CENTER_1F
+ warp_def 20, 24, 0, 0, PETALBURG_CITY_HOUSE_2
+ warp_def 25, 12, 0, 0, PETALBURG_CITY_MART
+
+PetalburgCity_MapCoordEvents: @ 85260D8
+ coord_event 8, 10, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC49A
+ coord_event 8, 11, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4A6
+ coord_event 8, 12, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4B2
+ coord_event 8, 13, 3, 0, VAR_0x4057, 0, 0, PetalburgCity_EventScript_1DC4BE
+ coord_event 4, 10, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC691
+ coord_event 4, 11, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6A7
+ coord_event 4, 12, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6BD
+ coord_event 4, 13, 3, 0, VAR_0x40C9, 0, 0, PetalburgCity_EventScript_1DC6D3
+
+PetalburgCity_MapBGEvents: @ 8526158
+ bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_1DC476
+ bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
+ bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
+ bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_1DC47F
+ bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_271E73
+ bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_271E6A
+ bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_1DC491
+ bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0
+
+PetalburgCity_MapEvents:: @ 85261B8
+ map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
+
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc
new file mode 100644
index 000000000..2ee8771a0
--- /dev/null
+++ b/data/maps/events/PetalburgCity_Gym.inc
@@ -0,0 +1,72 @@
+PetalburgCity_Gym_MapObjects: @ 852EDC8
+ object_event 1, MAP_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0
+ object_event 10, MAP_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0
+ object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0
+
+PetalburgCity_Gym_MapWarps: @ 852EED0
+ warp_def 4, 111, 3, 2, PETALBURG_CITY
+ warp_def 5, 111, 3, 2, PETALBURG_CITY
+ warp_def 1, 105, 3, 3, PETALBURG_CITY_GYM
+ warp_def 7, 85, 3, 2, PETALBURG_CITY_GYM
+ warp_def 6, 85, 3, 2, PETALBURG_CITY_GYM
+ warp_def 7, 105, 3, 6, PETALBURG_CITY_GYM
+ warp_def 1, 98, 3, 5, PETALBURG_CITY_GYM
+ warp_def 2, 98, 3, 5, PETALBURG_CITY_GYM
+ warp_def 1, 79, 3, 10, PETALBURG_CITY_GYM
+ warp_def 7, 79, 3, 12, PETALBURG_CITY_GYM
+ warp_def 7, 46, 3, 8, PETALBURG_CITY_GYM
+ warp_def 6, 46, 3, 8, PETALBURG_CITY_GYM
+ warp_def 1, 59, 3, 9, PETALBURG_CITY_GYM
+ warp_def 2, 59, 3, 9, PETALBURG_CITY_GYM
+ warp_def 1, 92, 3, 16, PETALBURG_CITY_GYM
+ warp_def 7, 92, 3, 18, PETALBURG_CITY_GYM
+ warp_def 7, 59, 3, 14, PETALBURG_CITY_GYM
+ warp_def 6, 59, 3, 14, PETALBURG_CITY_GYM
+ warp_def 1, 72, 3, 15, PETALBURG_CITY_GYM
+ warp_def 2, 72, 3, 15, PETALBURG_CITY_GYM
+ warp_def 7, 40, 3, 24, PETALBURG_CITY_GYM
+ warp_def 1, 53, 3, 26, PETALBURG_CITY_GYM
+ warp_def 7, 53, 3, 28, PETALBURG_CITY_GYM
+ warp_def 1, 66, 3, 30, PETALBURG_CITY_GYM
+ warp_def 1, 20, 3, 20, PETALBURG_CITY_GYM
+ warp_def 2, 20, 3, 20, PETALBURG_CITY_GYM
+ warp_def 7, 20, 3, 21, PETALBURG_CITY_GYM
+ warp_def 6, 20, 3, 21, PETALBURG_CITY_GYM
+ warp_def 1, 33, 3, 22, PETALBURG_CITY_GYM
+ warp_def 2, 33, 3, 22, PETALBURG_CITY_GYM
+ warp_def 7, 33, 3, 23, PETALBURG_CITY_GYM
+ warp_def 6, 33, 3, 23, PETALBURG_CITY_GYM
+ warp_def 7, 14, 3, 34, PETALBURG_CITY_GYM
+ warp_def 1, 27, 3, 36, PETALBURG_CITY_GYM
+ warp_def 1, 7, 3, 32, PETALBURG_CITY_GYM
+ warp_def 2, 7, 3, 32, PETALBURG_CITY_GYM
+ warp_def 7, 7, 3, 33, PETALBURG_CITY_GYM
+ warp_def 6, 7, 3, 33, PETALBURG_CITY_GYM
+
+PetalburgCity_Gym_MapBGEvents: @ 852F000
+ bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205137
+ bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_205187
+ bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051BC
+ bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_2051EF
+ bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205222
+ bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_205255
+ bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_205288
+ bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052BB
+ bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_2052EE
+ bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_205321
+ bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_205354
+ bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_205387
+ bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20576E
+ bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E
+
+PetalburgCity_Gym_MapEvents:: @ 852F0A8
+ map_events PetalburgCity_Gym_MapObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
+
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc
new file mode 100644
index 000000000..59ffd7eca
--- /dev/null
+++ b/data/maps/events/PetalburgCity_House1.inc
@@ -0,0 +1,11 @@
+PetalburgCity_House1_MapObjects: @ 852F0BC
+ object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0
+
+PetalburgCity_House1_MapWarps: @ 852F0EC
+ warp_def 3, 8, 0, 0, PETALBURG_CITY
+ warp_def 4, 8, 0, 0, PETALBURG_CITY
+
+PetalburgCity_House1_MapEvents:: @ 852F0FC
+ map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc
new file mode 100644
index 000000000..14ca86ab8
--- /dev/null
+++ b/data/maps/events/PetalburgCity_House2.inc
@@ -0,0 +1,11 @@
+PetalburgCity_House2_MapObjects: @ 852F110
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0
+
+PetalburgCity_House2_MapWarps: @ 852F140
+ warp_def 3, 7, 0, 4, PETALBURG_CITY
+ warp_def 4, 7, 0, 4, PETALBURG_CITY
+
+PetalburgCity_House2_MapEvents:: @ 852F150
+ map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc
new file mode 100644
index 000000000..e5f1a1d3d
--- /dev/null
+++ b/data/maps/events/PetalburgCity_Mart.inc
@@ -0,0 +1,13 @@
+PetalburgCity_Mart_MapObjects: @ 852F294
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0
+
+PetalburgCity_Mart_MapWarps: @ 852F2F4
+ warp_def 3, 7, 0, 5, PETALBURG_CITY
+ warp_def 4, 7, 0, 5, PETALBURG_CITY
+
+PetalburgCity_Mart_MapEvents:: @ 852F304
+ map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..3395f43b4
--- /dev/null
+++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
@@ -0,0 +1,15 @@
+PetalburgCity_PokemonCenter_1F_MapObjects: @ 852F164
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0
+
+PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC
+ warp_def 7, 8, 3, 3, PETALBURG_CITY
+ warp_def 6, 8, 3, 3, PETALBURG_CITY
+ warp_def 1, 6, 4, 0, PETALBURG_CITY_POKEMON_CENTER_2F
+
+PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4
+ map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..5506670c5
--- /dev/null
+++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+PetalburgCity_PokemonCenter_2F_MapObjects: @ 852F208
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268
+ warp_def 1, 6, 4, 2, PETALBURG_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280
+ map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc
new file mode 100644
index 000000000..df04a0695
--- /dev/null
+++ b/data/maps/events/PetalburgCity_WallysHouse.inc
@@ -0,0 +1,11 @@
+PetalburgCity_WallysHouse_MapObjects: @ 852ED74
+ object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0
+
+PetalburgCity_WallysHouse_MapWarps: @ 852EDA4
+ warp_def 3, 7, 0, 1, PETALBURG_CITY
+ warp_def 4, 7, 0, 1, PETALBURG_CITY
+
+PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4
+ map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
new file mode 100644
index 000000000..5d6c10149
--- /dev/null
+++ b/data/maps/events/PetalburgWoods.inc
@@ -0,0 +1,38 @@
+PetalburgWoods_MapObjects: @ 85345E4
+ object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0
+ object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0
+ object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0
+ object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0
+ object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0
+
+PetalburgWoods_MapWarps: @ 853471C
+ warp_def 14, 5, 0, 2, ROUTE_104
+ warp_def 15, 5, 0, 3, ROUTE_104
+ warp_def 16, 38, 0, 4, ROUTE_104
+ warp_def 17, 38, 0, 5, ROUTE_104
+ warp_def 36, 38, 0, 6, ROUTE_104
+ warp_def 37, 38, 0, 7, ROUTE_104
+
+PetalburgWoods_MapCoordEvents: @ 853474C
+ coord_event 26, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22DFD7
+ coord_event 27, 23, 3, 0, VAR_0x4098, 0, 0, PetalburgWoods_EventScript_22E079
+
+PetalburgWoods_MapBGEvents: @ 853476C
+ bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_22E25B
+ bg_event 39, 35, 3, 7, 0, ITEM_POTION, 58, 0
+ bg_event 26, 6, 3, 7, 0, ITEM_TINY_MUSHROOM, 59, 0
+ bg_event 40, 29, 3, 7, 0, ITEM_TINY_MUSHROOM, 60, 0
+ bg_event 4, 19, 3, 7, 0, ITEM_POKE_BALL, 61, 0
+ bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264
+
+PetalburgWoods_MapEvents:: @ 85347B4
+ map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
+
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc
new file mode 100644
index 000000000..67c2c56da
--- /dev/null
+++ b/data/maps/events/RecordCorner.inc
@@ -0,0 +1,18 @@
+RecordCorner_MapObjects: @ 8539DFC
+ object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0
+
+RecordCorner_MapWarps: @ 8539E14
+ warp_def 8, 9, 3, 127, NONE
+ warp_def 9, 9, 3, 127, NONE
+ warp_def 11, 9, 3, 127, NONE
+ warp_def 10, 9, 3, 127, NONE
+
+RecordCorner_MapCoordEvents: @ 8539E34
+ coord_event 6, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_0827741D
+ coord_event 6, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277447
+ coord_event 13, 4, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277432
+ coord_event 13, 6, 3, 0, VAR_0x4000, 0, 0, gUnknown_0827745C
+
+RecordCorner_MapEvents:: @ 8539E74
+ map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
new file mode 100644
index 000000000..aa8389e29
--- /dev/null
+++ b/data/maps/events/Route101.inc
@@ -0,0 +1,25 @@
+Route101_MapObjects: @ 8527E98
+ object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0
+ object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0
+ object_event 4, MAP_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0
+ object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0
+ object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0
+
+Route101_MapCoordEvents: @ 8527F28
+ coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
+ coord_event 11, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
+ coord_event 10, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
+ coord_event 11, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
+ coord_event 6, 16, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+ coord_event 6, 15, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+ coord_event 6, 17, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+ coord_event 6, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+ coord_event 7, 13, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD7A
+
+Route101_MapBGEvents: @ 8527FB8
+ bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D
+
+Route101_MapEvents:: @ 8527FC4
+ map_events Route101_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
+
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
new file mode 100644
index 000000000..e128d9652
--- /dev/null
+++ b/data/maps/events/Route102.inc
@@ -0,0 +1,18 @@
+Route102_MapObjects: @ 8527FD8
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0
+ object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0
+
+Route102_MapBGEvents: @ 85280B0
+ bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3
+ bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA
+
+Route102_MapEvents:: @ 85280C8
+ map_events Route102_MapObjects, 0x0, 0x0, Route102_MapBGEvents
+
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
new file mode 100644
index 000000000..0b1bae04a
--- /dev/null
+++ b/data/maps/events/Route103.inc
@@ -0,0 +1,31 @@
+Route103_MapObjects: @ 85280DC
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0
+ object_event 12, MAP_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0
+ object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0
+ object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0
+ object_event 16, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0
+
+Route103_MapWarps: @ 85282BC
+ warp_def 45, 6, 0, 0, ALTERING_CAVE
+
+Route103_MapBGEvents: @ 85282C4
+ bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB
+
+Route103_MapEvents:: @ 85282D0
+ map_events Route103_MapObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
+
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
new file mode 100644
index 000000000..2913f96c4
--- /dev/null
+++ b/data/maps/events/Route104.inc
@@ -0,0 +1,64 @@
+Route104_MapObjects: @ 85282E4
+ object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0
+ object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0
+ object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0
+ object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0
+ object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0
+ object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0
+ object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0
+ object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0
+ object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0
+ object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0
+ object_event 32, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0
+ object_event 33, MAP_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0
+ object_event 34, MAP_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0
+
+Route104_MapWarps: @ 8528614
+ warp_def 17, 50, 0, 0, ROUTE_104_MR_BRINEYS_HOUSE
+ warp_def 5, 18, 0, 0, ROUTE_104_PRETTY_PETAL_FLOWER_SHOP
+ warp_def 10, 30, 3, 0, PETALBURG_WOODS
+ warp_def 11, 30, 3, 1, PETALBURG_WOODS
+ warp_def 10, 38, 3, 2, PETALBURG_WOODS
+ warp_def 11, 38, 3, 3, PETALBURG_WOODS
+ warp_def 32, 42, 3, 4, PETALBURG_WOODS
+ warp_def 33, 42, 3, 5, PETALBURG_WOODS
+
+Route104_MapCoordEvents: @ 8528654
+ coord_event 17, 51, 3, 0, VAR_0x4063, 1, 0, Route104_EventScript_1ECCB3
+
+Route104_MapBGEvents: @ 8528664
+ bg_event 20, 50, 0, 0, 0, Route104_EventScript_1ED018
+ bg_event 27, 66, 0, 0, 0, Route104_EventScript_1ED021
+ bg_event 23, 5, 0, 0, 0, Route104_EventScript_1ED02A
+ bg_event 7, 20, 0, 0, 0, Route104_EventScript_1ED033
+ bg_event 17, 23, 3, 0, 0, Route104_EventScript_1ED03C
+ bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0
+ bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0
+ bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0
+ bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0
+ bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0
+
+Route104_MapEvents:: @ 85286DC
+ map_events Route104_MapObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents
+
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc
new file mode 100644
index 000000000..c643b364b
--- /dev/null
+++ b/data/maps/events/Route104_MrBrineysHouse.inc
@@ -0,0 +1,11 @@
+Route104_MrBrineysHouse_MapObjects: @ 8533AD4
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0
+ object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0
+
+Route104_MrBrineysHouse_MapWarps: @ 8533B04
+ warp_def 5, 8, 0, 0, ROUTE_104
+ warp_def 6, 8, 0, 0, ROUTE_104
+
+Route104_MrBrineysHouse_MapEvents:: @ 8533B14
+ map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
new file mode 100644
index 000000000..08f2390c0
--- /dev/null
+++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
@@ -0,0 +1,12 @@
+Route104_PrettyPetalFlowerShop_MapObjects: @ 8533B28
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0
+
+Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70
+ warp_def 2, 8, 0, 1, ROUTE_104
+ warp_def 3, 8, 0, 1, ROUTE_104
+
+Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80
+ map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc
new file mode 100644
index 000000000..08976e5a8
--- /dev/null
+++ b/data/maps/events/Route104_Prototype.inc
@@ -0,0 +1,3 @@
+Route104_Prototype_MapEvents:: @ 853DDC0
+ map_events 0x0, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
new file mode 100644
index 000000000..e66b3c841
--- /dev/null
+++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
@@ -0,0 +1,3 @@
+Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 853DDD4
+ map_events 0x0, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc
new file mode 100644
index 000000000..c27cff262
--- /dev/null
+++ b/data/maps/events/Route105.inc
@@ -0,0 +1,20 @@
+Route105_MapObjects: @ 85286F0
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0
+ object_event 6, MAP_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0
+
+Route105_MapWarps: @ 85287B0
+ warp_def 9, 20, 0, 0, ISLAND_CAVE
+
+Route105_MapBGEvents: @ 85287B8
+ bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0
+ bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0
+
+Route105_MapEvents:: @ 85287D0
+ map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
+
diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc
new file mode 100644
index 000000000..ee4beeddd
--- /dev/null
+++ b/data/maps/events/Route106.inc
@@ -0,0 +1,19 @@
+Route106_MapObjects: @ 85287E4
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0
+
+Route106_MapWarps: @ 852885C
+ warp_def 48, 16, 0, 0, GRANITE_CAVE_1F
+
+Route106_MapBGEvents: @ 8528864
+ bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0
+ bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0
+ bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0
+ bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A
+
+Route106_MapEvents:: @ 8528894
+ map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
+
diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc
new file mode 100644
index 000000000..8498a0f42
--- /dev/null
+++ b/data/maps/events/Route107.inc
@@ -0,0 +1,12 @@
+Route107_MapObjects: @ 85288A8
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0
+
+Route107_MapEvents:: @ 8528950
+ map_events Route107_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc
new file mode 100644
index 000000000..340a3bd3f
--- /dev/null
+++ b/data/maps/events/Route108.inc
@@ -0,0 +1,18 @@
+Route108_MapObjects: @ 8528964
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0
+
+Route108_MapWarps: @ 8528A0C
+ warp_def 29, 6, 3, 0, ABANDONED_SHIP_DECK
+
+Route108_MapBGEvents: @ 8528A14
+ bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0
+
+Route108_MapEvents:: @ 8528A20
+ map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
+
diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc
new file mode 100644
index 000000000..aab8c40c0
--- /dev/null
+++ b/data/maps/events/Route109.inc
@@ -0,0 +1,42 @@
+Route109_MapObjects: @ 8528A34
+ object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0
+ object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0
+ object_event 24, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0
+
+Route109_MapWarps: @ 8528C74
+ warp_def 12, 5, 0, 0, ROUTE_109_SEASHORE_HOUSE
+
+Route109_MapBGEvents: @ 8528C7C
+ bg_event 15, 5, 0, 0, 0, Route109_EventScript_1EEA2B
+ bg_event 29, 10, 3, 0, 0, Route109_EventScript_1EEA34
+ bg_event 16, 23, 3, 7, 0, ITEM_REVIVE, 50, 0
+ bg_event 33, 5, 3, 7, 0, ITEM_HEART_SCALE, 52, 0
+ bg_event 9, 10, 3, 7, 0, ITEM_GREAT_BALL, 51, 0
+ bg_event 28, 20, 3, 7, 0, ITEM_ETHER, 64, 0
+ bg_event 13, 16, 3, 7, 0, ITEM_HEART_SCALE, 90, 0
+ bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0
+
+Route109_MapEvents:: @ 8528CDC
+ map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
+
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc
new file mode 100644
index 000000000..1e2332451
--- /dev/null
+++ b/data/maps/events/Route109_SeashoreHouse.inc
@@ -0,0 +1,13 @@
+Route109_SeashoreHouse_MapObjects: @ 853DDE8
+ object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0
+
+Route109_SeashoreHouse_MapWarps: @ 853DE48
+ warp_def 6, 9, 0, 0, ROUTE_109
+ warp_def 7, 9, 0, 0, ROUTE_109
+
+Route109_SeashoreHouse_MapEvents:: @ 853DE58
+ map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
new file mode 100644
index 000000000..2b8e1571d
--- /dev/null
+++ b/data/maps/events/Route110.inc
@@ -0,0 +1,79 @@
+Route110_MapObjects: @ 8528CF0
+ object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0
+ object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0
+ object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0
+ object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0
+ object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0
+ object_event 25, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0
+ object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0
+ object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0
+ object_event 29, MAP_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0
+ object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0
+ object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0
+ object_event 32, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0
+ object_event 33, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0
+ object_event 34, MAP_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0
+ object_event 35, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0
+ object_event 36, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0
+
+Route110_MapWarps: @ 8529050
+ warp_def 35, 24, 3, 0, NEW_MAUVILLE_ENTRANCE
+ warp_def 11, 66, 0, 0, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 15, 16, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2
+ warp_def 18, 16, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2
+ warp_def 16, 88, 0, 0, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1
+ warp_def 19, 88, 0, 2, ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1
+
+Route110_MapCoordEvents: @ 8529080
+ coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
+ coord_event 29, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661
+ coord_event 33, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF74D
+ coord_event 34, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF758
+ coord_event 35, 56, 3, 0, VAR_0x4069, 0, 0, Route110_EventScript_1EF763
+ coord_event 7, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9CB
+ coord_event 8, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9D6
+ coord_event 9, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9E1
+ coord_event 10, 85, 3, 0, VAR_0x40DA, 1, 0, Route110_EventScript_1EF9EC
+
+Route110_MapBGEvents: @ 8529110
+ bg_event 15, 25, 0, 0, 0, Route110_EventScript_1EF353
+ bg_event 9, 51, 0, 0, 0, Route110_EventScript_1EF365
+ bg_event 14, 88, 0, 0, 0, Route110_EventScript_1EF34A
+ bg_event 20, 94, 0, 0, 0, Route110_EventScript_1EF341
+ bg_event 7, 79, 0, 0, 0, Route110_EventScript_1EF35C
+ bg_event 3, 17, 0, 0, 0, Route110_EventScript_1EF36E
+ bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0
+ bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0
+ bg_event 33, 39, 3, 0, 0, Route110_EventScript_1EF377
+ bg_event 37, 70, 3, 0, 0, Route110_EventScript_1EF380
+ bg_event 8, 67, 0, 0, 0, Route110_EventScript_1EF389
+ bg_event 32, 93, 0, 0, 0, Route110_EventScript_1EF392
+ bg_event 35, 39, 3, 7, 0, ITEM_REVIVE, 54, 0
+ bg_event 33, 45, 3, 7, 0, ITEM_GREAT_BALL, 53, 0
+ bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0
+ bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0
+ bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A
+
+Route110_MapEvents:: @ 85291DC
+ map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
+
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
new file mode 100644
index 000000000..ec107e176
--- /dev/null
+++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
@@ -0,0 +1,16 @@
+Route110_SeasideCyclingRoadEntrance1_MapObjects: @ 853E9A0
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0
+
+Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8
+ warp_def 1, 5, 0, 4, ROUTE_110
+ warp_def 2, 5, 0, 4, ROUTE_110
+ warp_def 12, 5, 0, 5, ROUTE_110
+ warp_def 13, 5, 0, 5, ROUTE_110
+
+Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8
+ coord_event 7, 4, 3, 0, VAR_0x4001, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84
+ coord_event 5, 4, 3, 0, VAR_0x4001, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6
+
+Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8
+ map_events Route110_SeasideCyclingRoadEntrance1_MapObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
new file mode 100644
index 000000000..23b8f7253
--- /dev/null
+++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
@@ -0,0 +1,16 @@
+Route110_SeasideCyclingRoadEntrance2_MapObjects: @ 853EA0C
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0
+
+Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24
+ warp_def 1, 5, 0, 2, ROUTE_110
+ warp_def 2, 5, 0, 2, ROUTE_110
+ warp_def 12, 5, 0, 3, ROUTE_110
+ warp_def 13, 5, 0, 3, ROUTE_110
+
+Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44
+ coord_event 7, 4, 3, 0, VAR_0x4001, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0
+ coord_event 5, 4, 3, 0, VAR_0x4001, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13
+
+Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64
+ map_events Route110_SeasideCyclingRoadEntrance2_MapObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc
new file mode 100644
index 000000000..eaef9c9a2
--- /dev/null
+++ b/data/maps/events/Route110_TrickHouseCorridor.inc
@@ -0,0 +1,9 @@
+Route110_TrickHouseCorridor_MapWarps: @ 853DF54
+ warp_def 13, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END
+ warp_def 14, 3, 3, 1, ROUTE_110_TRICK_HOUSE_END
+ warp_def 4, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 5, 23, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+
+Route110_TrickHouseCorridor_MapEvents:: @ 853DF74
+ map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc
new file mode 100644
index 000000000..42ff2196c
--- /dev/null
+++ b/data/maps/events/Route110_TrickHouseEnd.inc
@@ -0,0 +1,16 @@
+Route110_TrickHouseEnd_MapObjects: @ 853DEFC
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0
+
+Route110_TrickHouseEnd_MapWarps: @ 853DF14
+ warp_def 10, 1, 3, 2, ROUTE_110_TRICK_HOUSE_PUZZLE_1
+ warp_def 2, 1, 3, 0, ROUTE_110_TRICK_HOUSE_CORRIDOR
+
+Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24
+ coord_event 2, 2, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_26B041
+
+Route110_TrickHouseEnd_MapBGEvents: @ 853DF34
+ bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0
+
+Route110_TrickHouseEnd_MapEvents:: @ 853DF40
+ map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc
new file mode 100644
index 000000000..a87df306b
--- /dev/null
+++ b/data/maps/events/Route110_TrickHouseEntrance.inc
@@ -0,0 +1,20 @@
+Route110_TrickHouseEntrance_MapObjects: @ 853DE6C
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0
+
+Route110_TrickHouseEntrance_MapWarps: @ 853DE84
+ warp_def 5, 7, 3, 1, ROUTE_110
+ warp_def 6, 7, 3, 1, ROUTE_110
+ warp_def 5, 2, 3, 0, ROUTE_110_TRICK_HOUSE_PUZZLE_1
+
+Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C
+ coord_event 4, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+ coord_event 5, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+ coord_event 6, 6, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+ coord_event 7, 7, 3, 0, VAR_0x40A5, 0, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+
+Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC
+ bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3
+
+Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8
+ map_events Route110_TrickHouseEntrance_MapObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc
new file mode 100644
index 000000000..002ad0532
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle1.inc
@@ -0,0 +1,28 @@
+Route110_TrickHousePuzzle1_MapObjects: @ 853DF88
+ object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0
+ object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0
+ object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0
+ object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0
+ object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0
+ object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0
+ object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0
+ object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0
+ object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0
+ object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0
+ object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0
+ object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0
+
+Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108
+ bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B
+
+Route110_TrickHousePuzzle1_MapEvents:: @ 853E114
+ map_events Route110_TrickHousePuzzle1_MapObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc
new file mode 100644
index 000000000..007be3861
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle2.inc
@@ -0,0 +1,24 @@
+Route110_TrickHousePuzzle2_MapObjects: @ 853E128
+ object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0
+
+Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8
+ coord_event 11, 12, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD
+ coord_event 0, 4, 0, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0
+ coord_event 14, 5, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC03
+ coord_event 7, 11, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BC16
+
+Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8
+ bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0
+
+Route110_TrickHousePuzzle2_MapEvents:: @ 853E204
+ map_events Route110_TrickHousePuzzle2_MapObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc
new file mode 100644
index 000000000..88aedca9f
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle3.inc
@@ -0,0 +1,26 @@
+Route110_TrickHousePuzzle3_MapObjects: @ 853E218
+ object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0
+ object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0
+ object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0
+
+Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8
+ coord_event 4, 14, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD
+ coord_event 3, 11, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9
+ coord_event 12, 5, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5
+ coord_event 8, 2, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1
+
+Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318
+ bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7
+
+Route110_TrickHousePuzzle3_MapEvents:: @ 853E324
+ map_events Route110_TrickHousePuzzle3_MapObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc
new file mode 100644
index 000000000..79731353c
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle4.inc
@@ -0,0 +1,27 @@
+Route110_TrickHousePuzzle4_MapObjects: @ 853E338
+ object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0
+ object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0
+ object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0
+ object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0
+ object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0
+ object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0
+ object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0
+ object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0
+ object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0
+ object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0
+ object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0
+
+Route110_TrickHousePuzzle4_MapWarps: @ 853E488
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0
+ bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861
+
+Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC
+ map_events Route110_TrickHousePuzzle4_MapObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc
new file mode 100644
index 000000000..7d15de921
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle5.inc
@@ -0,0 +1,42 @@
+Route110_TrickHousePuzzle5_MapObjects: @ 853E4C0
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0
+
+Route110_TrickHousePuzzle5_MapWarps: @ 853E538
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550
+ coord_event 5, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7
+ coord_event 4, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3
+ coord_event 3, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF
+ coord_event 2, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB
+ coord_event 1, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC13
+ coord_event 2, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F
+ coord_event 13, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B
+ coord_event 12, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC67
+ coord_event 11, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC73
+ coord_event 13, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC97
+ coord_event 12, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3
+ coord_event 11, 4, 3, 0, VAR_0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF
+ coord_event 1, 17, 3, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC07
+ coord_event 3, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B
+ coord_event 4, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC37
+ coord_event 5, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC43
+ coord_event 6, 7, 3, 0, VAR_0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F
+ coord_event 10, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F
+ coord_event 9, 10, 3, 0, VAR_0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B
+ coord_event 11, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF
+ coord_event 10, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB
+ coord_event 9, 19, 3, 0, VAR_0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7
+
+Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0
+ bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15
+
+Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC
+ map_events Route110_TrickHousePuzzle5_MapObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc
new file mode 100644
index 000000000..d08169a76
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle6.inc
@@ -0,0 +1,17 @@
+Route110_TrickHousePuzzle6_MapObjects: @ 853E6D0
+ object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0
+
+Route110_TrickHousePuzzle6_MapWarps: @ 853E730
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748
+ bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4
+
+Route110_TrickHousePuzzle6_MapEvents:: @ 853E754
+ map_events Route110_TrickHousePuzzle6_MapObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc
new file mode 100644
index 000000000..49003a63e
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle7.inc
@@ -0,0 +1,38 @@
+Route110_TrickHousePuzzle7_MapObjects: @ 853E768
+ object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0
+ object_event 5, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+Route110_TrickHousePuzzle7_MapWarps: @ 853E840
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 3, 0, ROUTE_110_TRICK_HOUSE_END
+ warp_def 13, 4, 0, 4, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 7, 3, 0, 3, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 13, 11, 0, 6, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 4, 3, 0, 5, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 1, 17, 0, 8, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 0, 11, 0, 7, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 2, 3, 0, 10, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 4, 13, 0, 9, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 1, 3, 0, 12, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+ warp_def 8, 12, 0, 11, ROUTE_110_TRICK_HOUSE_PUZZLE_7
+
+Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8
+ coord_event 8, 19, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E31B
+ coord_event 0, 14, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E331
+ coord_event 6, 6, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E347
+ coord_event 9, 7, 0, 0, VAR_0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E35D
+
+Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8
+ bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0
+
+Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4
+ map_events Route110_TrickHousePuzzle7_MapObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
+
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc
new file mode 100644
index 000000000..5d942affa
--- /dev/null
+++ b/data/maps/events/Route110_TrickHousePuzzle8.inc
@@ -0,0 +1,17 @@
+Route110_TrickHousePuzzle8_MapObjects: @ 853E908
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0
+
+Route110_TrickHousePuzzle8_MapWarps: @ 853E968
+ warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 1, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE
+ warp_def 13, 1, 0, 0, ROUTE_110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980
+ bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802
+
+Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C
+ map_events Route110_TrickHousePuzzle8_MapObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
+
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
new file mode 100644
index 000000000..564b94797
--- /dev/null
+++ b/data/maps/events/Route111.inc
@@ -0,0 +1,114 @@
+Route111_MapObjects: @ 85291F0
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0
+ object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0
+ object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0
+ object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0
+ object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0
+ object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0
+ object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0
+ object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0
+ object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0
+ object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0
+ object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0
+ object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0
+ object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0
+ object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0
+ object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0
+ object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0
+ object_event 29, MAP_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0
+ object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0
+ object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0
+ object_event 32, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0
+ object_event 33, MAP_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0
+ object_event 34, MAP_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0
+ object_event 35, MAP_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0
+ object_event 36, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0
+ object_event 37, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0
+ object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0
+ object_event 39, MAP_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0
+ object_event 40, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0
+ object_event 41, MAP_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0
+ object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0
+ object_event 43, MAP_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0
+ object_event 44, MAP_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0
+ object_event 45, MAP_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0
+ object_event 46, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0
+
+Route111_MapWarps: @ 8529640
+ warp_def 13, 113, 0, 0, ROUTE_111_WINSTRATE_FAMILYS_HOUSE
+ warp_def 29, 87, 0, 0, DESERT_RUINS
+ warp_def 26, 18, 0, 0, ROUTE_111_OLD_LADYS_REST_STOP
+ warp_def 19, 58, 0, 0, MIRAGE_TOWER_1F
+ warp_def 31, 113, 0, 0, TRAINER_HILL_ENTRANCE
+
+Route111_MapCoordEvents: @ 8529668
+ coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 11, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A
+ coord_event 12, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A
+ coord_event 13, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A
+ coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 12, 44, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16
+ coord_event 13, 43, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16
+ coord_event 14, 42, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16
+ coord_event 16, 40, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16
+ coord_event 14, 61, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F0A
+ coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 17, 39, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16
+ coord_event 18, 38, 3, 0, VAR_0x4003, 0, 0, Route111_EventScript_1F0F16
+ coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1F0FB0
+ coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+ coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1F0FBD
+
+Route111_MapBGEvents: @ 8529888
+ bg_event 16, 114, 0, 0, 0, Route111_EventScript_1F115C
+ bg_event 24, 126, 0, 0, 0, Route111_EventScript_1F1153
+ bg_event 7, 66, 0, 0, 0, Route111_EventScript_1F1165
+ bg_event 13, 6, 0, 0, 0, Route111_EventScript_1F116E
+ bg_event 24, 36, 0, 8, 0, ITEM_FAB_MAIL, 0, 0
+ bg_event 34, 50, 0, 8, 0, ITEM_LUM_BERRY, 0, 0
+ bg_event 33, 34, 0, 8, 0, ITEM_ORANGE_MAIL, 0, 0
+ bg_event 25, 19, 0, 0, 0, Route111_EventScript_1F1177
+ bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0
+ bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0
+ bg_event 26, 70, 0, 7, 0, ITEM_STARDUST, 2, 0
+ bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0
+ bg_event 7, 84, 3, 0, 0, Route111_EventScript_1F1180
+ bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0
+ bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0
+ bg_event 19, 55, 0, 7, 0, ITEM_PROTEIN, 56, 0
+ bg_event 35, 66, 0, 7, 0, ITEM_RARE_CANDY, 57, 0
+ bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C
+
+Route111_MapEvents:: @ 8529960
+ map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
+
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc
new file mode 100644
index 000000000..05510b62d
--- /dev/null
+++ b/data/maps/events/Route111_OldLadysRestStop.inc
@@ -0,0 +1,10 @@
+Route111_OldLadysRestStop_MapObjects: @ 8533C18
+ object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0
+
+Route111_OldLadysRestStop_MapWarps: @ 8533C30
+ warp_def 3, 7, 0, 2, ROUTE_111
+ warp_def 4, 7, 0, 2, ROUTE_111
+
+Route111_OldLadysRestStop_MapEvents:: @ 8533C40
+ map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc
new file mode 100644
index 000000000..402b6e180
--- /dev/null
+++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc
@@ -0,0 +1,13 @@
+Route111_WinstrateFamilysHouse_MapObjects: @ 8533B94
+ object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0
+
+Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4
+ warp_def 3, 7, 0, 0, ROUTE_111
+ warp_def 4, 7, 0, 0, ROUTE_111
+
+Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04
+ map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
new file mode 100644
index 000000000..56bd16935
--- /dev/null
+++ b/data/maps/events/Route112.inc
@@ -0,0 +1,32 @@
+Route112_MapObjects: @ 8529974
+ object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
+ object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0
+ object_event 13, MAP_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0
+
+Route112_MapWarps: @ 8529AC4
+ warp_def 28, 27, 0, 0, ROUTE_112_CABLE_CAR_STATION
+ warp_def 29, 27, 0, 1, ROUTE_112_CABLE_CAR_STATION
+ warp_def 6, 46, 3, 0, JAGGED_PASS
+ warp_def 7, 46, 3, 1, JAGGED_PASS
+ warp_def 11, 36, 0, 0, FIERY_PATH
+ warp_def 22, 10, 0, 1, FIERY_PATH
+
+Route112_MapBGEvents: @ 8529AF4
+ bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F
+ bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46
+ bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58
+
+Route112_MapEvents:: @ 8529B18
+ map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
+
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc
new file mode 100644
index 000000000..e1f001aad
--- /dev/null
+++ b/data/maps/events/Route112_CableCarStation.inc
@@ -0,0 +1,11 @@
+Route112_CableCarStation_MapObjects: @ 8533C54
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+Route112_CableCarStation_MapWarps: @ 8533C84
+ warp_def 6, 11, 0, 0, ROUTE_112
+ warp_def 7, 11, 0, 1, ROUTE_112
+
+Route112_CableCarStation_MapEvents:: @ 8533C94
+ map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
new file mode 100644
index 000000000..f1d07a671
--- /dev/null
+++ b/data/maps/events/Route113.inc
@@ -0,0 +1,57 @@
+Route113_MapObjects: @ 8529B2C
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0
+ object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0
+ object_event 13, MAP_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0
+
+Route113_MapWarps: @ 8529CAC
+ warp_def 33, 5, 0, 0, ROUTE_113_GLASS_WORKSHOP
+ warp_def 41, 12, 0, 0, TERRA_CAVE_ENTRANCE
+ warp_def 88, 5, 0, 0, TERRA_CAVE_ENTRANCE
+
+Route113_MapCoordEvents: @ 8529CC4
+ coord_event 19, 11, 3, 0, 8, 0, 0, 0x0
+ coord_event 19, 10, 3, 0, 8, 0, 0, 0x0
+ coord_event 19, 12, 3, 0, 8, 0, 0, 0x0
+ coord_event 19, 13, 3, 0, 8, 0, 0, 0x0
+ coord_event 86, 9, 3, 0, 8, 0, 0, 0x0
+ coord_event 85, 10, 3, 0, 8, 0, 0, 0x0
+ coord_event 85, 11, 3, 0, 8, 0, 0, 0x0
+ coord_event 14, 10, 3, 0, 2, 0, 0, 0x0
+ coord_event 14, 11, 3, 0, 2, 0, 0, 0x0
+ coord_event 14, 12, 3, 0, 2, 0, 0, 0x0
+ coord_event 14, 13, 3, 0, 2, 0, 0, 0x0
+ coord_event 94, 8, 3, 0, 2, 0, 0, 0x0
+ coord_event 94, 9, 3, 0, 2, 0, 0, 0x0
+ coord_event 94, 10, 3, 0, 2, 0, 0, 0x0
+ coord_event 94, 11, 0, 0, 2, 0, 0, 0x0
+ coord_event 19, 14, 3, 0, 8, 0, 0, 0x0
+ coord_event 87, 8, 3, 0, 8, 0, 0, 0x0
+ coord_event 87, 6, 3, 0, 8, 0, 0, 0x0
+ coord_event 87, 7, 3, 0, 8, 0, 0, 0x0
+
+Route113_MapBGEvents: @ 8529DF4
+ bg_event 85, 6, 0, 0, 0, Route113_EventScript_1F219C
+ bg_event 12, 9, 0, 0, 0, Route113_EventScript_1F21A5
+ bg_event 58, 4, 3, 0, 0, Route113_EventScript_1F21B7
+ bg_event 31, 5, 0, 0, 0, Route113_EventScript_1F21AE
+ bg_event 49, 8, 3, 8, 0, ITEM_GREAT_BALL, 0, 0
+ bg_event 66, 3, 3, 7, 0, ITEM_ETHER, 3, 0
+ bg_event 22, 5, 3, 7, 0, ITEM_TM32, 30, 0
+ bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0
+
+Route113_MapEvents:: @ 8529E54
+ map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
+
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc
new file mode 100644
index 000000000..0191f8578
--- /dev/null
+++ b/data/maps/events/Route113_GlassWorkshop.inc
@@ -0,0 +1,11 @@
+Route113_GlassWorkshop_MapObjects: @ 853EA78
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0
+
+Route113_GlassWorkshop_MapWarps: @ 853EAA8
+ warp_def 3, 8, 0, 0, ROUTE_113
+ warp_def 4, 8, 0, 0, ROUTE_113
+
+Route113_GlassWorkshop_MapEvents:: @ 853EAB8
+ map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
new file mode 100644
index 000000000..800af012c
--- /dev/null
+++ b/data/maps/events/Route114.inc
@@ -0,0 +1,53 @@
+Route114_MapObjects: @ 8529E68
+ object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0
+ object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0
+ object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0
+ object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0
+ object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0
+ object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0
+ object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0
+ object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0
+ object_event 27, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0
+
+Route114_MapWarps: @ 852A0F0
+ warp_def 8, 63, 0, 0, METEOR_FALLS_1F_1R
+ warp_def 29, 5, 0, 0, ROUTE_114_FOSSIL_MANIACS_HOUSE
+ warp_def 27, 36, 0, 0, ROUTE_114_LANETTES_HOUSE
+ warp_def 6, 46, 0, 0, TERRA_CAVE_ENTRANCE
+ warp_def 7, 4, 0, 0, TERRA_CAVE_ENTRANCE
+
+Route114_MapBGEvents: @ 852A118
+ bg_event 7, 64, 0, 0, 0, Route114_EventScript_1F2625
+ bg_event 31, 7, 0, 0, 0, Route114_EventScript_1F262E
+ bg_event 9, 47, 0, 8, 0, ITEM_RED_FLUTE, 0, 0
+ bg_event 30, 51, 0, 8, 0, ITEM_GREEN_SHARD, 0, 0
+ bg_event 11, 62, 0, 8, 0, 61, 0, 0
+ bg_event 19, 70, 0, 8, 0, ITEM_PP_MAX, 0, 0
+ bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0
+ bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0
+ bg_event 25, 38, 3, 0, 0, Route114_EventScript_1F2637
+ bg_event 20, 57, 3, 7, 0, ITEM_CARBOS, 4, 0
+ bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0
+ bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0
+
+Route114_MapEvents:: @ 852A1A8
+ map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
+
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc
new file mode 100644
index 000000000..e20e9c54c
--- /dev/null
+++ b/data/maps/events/Route114_FossilManiacsHouse.inc
@@ -0,0 +1,17 @@
+Route114_FossilManiacsHouse_MapObjects: @ 8533CFC
+ object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0
+
+Route114_FossilManiacsHouse_MapWarps: @ 8533D14
+ warp_def 4, 7, 0, 1, ROUTE_114
+ warp_def 5, 7, 0, 1, ROUTE_114
+ warp_def 4, 1, 0, 0, ROUTE_114_FOSSIL_MANIACS_TUNNEL
+
+Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C
+ bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73
+ bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD73
+ bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C
+ bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C
+
+Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C
+ map_events Route114_FossilManiacsHouse_MapObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
+
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc
new file mode 100644
index 000000000..3fb19d06e
--- /dev/null
+++ b/data/maps/events/Route114_FossilManiacsTunnel.inc
@@ -0,0 +1,15 @@
+Route114_FossilManiacsTunnel_MapObjects: @ 8533D70
+ object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0
+
+Route114_FossilManiacsTunnel_MapWarps: @ 8533D88
+ warp_def 6, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE
+ warp_def 7, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE
+ warp_def 6, 2, 0, 0, DESERT_UNDERPASS
+
+Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0
+ coord_event 5, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66
+ coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66
+
+Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0
+ map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc
new file mode 100644
index 000000000..c6e493c73
--- /dev/null
+++ b/data/maps/events/Route114_LanettesHouse.inc
@@ -0,0 +1,15 @@
+Route114_LanettesHouse_MapObjects: @ 8533DD4
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0
+
+Route114_LanettesHouse_MapWarps: @ 8533DEC
+ warp_def 5, 7, 0, 2, ROUTE_114
+ warp_def 6, 7, 0, 2, ROUTE_114
+
+Route114_LanettesHouse_MapBGEvents: @ 8533DFC
+ bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B309
+ bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345
+ bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345
+
+Route114_LanettesHouse_MapEvents:: @ 8533E20
+ map_events Route114_LanettesHouse_MapObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
+
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
new file mode 100644
index 000000000..e59081620
--- /dev/null
+++ b/data/maps/events/Route115.inc
@@ -0,0 +1,49 @@
+Route115_MapObjects: @ 852A1BC
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0
+ object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0
+ object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0
+ object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0
+ object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0
+ object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0
+ object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0
+
+Route115_MapWarps: @ 852A3E4
+ warp_def 27, 37, 0, 1, METEOR_FALLS_1F_1R
+ warp_def 21, 6, 0, 0, TERRA_CAVE_ENTRANCE
+ warp_def 36, 10, 0, 0, TERRA_CAVE_ENTRANCE
+
+Route115_MapBGEvents: @ 852A3FC
+ bg_event 32, 6, 0, 8, 0, 72, 0, 0
+ bg_event 21, 18, 0, 8, 0, 62, 0, 0
+ bg_event 16, 64, 0, 0, 0, Route115_EventScript_1F297C
+ bg_event 25, 38, 3, 0, 0, Route115_EventScript_1F2985
+ bg_event 8, 30, 0, 8, 0, ITEM_CHERI_BERRY, 0, 0
+ bg_event 32, 39, 0, 8, 0, ITEM_BLACK_FLUTE, 0, 0
+ bg_event 26, 15, 0, 8, 0, 52, 0, 0
+ bg_event 23, 8, 0, 8, 0, ITEM_WHITE_FLUTE, 0, 0
+ bg_event 32, 46, 0, 8, 0, 53, 0, 0
+ bg_event 7, 20, 0, 8, 0, ITEM_STARF_BERRY, 0, 0
+ bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0
+ bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0
+ bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0
+ bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0
+
+Route115_MapEvents:: @ 852A4A4
+ map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
+
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
new file mode 100644
index 000000000..a28f44e92
--- /dev/null
+++ b/data/maps/events/Route116.inc
@@ -0,0 +1,56 @@
+Route116_MapObjects: @ 852A4B8
+ object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0
+ object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0
+ object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0
+ object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0
+ object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0
+ object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0
+ object_event 13, MAP_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0
+ object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0
+ object_event 16, MAP_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0
+ object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0
+ object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0
+ object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0
+ object_event 23, MAP_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0
+ object_event 26, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0
+ object_event 27, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0
+
+Route116_MapWarps: @ 852A758
+ warp_def 47, 8, 0, 0, RUSTURF_TUNNEL
+ warp_def 38, 8, 0, 0, ROUTE_116_TUNNELERS_REST_HOUSE
+ warp_def 65, 10, 0, 2, RUSTURF_TUNNEL
+ warp_def 59, 13, 0, 0, TERRA_CAVE_ENTRANCE
+ warp_def 79, 6, 0, 0, TERRA_CAVE_ENTRANCE
+
+Route116_MapCoordEvents: @ 852A780
+ coord_event 47, 9, 3, 0, VAR_0x406F, 1, 0, Route116_EventScript_1F2D95
+
+Route116_MapBGEvents: @ 852A790
+ bg_event 5, 10, 0, 0, 0, Route116_EventScript_1F2D57
+ bg_event 48, 9, 0, 0, 0, Route116_EventScript_1F2D60
+ bg_event 40, 9, 0, 0, 0, Route116_EventScript_1F2D69
+ bg_event 71, 4, 0, 8, 0, ITEM_FLUFFY_TAIL, 0, 0
+ bg_event 79, 11, 0, 8, 0, 91, 0, 0
+ bg_event 16, 12, 0, 0, 0, Route116_EventScript_1F2D72
+ bg_event 29, 10, 0, 0, 0, Route116_EventScript_1F2D7B
+ bg_event 56, 6, 0, 8, 0, 102, 0, 0
+ bg_event 55, 15, 0, 8, 0, 112, 0, 0
+ bg_event 22, 9, 3, 7, 0, ITEM_SUPER_POTION, 45, 0
+ bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0
+
+Route116_MapEvents:: @ 852A814
+ map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
+
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc
new file mode 100644
index 000000000..bc159312e
--- /dev/null
+++ b/data/maps/events/Route116_TunnelersRestHouse.inc
@@ -0,0 +1,12 @@
+Route116_TunnelersRestHouse_MapObjects: @ 8533E34
+ object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0
+
+Route116_TunnelersRestHouse_MapWarps: @ 8533E7C
+ warp_def 4, 8, 0, 1, ROUTE_116
+ warp_def 5, 8, 0, 1, ROUTE_116
+
+Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C
+ map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
new file mode 100644
index 000000000..5b0e89239
--- /dev/null
+++ b/data/maps/events/Route117.inc
@@ -0,0 +1,38 @@
+Route117_MapObjects: @ 852A828
+ object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0
+ object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0
+ object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0
+ object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0
+
+Route117_MapWarps: @ 852AA68
+ warp_def 51, 5, 0, 0, ROUTE_117_POKEMON_DAY_CARE
+
+Route117_MapBGEvents: @ 852AA70
+ bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5
+ bg_event 49, 12, 0, 0, 0, Route117_EventScript_1F39BE
+ bg_event 49, 5, 0, 0, 0, Route117_EventScript_1F39C7
+ bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0
+
+Route117_MapEvents:: @ 852AAA0
+ map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
+
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc
new file mode 100644
index 000000000..e9625991f
--- /dev/null
+++ b/data/maps/events/Route117_PokemonDayCare.inc
@@ -0,0 +1,10 @@
+Route117_PokemonDayCare_MapObjects: @ 8533EA0
+ object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0
+
+Route117_PokemonDayCare_MapWarps: @ 8533EB8
+ warp_def 2, 8, 0, 0, ROUTE_117
+ warp_def 3, 8, 0, 0, ROUTE_117
+
+Route117_PokemonDayCare_MapEvents:: @ 8533EC8
+ map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
new file mode 100644
index 000000000..40e1e4b70
--- /dev/null
+++ b/data/maps/events/Route118.inc
@@ -0,0 +1,46 @@
+Route118_MapObjects: @ 852AAB4
+ object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0
+ object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0
+ object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0
+ object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0
+ object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0
+ object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0
+ object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0
+ object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0
+ object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0
+ object_event 21, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0
+
+Route118_MapWarps: @ 852ACAC
+ warp_def 42, 6, 0, 0, TERRA_CAVE_ENTRANCE
+ warp_def 9, 6, 0, 0, TERRA_CAVE_ENTRANCE
+
+Route118_MapCoordEvents: @ 852ACBC
+ coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E
+ coord_event 44, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EAE
+ coord_event 45, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EC4
+
+Route118_MapBGEvents: @ 852ACEC
+ bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0
+ bg_event 13, 6, 0, 0, 0, Route118_EventScript_1F3E7C
+ bg_event 56, 8, 0, 0, 0, Route118_EventScript_1F3E85
+ bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0
+ bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0
+ bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0
+ bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0
+ bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0
+ bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0
+
+Route118_MapEvents:: @ 852AD58
+ map_events Route118_MapObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
+
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
new file mode 100644
index 000000000..e78006b3c
--- /dev/null
+++ b/data/maps/events/Route119.inc
@@ -0,0 +1,99 @@
+Route119_MapObjects: @ 852AD6C
+ object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0
+ object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0
+ object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0
+ object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0
+ object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0
+ object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0
+ object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0
+ object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0
+ object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0
+ object_event 25, MAP_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0
+ object_event 26, MAP_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0
+ object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0
+ object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0
+ object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0
+ object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0
+ object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0
+ object_event 33, MAP_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0
+ object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0
+ object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0
+ object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0
+ object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0
+ object_event 38, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0
+ object_event 39, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0
+ object_event 40, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0
+ object_event 41, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0
+ object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0
+ object_event 43, MAP_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0
+
+Route119_MapWarps: @ 852B174
+ warp_def 6, 32, 0, 0, ROUTE_119_WEATHER_INSTITUTE_1F
+ warp_def 33, 109, 0, 0, ROUTE_119_HOUSE
+
+Route119_MapCoordEvents: @ 852B184
+ coord_event 25, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F4472
+ coord_event 26, 31, 0, 0, VAR_0x4072, 0, 0, Route119_EventScript_1F447D
+ coord_event 29, 13, 3, 0, 20, 0, 0, 0x0
+ coord_event 30, 13, 3, 0, 20, 0, 0, 0x0
+ coord_event 31, 13, 3, 0, 20, 0, 0, 0x0
+ coord_event 32, 13, 3, 0, 20, 0, 0, 0x0
+ coord_event 15, 133, 3, 0, 20, 0, 0, 0x0
+ coord_event 16, 132, 3, 0, 20, 0, 0, 0x0
+ coord_event 17, 131, 3, 0, 20, 0, 0, 0x0
+ coord_event 18, 130, 3, 0, 20, 0, 0, 0x0
+ coord_event 19, 131, 3, 0, 20, 0, 0, 0x0
+ coord_event 20, 132, 3, 0, 20, 0, 0, 0x0
+ coord_event 21, 133, 3, 0, 20, 0, 0, 0x0
+ coord_event 36, 6, 3, 0, 2, 0, 0, 0x0
+ coord_event 36, 7, 3, 0, 2, 0, 0, 0x0
+ coord_event 35, 8, 3, 0, 2, 0, 0, 0x0
+ coord_event 35, 9, 3, 0, 2, 0, 0, 0x0
+ coord_event 16, 137, 3, 0, 2, 0, 0, 0x0
+ coord_event 17, 137, 3, 0, 2, 0, 0, 0x0
+ coord_event 18, 137, 3, 0, 2, 0, 0, 0x0
+ coord_event 19, 137, 3, 0, 2, 0, 0, 0x0
+ coord_event 20, 137, 3, 0, 2, 0, 0, 0x0
+ coord_event 34, 13, 3, 0, 20, 0, 0, 0x0
+
+Route119_MapBGEvents: @ 852B2F4
+ bg_event 9, 33, 0, 0, 0, Route119_EventScript_1F477D
+ bg_event 27, 19, 0, 0, 0, Route119_EventScript_1F4774
+ bg_event 5, 2, 0, 8, 0, ITEM_DRAGON_SCALE, 0, 0
+ bg_event 4, 89, 0, 8, 0, ITEM_LIGHT_BALL, 0, 0
+ bg_event 5, 15, 0, 8, 0, ITEM_POISON_BARB, 0, 0
+ bg_event 7, 101, 3, 8, 0, ITEM_NEVER_MELT_ICE, 0, 0
+ bg_event 34, 24, 3, 8, 0, ITEM_LAX_INCENSE, 0, 0
+ bg_event 31, 73, 3, 8, 0, 231, 0, 0
+ bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0
+ bg_event 16, 28, 0, 8, 0, 113, 0, 0
+ bg_event 17, 82, 3, 7, 0, ITEM_CALCIUM, 5, 0
+ bg_event 38, 63, 3, 7, 0, ITEM_ULTRA_BALL, 6, 0
+ bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0
+ bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0
+ bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0
+ bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0
+ bg_event 6, 2, 0, 8, 0, 233, 0, 0
+ bg_event 26, 120, 3, 7, 0, ITEM_FULL_HEAL, 68, 0
+ bg_event 20, 29, 3, 7, 0, ITEM_MAX_ETHER, 87, 0
+ bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3
+
+Route119_MapEvents:: @ 852B3E4
+ map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
+
diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc
new file mode 100644
index 000000000..7033c505a
--- /dev/null
+++ b/data/maps/events/Route119_House.inc
@@ -0,0 +1,16 @@
+Route119_House_MapObjects: @ 853ECD0
+ object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
+
+Route119_House_MapWarps: @ 853ED78
+ warp_def 3, 8, 0, 1, ROUTE_119
+ warp_def 4, 8, 0, 1, ROUTE_119
+
+Route119_House_MapEvents:: @ 853ED88
+ map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc
new file mode 100644
index 000000000..01a53d75a
--- /dev/null
+++ b/data/maps/events/Route119_WeatherInstitute_1F.inc
@@ -0,0 +1,21 @@
+Route119_WeatherInstitute_1F_MapObjects: @ 853EB20
+ object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0
+ object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0
+ object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0
+
+Route119_WeatherInstitute_1F_MapWarps: @ 853EB98
+ warp_def 9, 12, 0, 0, ROUTE_119
+ warp_def 10, 12, 0, 0, ROUTE_119
+ warp_def 17, 1, 0, 0, ROUTE_119_WEATHER_INSTITUTE_2F
+
+Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0
+ bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+ bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+ bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+ bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18
+
+Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0
+ map_events Route119_WeatherInstitute_1F_MapObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
+
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc
new file mode 100644
index 000000000..3a68ca865
--- /dev/null
+++ b/data/maps/events/Route119_WeatherInstitute_2F.inc
@@ -0,0 +1,16 @@
+Route119_WeatherInstitute_2F_MapObjects: @ 853EBF4
+ object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0
+ object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0
+ object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
+ object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0
+ object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0
+
+Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
+ warp_def 17, 1, 0, 2, ROUTE_119_WEATHER_INSTITUTE_1F
+
+Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC
+ map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
new file mode 100644
index 000000000..6206e713f
--- /dev/null
+++ b/data/maps/events/Route120.inc
@@ -0,0 +1,90 @@
+Route120_MapObjects: @ 852B3F8
+ object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0
+ object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0
+ object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0
+ object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0
+ object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0
+ object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0
+ object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0
+ object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0
+ object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0
+ object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0
+ object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0
+ object_event 31, MAP_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0
+ object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0
+ object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0
+ object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0
+ object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0
+ object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0
+ object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0
+ object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0
+ object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0
+ object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0
+ object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0
+ object_event 42, MAP_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0
+ object_event 43, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0
+ object_event 44, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0
+
+Route120_MapWarps: @ 852B818
+ warp_def 7, 55, 0, 0, ANCIENT_TOMB
+ warp_def 19, 23, 1, 0, SCORCHED_SLAB
+
+Route120_MapCoordEvents: @ 852B828
+ coord_event 7, 15, 0, 0, 3, 0, 0, 0x0
+ coord_event 7, 16, 0, 0, 3, 0, 0, 0x0
+ coord_event 22, 61, 3, 0, 3, 0, 0, 0x0
+ coord_event 12, 64, 3, 0, 3, 0, 0, 0x0
+ coord_event 35, 63, 3, 0, 1, 0, 0, 0x0
+ coord_event 36, 63, 3, 0, 1, 0, 0, 0x0
+ coord_event 37, 63, 3, 0, 1, 0, 0, 0x0
+ coord_event 38, 63, 3, 0, 1, 0, 0, 0x0
+ coord_event 32, 88, 5, 0, 1, 0, 0, 0x0
+ coord_event 28, 15, 0, 0, 2, 0, 0, 0x0
+ coord_event 28, 16, 0, 0, 2, 0, 0, 0x0
+ coord_event 28, 17, 3, 0, 2, 0, 0, 0x0
+ coord_event 32, 89, 5, 0, 1, 0, 0, 0x0
+ coord_event 32, 90, 5, 0, 1, 0, 0, 0x0
+ coord_event 32, 91, 5, 0, 1, 0, 0, 0x0
+ coord_event 10, 75, 3, 0, 1, 0, 0, 0x0
+ coord_event 11, 75, 3, 0, 1, 0, 0, 0x0
+ coord_event 12, 75, 3, 0, 1, 0, 0, 0x0
+ coord_event 13, 75, 3, 0, 1, 0, 0, 0x0
+
+Route120_MapBGEvents: @ 852B958
+ bg_event 27, 3, 3, 0, 0, Route120_EventScript_1F57C5
+ bg_event 38, 88, 3, 0, 0, Route120_EventScript_1F57CE
+ bg_event 28, 62, 0, 8, 0, 101, 0, 0
+ bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0
+ bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0
+ bg_event 29, 85, 5, 8, 0, 232, 0, 0
+ bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0
+ bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0
+ bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0
+ bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0
+ bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0
+ bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0
+ bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0
+ bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0
+
+Route120_MapEvents:: @ 852BA00
+ map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
+
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
new file mode 100644
index 000000000..b58fe4858
--- /dev/null
+++ b/data/maps/events/Route121.inc
@@ -0,0 +1,55 @@
+Route121_MapObjects: @ 852BA14
+ object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0
+ object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0
+ object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0
+ object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0
+ object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0
+ object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0
+ object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0
+ object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0
+ object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0
+ object_event 23, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0
+ object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0
+ object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0
+
+Route121_MapWarps: @ 852BCCC
+ warp_def 37, 5, 0, 2, ROUTE_121_SAFARI_ZONE_ENTRANCE
+
+Route121_MapCoordEvents: @ 852BCD4
+ coord_event 25, 5, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+ coord_event 25, 6, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+ coord_event 25, 7, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+ coord_event 25, 8, 3, 0, VAR_0x4074, 0, 0, Route121_EventScript_1F5E18
+
+Route121_MapBGEvents: @ 852BD14
+ bg_event 32, 14, 0, 0, 0, Route121_EventScript_1F5E06
+ bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0
+ bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0
+ bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0
+ bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0
+ bg_event 39, 6, 0, 0, 0, Route121_EventScript_1F5E0F
+ bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0
+ bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0
+ bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0
+ bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0
+
+Route121_MapEvents:: @ 852BD8C
+ map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
+
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc
new file mode 100644
index 000000000..cad82a51a
--- /dev/null
+++ b/data/maps/events/Route121_SafariZoneEntrance.inc
@@ -0,0 +1,20 @@
+Route121_SafariZoneEntrance_MapObjects: @ 8533EDC
+ object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+Route121_SafariZoneEntrance_MapWarps: @ 8533F24
+ warp_def 2, 5, 0, 0, SAFARI_ZONE_SOUTH
+ warp_def 3, 5, 0, 0, SAFARI_ZONE_SOUTH
+ warp_def 14, 13, 0, 0, ROUTE_121
+ warp_def 15, 13, 0, 0, ROUTE_121
+
+Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44
+ coord_event 8, 4, 3, 0, VAR_0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_22BC18
+
+Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54
+ bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21
+
+Route121_SafariZoneEntrance_MapEvents:: @ 8533F60
+ map_events Route121_SafariZoneEntrance_MapObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
+
diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc
new file mode 100644
index 000000000..10330d8e3
--- /dev/null
+++ b/data/maps/events/Route122.inc
@@ -0,0 +1,6 @@
+Route122_MapWarps: @ 852BDA0
+ warp_def 22, 29, 0, 0, MT_PYRE_1F
+
+Route122_MapEvents:: @ 852BDA8
+ map_events 0x0, Route122_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
new file mode 100644
index 000000000..cb60786c0
--- /dev/null
+++ b/data/maps/events/Route123.inc
@@ -0,0 +1,88 @@
+Route123_MapObjects: @ 852BDBC
+ object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0
+ object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0
+ object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0
+ object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0
+ object_event 22, MAP_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0
+ object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0
+ object_event 27, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0
+ object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0
+ object_event 29, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0
+ object_event 30, MAP_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0
+ object_event 31, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0
+ object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0
+ object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0
+ object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0
+ object_event 35, MAP_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0
+ object_event 36, MAP_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0
+ object_event 37, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0
+ object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0
+ object_event 39, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0
+ object_event 40, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0
+ object_event 41, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0
+ object_event 42, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0
+ object_event 43, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0
+
+Route123_MapWarps: @ 852C1C4
+ warp_def 22, 6, 0, 0, ROUTE_123_BERRY_MASTERS_HOUSE
+
+Route123_MapCoordEvents: @ 852C1CC
+ coord_event 90, 16, 3, 0, 21, 0, 0, 0x0
+ coord_event 92, 9, 3, 0, 21, 0, 0, 0x0
+ coord_event 93, 12, 3, 0, 21, 0, 0, 0x0
+ coord_event 92, 13, 3, 0, 21, 0, 0, 0x0
+ coord_event 91, 14, 3, 0, 21, 0, 0, 0x0
+ coord_event 19, 13, 3, 0, 21, 0, 0, 0x0
+ coord_event 19, 12, 3, 0, 21, 0, 0, 0x0
+ coord_event 34, 13, 3, 0, 21, 0, 0, 0x0
+ coord_event 19, 14, 3, 0, 21, 0, 0, 0x0
+ coord_event 19, 15, 3, 0, 21, 0, 0, 0x0
+ coord_event 19, 16, 3, 0, 21, 0, 0, 0x0
+ coord_event 108, 14, 3, 0, 2, 0, 0, 0x0
+ coord_event 109, 15, 3, 0, 2, 0, 0, 0x0
+ coord_event 110, 16, 3, 0, 2, 0, 0, 0x0
+ coord_event 111, 17, 3, 0, 2, 0, 0, 0x0
+ coord_event 112, 18, 3, 0, 2, 0, 0, 0x0
+ coord_event 9, 12, 3, 0, 2, 0, 0, 0x0
+ coord_event 9, 13, 3, 0, 2, 0, 0, 0x0
+ coord_event 9, 14, 3, 0, 2, 0, 0, 0x0
+ coord_event 9, 15, 3, 0, 2, 0, 0, 0x0
+ coord_event 9, 16, 3, 0, 2, 0, 0, 0x0
+ coord_event 94, 10, 3, 0, 21, 0, 0, 0x0
+
+Route123_MapBGEvents: @ 852C32C
+ bg_event 117, 10, 0, 0, 0, Route123_EventScript_1F61B3
+ bg_event 47, 3, 0, 8, 0, 82, 0, 0
+ bg_event 49, 3, 0, 8, 0, 92, 0, 0
+ bg_event 10, 12, 3, 0, 0, Route123_EventScript_1F61AA
+ bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0
+ bg_event 20, 7, 3, 0, 0, Route123_EventScript_1F61BC
+ bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0
+ bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0
+ bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0
+ bg_event 139, 15, 3, 7, 0, ITEM_PP_UP, 99, 0
+ bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0
+
+Route123_MapEvents:: @ 852C3B0
+ map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
+
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc
new file mode 100644
index 000000000..cbe15cac1
--- /dev/null
+++ b/data/maps/events/Route123_BerryMastersHouse.inc
@@ -0,0 +1,11 @@
+Route123_BerryMastersHouse_MapObjects: @ 853EACC
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0
+
+Route123_BerryMastersHouse_MapWarps: @ 853EAFC
+ warp_def 3, 7, 0, 0, ROUTE_123
+ warp_def 4, 7, 0, 0, ROUTE_123
+
+Route123_BerryMastersHouse_MapEvents:: @ 853EB0C
+ map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc
new file mode 100644
index 000000000..6f40347e9
--- /dev/null
+++ b/data/maps/events/Route124.inc
@@ -0,0 +1,23 @@
+Route124_MapObjects: @ 852C3C4
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0
+ object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0
+ object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0
+ object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0
+
+Route124_MapWarps: @ 852C4E4
+ warp_def 70, 48, 3, 0, ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE
+
+Route124_MapBGEvents: @ 852C4EC
+ bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C
+
+Route124_MapEvents:: @ 852C4F8
+ map_events Route124_MapObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
+
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
new file mode 100644
index 000000000..43c364e8d
--- /dev/null
+++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
@@ -0,0 +1,12 @@
+Route124_DivingTreasureHuntersHouse_MapObjects: @ 853ED9C
+ object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0
+
+Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4
+ warp_def 3, 8, 0, 0, ROUTE_124
+ warp_def 4, 8, 0, 0, ROUTE_124
+
+Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4
+ bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63
+
+Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0
+ map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc
new file mode 100644
index 000000000..1211044f2
--- /dev/null
+++ b/data/maps/events/Route125.inc
@@ -0,0 +1,24 @@
+Route125_MapObjects: @ 852C50C
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0
+
+Route125_MapWarps: @ 852C5FC
+ warp_def 22, 19, 0, 0, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+
+Route125_MapBGEvents: @ 852C604
+ bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0
+ bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0
+ bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0
+ bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0
+
+Route125_MapEvents:: @ 852C634
+ map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
+
diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc
new file mode 100644
index 000000000..e8bfd1a5f
--- /dev/null
+++ b/data/maps/events/Route126.inc
@@ -0,0 +1,14 @@
+Route126_MapObjects: @ 852C648
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0
+ object_event 6, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0
+
+Route126_MapEvents:: @ 852C720
+ map_events Route126_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
new file mode 100644
index 000000000..7a486263e
--- /dev/null
+++ b/data/maps/events/Route127.inc
@@ -0,0 +1,23 @@
+Route127_MapObjects: @ 852C734
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0
+ object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0
+ object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0
+
+Route127_MapBGEvents: @ 852C83C
+ bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0
+ bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0
+ bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0
+ bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0
+ bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0
+
+Route127_MapEvents:: @ 852C878
+ map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents
+
diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc
new file mode 100644
index 000000000..b48c8c4a2
--- /dev/null
+++ b/data/maps/events/Route128.inc
@@ -0,0 +1,20 @@
+Route128_MapObjects: @ 852C88C
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0
+ object_event 4, MAP_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0
+ object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0
+
+Route128_MapBGEvents: @ 852C97C
+ bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0
+ bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0
+ bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0
+
+Route128_MapEvents:: @ 852C9A0
+ map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents
+
diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc
new file mode 100644
index 000000000..38ac3513c
--- /dev/null
+++ b/data/maps/events/Route129.inc
@@ -0,0 +1,10 @@
+Route129_MapObjects: @ 852C9B4
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0
+
+Route129_MapEvents:: @ 852CA2C
+ map_events Route129_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
new file mode 100644
index 000000000..d5bd41cbd
--- /dev/null
+++ b/data/maps/events/Route130.inc
@@ -0,0 +1,9 @@
+Route130_MapObjects: @ 852CA40
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0
+
+Route130_MapEvents:: @ 852CAA0
+ map_events Route130_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc
new file mode 100644
index 000000000..0f37a4c70
--- /dev/null
+++ b/data/maps/events/Route131.inc
@@ -0,0 +1,16 @@
+Route131_MapObjects: @ 852CAB4
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0
+
+Route131_MapWarps: @ 852CB74
+ warp_def 36, 6, 3, 0, SKY_PILLAR_ENTRANCE
+
+Route131_MapEvents:: @ 852CB7C
+ map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc
new file mode 100644
index 000000000..3e1287b7d
--- /dev/null
+++ b/data/maps/events/Route132.inc
@@ -0,0 +1,15 @@
+Route132_MapObjects: @ 852CB90
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0
+ object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0
+
+Route132_MapEvents:: @ 852CC80
+ map_events Route132_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc
new file mode 100644
index 000000000..c6cb4ac3b
--- /dev/null
+++ b/data/maps/events/Route133.inc
@@ -0,0 +1,15 @@
+Route133_MapObjects: @ 852CC94
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0
+
+Route133_MapEvents:: @ 852CD84
+ map_events Route133_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc
new file mode 100644
index 000000000..6905f533f
--- /dev/null
+++ b/data/maps/events/Route134.inc
@@ -0,0 +1,16 @@
+Route134_MapObjects: @ 852CD98
+ object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0
+ object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0
+
+Route134_MapEvents:: @ 852CEA0
+ map_events Route134_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
new file mode 100644
index 000000000..26a0c1a11
--- /dev/null
+++ b/data/maps/events/RustboroCity.inc
@@ -0,0 +1,70 @@
+RustboroCity_MapObjects: @ 85267E0
+ object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0
+ object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0
+ object_event 11, MAP_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0
+ object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0
+ object_event 13, MAP_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0
+ object_event 15, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0
+ object_event 16, MAP_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0
+
+RustboroCity_MapWarps: @ 8526960
+ warp_def 27, 19, 0, 0, RUSTBORO_CITY_GYM
+ warp_def 13, 30, 0, 0, RUSTBORO_CITY_FLAT_1_1F
+ warp_def 16, 45, 0, 0, RUSTBORO_CITY_MART
+ warp_def 16, 38, 0, 0, RUSTBORO_CITY_POKEMON_CENTER_1F
+ warp_def 27, 34, 0, 0, RUSTBORO_CITY_POKEMON_SCHOOL
+ warp_def 11, 15, 0, 0, RUSTBORO_CITY_DEVON_CORP_1F
+ warp_def 12, 15, 0, 1, RUSTBORO_CITY_DEVON_CORP_1F
+ warp_def 33, 19, 0, 0, RUSTBORO_CITY_HOUSE_1
+ warp_def 9, 38, 0, 0, RUSTBORO_CITY_CUTTERS_HOUSE
+ warp_def 30, 28, 0, 0, RUSTBORO_CITY_HOUSE_2
+ warp_def 5, 51, 0, 0, RUSTBORO_CITY_FLAT_2_1F
+ warp_def 26, 46, 0, 0, RUSTBORO_CITY_HOUSE_3
+
+RustboroCity_MapCoordEvents: @ 85269C0
+ coord_event 23, 20, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E095A
+ coord_event 23, 21, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0971
+ coord_event 23, 22, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E0988
+ coord_event 23, 23, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E099F
+ coord_event 23, 24, 3, 0, VAR_0x405A, 1, 0, RustboroCity_EventScript_1E09B6
+ coord_event 30, 9, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0AFE
+ coord_event 29, 10, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B0A
+ coord_event 30, 11, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B16
+ coord_event 30, 12, 3, 0, VAR_0x405A, 2, 0, RustboroCity_EventScript_1E0B22
+ coord_event 30, 9, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C2B
+ coord_event 31, 10, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C37
+ coord_event 30, 11, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C43
+ coord_event 30, 12, 3, 0, VAR_0x405A, 4, 0, RustboroCity_EventScript_1E0C4F
+ coord_event 12, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0DF3
+ coord_event 13, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E33
+ coord_event 14, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0E73
+ coord_event 15, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EB3
+ coord_event 16, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0EF3
+ coord_event 17, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F33
+ coord_event 18, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0F73
+ coord_event 19, 53, 3, 0, VAR_0x405A, 7, 0, RustboroCity_EventScript_1E0FB3
+
+RustboroCity_MapBGEvents: @ 8526B10
+ bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_1E08F5
+ bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_1E0910
+ bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_271E6A
+ bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_271E73
+ bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_1E0907
+ bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_271E6A
+ bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_271E73
+ bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_1E08EC
+ bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_1E08E3
+ bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919
+
+RustboroCity_MapEvents:: @ 8526B88
+ map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
+
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc
new file mode 100644
index 000000000..1e779cb1e
--- /dev/null
+++ b/data/maps/events/RustboroCity_CuttersHouse.inc
@@ -0,0 +1,11 @@
+RustboroCity_CuttersHouse_MapObjects: @ 8530A1C
+ object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0
+
+RustboroCity_CuttersHouse_MapWarps: @ 8530A4C
+ warp_def 5, 8, 0, 8, RUSTBORO_CITY
+ warp_def 6, 8, 0, 8, RUSTBORO_CITY
+
+RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C
+ map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc
new file mode 100644
index 000000000..5a92ba2fc
--- /dev/null
+++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc
@@ -0,0 +1,17 @@
+RustboroCity_DevonCorp_1F_MapObjects: @ 853037C
+ object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0
+
+RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4
+ warp_def 5, 8, 0, 5, RUSTBORO_CITY
+ warp_def 6, 8, 0, 6, RUSTBORO_CITY
+ warp_def 14, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_2F
+
+RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC
+ bg_event 3, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211312
+ bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309
+
+RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4
+ map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents
+
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc
new file mode 100644
index 000000000..a84456e44
--- /dev/null
+++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_2F_MapObjects: @ 8530408
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0
+
+RustboroCity_DevonCorp_2F_MapWarps: @ 8530498
+ warp_def 14, 1, 0, 2, RUSTBORO_CITY_DEVON_CORP_1F
+ warp_def 2, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_3F
+
+RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8
+ map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc
new file mode 100644
index 000000000..ec2d22707
--- /dev/null
+++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc
@@ -0,0 +1,15 @@
+RustboroCity_DevonCorp_3F_MapObjects: @ 85304BC
+ object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0
+ object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
+
+RustboroCity_DevonCorp_3F_MapWarps: @ 8530504
+ warp_def 2, 1, 0, 1, RUSTBORO_CITY_DEVON_CORP_2F
+
+RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C
+ bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600
+ bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600
+
+RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524
+ map_events RustboroCity_DevonCorp_3F_MapObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
+
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc
new file mode 100644
index 000000000..93185e0fd
--- /dev/null
+++ b/data/maps/events/RustboroCity_Flat1_1F.inc
@@ -0,0 +1,12 @@
+RustboroCity_Flat1_1F_MapObjects: @ 8530890
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0
+
+RustboroCity_Flat1_1F_MapWarps: @ 85308C0
+ warp_def 6, 7, 0, 1, RUSTBORO_CITY
+ warp_def 7, 7, 0, 1, RUSTBORO_CITY
+ warp_def 2, 1, 0, 0, RUSTBORO_CITY_FLAT_1_2F
+
+RustboroCity_Flat1_1F_MapEvents:: @ 85308D8
+ map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc
new file mode 100644
index 000000000..0fa012eda
--- /dev/null
+++ b/data/maps/events/RustboroCity_Flat1_2F.inc
@@ -0,0 +1,16 @@
+RustboroCity_Flat1_2F_MapObjects: @ 85308EC
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0
+
+RustboroCity_Flat1_2F_MapWarps: @ 85309AC
+ warp_def 2, 1, 0, 2, RUSTBORO_CITY_FLAT_1_1F
+
+RustboroCity_Flat1_2F_MapEvents:: @ 85309B4
+ map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc
new file mode 100644
index 000000000..937d1afb9
--- /dev/null
+++ b/data/maps/events/RustboroCity_Flat2_1F.inc
@@ -0,0 +1,12 @@
+RustboroCity_Flat2_1F_MapObjects: @ 8530AC4
+ object_event 1, MAP_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0
+
+RustboroCity_Flat2_1F_MapWarps: @ 8530AF4
+ warp_def 2, 8, 0, 10, RUSTBORO_CITY
+ warp_def 3, 8, 0, 10, RUSTBORO_CITY
+ warp_def 3, 1, 0, 0, RUSTBORO_CITY_FLAT_2_2F
+
+RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C
+ map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc
new file mode 100644
index 000000000..2ea886e54
--- /dev/null
+++ b/data/maps/events/RustboroCity_Flat2_2F.inc
@@ -0,0 +1,11 @@
+RustboroCity_Flat2_2F_MapObjects: @ 8530B20
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0
+
+RustboroCity_Flat2_2F_MapWarps: @ 8530B50
+ warp_def 3, 1, 0, 2, RUSTBORO_CITY_FLAT_2_1F
+ warp_def 1, 1, 0, 0, RUSTBORO_CITY_FLAT_2_3F
+
+RustboroCity_Flat2_2F_MapEvents:: @ 8530B60
+ map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc
new file mode 100644
index 000000000..44c5bc37a
--- /dev/null
+++ b/data/maps/events/RustboroCity_Flat2_3F.inc
@@ -0,0 +1,10 @@
+RustboroCity_Flat2_3F_MapObjects: @ 8530B74
+ object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0
+
+RustboroCity_Flat2_3F_MapWarps: @ 8530BA4
+ warp_def 1, 1, 0, 1, RUSTBORO_CITY_FLAT_2_2F
+
+RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC
+ map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc
new file mode 100644
index 000000000..dc395c064
--- /dev/null
+++ b/data/maps/events/RustboroCity_Gym.inc
@@ -0,0 +1,18 @@
+RustboroCity_Gym_MapObjects: @ 8530538
+ object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0
+
+RustboroCity_Gym_MapWarps: @ 85305B0
+ warp_def 5, 19, 0, 0, RUSTBORO_CITY
+ warp_def 6, 19, 0, 0, RUSTBORO_CITY
+
+RustboroCity_Gym_MapBGEvents: @ 85305C0
+ bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047
+ bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057
+
+RustboroCity_Gym_MapEvents:: @ 85305D8
+ map_events RustboroCity_Gym_MapObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
+
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc
new file mode 100644
index 000000000..eee616f8a
--- /dev/null
+++ b/data/maps/events/RustboroCity_House1.inc
@@ -0,0 +1,11 @@
+RustboroCity_House1_MapObjects: @ 85309C8
+ object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0
+
+RustboroCity_House1_MapWarps: @ 85309F8
+ warp_def 5, 7, 0, 7, RUSTBORO_CITY
+ warp_def 6, 7, 0, 7, RUSTBORO_CITY
+
+RustboroCity_House1_MapEvents:: @ 8530A08
+ map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc
new file mode 100644
index 000000000..b4a00970f
--- /dev/null
+++ b/data/maps/events/RustboroCity_House2.inc
@@ -0,0 +1,11 @@
+RustboroCity_House2_MapObjects: @ 8530A70
+ object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0
+
+RustboroCity_House2_MapWarps: @ 8530AA0
+ warp_def 5, 8, 0, 9, RUSTBORO_CITY
+ warp_def 6, 8, 0, 9, RUSTBORO_CITY
+
+RustboroCity_House2_MapEvents:: @ 8530AB0
+ map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc
new file mode 100644
index 000000000..09cf245e0
--- /dev/null
+++ b/data/maps/events/RustboroCity_House3.inc
@@ -0,0 +1,12 @@
+RustboroCity_House3_MapObjects: @ 8530BC0
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0
+
+RustboroCity_House3_MapWarps: @ 8530C08
+ warp_def 5, 8, 0, 11, RUSTBORO_CITY
+ warp_def 6, 8, 0, 11, RUSTBORO_CITY
+
+RustboroCity_House3_MapEvents:: @ 8530C18
+ map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc
new file mode 100644
index 000000000..28b614d47
--- /dev/null
+++ b/data/maps/events/RustboroCity_Mart.inc
@@ -0,0 +1,13 @@
+RustboroCity_Mart_MapObjects: @ 853080C
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0
+
+RustboroCity_Mart_MapWarps: @ 853086C
+ warp_def 3, 7, 0, 2, RUSTBORO_CITY
+ warp_def 4, 7, 0, 2, RUSTBORO_CITY
+
+RustboroCity_Mart_MapEvents:: @ 853087C
+ map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..9c44870ad
--- /dev/null
+++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonCenter_1F_MapObjects: @ 85306F4
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0
+
+RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754
+ warp_def 7, 8, 3, 3, RUSTBORO_CITY
+ warp_def 6, 8, 3, 3, RUSTBORO_CITY
+ warp_def 1, 6, 4, 0, RUSTBORO_CITY_POKEMON_CENTER_2F
+
+RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C
+ map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..71defda3d
--- /dev/null
+++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonCenter_2F_MapObjects: @ 8530780
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0
+ warp_def 1, 6, 4, 2, RUSTBORO_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8
+ map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc
new file mode 100644
index 000000000..3facee89a
--- /dev/null
+++ b/data/maps/events/RustboroCity_PokemonSchool.inc
@@ -0,0 +1,23 @@
+RustboroCity_PokemonSchool_MapObjects: @ 85305EC
+ object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0
+
+RustboroCity_PokemonSchool_MapWarps: @ 8530694
+ warp_def 5, 10, 0, 4, RUSTBORO_CITY
+ warp_def 6, 10, 0, 4, RUSTBORO_CITY
+
+RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4
+ bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+ bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+ bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+ bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213EA9
+ bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C
+
+RustboroCity_PokemonSchool_MapEvents:: @ 85306E0
+ map_events RustboroCity_PokemonSchool_MapObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
+
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
new file mode 100644
index 000000000..94846323a
--- /dev/null
+++ b/data/maps/events/RusturfTunnel.inc
@@ -0,0 +1,27 @@
+RusturfTunnel_MapObjects: @ 85341C4
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0
+ object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0
+ object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0
+ object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0
+ object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0
+ object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0
+ object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0
+ object_event 9, MAP_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0
+
+RusturfTunnel_MapWarps: @ 85342B4
+ warp_def 4, 10, 3, 0, ROUTE_116
+ warp_def 29, 16, 3, 4, VERDANTURF_TOWN
+ warp_def 18, 20, 3, 2, ROUTE_116
+
+RusturfTunnel_MapCoordEvents: @ 85342CC
+ coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D071
+ coord_event 9, 4, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083
+ coord_event 9, 5, 3, 0, VAR_0x409A, 2, 0, RusturfTunnel_EventScript_22D083
+ coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D077
+ coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D
+
+RusturfTunnel_MapEvents:: @ 853431C
+ map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc
new file mode 100644
index 000000000..5d6d73288
--- /dev/null
+++ b/data/maps/events/SSTidalCorridor.inc
@@ -0,0 +1,35 @@
+SSTidalCorridor_MapObjects: @ 853A158
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0
+ object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0
+
+SSTidalCorridor_MapWarps: @ 853A1D0
+ warp_def 4, 9, 3, 0, SS_TIDAL_ROOMS
+ warp_def 7, 9, 3, 2, SS_TIDAL_ROOMS
+ warp_def 10, 9, 3, 4, SS_TIDAL_ROOMS
+ warp_def 13, 9, 3, 6, SS_TIDAL_ROOMS
+ warp_def 4, 3, 3, 8, SS_TIDAL_ROOMS
+ warp_def 7, 3, 3, 9, SS_TIDAL_ROOMS
+ warp_def 10, 3, 3, 10, SS_TIDAL_ROOMS
+ warp_def 13, 3, 3, 11, SS_TIDAL_ROOMS
+ warp_def 16, 2, 3, 0, SS_TIDAL_LOWER_DECK
+
+SSTidalCorridor_MapBGEvents: @ 853A218
+ bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_23C17D
+ bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0F5
+ bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C0FE
+ bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C107
+ bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110
+
+SSTidalCorridor_MapEvents:: @ 853A2A8
+ map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
+
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc
new file mode 100644
index 000000000..0ce76cf29
--- /dev/null
+++ b/data/maps/events/SSTidalLowerDeck.inc
@@ -0,0 +1,13 @@
+SSTidalLowerDeck_MapObjects: @ 853A2BC
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0
+
+SSTidalLowerDeck_MapWarps: @ 853A2EC
+ warp_def 15, 2, 3, 8, SS_TIDAL_CORRIDOR
+
+SSTidalLowerDeck_MapBGEvents: @ 853A2F4
+ bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0
+
+SSTidalLowerDeck_MapEvents:: @ 853A300
+ map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
+
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc
new file mode 100644
index 000000000..81648162b
--- /dev/null
+++ b/data/maps/events/SSTidalRooms.inc
@@ -0,0 +1,31 @@
+SSTidalRooms_MapObjects: @ 853A314
+ object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0
+
+SSTidalRooms_MapWarps: @ 853A3D4
+ warp_def 4, 16, 0, 0, SS_TIDAL_CORRIDOR
+ warp_def 5, 16, 0, 0, SS_TIDAL_CORRIDOR
+ warp_def 13, 16, 0, 1, SS_TIDAL_CORRIDOR
+ warp_def 14, 16, 0, 1, SS_TIDAL_CORRIDOR
+ warp_def 22, 16, 0, 2, SS_TIDAL_CORRIDOR
+ warp_def 23, 16, 0, 2, SS_TIDAL_CORRIDOR
+ warp_def 31, 16, 0, 3, SS_TIDAL_CORRIDOR
+ warp_def 32, 16, 0, 3, SS_TIDAL_CORRIDOR
+ warp_def 4, 1, 0, 4, SS_TIDAL_CORRIDOR
+ warp_def 13, 1, 0, 5, SS_TIDAL_CORRIDOR
+ warp_def 22, 1, 0, 6, SS_TIDAL_CORRIDOR
+ warp_def 31, 1, 0, 7, SS_TIDAL_CORRIDOR
+
+SSTidalRooms_MapBGEvents: @ 853A434
+ bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_23CA33
+ bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33
+
+SSTidalRooms_MapEvents:: @ 853A44C
+ map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
+
diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/events/SafariZone_North.inc
new file mode 100644
index 000000000..e8ace6482
--- /dev/null
+++ b/data/maps/events/SafariZone_North.inc
@@ -0,0 +1,14 @@
+SafariZone_North_MapObjects: @ 853B160
+ object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0
+ object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0
+ object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0
+ object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0
+ object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0
+ object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0
+ object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0
+
+SafariZone_North_MapEvents:: @ 853B238
+ map_events SafariZone_North_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
new file mode 100644
index 000000000..84505d6e6
--- /dev/null
+++ b/data/maps/events/SafariZone_Northeast.inc
@@ -0,0 +1,18 @@
+SafariZone_Northeast_MapObjects: @ 853B968
+ object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0
+ object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0
+ object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0
+ object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0
+ object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0
+
+SafariZone_Northeast_MapBGEvents: @ 853BA40
+ bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0
+ bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0
+
+SafariZone_Northeast_MapEvents:: @ 853BA58
+ map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents
+
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc
new file mode 100644
index 000000000..64152d008
--- /dev/null
+++ b/data/maps/events/SafariZone_Northwest.inc
@@ -0,0 +1,7 @@
+SafariZone_Northwest_MapObjects: @ 853B11C
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0
+
+SafariZone_Northwest_MapEvents:: @ 853B14C
+ map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc
new file mode 100644
index 000000000..863c3113a
--- /dev/null
+++ b/data/maps/events/SafariZone_RestHouse.inc
@@ -0,0 +1,12 @@
+SafariZone_RestHouse_MapObjects: @ 853B8FC
+ object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0
+
+SafariZone_RestHouse_MapWarps: @ 853B944
+ warp_def 3, 8, 0, 0, SAFARI_ZONE_SOUTHWEST
+ warp_def 4, 8, 0, 0, SAFARI_ZONE_SOUTHWEST
+
+SafariZone_RestHouse_MapEvents:: @ 853B954
+ map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/events/SafariZone_South.inc
new file mode 100644
index 000000000..4a0ead84c
--- /dev/null
+++ b/data/maps/events/SafariZone_South.inc
@@ -0,0 +1,14 @@
+SafariZone_South_MapObjects: @ 853B2A4
+ object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0
+ object_event 6, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0
+
+SafariZone_South_MapWarps: @ 853B334
+ warp_def 32, 33, 0, 0, ROUTE_121_SAFARI_ZONE_ENTRANCE
+
+SafariZone_South_MapEvents:: @ 853B33C
+ map_events SafariZone_South_MapObjects, SafariZone_South_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc
new file mode 100644
index 000000000..3970e6eb0
--- /dev/null
+++ b/data/maps/events/SafariZone_Southeast.inc
@@ -0,0 +1,14 @@
+SafariZone_Southeast_MapObjects: @ 853BA6C
+ object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0
+ object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0
+
+SafariZone_Southeast_MapBGEvents: @ 853BAE4
+ bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0
+ bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0
+
+SafariZone_Southeast_MapEvents:: @ 853BAFC
+ map_events SafariZone_Southeast_MapObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents
+
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc
new file mode 100644
index 000000000..9edb33ddb
--- /dev/null
+++ b/data/maps/events/SafariZone_Southwest.inc
@@ -0,0 +1,13 @@
+SafariZone_Southwest_MapObjects: @ 853B24C
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0
+
+SafariZone_Southwest_MapWarps: @ 853B27C
+ warp_def 29, 7, 3, 0, SAFARI_ZONE_REST_HOUSE
+
+SafariZone_Southwest_MapBGEvents: @ 853B284
+ bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270
+
+SafariZone_Southwest_MapEvents:: @ 853B290
+ map_events SafariZone_Southwest_MapObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
+
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc
new file mode 100644
index 000000000..f5c878466
--- /dev/null
+++ b/data/maps/events/ScorchedSlab.inc
@@ -0,0 +1,9 @@
+ScorchedSlab_MapObjects: @ 8536F88
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0
+
+ScorchedSlab_MapWarps: @ 8536FA0
+ warp_def 7, 16, 1, 1, ROUTE_120
+
+ScorchedSlab_MapEvents:: @ 8536FA8
+ map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc
new file mode 100644
index 000000000..3a41757e2
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Entrance.inc
@@ -0,0 +1,10 @@
+SeafloorCavern_Entrance_MapObjects: @ 85356BC
+ object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0
+
+SeafloorCavern_Entrance_MapWarps: @ 85356D4
+ warp_def 10, 18, 3, 0, UNDERWATER_4
+ warp_def 10, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_1
+
+SeafloorCavern_Entrance_MapEvents:: @ 85356E4
+ map_events SeafloorCavern_Entrance_MapObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc
new file mode 100644
index 000000000..4a219357c
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room1.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room1_MapObjects: @ 85356F8
+ object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0
+ object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0
+ object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0
+ object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0
+ object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0
+
+SeafloorCavern_Room1_MapWarps: @ 8535770
+ warp_def 5, 18, 3, 1, SEAFLOOR_CAVERN_ENTRANCE
+ warp_def 17, 13, 3, 0, SEAFLOOR_CAVERN_ROOM_5
+ warp_def 6, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_2
+
+SeafloorCavern_Room1_MapEvents:: @ 8535788
+ map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc
new file mode 100644
index 000000000..cf0c2dfad
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room2.inc
@@ -0,0 +1,19 @@
+SeafloorCavern_Room2_MapObjects: @ 853579C
+ object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0
+ object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0
+ object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0
+ object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0
+ object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0
+ object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0
+ object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0
+ object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0
+
+SeafloorCavern_Room2_MapWarps: @ 853585C
+ warp_def 10, 7, 3, 2, SEAFLOOR_CAVERN_ROOM_1
+ warp_def 4, 10, 3, 0, SEAFLOOR_CAVERN_ROOM_4
+ warp_def 6, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_6
+ warp_def 11, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_7
+
+SeafloorCavern_Room2_MapEvents:: @ 853587C
+ map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc
new file mode 100644
index 000000000..964b45a6d
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room3.inc
@@ -0,0 +1,19 @@
+SeafloorCavern_Room3_MapObjects: @ 8535890
+ object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0
+ object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0
+ object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0
+ object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0
+ object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0
+ object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0
+ object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0
+ object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0
+ object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0
+
+SeafloorCavern_Room3_MapWarps: @ 8535968
+ warp_def 8, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_8
+ warp_def 9, 13, 3, 1, SEAFLOOR_CAVERN_ROOM_7
+ warp_def 4, 15, 3, 1, SEAFLOOR_CAVERN_ROOM_6
+
+SeafloorCavern_Room3_MapEvents:: @ 8535980
+ map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc
new file mode 100644
index 000000000..79d57dd72
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room4.inc
@@ -0,0 +1,13 @@
+SeafloorCavern_Room4_MapObjects: @ 8535994
+ object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0
+ object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0
+
+SeafloorCavern_Room4_MapWarps: @ 85359C4
+ warp_def 13, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_2
+ warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_5
+ warp_def 9, 10, 3, 2, SEAFLOOR_CAVERN_ROOM_5
+ warp_def 10, 15, 3, 1, SEAFLOOR_CAVERN_ENTRANCE
+
+SeafloorCavern_Room4_MapEvents:: @ 85359E4
+ map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc
new file mode 100644
index 000000000..b88a862ab
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room5.inc
@@ -0,0 +1,16 @@
+SeafloorCavern_Room5_MapObjects: @ 85359F8
+ object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0
+ object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0
+ object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0
+ object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0
+ object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0
+ object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0
+
+SeafloorCavern_Room5_MapWarps: @ 8535A88
+ warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_1
+ warp_def 15, 12, 3, 1, SEAFLOOR_CAVERN_ROOM_4
+ warp_def 7, 17, 3, 2, SEAFLOOR_CAVERN_ROOM_4
+
+SeafloorCavern_Room5_MapEvents:: @ 8535AA0
+ map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc
new file mode 100644
index 000000000..2293f359d
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room6.inc
@@ -0,0 +1,8 @@
+SeafloorCavern_Room6_MapWarps: @ 8535AB4
+ warp_def 11, 21, 3, 2, SEAFLOOR_CAVERN_ROOM_2
+ warp_def 4, 1, 3, 2, SEAFLOOR_CAVERN_ROOM_3
+ warp_def 14, 8, 1, 1, SEAFLOOR_CAVERN_ENTRANCE
+
+SeafloorCavern_Room6_MapEvents:: @ 8535ACC
+ map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/events/SeafloorCavern_Room7.inc
new file mode 100644
index 000000000..002154473
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room7.inc
@@ -0,0 +1,7 @@
+SeafloorCavern_Room7_MapWarps: @ 8535AE0
+ warp_def 3, 23, 3, 3, SEAFLOOR_CAVERN_ROOM_2
+ warp_def 5, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_3
+
+SeafloorCavern_Room7_MapEvents:: @ 8535AF0
+ map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc
new file mode 100644
index 000000000..7fd65fc08
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room8.inc
@@ -0,0 +1,21 @@
+SeafloorCavern_Room8_MapObjects: @ 8535B04
+ object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0
+ object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0
+ object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0
+ object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0
+ object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0
+ object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0
+ object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0
+ object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0
+ object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0
+ object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0
+ object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0
+ object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0
+
+SeafloorCavern_Room8_MapWarps: @ 8535C24
+ warp_def 5, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_9
+ warp_def 5, 12, 3, 0, SEAFLOOR_CAVERN_ROOM_3
+
+SeafloorCavern_Room8_MapEvents:: @ 8535C34
+ map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
new file mode 100644
index 000000000..bcd27d030
--- /dev/null
+++ b/data/maps/events/SeafloorCavern_Room9.inc
@@ -0,0 +1,18 @@
+SeafloorCavern_Room9_MapObjects: @ 8535C48
+ object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0
+ object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0
+ object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0
+ object_event 7, MAP_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0
+
+SeafloorCavern_Room9_MapWarps: @ 8535CF0
+ warp_def 5, 4, 3, 0, SEAFLOOR_CAVERN_ROOM_8
+
+SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8
+ coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9
+
+SeafloorCavern_Room9_MapEvents:: @ 8535D08
+ map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc
new file mode 100644
index 000000000..753d6dbfb
--- /dev/null
+++ b/data/maps/events/SealedChamber_InnerRoom.inc
@@ -0,0 +1,17 @@
+SealedChamber_InnerRoom_MapWarps: @ 8536F00
+ warp_def 10, 19, 3, 0, SEALED_CHAMBER_OUTER_ROOM
+
+SealedChamber_InnerRoom_MapBGEvents: @ 8536F08
+ bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
+ bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239255
+ bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23925F
+ bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239269
+ bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239273
+ bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_23927D
+ bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_239287
+ bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
+ bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_2391F8
+
+SealedChamber_InnerRoom_MapEvents:: @ 8536F74
+ map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents
+
diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc
new file mode 100644
index 000000000..21be37675
--- /dev/null
+++ b/data/maps/events/SealedChamber_OuterRoom.inc
@@ -0,0 +1,37 @@
+SealedChamber_OuterRoom_MapWarps: @ 8536D88
+ warp_def 10, 2, 3, 0, SEALED_CHAMBER_INNER_ROOM
+
+SealedChamber_OuterRoom_MapBGEvents: @ 8536D90
+ bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
+ bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
+ bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
+ bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
+ bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
+ bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
+ bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
+ bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
+ bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391B2
+ bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391C6
+ bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391D0
+ bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
+ bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23916C
+ bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
+ bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239176
+ bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
+ bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239180
+ bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
+ bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23918A
+ bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
+ bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_239194
+ bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
+ bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_23919E
+ bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
+ bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391A8
+ bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
+ bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391BC
+ bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED
+ bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_2391ED
+
+SealedChamber_OuterRoom_MapEvents:: @ 8536EEC
+ map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents
+
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc
new file mode 100644
index 000000000..eb92a3851
--- /dev/null
+++ b/data/maps/events/SecretBase_BlueCave1.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave1_MapObjects: @ 8537BEC
+ object_event 1, 255, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BlueCave1_MapWarps: @ 8537D54
+ warp_def 5, 7, 0, 126, NONE
+
+SecretBase_BlueCave1_MapEvents:: @ 8537D5C
+ map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc
new file mode 100644
index 000000000..e2db7471f
--- /dev/null
+++ b/data/maps/events/SecretBase_BlueCave2.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave2_MapObjects: @ 8538504
+ object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BlueCave2_MapWarps: @ 853866C
+ warp_def 7, 5, 0, 126, NONE
+
+SecretBase_BlueCave2_MapEvents:: @ 8538674
+ map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc
new file mode 100644
index 000000000..cc5606ac4
--- /dev/null
+++ b/data/maps/events/SecretBase_BlueCave3.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave3_MapObjects: @ 8538E1C
+ object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BlueCave3_MapWarps: @ 8538F84
+ warp_def 4, 15, 0, 126, NONE
+
+SecretBase_BlueCave3_MapEvents:: @ 8538F8C
+ map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc
new file mode 100644
index 000000000..0efdf765d
--- /dev/null
+++ b/data/maps/events/SecretBase_BlueCave4.inc
@@ -0,0 +1,23 @@
+SecretBase_BlueCave4_MapObjects: @ 8539734
+ object_event 1, 255, 0, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BlueCave4_MapWarps: @ 853989C
+ warp_def 4, 15, 0, 126, NONE
+
+SecretBase_BlueCave4_MapEvents:: @ 85398A4
+ map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc
new file mode 100644
index 000000000..7755a5a09
--- /dev/null
+++ b/data/maps/events/SecretBase_BrownCave1.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave1_MapObjects: @ 8537A68
+ object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BrownCave1_MapWarps: @ 8537BD0
+ warp_def 5, 7, 0, 126, NONE
+
+SecretBase_BrownCave1_MapEvents:: @ 8537BD8
+ map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc
new file mode 100644
index 000000000..37a1387bf
--- /dev/null
+++ b/data/maps/events/SecretBase_BrownCave2.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave2_MapObjects: @ 8538380
+ object_event 1, 255, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BrownCave2_MapWarps: @ 85384E8
+ warp_def 1, 7, 0, 126, NONE
+
+SecretBase_BrownCave2_MapEvents:: @ 85384F0
+ map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc
new file mode 100644
index 000000000..14c9905a2
--- /dev/null
+++ b/data/maps/events/SecretBase_BrownCave3.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave3_MapObjects: @ 8538C98
+ object_event 1, 255, 0, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BrownCave3_MapWarps: @ 8538E00
+ warp_def 11, 9, 0, 126, NONE
+
+SecretBase_BrownCave3_MapEvents:: @ 8538E08
+ map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc
new file mode 100644
index 000000000..543cb0072
--- /dev/null
+++ b/data/maps/events/SecretBase_BrownCave4.inc
@@ -0,0 +1,23 @@
+SecretBase_BrownCave4_MapObjects: @ 85395B0
+ object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_BrownCave4_MapWarps: @ 8539718
+ warp_def 2, 8, 0, 126, NONE
+
+SecretBase_BrownCave4_MapEvents:: @ 8539720
+ map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc
new file mode 100644
index 000000000..ebc15ecd7
--- /dev/null
+++ b/data/maps/events/SecretBase_RedCave1.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave1_MapObjects: @ 85378E4
+ object_event 1, 255, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_RedCave1_MapWarps: @ 8537A4C
+ warp_def 5, 7, 0, 126, NONE
+
+SecretBase_RedCave1_MapEvents:: @ 8537A54
+ map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc
new file mode 100644
index 000000000..ef7958e9a
--- /dev/null
+++ b/data/maps/events/SecretBase_RedCave2.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave2_MapObjects: @ 85381FC
+ object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_RedCave2_MapWarps: @ 8538364
+ warp_def 3, 14, 0, 126, NONE
+
+SecretBase_RedCave2_MapEvents:: @ 853836C
+ map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc
new file mode 100644
index 000000000..65dc43026
--- /dev/null
+++ b/data/maps/events/SecretBase_RedCave3.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave3_MapObjects: @ 8538B14
+ object_event 1, 255, 0, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_RedCave3_MapWarps: @ 8538C7C
+ warp_def 3, 6, 0, 126, NONE
+
+SecretBase_RedCave3_MapEvents:: @ 8538C84
+ map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc
new file mode 100644
index 000000000..274a459cd
--- /dev/null
+++ b/data/maps/events/SecretBase_RedCave4.inc
@@ -0,0 +1,23 @@
+SecretBase_RedCave4_MapObjects: @ 853942C
+ object_event 1, 255, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_RedCave4_MapWarps: @ 8539594
+ warp_def 2, 12, 0, 126, NONE
+
+SecretBase_RedCave4_MapEvents:: @ 853959C
+ map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc
new file mode 100644
index 000000000..e20d76bc2
--- /dev/null
+++ b/data/maps/events/SecretBase_Shrub1.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub1_MapObjects: @ 8538078
+ object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Shrub1_MapWarps: @ 85381E0
+ warp_def 5, 7, 0, 126, NONE
+
+SecretBase_Shrub1_MapEvents:: @ 85381E8
+ map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc
new file mode 100644
index 000000000..23d023b31
--- /dev/null
+++ b/data/maps/events/SecretBase_Shrub2.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub2_MapObjects: @ 8538990
+ object_event 1, 255, 0, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Shrub2_MapWarps: @ 8538AF8
+ warp_def 7, 5, 0, 126, NONE
+
+SecretBase_Shrub2_MapEvents:: @ 8538B00
+ map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc
new file mode 100644
index 000000000..5fe624dc3
--- /dev/null
+++ b/data/maps/events/SecretBase_Shrub3.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub3_MapObjects: @ 85392A8
+ object_event 1, 255, 0, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Shrub3_MapWarps: @ 8539410
+ warp_def 6, 9, 0, 126, NONE
+
+SecretBase_Shrub3_MapEvents:: @ 8539418
+ map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc
new file mode 100644
index 000000000..ad432f6ff
--- /dev/null
+++ b/data/maps/events/SecretBase_Shrub4.inc
@@ -0,0 +1,23 @@
+SecretBase_Shrub4_MapObjects: @ 8539BC0
+ object_event 1, 255, 0, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Shrub4_MapWarps: @ 8539D28
+ warp_def 11, 8, 0, 126, NONE
+
+SecretBase_Shrub4_MapEvents:: @ 8539D30
+ map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc
new file mode 100644
index 000000000..149d5dea3
--- /dev/null
+++ b/data/maps/events/SecretBase_Tree1.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree1_MapObjects: @ 8537EF4
+ object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Tree1_MapWarps: @ 853805C
+ warp_def 5, 7, 0, 126, NONE
+
+SecretBase_Tree1_MapEvents:: @ 8538064
+ map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc
new file mode 100644
index 000000000..16037e22f
--- /dev/null
+++ b/data/maps/events/SecretBase_Tree2.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree2_MapObjects: @ 853880C
+ object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Tree2_MapWarps: @ 8538974
+ warp_def 3, 14, 0, 126, NONE
+
+SecretBase_Tree2_MapEvents:: @ 853897C
+ map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc
new file mode 100644
index 000000000..6fbd60683
--- /dev/null
+++ b/data/maps/events/SecretBase_Tree3.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree3_MapObjects: @ 8539124
+ object_event 1, 255, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Tree3_MapWarps: @ 853928C
+ warp_def 8, 6, 0, 126, NONE
+
+SecretBase_Tree3_MapEvents:: @ 8539294
+ map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc
new file mode 100644
index 000000000..4032d668a
--- /dev/null
+++ b/data/maps/events/SecretBase_Tree4.inc
@@ -0,0 +1,23 @@
+SecretBase_Tree4_MapObjects: @ 8539A3C
+ object_event 1, 255, 0, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_Tree4_MapWarps: @ 8539BA4
+ warp_def 7, 12, 0, 126, NONE
+
+SecretBase_Tree4_MapEvents:: @ 8539BAC
+ map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc
new file mode 100644
index 000000000..7d604b093
--- /dev/null
+++ b/data/maps/events/SecretBase_YellowCave1.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave1_MapObjects: @ 8537D70
+ object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_YellowCave1_MapWarps: @ 8537ED8
+ warp_def 5, 7, 0, 126, NONE
+
+SecretBase_YellowCave1_MapEvents:: @ 8537EE0
+ map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc
new file mode 100644
index 000000000..592595aa8
--- /dev/null
+++ b/data/maps/events/SecretBase_YellowCave2.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave2_MapObjects: @ 8538688
+ object_event 1, 255, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_YellowCave2_MapWarps: @ 85387F0
+ warp_def 12, 7, 0, 126, NONE
+
+SecretBase_YellowCave2_MapEvents:: @ 85387F8
+ map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc
new file mode 100644
index 000000000..bd1f69b1a
--- /dev/null
+++ b/data/maps/events/SecretBase_YellowCave3.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave3_MapObjects: @ 8538FA0
+ object_event 1, 255, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_YellowCave3_MapWarps: @ 8539108
+ warp_def 5, 9, 0, 126, NONE
+
+SecretBase_YellowCave3_MapEvents:: @ 8539110
+ map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc
new file mode 100644
index 000000000..fe52f12bb
--- /dev/null
+++ b/data/maps/events/SecretBase_YellowCave4.inc
@@ -0,0 +1,23 @@
+SecretBase_YellowCave4_MapObjects: @ 85398B8
+ object_event 1, 255, 0, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
+ object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
+ object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
+ object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0
+ object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0
+ object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0
+ object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0
+ object_event 11, 249, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183, 0, 0
+ object_event 12, 250, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184, 0, 0
+ object_event 13, 251, 0, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185, 0, 0
+ object_event 14, 252, 0, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186, 0, 0
+ object_event 15, 253, 0, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187, 0, 0
+
+SecretBase_YellowCave4_MapWarps: @ 8539A20
+ warp_def 6, 12, 0, 126, NONE
+
+SecretBase_YellowCave4_MapEvents:: @ 8539A28
+ map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
new file mode 100644
index 000000000..e04abe693
--- /dev/null
+++ b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
@@ -0,0 +1,3 @@
+ShoalCave_HighTideEntranceRoom_MapEvents:: @ 853644C
+ map_events 0x0, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/events/ShoalCave_HighTideInnerRoom.inc
new file mode 100644
index 000000000..20d59a56f
--- /dev/null
+++ b/data/maps/events/ShoalCave_HighTideInnerRoom.inc
@@ -0,0 +1,3 @@
+ShoalCave_HighTideInnerRoom_MapEvents:: @ 8536460
+ map_events 0x0, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
new file mode 100644
index 000000000..b19a293ef
--- /dev/null
+++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
@@ -0,0 +1,13 @@
+ShoalCave_LowTideEntranceRoom_MapObjects: @ 853627C
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0
+ object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0
+
+ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC
+ warp_def 20, 30, 3, 0, ROUTE_125
+ warp_def 19, 5, 3, 0, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+ warp_def 6, 2, 3, 6, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+ warp_def 27, 2, 3, 7, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+
+ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC
+ map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc
new file mode 100644
index 000000000..a02a20864
--- /dev/null
+++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc
@@ -0,0 +1,10 @@
+ShoalCave_LowTideIceRoom_MapObjects: @ 8537100
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0
+ object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0
+
+ShoalCave_LowTideIceRoom_MapWarps: @ 8537130
+ warp_def 17, 10, 3, 3, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+
+ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138
+ map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
new file mode 100644
index 000000000..8fe34709b
--- /dev/null
+++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
@@ -0,0 +1,24 @@
+ShoalCave_LowTideInnerRoom_MapObjects: @ 85362E0
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0
+
+ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8
+ warp_def 34, 29, 3, 1, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+ warp_def 38, 15, 3, 0, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
+ warp_def 42, 4, 3, 1, SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
+ warp_def 19, 14, 4, 0, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+ warp_def 15, 19, 3, 1, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+ warp_def 30, 25, 3, 2, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+ warp_def 14, 33, 5, 2, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+ warp_def 40, 33, 5, 3, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+
+ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338
+ bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23708C
+ bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2370C8
+ bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FBA
+ bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_236FF6
+ bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_237028
+ bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A
+
+ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380
+ map_events ShoalCave_LowTideInnerRoom_MapObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
+
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
new file mode 100644
index 000000000..384b6570f
--- /dev/null
+++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
@@ -0,0 +1,16 @@
+ShoalCave_LowTideLowerRoom_MapObjects: @ 85363DC
+ object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0
+ object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0
+
+ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C
+ warp_def 7, 2, 3, 3, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+ warp_def 2, 6, 3, 4, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+ warp_def 19, 11, 3, 5, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+ warp_def 28, 11, 3, 0, SHOAL_CAVE_LOW_TIDE_ICE_ROOM
+
+ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C
+ bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176
+
+ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438
+ map_events ShoalCave_LowTideLowerRoom_MapObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
+
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
new file mode 100644
index 000000000..6592f68d7
--- /dev/null
+++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
@@ -0,0 +1,13 @@
+ShoalCave_LowTideStairsRoom_MapObjects: @ 8536394
+ object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0
+
+ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC
+ warp_def 3, 12, 3, 1, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+ warp_def 7, 4, 3, 2, SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+
+ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC
+ bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A
+
+ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8
+ map_events ShoalCave_LowTideStairsRoom_MapObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
+
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc
new file mode 100644
index 000000000..6672b1221
--- /dev/null
+++ b/data/maps/events/SingleBattleColosseum.inc
@@ -0,0 +1,14 @@
+SingleBattleColosseum_MapObjects: @ 8539D44
+ object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0
+
+SingleBattleColosseum_MapWarps: @ 8539D5C
+ warp_def 6, 8, 3, 127, NONE
+ warp_def 7, 8, 3, 127, NONE
+
+SingleBattleColosseum_MapCoordEvents: @ 8539D6C
+ coord_event 3, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_08277374
+ coord_event 10, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_0827737E
+
+SingleBattleColosseum_MapEvents:: @ 8539D8C
+ map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc
new file mode 100644
index 000000000..c9eda68b0
--- /dev/null
+++ b/data/maps/events/SkyPillar_1F.inc
@@ -0,0 +1,8 @@
+SkyPillar_1F_MapWarps: @ 8537058
+ warp_def 6, 13, 3, 1, SKY_PILLAR_OUTSIDE
+ warp_def 7, 13, 3, 1, SKY_PILLAR_OUTSIDE
+ warp_def 10, 1, 3, 0, SKY_PILLAR_2F
+
+SkyPillar_1F_MapEvents:: @ 8537070
+ map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/events/SkyPillar_2F.inc
new file mode 100644
index 000000000..1c81f7838
--- /dev/null
+++ b/data/maps/events/SkyPillar_2F.inc
@@ -0,0 +1,7 @@
+SkyPillar_2F_MapWarps: @ 8537084
+ warp_def 10, 1, 3, 2, SKY_PILLAR_1F
+ warp_def 3, 1, 3, 0, SKY_PILLAR_3F
+
+SkyPillar_2F_MapEvents:: @ 8537094
+ map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/events/SkyPillar_3F.inc
new file mode 100644
index 000000000..c8a97565b
--- /dev/null
+++ b/data/maps/events/SkyPillar_3F.inc
@@ -0,0 +1,8 @@
+SkyPillar_3F_MapWarps: @ 85370A8
+ warp_def 3, 1, 3, 1, SKY_PILLAR_2F
+ warp_def 11, 1, 3, 0, SKY_PILLAR_4F
+ warp_def 7, 1, 3, 1, SKY_PILLAR_4F
+
+SkyPillar_3F_MapEvents:: @ 85370C0
+ map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/events/SkyPillar_4F.inc
new file mode 100644
index 000000000..a399d1364
--- /dev/null
+++ b/data/maps/events/SkyPillar_4F.inc
@@ -0,0 +1,8 @@
+SkyPillar_4F_MapWarps: @ 85370D4
+ warp_def 11, 1, 3, 1, SKY_PILLAR_3F
+ warp_def 7, 1, 3, 2, SKY_PILLAR_3F
+ warp_def 3, 1, 3, 0, SKY_PILLAR_5F
+
+SkyPillar_4F_MapEvents:: @ 85370EC
+ map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/events/SkyPillar_5F.inc
new file mode 100644
index 000000000..d6ce944cb
--- /dev/null
+++ b/data/maps/events/SkyPillar_5F.inc
@@ -0,0 +1,7 @@
+SkyPillar_5F_MapWarps: @ 853714C
+ warp_def 3, 1, 3, 2, SKY_PILLAR_4F
+ warp_def 10, 1, 3, 0, SKY_PILLAR_TOP
+
+SkyPillar_5F_MapEvents:: @ 853715C
+ map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/events/SkyPillar_Entrance.inc
new file mode 100644
index 000000000..5a63e2496
--- /dev/null
+++ b/data/maps/events/SkyPillar_Entrance.inc
@@ -0,0 +1,7 @@
+SkyPillar_Entrance_MapWarps: @ 8536FF8
+ warp_def 6, 16, 3, 0, ROUTE_131
+ warp_def 14, 4, 3, 0, SKY_PILLAR_OUTSIDE
+
+SkyPillar_Entrance_MapEvents:: @ 8537008
+ map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc
new file mode 100644
index 000000000..70a9c5c21
--- /dev/null
+++ b/data/maps/events/SkyPillar_Outside.inc
@@ -0,0 +1,10 @@
+SkyPillar_Outside_MapObjects: @ 853701C
+ object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0
+
+SkyPillar_Outside_MapWarps: @ 8537034
+ warp_def 17, 13, 3, 1, SKY_PILLAR_ENTRANCE
+ warp_def 14, 5, 0, 0, SKY_PILLAR_1F
+
+SkyPillar_Outside_MapEvents:: @ 8537044
+ map_events SkyPillar_Outside_MapObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc
new file mode 100644
index 000000000..8abe8401f
--- /dev/null
+++ b/data/maps/events/SkyPillar_Top.inc
@@ -0,0 +1,13 @@
+SkyPillar_Top_MapObjects: @ 8537170
+ object_event 1, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0
+ object_event 2, MAP_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0
+
+SkyPillar_Top_MapWarps: @ 85371A0
+ warp_def 16, 14, 3, 1, SKY_PILLAR_5F
+
+SkyPillar_Top_MapCoordEvents: @ 85371A8
+ coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A
+
+SkyPillar_Top_MapEvents:: @ 85371B8
+ map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc
new file mode 100644
index 000000000..a187aaf1f
--- /dev/null
+++ b/data/maps/events/SlateportCity.inc
@@ -0,0 +1,71 @@
+SlateportCity_MapObjects: @ 85261CC
+ object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0
+ object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0
+ object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0
+ object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0
+ object_event 12, MAP_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0
+ object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0
+ object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0
+ object_event 18, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0
+ object_event 19, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0
+ object_event 20, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0
+ object_event 22, MAP_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0
+ object_event 23, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0
+ object_event 24, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0
+ object_event 25, MAP_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0
+ object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0
+ object_event 27, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0
+ object_event 28, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0
+ object_event 29, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0
+ object_event 30, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0
+ object_event 31, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0
+ object_event 32, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0
+ object_event 33, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0
+ object_event 34, MAP_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0
+ object_event 35, MAP_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0
+
+SlateportCity_MapWarps: @ 8526514
+ warp_def 19, 19, 0, 0, SLATEPORT_CITY_POKEMON_CENTER_1F
+ warp_def 13, 26, 0, 0, SLATEPORT_CITY_MART
+ warp_def 26, 38, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_1F
+ warp_def 10, 12, 0, 0, SLATEPORT_CITY_BATTLE_TENT_LOBBY
+ warp_def 4, 26, 0, 0, SLATEPORT_CITY_POKEMON_FAN_CLUB
+ warp_def 30, 26, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+ warp_def 5, 19, 0, 0, SLATEPORT_CITY_HOUSE_1
+ warp_def 31, 26, 0, 1, SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+ warp_def 28, 12, 0, 0, SLATEPORT_CITY_HARBOR
+ warp_def 40, 7, 0, 2, SLATEPORT_CITY_HARBOR
+ warp_def 21, 44, 0, 0, SLATEPORT_CITY_HOUSE_2
+
+SlateportCity_MapCoordEvents: @ 852656C
+ coord_event 10, 13, 3, 0, VAR_0x40D2, 2, 0, SlateportCity_EventScript_1DD5DC
+
+SlateportCity_MapBGEvents: @ 852657C
+ bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_1DCFB2
+ bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_271E73
+ bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_271E73
+ bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_271E6A
+ bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_1DCF94
+ bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_271E6A
+ bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_1DCF8B
+ bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_1DCF79
+ bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_1DCF82
+ bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_1DCF70
+ bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_1DCF36
+ bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_1DCF3F
+ bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643
+
+SlateportCity_MapEvents:: @ 8526618
+ map_events SlateportCity_MapObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents
+
diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
new file mode 100644
index 000000000..8c13a223a
--- /dev/null
+++ b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
@@ -0,0 +1,8 @@
+SlateportCity_BattleTentBattleRoom_MapObjects: @ 852F4DC
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524
+ map_events SlateportCity_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc
new file mode 100644
index 000000000..acd0f732c
--- /dev/null
+++ b/data/maps/events/SlateportCity_BattleTentCorridor.inc
@@ -0,0 +1,6 @@
+SlateportCity_BattleTentCorridor_MapObjects: @ 852F4B0
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8
+ map_events SlateportCity_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc
new file mode 100644
index 000000000..7b0f10331
--- /dev/null
+++ b/data/maps/events/SlateportCity_BattleTentLobby.inc
@@ -0,0 +1,17 @@
+SlateportCity_BattleTentLobby_MapObjects: @ 852F408
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0
+
+SlateportCity_BattleTentLobby_MapWarps: @ 852F480
+ warp_def 6, 9, 0, 3, SLATEPORT_CITY
+ warp_def 7, 9, 0, 3, SLATEPORT_CITY
+
+SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490
+ bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99
+
+SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C
+ map_events SlateportCity_BattleTentLobby_MapObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents
+
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc
new file mode 100644
index 000000000..307cfd1c2
--- /dev/null
+++ b/data/maps/events/SlateportCity_Harbor.inc
@@ -0,0 +1,25 @@
+SlateportCity_Harbor_MapObjects: @ 852FA68
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0
+ object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0
+ object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0
+ object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0
+ object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0
+ object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0
+ object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0
+ object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0
+
+SlateportCity_Harbor_MapWarps: @ 852FB28
+ warp_def 11, 14, 0, 8, SLATEPORT_CITY
+ warp_def 12, 14, 0, 8, SLATEPORT_CITY
+ warp_def 19, 15, 0, 9, SLATEPORT_CITY
+ warp_def 20, 15, 0, 9, SLATEPORT_CITY
+
+SlateportCity_Harbor_MapCoordEvents: @ 852FB48
+ coord_event 8, 11, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9BB
+ coord_event 8, 12, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9C7
+ coord_event 8, 13, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9D3
+ coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF
+
+SlateportCity_Harbor_MapEvents:: @ 852FB88
+ map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc
new file mode 100644
index 000000000..d5151a0a1
--- /dev/null
+++ b/data/maps/events/SlateportCity_House1.inc
@@ -0,0 +1,10 @@
+SlateportCity_House1_MapObjects: @ 852F538
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0
+
+SlateportCity_House1_MapWarps: @ 852F550
+ warp_def 3, 7, 0, 6, SLATEPORT_CITY
+ warp_def 4, 7, 0, 6, SLATEPORT_CITY
+
+SlateportCity_House1_MapEvents:: @ 852F560
+ map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc
new file mode 100644
index 000000000..f77f34456
--- /dev/null
+++ b/data/maps/events/SlateportCity_House2.inc
@@ -0,0 +1,11 @@
+SlateportCity_House2_MapObjects: @ 852FB9C
+ object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0
+
+SlateportCity_House2_MapWarps: @ 852FBCC
+ warp_def 3, 7, 0, 10, SLATEPORT_CITY
+ warp_def 4, 7, 0, 10, SLATEPORT_CITY
+
+SlateportCity_House2_MapEvents:: @ 852FBDC
+ map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc
new file mode 100644
index 000000000..bab6768de
--- /dev/null
+++ b/data/maps/events/SlateportCity_Mart.inc
@@ -0,0 +1,12 @@
+SlateportCity_Mart_MapObjects: @ 852FCF0
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0
+
+SlateportCity_Mart_MapWarps: @ 852FD38
+ warp_def 3, 7, 0, 1, SLATEPORT_CITY
+ warp_def 4, 7, 0, 1, SLATEPORT_CITY
+
+SlateportCity_Mart_MapEvents:: @ 852FD48
+ map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
new file mode 100644
index 000000000..1ae29ed6f
--- /dev/null
+++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
@@ -0,0 +1,43 @@
+SlateportCity_OceanicMuseum_1F_MapObjects: @ 852F670
+ object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0
+ object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0
+ object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0
+ object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0
+ object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0
+ object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0
+ object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0
+ object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0
+ object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0
+ object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0
+ object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0
+ object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0
+
+SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0
+ warp_def 9, 8, 0, 5, SLATEPORT_CITY
+ warp_def 10, 8, 0, 7, SLATEPORT_CITY
+ warp_def 6, 1, 0, 0, SLATEPORT_CITY_OCEANIC_MUSEUM_2F
+
+SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8
+ coord_event 9, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F
+ coord_event 10, 7, 3, 0, VAR_0x40AA, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0
+
+SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8
+ bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE83
+ bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C
+ bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
+ bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
+ bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
+ bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
+ bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7
+ bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0
+ bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9
+ bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
+ bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
+ bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
+ bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
+
+SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894
+ map_events SlateportCity_OceanicMuseum_1F_MapObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
+
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
new file mode 100644
index 000000000..5c3f7108d
--- /dev/null
+++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
@@ -0,0 +1,38 @@
+SlateportCity_OceanicMuseum_2F_MapObjects: @ 852F8A8
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0
+ object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0
+ object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0
+ object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0
+ object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0
+ object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0
+
+SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950
+ warp_def 6, 1, 0, 2, SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+
+SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958
+ bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A
+ bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD13
+ bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
+ bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
+ bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+ bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+ bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+ bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+ bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+ bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
+ bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
+ bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
+ bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
+ bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
+ bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
+ bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
+ bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
+ bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
+ bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
+ bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+ bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+
+SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54
+ map_events SlateportCity_OceanicMuseum_2F_MapObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
+
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..52f406b71
--- /dev/null
+++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
@@ -0,0 +1,13 @@
+SlateportCity_PokemonCenter_1F_MapObjects: @ 852FBF0
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0
+
+SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38
+ warp_def 7, 8, 3, 0, SLATEPORT_CITY
+ warp_def 6, 8, 3, 0, SLATEPORT_CITY
+ warp_def 1, 6, 4, 0, SLATEPORT_CITY_POKEMON_CENTER_2F
+
+SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50
+ map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..cd9f74d39
--- /dev/null
+++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+SlateportCity_PokemonCenter_2F_MapObjects: @ 852FC64
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4
+ warp_def 1, 6, 4, 2, SLATEPORT_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC
+ map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc
new file mode 100644
index 000000000..ba18519ef
--- /dev/null
+++ b/data/maps/events/SlateportCity_PokemonFanClub.inc
@@ -0,0 +1,18 @@
+SlateportCity_PokemonFanClub_MapObjects: @ 852F574
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0
+
+SlateportCity_PokemonFanClub_MapWarps: @ 852F64C
+ warp_def 6, 10, 0, 4, SLATEPORT_CITY
+ warp_def 7, 10, 0, 4, SLATEPORT_CITY
+
+SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C
+ map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
new file mode 100644
index 000000000..07e93e516
--- /dev/null
+++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_1F_MapObjects: @ 852F318
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0
+
+SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378
+ warp_def 2, 14, 0, 2, SLATEPORT_CITY
+ warp_def 3, 14, 0, 2, SLATEPORT_CITY
+ warp_def 3, 1, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_2F
+
+SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390
+ map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
new file mode 100644
index 000000000..d43e45568
--- /dev/null
+++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
@@ -0,0 +1,11 @@
+SlateportCity_SternsShipyard_2F_MapObjects: @ 852F3A4
+ object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0
+
+SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC
+ warp_def 3, 1, 0, 2, SLATEPORT_CITY_STERNS_SHIPYARD_1F
+
+SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4
+ map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc
new file mode 100644
index 000000000..6f3bb0111
--- /dev/null
+++ b/data/maps/events/SootopolisCity.inc
@@ -0,0 +1,46 @@
+SootopolisCity_MapObjects: @ 8527314
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0
+ object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0
+ object_event 7, MAP_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0
+ object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0
+ object_event 10, MAP_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0
+ object_event 11, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0
+ object_event 12, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0
+ object_event 13, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0
+ object_event 14, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0
+ object_event 15, MAP_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0
+ object_event 16, MAP_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0
+ object_event 17, MAP_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0
+ object_event 18, MAP_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0
+
+SootopolisCity_MapWarps: @ 85274C4
+ warp_def 43, 31, 0, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_1F
+ warp_def 17, 29, 0, 0, SOOTOPOLIS_CITY_MART
+ warp_def 31, 32, 0, 0, SOOTOPOLIS_CITY_GYM_1F
+ warp_def 31, 16, 3, 0, CAVE_OF_ORIGIN_ENTRANCE
+ warp_def 9, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_1
+ warp_def 45, 6, 0, 0, SOOTOPOLIS_CITY_HOUSE_2
+ warp_def 9, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_3
+ warp_def 44, 17, 0, 0, SOOTOPOLIS_CITY_HOUSE_4
+ warp_def 9, 26, 0, 0, SOOTOPOLIS_CITY_HOUSE_5
+ warp_def 53, 28, 0, 0, SOOTOPOLIS_CITY_HOUSE_6
+ warp_def 8, 35, 0, 0, SOOTOPOLIS_CITY_HOUSE_7
+ warp_def 48, 25, 0, 0, SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE
+ warp_def 51, 36, 0, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
+
+SootopolisCity_MapBGEvents: @ 852752C
+ bg_event 33, 34, 3, 0, 0, SootopolisCity_EventScript_1E614B
+ bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A
+ bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_271E73
+ bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_271E73
+ bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_271E6A
+ bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154
+
+SootopolisCity_MapEvents:: @ 8527574
+ map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents
+
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc
new file mode 100644
index 000000000..b348cebcf
--- /dev/null
+++ b/data/maps/events/SootopolisCity_Gym_1F.inc
@@ -0,0 +1,16 @@
+SootopolisCity_Gym_1F_MapObjects: @ 8532FF4
+ object_event 1, MAP_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0
+
+SootopolisCity_Gym_1F_MapWarps: @ 8533024
+ warp_def 8, 25, 0, 2, SOOTOPOLIS_CITY
+ warp_def 9, 25, 0, 2, SOOTOPOLIS_CITY
+ warp_def 11, 22, 3, 0, SOOTOPOLIS_CITY_GYM_B1F
+
+SootopolisCity_Gym_1F_MapBGEvents: @ 853303C
+ bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_22505F
+ bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F
+
+SootopolisCity_Gym_1F_MapEvents:: @ 8533054
+ map_events SootopolisCity_Gym_1F_MapObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
+
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc
new file mode 100644
index 000000000..9e0dcbadd
--- /dev/null
+++ b/data/maps/events/SootopolisCity_Gym_B1F.inc
@@ -0,0 +1,18 @@
+SootopolisCity_Gym_B1F_MapObjects: @ 8533068
+ object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0
+ object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0
+ object_event 10, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0
+
+SootopolisCity_Gym_B1F_MapWarps: @ 8533158
+ warp_def 11, 22, 3, 2, SOOTOPOLIS_CITY_GYM_1F
+
+SootopolisCity_Gym_B1F_MapEvents:: @ 8533160
+ map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc
new file mode 100644
index 000000000..b7eb626e0
--- /dev/null
+++ b/data/maps/events/SootopolisCity_House1.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House1_MapObjects: @ 85332F8
+ object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0
+
+SootopolisCity_House1_MapWarps: @ 8533328
+ warp_def 3, 6, 0, 4, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 4, SOOTOPOLIS_CITY
+
+SootopolisCity_House1_MapEvents:: @ 8533338
+ map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc
new file mode 100644
index 000000000..98b1b6712
--- /dev/null
+++ b/data/maps/events/SootopolisCity_House2.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House2_MapObjects: @ 853334C
+ object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0
+
+SootopolisCity_House2_MapWarps: @ 8533364
+ warp_def 3, 6, 0, 5, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 5, SOOTOPOLIS_CITY
+
+SootopolisCity_House2_MapEvents:: @ 8533374
+ map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc
new file mode 100644
index 000000000..eaf48fd6e
--- /dev/null
+++ b/data/maps/events/SootopolisCity_House3.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House3_MapObjects: @ 8533388
+ object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0
+
+SootopolisCity_House3_MapWarps: @ 85333B8
+ warp_def 3, 6, 0, 6, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 6, SOOTOPOLIS_CITY
+
+SootopolisCity_House3_MapEvents:: @ 85333C8
+ map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc
new file mode 100644
index 000000000..eb41cbafb
--- /dev/null
+++ b/data/maps/events/SootopolisCity_House4.inc
@@ -0,0 +1,12 @@
+SootopolisCity_House4_MapObjects: @ 85333DC
+ object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0
+
+SootopolisCity_House4_MapWarps: @ 8533424
+ warp_def 3, 6, 0, 7, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 7, SOOTOPOLIS_CITY
+
+SootopolisCity_House4_MapEvents:: @ 8533434
+ map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc
new file mode 100644
index 000000000..5bffec912
--- /dev/null
+++ b/data/maps/events/SootopolisCity_House5.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House5_MapObjects: @ 8533448
+ object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0
+
+SootopolisCity_House5_MapWarps: @ 8533478
+ warp_def 3, 6, 0, 8, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 8, SOOTOPOLIS_CITY
+
+SootopolisCity_House5_MapEvents:: @ 8533488
+ map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc
new file mode 100644
index 000000000..5f0f5d430
--- /dev/null
+++ b/data/maps/events/SootopolisCity_House6.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House6_MapObjects: @ 853349C
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0
+
+SootopolisCity_House6_MapWarps: @ 85334B4
+ warp_def 3, 6, 0, 9, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 9, SOOTOPOLIS_CITY
+
+SootopolisCity_House6_MapEvents:: @ 85334C4
+ map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc
new file mode 100644
index 000000000..3a18508a2
--- /dev/null
+++ b/data/maps/events/SootopolisCity_House7.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House7_MapObjects: @ 85334D8
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0
+
+SootopolisCity_House7_MapWarps: @ 8533508
+ warp_def 3, 6, 0, 10, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 10, SOOTOPOLIS_CITY
+
+SootopolisCity_House7_MapEvents:: @ 8533518
+ map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
new file mode 100644
index 000000000..0dcb79d1b
--- /dev/null
+++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
@@ -0,0 +1,15 @@
+SootopolisCity_LotadAndSeedotHouse_MapObjects: @ 853352C
+ object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0
+
+SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C
+ warp_def 3, 6, 0, 11, SOOTOPOLIS_CITY
+ warp_def 4, 6, 0, 11, SOOTOPOLIS_CITY
+
+SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C
+ bg_event 5, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D
+ bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B
+
+SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584
+ map_events SootopolisCity_LotadAndSeedotHouse_MapObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents
+
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc
new file mode 100644
index 000000000..de29f556b
--- /dev/null
+++ b/data/maps/events/SootopolisCity_Mart.inc
@@ -0,0 +1,12 @@
+SootopolisCity_Mart_MapObjects: @ 853328C
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0
+
+SootopolisCity_Mart_MapWarps: @ 85332D4
+ warp_def 3, 7, 0, 1, SOOTOPOLIS_CITY
+ warp_def 4, 7, 0, 1, SOOTOPOLIS_CITY
+
+SootopolisCity_Mart_MapEvents:: @ 85332E4
+ map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
new file mode 100644
index 000000000..69865a2aa
--- /dev/null
+++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
@@ -0,0 +1,11 @@
+SootopolisCity_MysteryEventsHouse_1F_MapObjects: @ 8533598
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0
+
+SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0
+ warp_def 3, 7, 0, 12, SOOTOPOLIS_CITY
+ warp_def 4, 7, 0, 12, SOOTOPOLIS_CITY
+ warp_def 3, 1, 3, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F
+
+SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8
+ map_events SootopolisCity_MysteryEventsHouse_1F_MapObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
new file mode 100644
index 000000000..2a02e72f2
--- /dev/null
+++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
@@ -0,0 +1,9 @@
+SootopolisCity_MysteryEventsHouse_B1F_MapObjects: @ 85335DC
+ object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4
+ warp_def 3, 1, 0, 2, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F
+
+SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC
+ map_events SootopolisCity_MysteryEventsHouse_B1F_MapObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
new file mode 100644
index 000000000..669ce88ae
--- /dev/null
+++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
@@ -0,0 +1,14 @@
+SootopolisCity_PokemonCenter_1F_MapObjects: @ 8533174
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0
+
+SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4
+ warp_def 7, 8, 3, 0, SOOTOPOLIS_CITY
+ warp_def 6, 8, 3, 0, SOOTOPOLIS_CITY
+ warp_def 1, 6, 4, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_2F
+
+SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC
+ map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
new file mode 100644
index 000000000..d063a7666
--- /dev/null
+++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+SootopolisCity_PokemonCenter_2F_MapObjects: @ 8533200
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260
+ warp_def 1, 6, 4, 2, SOOTOPOLIS_CITY_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278
+ map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc
new file mode 100644
index 000000000..7c6bc4128
--- /dev/null
+++ b/data/maps/events/SouthernIsland_Exterior.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Exterior_MapObjects: @ 853B83C
+ object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
+
+SouthernIsland_Exterior_MapWarps: @ 853B86C
+ warp_def 14, 5, 3, 0, SOUTHERN_ISLAND_INTERIOR
+ warp_def 15, 5, 3, 1, SOUTHERN_ISLAND_INTERIOR
+
+SouthernIsland_Exterior_MapBGEvents: @ 853B87C
+ bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C
+
+SouthernIsland_Exterior_MapEvents:: @ 853B888
+ map_events SouthernIsland_Exterior_MapObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
+
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc
new file mode 100644
index 000000000..a304f1832
--- /dev/null
+++ b/data/maps/events/SouthernIsland_Interior.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Interior_MapObjects: @ 853B89C
+ object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0
+ object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0
+
+SouthernIsland_Interior_MapWarps: @ 853B8CC
+ warp_def 13, 18, 3, 0, SOUTHERN_ISLAND_EXTERIOR
+ warp_def 14, 18, 3, 1, SOUTHERN_ISLAND_EXTERIOR
+
+SouthernIsland_Interior_MapBGEvents: @ 853B8DC
+ bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4
+
+SouthernIsland_Interior_MapEvents:: @ 853B8E8
+ map_events SouthernIsland_Interior_MapObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
+
diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc
new file mode 100644
index 000000000..2421cba40
--- /dev/null
+++ b/data/maps/events/TerraCave_End.inc
@@ -0,0 +1,12 @@
+TerraCave_End_MapObjects: @ 8537850
+ object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0
+
+TerraCave_End_MapWarps: @ 8537868
+ warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE
+
+TerraCave_End_MapCoordEvents: @ 8537870
+ coord_event 17, 26, 3, 0, VAR_0x4001, 1, 0, TerraCave_End_EventScript_23B0EC
+
+TerraCave_End_MapEvents:: @ 8537880
+ map_events TerraCave_End_MapObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/events/TerraCave_Entrance.inc
new file mode 100644
index 000000000..3cea5a7c6
--- /dev/null
+++ b/data/maps/events/TerraCave_Entrance.inc
@@ -0,0 +1,7 @@
+TerraCave_Entrance_MapWarps: @ 853782C
+ warp_def 8, 18, 0, 127, NONE
+ warp_def 14, 1, 3, 0, TERRA_CAVE_END
+
+TerraCave_Entrance_MapEvents:: @ 853783C
+ map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc
new file mode 100644
index 000000000..ffb999b22
--- /dev/null
+++ b/data/maps/events/TradeCenter.inc
@@ -0,0 +1,14 @@
+TradeCenter_MapObjects: @ 8539DA0
+ object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0
+
+TradeCenter_MapWarps: @ 8539DB8
+ warp_def 5, 8, 3, 127, NONE
+ warp_def 6, 8, 3, 127, NONE
+
+TradeCenter_MapCoordEvents: @ 8539DC8
+ coord_event 4, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773F5
+ coord_event 7, 5, 3, 0, VAR_0x4000, 0, 0, gUnknown_082773FF
+
+TradeCenter_MapEvents:: @ 8539DE8
+ map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
+
diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/events/TrainerHill_1F.inc
new file mode 100644
index 000000000..ae8fecee7
--- /dev/null
+++ b/data/maps/events/TrainerHill_1F.inc
@@ -0,0 +1,7 @@
+TrainerHill_1F_MapWarps: @ 853D934
+ warp_def 2, 1, 3, 2, TRAINER_HILL_ENTRANCE
+ warp_def 12, 1, 3, 0, TRAINER_HILL_2F
+
+TrainerHill_1F_MapEvents:: @ 853D944
+ map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/events/TrainerHill_2F.inc
new file mode 100644
index 000000000..dc0e071a2
--- /dev/null
+++ b/data/maps/events/TrainerHill_2F.inc
@@ -0,0 +1,7 @@
+TrainerHill_2F_MapWarps: @ 853D958
+ warp_def 2, 1, 3, 1, TRAINER_HILL_1F
+ warp_def 12, 1, 3, 0, TRAINER_HILL_3F
+
+TrainerHill_2F_MapEvents:: @ 853D968
+ map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/events/TrainerHill_3F.inc
new file mode 100644
index 000000000..c022f16d2
--- /dev/null
+++ b/data/maps/events/TrainerHill_3F.inc
@@ -0,0 +1,7 @@
+TrainerHill_3F_MapWarps: @ 853D97C
+ warp_def 2, 1, 3, 1, TRAINER_HILL_2F
+ warp_def 12, 1, 3, 0, TRAINER_HILL_4F
+
+TrainerHill_3F_MapEvents:: @ 853D98C
+ map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/events/TrainerHill_4F.inc
new file mode 100644
index 000000000..7007a69a7
--- /dev/null
+++ b/data/maps/events/TrainerHill_4F.inc
@@ -0,0 +1,7 @@
+TrainerHill_4F_MapWarps: @ 853D9A0
+ warp_def 2, 1, 3, 1, TRAINER_HILL_3F
+ warp_def 12, 1, 3, 0, TRAINER_HILL_ROOF
+
+TrainerHill_4F_MapEvents:: @ 853D9B0
+ map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc
new file mode 100644
index 000000000..873495876
--- /dev/null
+++ b/data/maps/events/TrainerHill_Elevator.inc
@@ -0,0 +1,10 @@
+TrainerHill_Elevator_MapObjects: @ 853DD84
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0
+
+TrainerHill_Elevator_MapWarps: @ 853DD9C
+ warp_def 1, 6, 3, 1, TRAINER_HILL_ROOF
+ warp_def 2, 6, 3, 1, TRAINER_HILL_ROOF
+
+TrainerHill_Elevator_MapEvents:: @ 853DDAC
+ map_events TrainerHill_Elevator_MapObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc
new file mode 100644
index 000000000..a5574755b
--- /dev/null
+++ b/data/maps/events/TrainerHill_Entrance.inc
@@ -0,0 +1,21 @@
+TrainerHill_Entrance_MapObjects: @ 853D874
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0
+
+TrainerHill_Entrance_MapWarps: @ 853D8EC
+ warp_def 9, 16, 3, 4, ROUTE_111
+ warp_def 10, 16, 3, 4, ROUTE_111
+ warp_def 9, 1, 3, 0, TRAINER_HILL_1F
+
+TrainerHill_Entrance_MapCoordEvents: @ 853D904
+ coord_event 9, 6, 3, 0, VAR_0x40D6, 0, 0, TrainerHill_Entrance_EventScript_268229
+
+TrainerHill_Entrance_MapBGEvents: @ 853D914
+ bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388
+
+TrainerHill_Entrance_MapEvents:: @ 853D920
+ map_events TrainerHill_Entrance_MapObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents
+
diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc
new file mode 100644
index 000000000..4f48ef724
--- /dev/null
+++ b/data/maps/events/TrainerHill_Roof.inc
@@ -0,0 +1,10 @@
+TrainerHill_Roof_MapObjects: @ 853D9C4
+ object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0
+
+TrainerHill_Roof_MapWarps: @ 853D9DC
+ warp_def 9, 5, 3, 1, TRAINER_HILL_4F
+ warp_def 15, 5, 0, 1, TRAINER_HILL_ELEVATOR
+
+TrainerHill_Roof_MapEvents:: @ 853D9EC
+ map_events TrainerHill_Roof_MapObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Underwater1.inc b/data/maps/events/Underwater1.inc
new file mode 100644
index 000000000..08cf19a4c
--- /dev/null
+++ b/data/maps/events/Underwater1.inc
@@ -0,0 +1,12 @@
+Underwater1_MapBGEvents: @ 852CEB4
+ bg_event 42, 51, 0, 7, 0, ITEM_CARBOS, 8, 0
+ bg_event 14, 40, 0, 7, 0, ITEM_GREEN_SHARD, 9, 0
+ bg_event 66, 34, 3, 7, 0, ITEM_PEARL, 10, 0
+ bg_event 64, 54, 3, 7, 0, ITEM_BIG_PEARL, 11, 0
+ bg_event 70, 64, 3, 7, 0, ITEM_HEART_SCALE, 13, 0
+ bg_event 42, 5, 3, 7, 0, ITEM_CALCIUM, 36, 0
+ bg_event 45, 36, 3, 7, 0, ITEM_HEART_SCALE, 38, 0
+
+Underwater1_MapEvents:: @ 852CF08
+ map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents
+
diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc
new file mode 100644
index 000000000..097dbdc65
--- /dev/null
+++ b/data/maps/events/Underwater2.inc
@@ -0,0 +1,16 @@
+Underwater2_MapWarps: @ 852CF1C
+ warp_def 45, 65, 0, 0, UNDERWATER_SOOTOPOLIS_CITY
+
+Underwater2_MapBGEvents: @ 852CF24
+ bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0
+ bg_event 41, 19, 3, 7, 0, ITEM_ULTRA_BALL, 15, 0
+ bg_event 63, 19, 3, 7, 0, ITEM_STARDUST, 16, 0
+ bg_event 10, 36, 3, 7, 0, ITEM_PEARL, 17, 0
+ bg_event 11, 39, 3, 7, 0, ITEM_IRON, 19, 0
+ bg_event 12, 35, 3, 7, 0, ITEM_YELLOW_SHARD, 18, 0
+ bg_event 65, 60, 3, 7, 0, ITEM_BIG_PEARL, 20, 0
+ bg_event 9, 77, 3, 7, 0, ITEM_BLUE_SHARD, 12, 0
+
+Underwater2_MapEvents:: @ 852CF84
+ map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents
+
diff --git a/data/maps/events/Underwater3.inc b/data/maps/events/Underwater3.inc
new file mode 100644
index 000000000..66b7b8758
--- /dev/null
+++ b/data/maps/events/Underwater3.inc
@@ -0,0 +1,13 @@
+Underwater3_MapWarps: @ 852CF98
+ warp_def 57, 5, 0, 0, UNDERWATER_MARINE_CAVE
+ warp_def 67, 38, 0, 0, UNDERWATER_MARINE_CAVE
+
+Underwater3_MapBGEvents: @ 852CFA8
+ bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0
+ bg_event 50, 36, 3, 7, 0, ITEM_HP_UP, 22, 0
+ bg_event 34, 72, 3, 7, 0, ITEM_HEART_SCALE, 23, 0
+ bg_event 72, 20, 3, 7, 0, ITEM_RED_SHARD, 24, 0
+
+Underwater3_MapEvents:: @ 852CFD8
+ map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents
+
diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc
new file mode 100644
index 000000000..b1846f1aa
--- /dev/null
+++ b/data/maps/events/Underwater4.inc
@@ -0,0 +1,10 @@
+Underwater4_MapWarps: @ 852CFEC
+ warp_def 38, 26, 3, 0, UNDERWATER_SEAFLOOR_CAVERN
+
+Underwater4_MapBGEvents: @ 852CFF4
+ bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0
+ bg_event 69, 18, 3, 7, 0, ITEM_PEARL, 26, 0
+
+Underwater4_MapEvents:: @ 852D00C
+ map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents
+
diff --git a/data/maps/events/Underwater5.inc b/data/maps/events/Underwater5.inc
new file mode 100644
index 000000000..7f72f3771
--- /dev/null
+++ b/data/maps/events/Underwater5.inc
@@ -0,0 +1,7 @@
+Underwater5_MapWarps: @ 852D020
+ warp_def 26, 3, 0, 0, UNDERWATER_MARINE_CAVE
+ warp_def 32, 21, 0, 0, UNDERWATER_MARINE_CAVE
+
+Underwater5_MapEvents:: @ 852D030
+ map_events 0x0, Underwater5_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Underwater6.inc b/data/maps/events/Underwater6.inc
new file mode 100644
index 000000000..ba5883d7c
--- /dev/null
+++ b/data/maps/events/Underwater6.inc
@@ -0,0 +1,7 @@
+Underwater6_MapWarps: @ 852D044
+ warp_def 13, 4, 0, 0, UNDERWATER_MARINE_CAVE
+ warp_def 17, 66, 0, 0, UNDERWATER_MARINE_CAVE
+
+Underwater6_MapEvents:: @ 852D054
+ map_events 0x0, Underwater6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Underwater7.inc b/data/maps/events/Underwater7.inc
new file mode 100644
index 000000000..0841a343e
--- /dev/null
+++ b/data/maps/events/Underwater7.inc
@@ -0,0 +1,7 @@
+Underwater7_MapWarps: @ 852D068
+ warp_def 22, 10, 0, 0, UNDERWATER_MARINE_CAVE
+ warp_def 45, 30, 0, 0, UNDERWATER_MARINE_CAVE
+
+Underwater7_MapEvents:: @ 852D078
+ map_events 0x0, Underwater7_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/events/Underwater_MarineCave.inc
new file mode 100644
index 000000000..9266cc5c3
--- /dev/null
+++ b/data/maps/events/Underwater_MarineCave.inc
@@ -0,0 +1,6 @@
+Underwater_MarineCave_MapWarps: @ 85377B0
+ warp_def 9, 8, 0, 127, NONE
+
+Underwater_MarineCave_MapEvents:: @ 85377B8
+ map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc
new file mode 100644
index 000000000..03ed08535
--- /dev/null
+++ b/data/maps/events/Underwater_Route134.inc
@@ -0,0 +1,6 @@
+Underwater_Route134_MapWarps: @ 8536D44
+ warp_def 8, 8, 0, 0, UNDERWATER_SEALED_CHAMBER
+
+Underwater_Route134_MapEvents:: @ 8536D4C
+ map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc
new file mode 100644
index 000000000..b284db78f
--- /dev/null
+++ b/data/maps/events/Underwater_SeafloorCavern.inc
@@ -0,0 +1,12 @@
+Underwater_SeafloorCavern_MapObjects: @ 8535640
+ object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+ object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+ object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+ object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0
+
+Underwater_SeafloorCavern_MapWarps: @ 85356A0
+ warp_def 6, 7, 0, 0, UNDERWATER_4
+
+Underwater_SeafloorCavern_MapEvents:: @ 85356A8
+ map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc
new file mode 100644
index 000000000..9ef7be29e
--- /dev/null
+++ b/data/maps/events/Underwater_SealedChamber.inc
@@ -0,0 +1,9 @@
+Underwater_SealedChamber_MapWarps: @ 8536D60
+ warp_def 7, 1, 0, 0, UNDERWATER_ROUTE_134
+
+Underwater_SealedChamber_MapBGEvents: @ 8536D68
+ bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_2390FC
+
+Underwater_SealedChamber_MapEvents:: @ 8536D74
+ map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents
+
diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc
new file mode 100644
index 000000000..4b0cda4eb
--- /dev/null
+++ b/data/maps/events/Underwater_SootopolisCity.inc
@@ -0,0 +1,7 @@
+Underwater_SootopolisCity_MapWarps: @ 8534330
+ warp_def 9, 8, 0, 0, UNDERWATER_2
+ warp_def 10, 8, 0, 0, UNDERWATER_2
+
+Underwater_SootopolisCity_MapEvents:: @ 8534340
+ map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/UnionRoom.inc b/data/maps/events/UnionRoom.inc
new file mode 100644
index 000000000..be9b40243
--- /dev/null
+++ b/data/maps/events/UnionRoom.inc
@@ -0,0 +1,18 @@
+UnionRoom_MapObjects: @ 853B020
+ object_event 1, MAP_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0
+ object_event 3, 247, 0, 0, 7, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D22C, 710, 0, 0
+ object_event 4, 246, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D222, 709, 0, 0
+ object_event 5, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0
+ object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0
+ object_event 7, MAP_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0
+ object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0
+ object_event 9, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0
+
+UnionRoom_MapWarps: @ 853B0F8
+ warp_def 7, 11, 3, 127, NONE
+ warp_def 8, 11, 3, 127, NONE
+
+UnionRoom_MapEvents:: @ 853B108
+ map_events UnionRoom_MapObjects, UnionRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/events/UnknownMap_25_29.inc
new file mode 100644
index 000000000..13ea1b8b9
--- /dev/null
+++ b/data/maps/events/UnknownMap_25_29.inc
@@ -0,0 +1 @@
+UnknownMap_25_29_MapEvents:: @ 853A064
diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/events/UnknownMap_25_30.inc
new file mode 100644
index 000000000..0e221e240
--- /dev/null
+++ b/data/maps/events/UnknownMap_25_30.inc
@@ -0,0 +1 @@
+UnknownMap_25_30_MapEvents:: @ 853A064
diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/events/UnknownMap_25_31.inc
new file mode 100644
index 000000000..99e450de5
--- /dev/null
+++ b/data/maps/events/UnknownMap_25_31.inc
@@ -0,0 +1 @@
+UnknownMap_25_31_MapEvents:: @ 853A064
diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/events/UnknownMap_25_32.inc
new file mode 100644
index 000000000..c48eedb17
--- /dev/null
+++ b/data/maps/events/UnknownMap_25_32.inc
@@ -0,0 +1 @@
+UnknownMap_25_32_MapEvents:: @ 853A064
diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/events/UnknownMap_25_33.inc
new file mode 100644
index 000000000..14f4571d2
--- /dev/null
+++ b/data/maps/events/UnknownMap_25_33.inc
@@ -0,0 +1 @@
+UnknownMap_25_33_MapEvents:: @ 853A064
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc
new file mode 100644
index 000000000..0fcbef3a3
--- /dev/null
+++ b/data/maps/events/UnknownMap_25_34.inc
@@ -0,0 +1,3 @@
+UnknownMap_25_34_MapEvents:: @ 853A064
+ map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc
new file mode 100644
index 000000000..7738701b2
--- /dev/null
+++ b/data/maps/events/VerdanturfTown.inc
@@ -0,0 +1,28 @@
+VerdanturfTown_MapObjects: @ 8527CDC
+ object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0
+
+VerdanturfTown_MapWarps: @ 8527D3C
+ warp_def 3, 7, 0, 0, VERDANTURF_TOWN_BATTLE_TENT_LOBBY
+ warp_def 12, 3, 0, 0, VERDANTURF_TOWN_MART
+ warp_def 16, 3, 0, 0, VERDANTURF_TOWN_POKEMON_CENTER_1F
+ warp_def 10, 14, 0, 0, VERDANTURF_TOWN_WANDAS_HOUSE
+ warp_def 8, 1, 0, 1, RUSTURF_TUNNEL
+ warp_def 1, 14, 0, 0, VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE
+ warp_def 17, 15, 0, 0, VERDANTURF_TOWN_HOUSE
+
+VerdanturfTown_MapBGEvents: @ 8527D74
+ bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A
+ bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_1EB5D9
+ bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73
+ bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_1EB5E2
+ bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_271E6A
+ bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_271E73
+ bg_event 1, 8, 0, 0, 0, VerdanturfTown_EventScript_1EB5EB
+ bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4
+
+VerdanturfTown_MapEvents:: @ 8527DD4
+ map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
+
diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
new file mode 100644
index 000000000..0db3fc920
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
@@ -0,0 +1,8 @@
+VerdanturfTown_BattleTentBattleRoom_MapObjects: @ 852E734
+ object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C
+ map_events VerdanturfTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
new file mode 100644
index 000000000..7ec4cee10
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
@@ -0,0 +1,6 @@
+VerdanturfTown_BattleTentCorridor_MapObjects: @ 852E708
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
+
+VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720
+ map_events VerdanturfTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc
new file mode 100644
index 000000000..d6b5818da
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc
@@ -0,0 +1,18 @@
+VerdanturfTown_BattleTentLobby_MapObjects: @ 852E648
+ object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0
+ object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0
+
+VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8
+ warp_def 6, 9, 0, 0, VERDANTURF_TOWN
+ warp_def 7, 9, 0, 0, VERDANTURF_TOWN
+
+VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8
+ bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02
+
+VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4
+ map_events VerdanturfTown_BattleTentLobby_MapObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents
+
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
new file mode 100644
index 000000000..2441d8d41
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
@@ -0,0 +1,11 @@
+VerdanturfTown_FriendshipRatersHouse_MapObjects: @ 852E9C8
+ object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0
+
+VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8
+ warp_def 3, 7, 0, 5, VERDANTURF_TOWN
+ warp_def 4, 7, 0, 5, VERDANTURF_TOWN
+
+VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08
+ map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc
new file mode 100644
index 000000000..803f9f666
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_House.inc
@@ -0,0 +1,11 @@
+VerdanturfTown_House_MapObjects: @ 852EA1C
+ object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0
+
+VerdanturfTown_House_MapWarps: @ 852EA4C
+ warp_def 3, 8, 0, 6, VERDANTURF_TOWN
+ warp_def 4, 8, 0, 6, VERDANTURF_TOWN
+
+VerdanturfTown_House_MapEvents:: @ 852EA5C
+ map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc
new file mode 100644
index 000000000..6d6ca6a5d
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_Mart.inc
@@ -0,0 +1,13 @@
+VerdanturfTown_Mart_MapObjects: @ 852E790
+ object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0
+
+VerdanturfTown_Mart_MapWarps: @ 852E7F0
+ warp_def 3, 7, 0, 1, VERDANTURF_TOWN
+ warp_def 4, 7, 0, 1, VERDANTURF_TOWN
+
+VerdanturfTown_Mart_MapEvents:: @ 852E800
+ map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
new file mode 100644
index 000000000..9534ca9c7
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_PokemonCenter_1F_MapObjects: @ 852E814
+ object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0
+
+VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874
+ warp_def 7, 8, 3, 2, VERDANTURF_TOWN
+ warp_def 6, 8, 3, 2, VERDANTURF_TOWN
+ warp_def 1, 6, 4, 0, VERDANTURF_TOWN_POKEMON_CENTER_2F
+
+VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C
+ map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
new file mode 100644
index 000000000..2649066d8
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_PokemonCenter_2F_MapObjects: @ 852E8A0
+ object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0
+
+VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900
+ warp_def 1, 6, 4, 2, VERDANTURF_TOWN_POKEMON_CENTER_1F
+ warp_def 5, 1, 3, 0, UNION_ROOM
+ warp_def 9, 1, 3, 0, TRADE_CENTER
+
+VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918
+ map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc
new file mode 100644
index 000000000..2089da649
--- /dev/null
+++ b/data/maps/events/VerdanturfTown_WandasHouse.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_WandasHouse_MapObjects: @ 852E92C
+ object_event 1, MAP_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0
+ object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0
+
+VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4
+ warp_def 7, 7, 0, 3, VERDANTURF_TOWN
+ warp_def 8, 7, 0, 3, VERDANTURF_TOWN
+
+VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4
+ map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc
new file mode 100644
index 000000000..db3554ed4
--- /dev/null
+++ b/data/maps/events/VictoryRoad_1F.inc
@@ -0,0 +1,28 @@
+VictoryRoad_1F_MapObjects: @ 8535E04
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0
+ object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0
+ object_event 7, MAP_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0
+ object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0
+ object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0
+
+VictoryRoad_1F_MapWarps: @ 8535EDC
+ warp_def 15, 40, 3, 2, EVER_GRANDE_CITY
+ warp_def 39, 5, 3, 3, EVER_GRANDE_CITY
+ warp_def 21, 32, 3, 5, VICTORY_ROAD_B1F
+ warp_def 42, 38, 4, 2, VICTORY_ROAD_B1F
+ warp_def 9, 14, 4, 4, VICTORY_ROAD_B1F
+
+VictoryRoad_1F_MapCoordEvents: @ 8535F04
+ coord_event 2, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DAF
+ coord_event 3, 23, 4, 0, VAR_0x40C3, 0, 0, VictoryRoad_1F_EventScript_235DC8
+
+VictoryRoad_1F_MapBGEvents: @ 8535F24
+ bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0
+
+VictoryRoad_1F_MapEvents:: @ 8535F30
+ map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
+
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc
new file mode 100644
index 000000000..6c57f0662
--- /dev/null
+++ b/data/maps/events/VictoryRoad_B1F.inc
@@ -0,0 +1,35 @@
+VictoryRoad_B1F_MapObjects: @ 8535F44
+ object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0
+ object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0
+ object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0
+ object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0
+ object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0
+ object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0
+ object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0
+ object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0
+ object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0
+ object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0
+ object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0
+ object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0
+ object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0
+ object_event 14, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0
+ object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0
+ object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0
+ object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0
+ object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0
+ object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0
+ object_event 20, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0
+ object_event 21, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0
+
+VictoryRoad_B1F_MapWarps: @ 853613C
+ warp_def 30, 25, 3, 0, VICTORY_ROAD_B2F
+ warp_def 17, 16, 3, 2, VICTORY_ROAD_B2F
+ warp_def 42, 25, 3, 3, VICTORY_ROAD_1F
+ warp_def 42, 2, 4, 1, VICTORY_ROAD_B2F
+ warp_def 8, 3, 3, 4, VICTORY_ROAD_1F
+ warp_def 20, 21, 3, 2, VICTORY_ROAD_1F
+ warp_def 5, 26, 3, 3, VICTORY_ROAD_B2F
+
+VictoryRoad_B1F_MapEvents:: @ 8536174
+ map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc
new file mode 100644
index 000000000..09fdb466f
--- /dev/null
+++ b/data/maps/events/VictoryRoad_B2F.inc
@@ -0,0 +1,22 @@
+VictoryRoad_B2F_MapObjects: @ 8536188
+ object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0
+ object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0
+ object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0
+ object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0
+ object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0
+ object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0
+ object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0
+
+VictoryRoad_B2F_MapWarps: @ 8536230
+ warp_def 30, 25, 3, 0, VICTORY_ROAD_B1F
+ warp_def 43, 2, 3, 3, VICTORY_ROAD_B1F
+ warp_def 19, 12, 3, 1, VICTORY_ROAD_B1F
+ warp_def 5, 26, 3, 6, VICTORY_ROAD_B1F
+
+VictoryRoad_B2F_MapBGEvents: @ 8536250
+ bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0
+ bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0
+
+VictoryRoad_B2F_MapEvents:: @ 8536268
+ map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
+
diff --git a/data/maps/headers.inc b/data/maps/headers.inc
new file mode 100644
index 000000000..58d2cc66c
--- /dev/null
+++ b/data/maps/headers.inc
@@ -0,0 +1,518 @@
+ .include "data/maps/PetalburgCity/header.inc"
+ .include "data/maps/SlateportCity/header.inc"
+ .include "data/maps/MauvilleCity/header.inc"
+ .include "data/maps/RustboroCity/header.inc"
+ .include "data/maps/FortreeCity/header.inc"
+ .include "data/maps/LilycoveCity/header.inc"
+ .include "data/maps/MossdeepCity/header.inc"
+ .include "data/maps/SootopolisCity/header.inc"
+ .include "data/maps/EverGrandeCity/header.inc"
+ .include "data/maps/LittlerootTown/header.inc"
+ .include "data/maps/OldaleTown/header.inc"
+ .include "data/maps/DewfordTown/header.inc"
+ .include "data/maps/LavaridgeTown/header.inc"
+ .include "data/maps/FallarborTown/header.inc"
+ .include "data/maps/VerdanturfTown/header.inc"
+ .include "data/maps/PacifidlogTown/header.inc"
+ .include "data/maps/Route101/header.inc"
+ .include "data/maps/Route102/header.inc"
+ .include "data/maps/Route103/header.inc"
+ .include "data/maps/Route104/header.inc"
+ .include "data/maps/Route105/header.inc"
+ .include "data/maps/Route106/header.inc"
+ .include "data/maps/Route107/header.inc"
+ .include "data/maps/Route108/header.inc"
+ .include "data/maps/Route109/header.inc"
+ .include "data/maps/Route110/header.inc"
+ .include "data/maps/Route111/header.inc"
+ .include "data/maps/Route112/header.inc"
+ .include "data/maps/Route113/header.inc"
+ .include "data/maps/Route114/header.inc"
+ .include "data/maps/Route115/header.inc"
+ .include "data/maps/Route116/header.inc"
+ .include "data/maps/Route117/header.inc"
+ .include "data/maps/Route118/header.inc"
+ .include "data/maps/Route119/header.inc"
+ .include "data/maps/Route120/header.inc"
+ .include "data/maps/Route121/header.inc"
+ .include "data/maps/Route122/header.inc"
+ .include "data/maps/Route123/header.inc"
+ .include "data/maps/Route124/header.inc"
+ .include "data/maps/Route125/header.inc"
+ .include "data/maps/Route126/header.inc"
+ .include "data/maps/Route127/header.inc"
+ .include "data/maps/Route128/header.inc"
+ .include "data/maps/Route129/header.inc"
+ .include "data/maps/Route130/header.inc"
+ .include "data/maps/Route131/header.inc"
+ .include "data/maps/Route132/header.inc"
+ .include "data/maps/Route133/header.inc"
+ .include "data/maps/Route134/header.inc"
+ .include "data/maps/Underwater1/header.inc"
+ .include "data/maps/Underwater2/header.inc"
+ .include "data/maps/Underwater3/header.inc"
+ .include "data/maps/Underwater4/header.inc"
+ .include "data/maps/Underwater5/header.inc"
+ .include "data/maps/Underwater6/header.inc"
+ .include "data/maps/Underwater7/header.inc"
+ .include "data/maps/LittlerootTown_BrendansHouse_1F/header.inc"
+ .include "data/maps/LittlerootTown_BrendansHouse_2F/header.inc"
+ .include "data/maps/LittlerootTown_MaysHouse_1F/header.inc"
+ .include "data/maps/LittlerootTown_MaysHouse_2F/header.inc"
+ .include "data/maps/LittlerootTown_ProfessorBirchsLab/header.inc"
+ .include "data/maps/OldaleTown_House1/header.inc"
+ .include "data/maps/OldaleTown_House2/header.inc"
+ .include "data/maps/OldaleTown_PokemonCenter_1F/header.inc"
+ .include "data/maps/OldaleTown_PokemonCenter_2F/header.inc"
+ .include "data/maps/OldaleTown_Mart/header.inc"
+ .include "data/maps/DewfordTown_House1/header.inc"
+ .include "data/maps/DewfordTown_PokemonCenter_1F/header.inc"
+ .include "data/maps/DewfordTown_PokemonCenter_2F/header.inc"
+ .include "data/maps/DewfordTown_Gym/header.inc"
+ .include "data/maps/DewfordTown_Hall/header.inc"
+ .include "data/maps/DewfordTown_House2/header.inc"
+ .include "data/maps/LavaridgeTown_HerbShop/header.inc"
+ .include "data/maps/LavaridgeTown_Gym_1F/header.inc"
+ .include "data/maps/LavaridgeTown_Gym_B1F/header.inc"
+ .include "data/maps/LavaridgeTown_House/header.inc"
+ .include "data/maps/LavaridgeTown_Mart/header.inc"
+ .include "data/maps/LavaridgeTown_PokemonCenter_1F/header.inc"
+ .include "data/maps/LavaridgeTown_PokemonCenter_2F/header.inc"
+ .include "data/maps/FallarborTown_Mart/header.inc"
+ .include "data/maps/FallarborTown_BattleTentLobby/header.inc"
+ .include "data/maps/FallarborTown_BattleTentCorridor/header.inc"
+ .include "data/maps/FallarborTown_BattleTentBattleRoom/header.inc"
+ .include "data/maps/FallarborTown_PokemonCenter_1F/header.inc"
+ .include "data/maps/FallarborTown_PokemonCenter_2F/header.inc"
+ .include "data/maps/FallarborTown_House1/header.inc"
+ .include "data/maps/FallarborTown_House2/header.inc"
+ .include "data/maps/VerdanturfTown_BattleTentLobby/header.inc"
+ .include "data/maps/VerdanturfTown_BattleTentCorridor/header.inc"
+ .include "data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc"
+ .include "data/maps/VerdanturfTown_Mart/header.inc"
+ .include "data/maps/VerdanturfTown_PokemonCenter_1F/header.inc"
+ .include "data/maps/VerdanturfTown_PokemonCenter_2F/header.inc"
+ .include "data/maps/VerdanturfTown_WandasHouse/header.inc"
+ .include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc"
+ .include "data/maps/VerdanturfTown_House/header.inc"
+ .include "data/maps/PacifidlogTown_PokemonCenter_1F/header.inc"
+ .include "data/maps/PacifidlogTown_PokemonCenter_2F/header.inc"
+ .include "data/maps/PacifidlogTown_House1/header.inc"
+ .include "data/maps/PacifidlogTown_House2/header.inc"
+ .include "data/maps/PacifidlogTown_House3/header.inc"
+ .include "data/maps/PacifidlogTown_House4/header.inc"
+ .include "data/maps/PacifidlogTown_House5/header.inc"
+ .include "data/maps/PetalburgCity_WallysHouse/header.inc"
+ .include "data/maps/PetalburgCity_Gym/header.inc"
+ .include "data/maps/PetalburgCity_House1/header.inc"
+ .include "data/maps/PetalburgCity_House2/header.inc"
+ .include "data/maps/PetalburgCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/PetalburgCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/PetalburgCity_Mart/header.inc"
+ .include "data/maps/SlateportCity_SternsShipyard_1F/header.inc"
+ .include "data/maps/SlateportCity_SternsShipyard_2F/header.inc"
+ .include "data/maps/SlateportCity_BattleTentLobby/header.inc"
+ .include "data/maps/SlateportCity_BattleTentCorridor/header.inc"
+ .include "data/maps/SlateportCity_BattleTentBattleRoom/header.inc"
+ .include "data/maps/SlateportCity_House1/header.inc"
+ .include "data/maps/SlateportCity_PokemonFanClub/header.inc"
+ .include "data/maps/SlateportCity_OceanicMuseum_1F/header.inc"
+ .include "data/maps/SlateportCity_OceanicMuseum_2F/header.inc"
+ .include "data/maps/SlateportCity_Harbor/header.inc"
+ .include "data/maps/SlateportCity_House2/header.inc"
+ .include "data/maps/SlateportCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/SlateportCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/SlateportCity_Mart/header.inc"
+ .include "data/maps/MauvilleCity_Gym/header.inc"
+ .include "data/maps/MauvilleCity_BikeShop/header.inc"
+ .include "data/maps/MauvilleCity_House1/header.inc"
+ .include "data/maps/MauvilleCity_GameCorner/header.inc"
+ .include "data/maps/MauvilleCity_House2/header.inc"
+ .include "data/maps/MauvilleCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/MauvilleCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/MauvilleCity_Mart/header.inc"
+ .include "data/maps/RustboroCity_DevonCorp_1F/header.inc"
+ .include "data/maps/RustboroCity_DevonCorp_2F/header.inc"
+ .include "data/maps/RustboroCity_DevonCorp_3F/header.inc"
+ .include "data/maps/RustboroCity_Gym/header.inc"
+ .include "data/maps/RustboroCity_PokemonSchool/header.inc"
+ .include "data/maps/RustboroCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/RustboroCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/RustboroCity_Mart/header.inc"
+ .include "data/maps/RustboroCity_Flat1_1F/header.inc"
+ .include "data/maps/RustboroCity_Flat1_2F/header.inc"
+ .include "data/maps/RustboroCity_House1/header.inc"
+ .include "data/maps/RustboroCity_CuttersHouse/header.inc"
+ .include "data/maps/RustboroCity_House2/header.inc"
+ .include "data/maps/RustboroCity_Flat2_1F/header.inc"
+ .include "data/maps/RustboroCity_Flat2_2F/header.inc"
+ .include "data/maps/RustboroCity_Flat2_3F/header.inc"
+ .include "data/maps/RustboroCity_House3/header.inc"
+ .include "data/maps/FortreeCity_House1/header.inc"
+ .include "data/maps/FortreeCity_Gym/header.inc"
+ .include "data/maps/FortreeCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/FortreeCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/FortreeCity_Mart/header.inc"
+ .include "data/maps/FortreeCity_House2/header.inc"
+ .include "data/maps/FortreeCity_House3/header.inc"
+ .include "data/maps/FortreeCity_House4/header.inc"
+ .include "data/maps/FortreeCity_House5/header.inc"
+ .include "data/maps/FortreeCity_DecorationShop/header.inc"
+ .include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc"
+ .include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc"
+ .include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc"
+ .include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc"
+ .include "data/maps/LilycoveCity_ContestLobby/header.inc"
+ .include "data/maps/LilycoveCity_ContestHall/header.inc"
+ .include "data/maps/LilycoveCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/LilycoveCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/LilycoveCity_UnusedMart/header.inc"
+ .include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc"
+ .include "data/maps/LilycoveCity_Harbor/header.inc"
+ .include "data/maps/LilycoveCity_MoveDeletersHouse/header.inc"
+ .include "data/maps/LilycoveCity_House1/header.inc"
+ .include "data/maps/LilycoveCity_House2/header.inc"
+ .include "data/maps/LilycoveCity_House3/header.inc"
+ .include "data/maps/LilycoveCity_House4/header.inc"
+ .include "data/maps/LilycoveCity_DepartmentStore_1F/header.inc"
+ .include "data/maps/LilycoveCity_DepartmentStore_2F/header.inc"
+ .include "data/maps/LilycoveCity_DepartmentStore_3F/header.inc"
+ .include "data/maps/LilycoveCity_DepartmentStore_4F/header.inc"
+ .include "data/maps/LilycoveCity_DepartmentStore_5F/header.inc"
+ .include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc"
+ .include "data/maps/LilycoveCity_DepartmentStoreElevator/header.inc"
+ .include "data/maps/MossdeepCity_Gym/header.inc"
+ .include "data/maps/MossdeepCity_House1/header.inc"
+ .include "data/maps/MossdeepCity_House2/header.inc"
+ .include "data/maps/MossdeepCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/MossdeepCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/MossdeepCity_Mart/header.inc"
+ .include "data/maps/MossdeepCity_House3/header.inc"
+ .include "data/maps/MossdeepCity_StevensHouse/header.inc"
+ .include "data/maps/MossdeepCity_House4/header.inc"
+ .include "data/maps/MossdeepCity_SpaceCenter_1F/header.inc"
+ .include "data/maps/MossdeepCity_SpaceCenter_2F/header.inc"
+ .include "data/maps/MossdeepCity_GameCorner_1F/header.inc"
+ .include "data/maps/MossdeepCity_GameCorner_B1F/header.inc"
+ .include "data/maps/SootopolisCity_Gym_1F/header.inc"
+ .include "data/maps/SootopolisCity_Gym_B1F/header.inc"
+ .include "data/maps/SootopolisCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/SootopolisCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/SootopolisCity_Mart/header.inc"
+ .include "data/maps/SootopolisCity_House1/header.inc"
+ .include "data/maps/SootopolisCity_House2/header.inc"
+ .include "data/maps/SootopolisCity_House3/header.inc"
+ .include "data/maps/SootopolisCity_House4/header.inc"
+ .include "data/maps/SootopolisCity_House5/header.inc"
+ .include "data/maps/SootopolisCity_House6/header.inc"
+ .include "data/maps/SootopolisCity_House7/header.inc"
+ .include "data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc"
+ .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc"
+ .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc"
+ .include "data/maps/EverGrandeCity_SidneysRoom/header.inc"
+ .include "data/maps/EverGrandeCity_PhoebesRoom/header.inc"
+ .include "data/maps/EverGrandeCity_GlaciasRoom/header.inc"
+ .include "data/maps/EverGrandeCity_DrakesRoom/header.inc"
+ .include "data/maps/EverGrandeCity_ChampionsRoom/header.inc"
+ .include "data/maps/EverGrandeCity_Hall1/header.inc"
+ .include "data/maps/EverGrandeCity_Hall2/header.inc"
+ .include "data/maps/EverGrandeCity_Hall3/header.inc"
+ .include "data/maps/EverGrandeCity_Hall4/header.inc"
+ .include "data/maps/EverGrandeCity_Hall5/header.inc"
+ .include "data/maps/EverGrandeCity_PokemonLeague_1F/header.inc"
+ .include "data/maps/EverGrandeCity_HallOfFame/header.inc"
+ .include "data/maps/EverGrandeCity_PokemonCenter_1F/header.inc"
+ .include "data/maps/EverGrandeCity_PokemonCenter_2F/header.inc"
+ .include "data/maps/EverGrandeCity_PokemonLeague_2F/header.inc"
+ .include "data/maps/Route104_MrBrineysHouse/header.inc"
+ .include "data/maps/Route104_PrettyPetalFlowerShop/header.inc"
+ .include "data/maps/Route111_WinstrateFamilysHouse/header.inc"
+ .include "data/maps/Route111_OldLadysRestStop/header.inc"
+ .include "data/maps/Route112_CableCarStation/header.inc"
+ .include "data/maps/MtChimney_CableCarStation/header.inc"
+ .include "data/maps/Route114_FossilManiacsHouse/header.inc"
+ .include "data/maps/Route114_FossilManiacsTunnel/header.inc"
+ .include "data/maps/Route114_LanettesHouse/header.inc"
+ .include "data/maps/Route116_TunnelersRestHouse/header.inc"
+ .include "data/maps/Route117_PokemonDayCare/header.inc"
+ .include "data/maps/Route121_SafariZoneEntrance/header.inc"
+ .include "data/maps/MeteorFalls_1F_1R/header.inc"
+ .include "data/maps/MeteorFalls_1F_2R/header.inc"
+ .include "data/maps/MeteorFalls_B1F_1R/header.inc"
+ .include "data/maps/MeteorFalls_B1F_2R/header.inc"
+ .include "data/maps/RusturfTunnel/header.inc"
+ .include "data/maps/Underwater_SootopolisCity/header.inc"
+ .include "data/maps/DesertRuins/header.inc"
+ .include "data/maps/GraniteCave_1F/header.inc"
+ .include "data/maps/GraniteCave_B1F/header.inc"
+ .include "data/maps/GraniteCave_B2F/header.inc"
+ .include "data/maps/GraniteCave_StevensRoom/header.inc"
+ .include "data/maps/PetalburgWoods/header.inc"
+ .include "data/maps/MtChimney/header.inc"
+ .include "data/maps/JaggedPass/header.inc"
+ .include "data/maps/FieryPath/header.inc"
+ .include "data/maps/MtPyre_1F/header.inc"
+ .include "data/maps/MtPyre_2F/header.inc"
+ .include "data/maps/MtPyre_3F/header.inc"
+ .include "data/maps/MtPyre_4F/header.inc"
+ .include "data/maps/MtPyre_5F/header.inc"
+ .include "data/maps/MtPyre_6F/header.inc"
+ .include "data/maps/MtPyre_Exterior/header.inc"
+ .include "data/maps/MtPyre_Summit/header.inc"
+ .include "data/maps/AquaHideout_1F/header.inc"
+ .include "data/maps/AquaHideout_B1F/header.inc"
+ .include "data/maps/AquaHideout_B2F/header.inc"
+ .include "data/maps/Underwater_SeafloorCavern/header.inc"
+ .include "data/maps/SeafloorCavern_Entrance/header.inc"
+ .include "data/maps/SeafloorCavern_Room1/header.inc"
+ .include "data/maps/SeafloorCavern_Room2/header.inc"
+ .include "data/maps/SeafloorCavern_Room3/header.inc"
+ .include "data/maps/SeafloorCavern_Room4/header.inc"
+ .include "data/maps/SeafloorCavern_Room5/header.inc"
+ .include "data/maps/SeafloorCavern_Room6/header.inc"
+ .include "data/maps/SeafloorCavern_Room7/header.inc"
+ .include "data/maps/SeafloorCavern_Room8/header.inc"
+ .include "data/maps/SeafloorCavern_Room9/header.inc"
+ .include "data/maps/CaveOfOrigin_Entrance/header.inc"
+ .include "data/maps/CaveOfOrigin_1F/header.inc"
+ .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc"
+ .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc"
+ .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc"
+ .include "data/maps/CaveOfOrigin_B1F/header.inc"
+ .include "data/maps/VictoryRoad_1F/header.inc"
+ .include "data/maps/VictoryRoad_B1F/header.inc"
+ .include "data/maps/VictoryRoad_B2F/header.inc"
+ .include "data/maps/ShoalCave_LowTideEntranceRoom/header.inc"
+ .include "data/maps/ShoalCave_LowTideInnerRoom/header.inc"
+ .include "data/maps/ShoalCave_LowTideStairsRoom/header.inc"
+ .include "data/maps/ShoalCave_LowTideLowerRoom/header.inc"
+ .include "data/maps/ShoalCave_HighTideEntranceRoom/header.inc"
+ .include "data/maps/ShoalCave_HighTideInnerRoom/header.inc"
+ .include "data/maps/NewMauville_Entrance/header.inc"
+ .include "data/maps/NewMauville_Inside/header.inc"
+ .include "data/maps/AbandonedShip_Deck/header.inc"
+ .include "data/maps/AbandonedShip_Corridors_1F/header.inc"
+ .include "data/maps/AbandonedShip_Rooms_1F/header.inc"
+ .include "data/maps/AbandonedShip_Corridors_B1F/header.inc"
+ .include "data/maps/AbandonedShip_Rooms_B1F/header.inc"
+ .include "data/maps/AbandonedShip_Rooms2_B1F/header.inc"
+ .include "data/maps/AbandonedShip_Underwater1/header.inc"
+ .include "data/maps/AbandonedShip_Room_B1F/header.inc"
+ .include "data/maps/AbandonedShip_Rooms2_1F/header.inc"
+ .include "data/maps/AbandonedShip_CaptainsOffice/header.inc"
+ .include "data/maps/AbandonedShip_Underwater2/header.inc"
+ .include "data/maps/AbandonedShip_HiddenFloorCorridors/header.inc"
+ .include "data/maps/AbandonedShip_HiddenFloorRooms/header.inc"
+ .include "data/maps/IslandCave/header.inc"
+ .include "data/maps/AncientTomb/header.inc"
+ .include "data/maps/Underwater_Route134/header.inc"
+ .include "data/maps/Underwater_SealedChamber/header.inc"
+ .include "data/maps/SealedChamber_OuterRoom/header.inc"
+ .include "data/maps/SealedChamber_InnerRoom/header.inc"
+ .include "data/maps/ScorchedSlab/header.inc"
+ .include "data/maps/AquaHideout_UnusedRubyMap1/header.inc"
+ .include "data/maps/AquaHideout_UnusedRubyMap2/header.inc"
+ .include "data/maps/AquaHideout_UnusedRubyMap3/header.inc"
+ .include "data/maps/SkyPillar_Entrance/header.inc"
+ .include "data/maps/SkyPillar_Outside/header.inc"
+ .include "data/maps/SkyPillar_1F/header.inc"
+ .include "data/maps/SkyPillar_2F/header.inc"
+ .include "data/maps/SkyPillar_3F/header.inc"
+ .include "data/maps/SkyPillar_4F/header.inc"
+ .include "data/maps/ShoalCave_LowTideIceRoom/header.inc"
+ .include "data/maps/SkyPillar_5F/header.inc"
+ .include "data/maps/SkyPillar_Top/header.inc"
+ .include "data/maps/MagmaHideout_1F/header.inc"
+ .include "data/maps/MagmaHideout_2F_1R/header.inc"
+ .include "data/maps/MagmaHideout_2F_2R/header.inc"
+ .include "data/maps/MagmaHideout_3F_1R/header.inc"
+ .include "data/maps/MagmaHideout_3F_2R/header.inc"
+ .include "data/maps/MagmaHideout_4F/header.inc"
+ .include "data/maps/MagmaHideout_3F_3R/header.inc"
+ .include "data/maps/MagmaHideout_2F_3R/header.inc"
+ .include "data/maps/MirageTower_1F/header.inc"
+ .include "data/maps/MirageTower_2F/header.inc"
+ .include "data/maps/MirageTower_3F/header.inc"
+ .include "data/maps/MirageTower_4F/header.inc"
+ .include "data/maps/DesertUnderpass/header.inc"
+ .include "data/maps/ArtisanCave_B1F/header.inc"
+ .include "data/maps/ArtisanCave_1F/header.inc"
+ .include "data/maps/Underwater_MarineCave/header.inc"
+ .include "data/maps/MarineCave_Entrance/header.inc"
+ .include "data/maps/MarineCave_End/header.inc"
+ .include "data/maps/TerraCave_Entrance/header.inc"
+ .include "data/maps/TerraCave_End/header.inc"
+ .include "data/maps/AlteringCave/header.inc"
+ .include "data/maps/MeteorFalls_StevensCave/header.inc"
+ .include "data/maps/SecretBase_RedCave1/header.inc"
+ .include "data/maps/SecretBase_BrownCave1/header.inc"
+ .include "data/maps/SecretBase_BlueCave1/header.inc"
+ .include "data/maps/SecretBase_YellowCave1/header.inc"
+ .include "data/maps/SecretBase_Tree1/header.inc"
+ .include "data/maps/SecretBase_Shrub1/header.inc"
+ .include "data/maps/SecretBase_RedCave2/header.inc"
+ .include "data/maps/SecretBase_BrownCave2/header.inc"
+ .include "data/maps/SecretBase_BlueCave2/header.inc"
+ .include "data/maps/SecretBase_YellowCave2/header.inc"
+ .include "data/maps/SecretBase_Tree2/header.inc"
+ .include "data/maps/SecretBase_Shrub2/header.inc"
+ .include "data/maps/SecretBase_RedCave3/header.inc"
+ .include "data/maps/SecretBase_BrownCave3/header.inc"
+ .include "data/maps/SecretBase_BlueCave3/header.inc"
+ .include "data/maps/SecretBase_YellowCave3/header.inc"
+ .include "data/maps/SecretBase_Tree3/header.inc"
+ .include "data/maps/SecretBase_Shrub3/header.inc"
+ .include "data/maps/SecretBase_RedCave4/header.inc"
+ .include "data/maps/SecretBase_BrownCave4/header.inc"
+ .include "data/maps/SecretBase_BlueCave4/header.inc"
+ .include "data/maps/SecretBase_YellowCave4/header.inc"
+ .include "data/maps/SecretBase_Tree4/header.inc"
+ .include "data/maps/SecretBase_Shrub4/header.inc"
+ .include "data/maps/SingleBattleColosseum/header.inc"
+ .include "data/maps/TradeCenter/header.inc"
+ .include "data/maps/RecordCorner/header.inc"
+ .include "data/maps/DoubleBattleColosseum/header.inc"
+ .include "data/maps/LinkContestRoom1/header.inc"
+ .include "data/maps/UnknownMap_25_29/header.inc"
+ .include "data/maps/UnknownMap_25_30/header.inc"
+ .include "data/maps/UnknownMap_25_31/header.inc"
+ .include "data/maps/UnknownMap_25_32/header.inc"
+ .include "data/maps/UnknownMap_25_33/header.inc"
+ .include "data/maps/UnknownMap_25_34/header.inc"
+ .include "data/maps/LinkContestRoom2/header.inc"
+ .include "data/maps/LinkContestRoom3/header.inc"
+ .include "data/maps/LinkContestRoom4/header.inc"
+ .include "data/maps/LinkContestRoom5/header.inc"
+ .include "data/maps/LinkContestRoom6/header.inc"
+ .include "data/maps/InsideOfTruck/header.inc"
+ .include "data/maps/SSTidalCorridor/header.inc"
+ .include "data/maps/SSTidalLowerDeck/header.inc"
+ .include "data/maps/SSTidalRooms/header.inc"
+ .include "data/maps/BattlePyramidSquare01/header.inc"
+ .include "data/maps/BattlePyramidSquare02/header.inc"
+ .include "data/maps/BattlePyramidSquare03/header.inc"
+ .include "data/maps/BattlePyramidSquare04/header.inc"
+ .include "data/maps/BattlePyramidSquare05/header.inc"
+ .include "data/maps/BattlePyramidSquare06/header.inc"
+ .include "data/maps/BattlePyramidSquare07/header.inc"
+ .include "data/maps/BattlePyramidSquare08/header.inc"
+ .include "data/maps/BattlePyramidSquare09/header.inc"
+ .include "data/maps/BattlePyramidSquare10/header.inc"
+ .include "data/maps/BattlePyramidSquare11/header.inc"
+ .include "data/maps/BattlePyramidSquare12/header.inc"
+ .include "data/maps/BattlePyramidSquare13/header.inc"
+ .include "data/maps/BattlePyramidSquare14/header.inc"
+ .include "data/maps/BattlePyramidSquare15/header.inc"
+ .include "data/maps/BattlePyramidSquare16/header.inc"
+ .include "data/maps/UnionRoom/header.inc"
+ .include "data/maps/SafariZone_Northwest/header.inc"
+ .include "data/maps/SafariZone_North/header.inc"
+ .include "data/maps/SafariZone_Southwest/header.inc"
+ .include "data/maps/SafariZone_South/header.inc"
+ .include "data/maps/BattleFrontier_OutsideWest/header.inc"
+ .include "data/maps/BattleFrontier_BattleTowerLobby/header.inc"
+ .include "data/maps/BattleFrontier_BattleTowerElevator/header.inc"
+ .include "data/maps/BattleFrontier_BattleTowerCorridor/header.inc"
+ .include "data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc"
+ .include "data/maps/SouthernIsland_Exterior/header.inc"
+ .include "data/maps/SouthernIsland_Interior/header.inc"
+ .include "data/maps/SafariZone_RestHouse/header.inc"
+ .include "data/maps/SafariZone_Northeast/header.inc"
+ .include "data/maps/SafariZone_Southeast/header.inc"
+ .include "data/maps/BattleFrontier_OutsideEast/header.inc"
+ .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattleTowerCorridor2/header.inc"
+ .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc"
+ .include "data/maps/BattleFrontier_BattleDomeLobby/header.inc"
+ .include "data/maps/BattleFrontier_BattleDomeCorridor/header.inc"
+ .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattlePalaceLobby/header.inc"
+ .include "data/maps/BattleFrontier_BattlePalaceCorridor/header.inc"
+ .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattlePyramidLobby/header.inc"
+ .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc"
+ .include "data/maps/BattleFrontier_BattlePyramidTop/header.inc"
+ .include "data/maps/BattleFrontier_BattleArenaLobby/header.inc"
+ .include "data/maps/BattleFrontier_BattleArenaCorridor/header.inc"
+ .include "data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattleFactoryLobby/header.inc"
+ .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattlePikeLobby/header.inc"
+ .include "data/maps/BattleFrontier_BattlePikeCorridor/header.inc"
+ .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc"
+ .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc"
+ .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc"
+ .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc"
+ .include "data/maps/BattleFrontier_RankingHall/header.inc"
+ .include "data/maps/BattleFrontier_Lounge1/header.inc"
+ .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc"
+ .include "data/maps/BattleFrontier_Lounge2/header.inc"
+ .include "data/maps/BattleFrontier_Lounge3/header.inc"
+ .include "data/maps/BattleFrontier_Lounge4/header.inc"
+ .include "data/maps/BattleFrontier_ScottsHouse/header.inc"
+ .include "data/maps/BattleFrontier_Lounge5/header.inc"
+ .include "data/maps/BattleFrontier_Lounge6/header.inc"
+ .include "data/maps/BattleFrontier_Lounge7/header.inc"
+ .include "data/maps/BattleFrontier_ReceptionGate/header.inc"
+ .include "data/maps/BattleFrontier_Lounge8/header.inc"
+ .include "data/maps/BattleFrontier_Lounge9/header.inc"
+ .include "data/maps/BattleFrontier_PokemonCenter_1F/header.inc"
+ .include "data/maps/BattleFrontier_PokemonCenter_2F/header.inc"
+ .include "data/maps/BattleFrontier_Mart/header.inc"
+ .include "data/maps/FarawayIsland_Entrance/header.inc"
+ .include "data/maps/FarawayIsland_Interior/header.inc"
+ .include "data/maps/BirthIsland_Exterior/header.inc"
+ .include "data/maps/BirthIsland_Harbor/header.inc"
+ .include "data/maps/TrainerHill_Entrance/header.inc"
+ .include "data/maps/TrainerHill_1F/header.inc"
+ .include "data/maps/TrainerHill_2F/header.inc"
+ .include "data/maps/TrainerHill_3F/header.inc"
+ .include "data/maps/TrainerHill_4F/header.inc"
+ .include "data/maps/TrainerHill_Roof/header.inc"
+ .include "data/maps/NavelRock_Exterior/header.inc"
+ .include "data/maps/NavelRock_Harbor/header.inc"
+ .include "data/maps/NavelRock_Entrance/header.inc"
+ .include "data/maps/NavelRock_B1F/header.inc"
+ .include "data/maps/NavelRock_Fork/header.inc"
+ .include "data/maps/NavelRock_Up1/header.inc"
+ .include "data/maps/NavelRock_Up2/header.inc"
+ .include "data/maps/NavelRock_Up3/header.inc"
+ .include "data/maps/NavelRock_Up4/header.inc"
+ .include "data/maps/NavelRock_Top/header.inc"
+ .include "data/maps/NavelRock_Down01/header.inc"
+ .include "data/maps/NavelRock_Down02/header.inc"
+ .include "data/maps/NavelRock_Down03/header.inc"
+ .include "data/maps/NavelRock_Down04/header.inc"
+ .include "data/maps/NavelRock_Down05/header.inc"
+ .include "data/maps/NavelRock_Down06/header.inc"
+ .include "data/maps/NavelRock_Down07/header.inc"
+ .include "data/maps/NavelRock_Down08/header.inc"
+ .include "data/maps/NavelRock_Down09/header.inc"
+ .include "data/maps/NavelRock_Down10/header.inc"
+ .include "data/maps/NavelRock_Down11/header.inc"
+ .include "data/maps/NavelRock_Bottom/header.inc"
+ .include "data/maps/TrainerHill_Elevator/header.inc"
+ .include "data/maps/Route104_Prototype/header.inc"
+ .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc"
+ .include "data/maps/Route109_SeashoreHouse/header.inc"
+ .include "data/maps/Route110_TrickHouseEntrance/header.inc"
+ .include "data/maps/Route110_TrickHouseEnd/header.inc"
+ .include "data/maps/Route110_TrickHouseCorridor/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle1/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle2/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle3/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle4/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle5/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle6/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle7/header.inc"
+ .include "data/maps/Route110_TrickHousePuzzle8/header.inc"
+ .include "data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc"
+ .include "data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc"
+ .include "data/maps/Route113_GlassWorkshop/header.inc"
+ .include "data/maps/Route123_BerryMastersHouse/header.inc"
+ .include "data/maps/Route119_WeatherInstitute_1F/header.inc"
+ .include "data/maps/Route119_WeatherInstitute_2F/header.inc"
+ .include "data/maps/Route119_House/header.inc"
+ .include "data/maps/Route124_DivingTreasureHuntersHouse/header.inc"