ref: 55bb99580eeccc92106437c4ad86edb8ca89ecda
parent: a5375a080552f46a34377d21ab848f5cff7a6ecc
author: Rangi <[email protected]>
date: Fri Jul 3 14:19:56 EDT 2020
data/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects To do: Polished Map support for loading the objects
--- a/data/mapHeaders/AgathasRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header AgathasRoom, AGATHAS_ROOM, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/BikeShop.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header BikeShop, BIKE_SHOP, CLUB, 0
- end_map_header
--- a/data/mapHeaders/BillsHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header BillsHouse, BILLS_HOUSE, INTERIOR, 0
- end_map_header
--- a/data/mapHeaders/BluesHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header BluesHouse, BLUES_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/BrunosRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header BrunosRoom, BRUNOS_ROOM, GYM, 0
- end_map_header
--- a/data/mapHeaders/CeladonChiefHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION, 0
- end_map_header
--- a/data/mapHeaders/CeladonCity.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST
- connection west, Route16, ROUTE_16, 4
- connection east, Route7, ROUTE_7, 4
- end_map_header
--- a/data/mapHeaders/CeladonDiner.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonDiner, CELADON_DINER, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonGym, CELADON_GYM, GYM, 0
- end_map_header
--- a/data/mapHeaders/CeladonHotel.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonHotel, CELADON_HOTEL, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/CeladonMansion1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION, 0
- end_map_header
--- a/data/mapHeaders/CeladonMansion2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION, 0
- end_map_header
--- a/data/mapHeaders/CeladonMansion3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION, 0
- end_map_header
--- a/data/mapHeaders/CeladonMansionRoof.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION, 0
- end_map_header
--- a/data/mapHeaders/CeladonMansionRoofHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/CeladonMart1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMart1F, CELADON_MART_1F, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonMart2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMart2F, CELADON_MART_2F, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonMart3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMart3F, CELADON_MART_3F, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonMart4F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMart4F, CELADON_MART_4F, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonMart5F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMart5F, CELADON_MART_5F, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonMartElevator.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonMartRoof.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/CeladonPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/CeruleanBadgeHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP, 0
- end_map_header
--- a/data/mapHeaders/CeruleanCave1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/CeruleanCave2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/CeruleanCaveB1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/CeruleanCity.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-
- map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
- connection north, Route24, ROUTE_24, 5
- connection south, Route5, ROUTE_5, 5
- connection west, Route4, ROUTE_4, 4
- connection east, Route9, ROUTE_9, 4
- end_map_header
--- a/data/mapHeaders/CeruleanGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanGym, CERULEAN_GYM, GYM, 0
- end_map_header
--- a/data/mapHeaders/CeruleanMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanMart, CERULEAN_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/CeruleanPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/CeruleanTradeHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/CeruleanTrashedHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/ChampionsRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ChampionsRoom, CHAMPIONS_ROOM, GYM, $0
- end_map_header
--- a/data/mapHeaders/CinnabarGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CinnabarGym, CINNABAR_GYM, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/CinnabarIsland.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD, NORTH | EAST
- connection north, Route21, ROUTE_21, 0
- connection east, Route20, ROUTE_20, 0
- end_map_header
--- a/data/mapHeaders/CinnabarLab.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CinnabarLab, CINNABAR_LAB, LAB, 0
- end_map_header
--- a/data/mapHeaders/CinnabarLabFossilRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0
- end_map_header
--- a/data/mapHeaders/CinnabarLabMetronomeRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB, 0
- end_map_header
--- a/data/mapHeaders/CinnabarLabTradeRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB, 0
- end_map_header
--- a/data/mapHeaders/CinnabarMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CinnabarMart, CINNABAR_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/CinnabarPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/Colosseum.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Colosseum, COLOSSEUM, CLUB, 0
- end_map_header
--- a/data/mapHeaders/CopycatsHouse1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1, 0
- end_map_header
--- a/data/mapHeaders/CopycatsHouse2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2, 0
- end_map_header
--- a/data/mapHeaders/Daycare.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Daycare, DAYCARE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/DiglettsCave.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header DiglettsCave, DIGLETTS_CAVE, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/DiglettsCaveRoute11.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/DiglettsCaveRoute2.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/FightingDojo.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header FightingDojo, FIGHTING_DOJO, DOJO, 0
- end_map_header
--- a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/FuchsiaCity.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-
- map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD, SOUTH | WEST | EAST
- connection south, Route19, ROUTE_19, 5
- connection west, Route18, ROUTE_18, 4
- connection east, Route15, ROUTE_15, 4
- end_map_header
--- a/data/mapHeaders/FuchsiaGoodRodHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP, 0
- end_map_header
--- a/data/mapHeaders/FuchsiaGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header FuchsiaGym, FUCHSIA_GYM, GYM, 0
- end_map_header
--- a/data/mapHeaders/FuchsiaMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header FuchsiaMart, FUCHSIA_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/FuchsiaMeetingRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB, 0
- end_map_header
--- a/data/mapHeaders/FuchsiaPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/GameCorner.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header GameCorner, GAME_CORNER, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/GameCornerPrizeRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/HallOfFame.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header HallOfFame, HALL_OF_FAME, GYM, 0
- end_map_header
--- a/data/mapHeaders/IndigoPlateau.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-
- map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU, SOUTH
- connection south, Route23, ROUTE_23, 0
- end_map_header
--- a/data/mapHeaders/IndigoPlateauLobby.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART, 0
- end_map_header
--- a/data/mapHeaders/LancesRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header LancesRoom, LANCES_ROOM, DOJO, 0
- end_map_header
--- a/data/mapHeaders/LavenderCuboneHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/LavenderMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header LavenderMart, LAVENDER_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/LavenderPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/LavenderTown.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-
- map_header LavenderTown, LAVENDER_TOWN, OVERWORLD, NORTH | SOUTH | WEST
- connection north, Route10, ROUTE_10, 0
- connection south, Route12, ROUTE_12, 0
- connection west, Route8, ROUTE_8, 0
- end_map_header
--- a/data/mapHeaders/LoreleisRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header LoreleisRoom, LORELEIS_ROOM, GYM, 0
- end_map_header
--- a/data/mapHeaders/MrFujisHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/MrPsychicsHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/MtMoon1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header MtMoon1F, MT_MOON_1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/MtMoonB1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header MtMoonB1F, MT_MOON_B1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/MtMoonB2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header MtMoonB2F, MT_MOON_B2F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/MtMoonPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/Museum1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Museum1F, MUSEUM_1F, MUSEUM, 0
- end_map_header
--- a/data/mapHeaders/Museum2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Museum2F, MUSEUM_2F, MUSEUM, 0
- end_map_header
--- a/data/mapHeaders/NameRatersHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/OaksLab.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header OaksLab, OAKS_LAB, DOJO, 0
- end_map_header
--- a/data/mapHeaders/PalletTown.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header PalletTown, PALLET_TOWN, OVERWORLD, NORTH | SOUTH
- connection north, Route1, ROUTE_1, 0
- connection south, Route21, ROUTE_21, 0
- end_map_header
--- a/data/mapHeaders/PewterCity.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header PewterCity, PEWTER_CITY, OVERWORLD, SOUTH | EAST
- connection south, Route2, ROUTE_2, 5
- connection east, Route3, ROUTE_3, 4
- end_map_header
--- a/data/mapHeaders/PewterGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PewterGym, PEWTER_GYM, GYM, 0
- end_map_header
--- a/data/mapHeaders/PewterMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PewterMart, PEWTER_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/PewterNidoranHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/PewterPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/PewterSpeechHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/PokemonFanClub.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR, 0
- end_map_header
--- a/data/mapHeaders/PokemonMansion1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/PokemonMansion2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/PokemonMansion3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/PokemonMansionB1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/PokemonTower1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/PokemonTower2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/PokemonTower3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/PokemonTower4F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/PokemonTower5F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/PokemonTower6F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/PokemonTower7F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY, 0
- end_map_header
--- a/data/mapHeaders/PowerPlant.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header PowerPlant, POWER_PLANT, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/RedsHouse1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RedsHouse1F, REDS_HOUSE_1F, REDS_HOUSE_1, 0
- end_map_header
--- a/data/mapHeaders/RedsHouse2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RedsHouse2F, REDS_HOUSE_2F, REDS_HOUSE_2, $00
- end_map_header
--- a/data/mapHeaders/RockTunnel1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RockTunnel1F, ROCK_TUNNEL_1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/RockTunnelB1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RockTunnelB1F, ROCK_TUNNEL_B1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/RockTunnelPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RockTunnelPokecenter, ROCK_TUNNEL_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/RocketHideoutB1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RocketHideoutB1F, ROCKET_HIDEOUT_B1F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/RocketHideoutB2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RocketHideoutB2F, ROCKET_HIDEOUT_B2F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/RocketHideoutB3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RocketHideoutB3F, ROCKET_HIDEOUT_B3F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/RocketHideoutB4F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RocketHideoutB4F, ROCKET_HIDEOUT_B4F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/RocketHideoutElevator.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header RocketHideoutElevator, ROCKET_HIDEOUT_ELEVATOR, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/Route1.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route1, ROUTE_1, OVERWORLD, NORTH | SOUTH
- connection north, ViridianCity, VIRIDIAN_CITY, -5
- connection south, PalletTown, PALLET_TOWN, 0
- end_map_header
--- a/data/mapHeaders/Route10.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route10, ROUTE_10, OVERWORLD, SOUTH | WEST
- connection south, LavenderTown, LAVENDER_TOWN, 0
- connection west, Route9, ROUTE_9, 0
- end_map_header
--- a/data/mapHeaders/Route11.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route11, ROUTE_11, OVERWORLD, WEST | EAST
- connection west, VermilionCity, VERMILION_CITY, -4
- connection east, Route12, ROUTE_12, -27
- end_map_header
--- a/data/mapHeaders/Route11Gate1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route11Gate1F, ROUTE_11_GATE_1F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route11Gate2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route11Gate2F, ROUTE_11_GATE_2F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route12.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-
- map_header Route12, ROUTE_12, OVERWORLD, NORTH | SOUTH | WEST
- connection north, LavenderTown, LAVENDER_TOWN, 0
- connection south, Route13, ROUTE_13, -20
- connection west, Route11, ROUTE_11, 27
- end_map_header
--- a/data/mapHeaders/Route12Gate1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route12Gate1F, ROUTE_12_GATE_1F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route12Gate2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route12Gate2F, ROUTE_12_GATE_2F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route12SuperRodHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/Route13.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route13, ROUTE_13, OVERWORLD, NORTH | WEST
- connection north, Route12, ROUTE_12, 20
- connection west, Route14, ROUTE_14, 0
- end_map_header
--- a/data/mapHeaders/Route14.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route14, ROUTE_14, OVERWORLD, WEST | EAST
- connection west, Route15, ROUTE_15, 18
- connection east, Route13, ROUTE_13, 0
- end_map_header
--- a/data/mapHeaders/Route15.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route15, ROUTE_15, OVERWORLD, WEST | EAST
- connection west, FuchsiaCity, FUCHSIA_CITY, -4
- connection east, Route14, ROUTE_14, -18
- end_map_header
--- a/data/mapHeaders/Route15Gate1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route15Gate1F, ROUTE_15_GATE_1F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route15Gate2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route15Gate2F, ROUTE_15_GATE_2F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route16.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route16, ROUTE_16, OVERWORLD, SOUTH | EAST
- connection south, Route17, ROUTE_17, 0
- connection east, CeladonCity, CELADON_CITY, -4
- end_map_header
--- a/data/mapHeaders/Route16FlyHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route16FlyHouse, ROUTE_16_FLY_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/Route16Gate1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route16Gate1F, ROUTE_16_GATE_1F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route16Gate2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route16Gate2F, ROUTE_16_GATE_2F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route17.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route17, ROUTE_17, OVERWORLD, NORTH | SOUTH
- connection north, Route16, ROUTE_16, 0
- connection south, Route18, ROUTE_18, 0
- end_map_header
--- a/data/mapHeaders/Route18.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route18, ROUTE_18, OVERWORLD, NORTH | EAST
- connection north, Route17, ROUTE_17, 0
- connection east, FuchsiaCity, FUCHSIA_CITY, -4
- end_map_header
--- a/data/mapHeaders/Route18Gate1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route18Gate1F, ROUTE_18_GATE_1F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route18Gate2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route18Gate2F, ROUTE_18_GATE_2F, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route19.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST
- connection north, FuchsiaCity, FUCHSIA_CITY, -5
- connection west, Route20, ROUTE_20, 18
- end_map_header
--- a/data/mapHeaders/Route2.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route2, ROUTE_2, OVERWORLD, NORTH | SOUTH
- connection north, PewterCity, PEWTER_CITY, -5
- connection south, ViridianCity, VIRIDIAN_CITY, -5
- end_map_header
--- a/data/mapHeaders/Route20.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST
- connection west, CinnabarIsland, CINNABAR_ISLAND, 0
- connection east, Route19, ROUTE_19, -18
- end_map_header
--- a/data/mapHeaders/Route21.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route21, ROUTE_21, OVERWORLD, NORTH | SOUTH
- connection north, PalletTown, PALLET_TOWN, 0
- connection south, CinnabarIsland, CINNABAR_ISLAND, 0
- end_map_header
--- a/data/mapHeaders/Route22.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST
- connection north, Route23, ROUTE_23, 0
- connection east, ViridianCity, VIRIDIAN_CITY, -4
- end_map_header
--- a/data/mapHeaders/Route22Gate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route22Gate, ROUTE_22_GATE, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route23.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH
- connection north, IndigoPlateau, INDIGO_PLATEAU, 0
- connection south, Route22, ROUTE_22, 0
- end_map_header
--- a/data/mapHeaders/Route24.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route24, ROUTE_24, OVERWORLD, SOUTH | EAST
- connection south, CeruleanCity, CERULEAN_CITY, -5
- connection east, Route25, ROUTE_25, 0
- end_map_header
--- a/data/mapHeaders/Route25.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-
- map_header Route25, ROUTE_25, OVERWORLD, WEST
- connection west, Route24, ROUTE_24, 0
- end_map_header
--- a/data/mapHeaders/Route2Gate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route2Gate, ROUTE_2_GATE, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route2TradeHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route2TradeHouse, ROUTE_2_TRADE_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/Route3.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route3, ROUTE_3, OVERWORLD, NORTH | WEST
- connection north, Route4, ROUTE_4, 25
- connection west, PewterCity, PEWTER_CITY, -4
- end_map_header
--- a/data/mapHeaders/Route4.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route4, ROUTE_4, OVERWORLD, SOUTH | EAST
- connection south, Route3, ROUTE_3, -25
- connection east, CeruleanCity, CERULEAN_CITY, -4
- end_map_header
--- a/data/mapHeaders/Route5.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route5, ROUTE_5, OVERWORLD, NORTH | SOUTH
- connection north, CeruleanCity, CERULEAN_CITY, -5
- connection south, SaffronCity, SAFFRON_CITY, -5
- end_map_header
--- a/data/mapHeaders/Route5Gate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route5Gate, ROUTE_5_GATE, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route6.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route6, ROUTE_6, OVERWORLD, NORTH | SOUTH
- connection north, SaffronCity, SAFFRON_CITY, -5
- connection south, VermilionCity, VERMILION_CITY, -5
- end_map_header
--- a/data/mapHeaders/Route6Gate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route6Gate, ROUTE_6_GATE, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route7.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route7, ROUTE_7, OVERWORLD, WEST | EAST
- connection west, CeladonCity, CELADON_CITY, -4
- connection east, SaffronCity, SAFFRON_CITY, -4
- end_map_header
--- a/data/mapHeaders/Route7Gate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route7Gate, ROUTE_7_GATE, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route8.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route8, ROUTE_8, OVERWORLD, WEST | EAST
- connection west, SaffronCity, SAFFRON_CITY, -4
- connection east, LavenderTown, LAVENDER_TOWN, 0
- end_map_header
--- a/data/mapHeaders/Route8Gate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header Route8Gate, ROUTE_8_GATE, GATE, 0
- end_map_header
--- a/data/mapHeaders/Route9.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header Route9, ROUTE_9, OVERWORLD, WEST | EAST
- connection west, CeruleanCity, CERULEAN_CITY, -4
- connection east, Route10, ROUTE_10, 0
- end_map_header
--- a/data/mapHeaders/SSAnne1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnne1F, SS_ANNE_1F, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnne1FRooms.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnne1FRooms, SS_ANNE_1F_ROOMS, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnne2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnne2F, SS_ANNE_2F, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnne2FRooms.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnne2FRooms, SS_ANNE_2F_ROOMS, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnne3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnne3F, SS_ANNE_3F, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnneB1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnneB1F, SS_ANNE_B1F, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnneB1FRooms.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnneB1FRooms, SS_ANNE_B1F_ROOMS, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnneBow.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnneBow, SS_ANNE_BOW, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnneCaptainsRoom.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnneCaptainsRoom, SS_ANNE_CAPTAINS_ROOM, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SSAnneKitchen.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SSAnneKitchen, SS_ANNE_KITCHEN, SHIP, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneCenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneCenter, SAFARI_ZONE_CENTER, FOREST, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneCenterRestHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneEast.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneEast, SAFARI_ZONE_EAST, FOREST, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneEastRestHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneGate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneGate, SAFARI_ZONE_GATE, GATE, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneNorth.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneNorth, SAFARI_ZONE_NORTH, FOREST, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneNorthRestHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneSecretHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneSecretHouse, SAFARI_ZONE_SECRET_HOUSE, LAB, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneWest.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneWest, SAFARI_ZONE_WEST, FOREST, 0
- end_map_header
--- a/data/mapHeaders/SafariZoneWestRestHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0
- end_map_header
--- a/data/mapHeaders/SaffronCity.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-
- map_header SaffronCity, SAFFRON_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
- connection north, Route5, ROUTE_5, 5
- connection south, Route6, ROUTE_6, 5
- connection west, Route7, ROUTE_7, 4
- connection east, Route8, ROUTE_8, 4
- end_map_header
--- a/data/mapHeaders/SaffronGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SaffronGym, SAFFRON_GYM, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SaffronMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SaffronMart, SAFFRON_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/SaffronPidgeyHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SaffronPidgeyHouse, SAFFRON_PIDGEY_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/SaffronPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SaffronPokecenter, SAFFRON_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/SeafoamIslands1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SeafoamIslands1F, SEAFOAM_ISLANDS_1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/SeafoamIslandsB1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/SeafoamIslandsB2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/SeafoamIslandsB3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/SeafoamIslandsB4F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/SilphCo10F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo10F, SILPH_CO_10F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo11F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo11F, SILPH_CO_11F, INTERIOR, 0
- end_map_header
--- a/data/mapHeaders/SilphCo1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo1F, SILPH_CO_1F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo2F, SILPH_CO_2F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo3F, SILPH_CO_3F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo4F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo4F, SILPH_CO_4F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo5F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo5F, SILPH_CO_5F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo6F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo6F, SILPH_CO_6F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo7F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo7F, SILPH_CO_7F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo8F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo8F, SILPH_CO_8F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCo9F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCo9F, SILPH_CO_9F, FACILITY, 0
- end_map_header
--- a/data/mapHeaders/SilphCoElevator.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header SilphCoElevator, SILPH_CO_ELEVATOR, LOBBY, 0
- end_map_header
--- a/data/mapHeaders/TradeCenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header TradeCenter, TRADE_CENTER, CLUB, 0
- end_map_header
--- a/data/mapHeaders/UndergroundPathNorthSouth.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header UndergroundPathNorthSouth, UNDERGROUND_PATH_NORTH_SOUTH, UNDERGROUND, 0
- end_map_header
--- a/data/mapHeaders/UndergroundPathRoute5.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header UndergroundPathRoute5, UNDERGROUND_PATH_ROUTE_5, GATE, 0
- end_map_header
--- a/data/mapHeaders/UndergroundPathRoute6.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header UndergroundPathRoute6, UNDERGROUND_PATH_ROUTE_6, GATE, 0
- end_map_header
--- a/data/mapHeaders/UndergroundPathRoute7.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header UndergroundPathRoute7, UNDERGROUND_PATH_ROUTE_7, GATE, 0
- end_map_header
--- a/data/mapHeaders/UndergroundPathRoute7Copy.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header UndergroundPathRoute7Copy, UNDERGROUND_PATH_ROUTE_7, GATE, 0
- end_map_header
--- a/data/mapHeaders/UndergroundPathRoute8.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header UndergroundPathRoute8, UNDERGROUND_PATH_ROUTE_8, GATE, 0
- end_map_header
--- a/data/mapHeaders/UndergroundPathWestEast.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header UndergroundPathWestEast, UNDERGROUND_PATH_WEST_EAST, UNDERGROUND, 0
- end_map_header
--- a/data/mapHeaders/VermilionCity.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-
- map_header VermilionCity, VERMILION_CITY, OVERWORLD, NORTH | EAST
- connection north, Route6, ROUTE_6, 5
- connection east, Route11, ROUTE_11, 4
- end_map_header
--- a/data/mapHeaders/VermilionDock.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VermilionDock, VERMILION_DOCK, SHIP_PORT, 0
- end_map_header
--- a/data/mapHeaders/VermilionGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VermilionGym, VERMILION_GYM, GYM, 0
- end_map_header
--- a/data/mapHeaders/VermilionMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VermilionMart, VERMILION_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/VermilionOldRodHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VermilionOldRodHouse, VERMILION_OLD_ROD_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/VermilionPidgeyHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VermilionPidgeyHouse, VERMILION_PIDGEY_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/VermilionPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VermilionPokecenter, VERMILION_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/VermilionTradeHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VermilionTradeHouse, VERMILION_TRADE_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/VictoryRoad1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VictoryRoad1F, VICTORY_ROAD_1F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/VictoryRoad2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VictoryRoad2F, VICTORY_ROAD_2F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/VictoryRoad3F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header VictoryRoad3F, VICTORY_ROAD_3F, CAVERN, 0
- end_map_header
--- a/data/mapHeaders/ViridianCity.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-
- map_header ViridianCity, VIRIDIAN_CITY, OVERWORLD, NORTH | SOUTH | WEST
- connection north, Route2, ROUTE_2, 5
- connection south, Route1, ROUTE_1, 5
- connection west, Route22, ROUTE_22, 4
- end_map_header
--- a/data/mapHeaders/ViridianForest.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianForest, VIRIDIAN_FOREST, FOREST, 0
- end_map_header
--- a/data/mapHeaders/ViridianForestNorthGate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianForestNorthGate, VIRIDIAN_FOREST_NORTH_GATE, FOREST_GATE, 0
- end_map_header
--- a/data/mapHeaders/ViridianForestSouthGate.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianForestSouthGate, VIRIDIAN_FOREST_SOUTH_GATE, FOREST_GATE, 0
- end_map_header
--- a/data/mapHeaders/ViridianGym.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianGym, VIRIDIAN_GYM, GYM, 0
- end_map_header
--- a/data/mapHeaders/ViridianMart.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianMart, VIRIDIAN_MART, MART, 0
- end_map_header
--- a/data/mapHeaders/ViridianNicknameHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianNicknameHouse, VIRIDIAN_NICKNAME_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/ViridianPokecenter.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianPokecenter, VIRIDIAN_POKECENTER, POKECENTER, 0
- end_map_header
--- a/data/mapHeaders/ViridianSchoolHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header ViridianSchoolHouse, VIRIDIAN_SCHOOL_HOUSE, HOUSE, 0
- end_map_header
--- a/data/mapHeaders/WardensHouse.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-
- map_header WardensHouse, WARDENS_HOUSE, LAB, 0
- end_map_header
--- a/data/mapObjects/AgathasRoom.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-AgathasRoom_Object:
- db $0 ; border block
-
- db 4 ; warps
- warp 4, 11, 2, BRUNOS_ROOM
- warp 5, 11, 3, BRUNOS_ROOM
- warp 4, 0, 0, LANCES_ROOM
- warp 5, 0, 0, LANCES_ROOM
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1
-
- ; warp-to
- warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
- warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
- warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
- warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
--- a/data/mapObjects/BikeShop.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-BikeShop_Object:
- db $e ; border block
-
- db 2 ; warps
- warp 2, 7, 4, -1
- warp 3, 7, 4, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person
- object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person
- object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person
-
- ; warp-to
- warp_to 2, 7, BIKE_SHOP_WIDTH
- warp_to 3, 7, BIKE_SHOP_WIDTH
--- a/data/mapObjects/BillsHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-BillsHouse_Object:
- db $d ; border block
-
- db 2 ; warps
- warp 2, 7, 0, -1
- warp 3, 7, 0, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 2, 7, BILLS_HOUSE_WIDTH
- warp_to 3, 7, BILLS_HOUSE_WIDTH
--- a/data/mapObjects/BluesHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-BluesHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 1, -1
- warp 3, 7, 1, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map
- object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around
- object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table
-
- ; warp-to
- warp_to 2, 7, BLUES_HOUSE_WIDTH
- warp_to 3, 7, BLUES_HOUSE_WIDTH
--- a/data/mapObjects/BrunosRoom.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-BrunosRoom_Object:
- db $3 ; border block
-
- db 4 ; warps
- warp 4, 11, 2, LORELEIS_ROOM
- warp 5, 11, 3, LORELEIS_ROOM
- warp 4, 0, 0, AGATHAS_ROOM
- warp 5, 0, 1, AGATHAS_ROOM
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1
-
- ; warp-to
- warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
- warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
- warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
- warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
--- a/data/mapObjects/CeladonChiefHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-CeladonChiefHouse_Object:
- db $f ; border block
-
- db 2 ; warps
- warp 2, 7, 11, -1
- warp 3, 7, 11, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person
- object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person
- object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
-
- ; warp-to
- warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH
- warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH
--- a/data/mapObjects/CeladonCity.asm
+++ /dev/null
@@ -1,54 +1,0 @@
-CeladonCity_Object:
- db $f ; border block
-
- db 13 ; warps
- warp 8, 13, 0, CELADON_MART_1F
- warp 10, 13, 2, CELADON_MART_1F
- warp 24, 9, 0, CELADON_MANSION_1F
- warp 24, 3, 2, CELADON_MANSION_1F
- warp 25, 3, 2, CELADON_MANSION_1F
- warp 41, 9, 0, CELADON_POKECENTER
- warp 12, 27, 0, CELADON_GYM
- warp 28, 19, 0, GAME_CORNER
- warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used
- warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM
- warp 31, 27, 0, CELADON_DINER
- warp 35, 27, 0, CELADON_CHIEF_HOUSE
- warp 43, 27, 0, CELADON_HOTEL
-
- db 9 ; signs
- sign 27, 15, 10 ; CeladonCityText10
- sign 19, 15, 11 ; CeladonCityText11
- sign 42, 9, 12 ; PokeCenterSignText
- sign 13, 29, 13 ; CeladonCityText13
- sign 21, 9, 14 ; CeladonCityText14
- sign 12, 13, 15 ; CeladonCityText15
- sign 39, 21, 16 ; CeladonCityText16
- sign 33, 21, 17 ; CeladonCityText17
- sign 27, 21, 18 ; CeladonCityText18
-
- db 9 ; objects
- object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person
- object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person
- object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person
- object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person
- object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person
- object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person
- object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person
- object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person
- object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person
-
- ; warp-to
- warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
- warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
- warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
- warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
- warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
- warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER
- warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM
- warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER
- warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F
- warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM
- warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER
- warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE
- warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL
--- a/data/mapObjects/CeladonDiner.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-CeladonDiner_Object:
- db $f ; border block
-
- db 2 ; warps
- warp 3, 7, 10, -1
- warp 4, 7, 10, -1
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person
- object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person
- object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person
- object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person
- object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person
-
- ; warp-to
- warp_to 3, 7, CELADON_DINER_WIDTH
- warp_to 4, 7, CELADON_DINER_WIDTH
--- a/data/mapObjects/CeladonGym.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-CeladonGym_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 17, 6, -1
- warp 5, 17, 6, -1
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1
- object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
- object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
- object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
- object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2
- object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18
- object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
- object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
-
- ; warp-to
- warp_to 4, 17, CELADON_GYM_WIDTH
- warp_to 5, 17, CELADON_GYM_WIDTH
--- a/data/mapObjects/CeladonHotel.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-CeladonHotel_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 12, -1
- warp 4, 7, 12, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person
-
- ; warp-to
- warp_to 3, 7, CELADON_HOTEL_WIDTH
- warp_to 4, 7, CELADON_HOTEL_WIDTH
--- a/data/mapObjects/CeladonMansion1F.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-CeladonMansion1F_Object:
- db $f ; border block
-
- db 5 ; warps
- warp 4, 11, 2, -1
- warp 5, 11, 2, -1
- warp 4, 0, 4, -1
- warp 7, 1, 1, CELADON_MANSION_2F
- warp 2, 1, 2, CELADON_MANSION_2F
-
- db 1 ; signs
- sign 4, 9, 5 ; CeladonMansion1Text5
-
- db 4 ; objects
- object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person
- object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person
- object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person
-
- ; warp-to
- warp_to 4, 11, CELADON_MANSION_1F_WIDTH
- warp_to 5, 11, CELADON_MANSION_1F_WIDTH
- warp_to 4, 0, CELADON_MANSION_1F_WIDTH
- warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
- warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
--- a/data/mapObjects/CeladonMansion2F.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-CeladonMansion2F_Object:
- db $f ; border block
-
- db 4 ; warps
- warp 6, 1, 0, CELADON_MANSION_3F
- warp 7, 1, 3, CELADON_MANSION_1F
- warp 2, 1, 4, CELADON_MANSION_1F
- warp 4, 1, 3, CELADON_MANSION_3F
-
- db 1 ; signs
- sign 4, 9, 1 ; CeladonMansion2Text1
-
- db 0 ; objects
-
- ; warp-to
- warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
- warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
- warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
- warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
--- a/data/mapObjects/CeladonMansion3F.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-CeladonMansion3F_Object:
- db $f ; border block
-
- db 4 ; warps
- warp 6, 1, 0, CELADON_MANSION_2F
- warp 7, 1, 0, CELADON_MANSION_ROOF
- warp 2, 1, 1, CELADON_MANSION_ROOF
- warp 4, 1, 3, CELADON_MANSION_2F
-
- db 4 ; signs
- sign 1, 3, 5 ; CeladonMansion3Text5
- sign 4, 3, 6 ; CeladonMansion3Text6
- sign 1, 6, 7 ; CeladonMansion3Text7
- sign 4, 9, 8 ; CeladonMansion3Text8
-
- db 4 ; objects
- object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person
- object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person
- object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person
-
- ; warp-to
- warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
- warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
- warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
- warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
--- a/data/mapObjects/CeladonMansionRoof.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-CeladonMansionRoof_Object:
- db $9 ; border block
-
- db 3 ; warps
- warp 6, 1, 1, CELADON_MANSION_3F
- warp 2, 1, 2, CELADON_MANSION_3F
- warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
-
- db 1 ; signs
- sign 3, 7, 1 ; CeladonMansion4Text1
-
- db 0 ; objects
-
- ; warp-to
- warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
- warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
- warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE
--- a/data/mapObjects/CeladonMansionRoofHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-CeladonMansionRoofHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 2, CELADON_MANSION_ROOF
- warp 3, 7, 2, CELADON_MANSION_ROOF
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
- object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
- warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
--- a/data/mapObjects/CeladonMart1F.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-CeladonMart1F_Object:
- db $f ; border block
-
- db 6 ; warps
- warp 2, 7, 0, -1
- warp 3, 7, 0, -1
- warp 16, 7, 1, -1
- warp 17, 7, 1, -1
- warp 12, 1, 0, CELADON_MART_2F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
-
- db 2 ; signs
- sign 11, 4, 2 ; CeladonMart1Text2
- sign 14, 1, 3 ; CeladonMart1Text3
-
- db 1 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person
-
- ; warp-to
- warp_to 2, 7, CELADON_MART_1F_WIDTH
- warp_to 3, 7, CELADON_MART_1F_WIDTH
- warp_to 16, 7, CELADON_MART_1F_WIDTH
- warp_to 17, 7, CELADON_MART_1F_WIDTH
- warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F
- warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR
--- a/data/mapObjects/CeladonMart2F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-CeladonMart2F_Object:
- db $f ; border block
-
- db 3 ; warps
- warp 12, 1, 4, CELADON_MART_1F
- warp 16, 1, 1, CELADON_MART_3F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
-
- db 1 ; signs
- sign 14, 1, 5 ; CeladonMart2Text5
-
- db 4 ; objects
- object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person
- object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person
- object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person
- object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person
-
- ; warp-to
- warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
- warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F
- warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR
--- a/data/mapObjects/CeladonMart3F.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-CeladonMart3F_Object:
- db $f ; border block
-
- db 3 ; warps
- warp 12, 1, 0, CELADON_MART_4F
- warp 16, 1, 1, CELADON_MART_2F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
-
- db 12 ; signs
- sign 2, 4, 6 ; CeladonMart3Text6
- sign 3, 4, 7 ; CeladonMart3Text7
- sign 5, 4, 8 ; CeladonMart3Text8
- sign 6, 4, 9 ; CeladonMart3Text9
- sign 2, 6, 10 ; CeladonMart3Text10
- sign 3, 6, 11 ; CeladonMart3Text11
- sign 5, 6, 12 ; CeladonMart3Text12
- sign 6, 6, 13 ; CeladonMart3Text13
- sign 14, 1, 14 ; CeladonMart3Text14
- sign 4, 1, 15 ; CeladonMart3Text15
- sign 6, 1, 16 ; CeladonMart3Text16
- sign 10, 1, 17 ; CeladonMart3Text17
-
- db 5 ; objects
- object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person
- object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person
- object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person
- object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person
- object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person
-
- ; warp-to
- warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F
- warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F
- warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR
--- a/data/mapObjects/CeladonMart4F.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-CeladonMart4F_Object:
- db $f ; border block
-
- db 3 ; warps
- warp 12, 1, 0, CELADON_MART_3F
- warp 16, 1, 1, CELADON_MART_5F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
-
- db 1 ; signs
- sign 14, 1, 4 ; CeladonMart4Text4
-
- db 3 ; objects
- object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person
- object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person
-
- ; warp-to
- warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
- warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F
- warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR
--- a/data/mapObjects/CeladonMart5F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-CeladonMart5F_Object:
- db $f ; border block
-
- db 3 ; warps
- warp 12, 1, 0, CELADON_MART_ROOF
- warp 16, 1, 1, CELADON_MART_4F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
-
- db 1 ; signs
- sign 14, 1, 5 ; CeladonMart5Text5
-
- db 4 ; objects
- object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person
- object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
- object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person
- object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF
- warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F
- warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR
--- a/data/mapObjects/CeladonMartElevator.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-CeladonMartElevator_Object:
- db $f ; border block
-
- db 2 ; warps
- warp 1, 3, 5, CELADON_MART_1F
- warp 2, 3, 5, CELADON_MART_1F
-
- db 1 ; signs
- sign 3, 0, 1 ; CeladonMartElevatorText1
-
- db 0 ; objects
-
- ; warp-to
- warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
- warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
--- a/data/mapObjects/CeladonMartRoof.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-CeladonMartRoof_Object:
- db $42 ; border block
-
- db 1 ; warps
- warp 15, 2, 0, CELADON_MART_5F
-
- db 4 ; signs
- sign 10, 1, 3 ; CeladonMartRoofText3
- sign 11, 1, 4 ; CeladonMartRoofText4
- sign 12, 2, 5 ; CeladonMartRoofText5
- sign 13, 2, 6 ; CeladonMartRoofText6
-
- db 2 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person
- object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person
-
- ; warp-to
- warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F
--- a/data/mapObjects/CeladonPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-CeladonPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 5, -1
- warp 4, 7, 5, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
- object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, CELADON_POKECENTER_WIDTH
- warp_to 4, 7, CELADON_POKECENTER_WIDTH
--- a/data/mapObjects/CeruleanBadgeHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-CeruleanBadgeHouse_Object:
- db $c ; border block
-
- db 3 ; warps
- warp 2, 0, 9, -1
- warp 2, 7, 8, -1
- warp 3, 7, 8, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person
-
- ; warp-to
- warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH
- warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH
- warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH
--- a/data/mapObjects/CeruleanCave1F.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-CeruleanCave1F_Object:
- db $7d ; border block
-
- db 9 ; warps
- warp 24, 17, 6, -1
- warp 25, 17, 6, -1
- warp 27, 1, 0, CERULEAN_CAVE_2F
- warp 23, 7, 1, CERULEAN_CAVE_2F
- warp 18, 9, 2, CERULEAN_CAVE_2F
- warp 7, 1, 3, CERULEAN_CAVE_2F
- warp 1, 3, 4, CERULEAN_CAVE_2F
- warp 3, 11, 5, CERULEAN_CAVE_2F
- warp 0, 6, 0, CERULEAN_CAVE_B1F
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
- object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
- object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET
-
- ; warp-to
- warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH
- warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH
- warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F
--- a/data/mapObjects/CeruleanCave2F.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-CeruleanCave2F_Object:
- db $7d ; border block
-
- db 6 ; warps
- warp 29, 1, 2, CERULEAN_CAVE_1F
- warp 22, 6, 3, CERULEAN_CAVE_1F
- warp 19, 7, 4, CERULEAN_CAVE_1F
- warp 9, 1, 5, CERULEAN_CAVE_1F
- warp 1, 3, 6, CERULEAN_CAVE_1F
- warp 3, 11, 7, CERULEAN_CAVE_1F
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP
- object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
- object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
-
- ; warp-to
- warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
- warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
- warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
- warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
- warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
- warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
--- a/data/mapObjects/CeruleanCaveB1F.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-CeruleanCaveB1F_Object:
- db $7d ; border block
-
- db 1 ; warps
- warp 3, 6, 8, CERULEAN_CAVE_1F
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70
- object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL
- object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
-
- ; warp-to
- warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F
--- a/data/mapObjects/CeruleanCity.asm
+++ /dev/null
@@ -1,47 +1,0 @@
-CeruleanCity_Object:
- db $f ; border block
-
- db 10 ; warps
- warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
- warp 13, 15, 0, CERULEAN_TRADE_HOUSE
- warp 19, 17, 0, CERULEAN_POKECENTER
- warp 30, 19, 0, CERULEAN_GYM
- warp 13, 25, 0, BIKE_SHOP
- warp 25, 25, 0, CERULEAN_MART
- warp 4, 11, 0, CERULEAN_CAVE_1F
- warp 27, 9, 2, CERULEAN_TRASHED_HOUSE
- warp 9, 11, 1, CERULEAN_BADGE_HOUSE
- warp 9, 9, 0, CERULEAN_BADGE_HOUSE
-
- db 6 ; signs
- sign 23, 19, 12 ; CeruleanCityText12
- sign 17, 29, 13 ; CeruleanCityText13
- sign 26, 25, 14 ; MartSignText
- sign 20, 17, 15 ; PokeCenterSignText
- sign 11, 25, 16 ; CeruleanCityText16
- sign 27, 21, 17 ; CeruleanCityText17
-
- db 11 ; objects
- object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person
- object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5
- object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person
- object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person
- object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person
- object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person
- object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person
- object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
-
- ; warp-to
- warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
- warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE
- warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
- warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
- warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP
- warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART
- warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F
- warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
- warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
- warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
--- a/data/mapObjects/CeruleanGym.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-CeruleanGym_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 13, 3, -1
- warp 5, 13, 3, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1
- object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
- object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1
- object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 4, 13, CERULEAN_GYM_WIDTH
- warp_to 5, 13, CERULEAN_GYM_WIDTH
--- a/data/mapObjects/CeruleanMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-CeruleanMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 5, -1
- warp 4, 7, 5, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person
- object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person
-
- ; warp-to
- warp_to 3, 7, CERULEAN_MART_WIDTH
- warp_to 4, 7, CERULEAN_MART_WIDTH
--- a/data/mapObjects/CeruleanPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-CeruleanPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 2, -1
- warp 4, 7, 2, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person
- object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, CERULEAN_POKECENTER_WIDTH
- warp_to 4, 7, CERULEAN_POKECENTER_WIDTH
--- a/data/mapObjects/CeruleanTradeHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-CeruleanTradeHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 1, -1
- warp 3, 7, 1, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person
- object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH
- warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH
--- a/data/mapObjects/CeruleanTrashedHouse.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-CeruleanTrashedHouse_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 2, 7, 0, -1
- warp 3, 7, 0, -1
- warp 3, 0, 7, -1
-
- db 1 ; signs
- sign 3, 0, 3 ; CeruleanHouseTrashedText3
-
- db 2 ; objects
- object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person
- object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person
-
- ; warp-to
- warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH
- warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH
- warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH
--- a/data/mapObjects/ChampionsRoom.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-ChampionsRoom_Object:
- db $3 ; border block
-
- db 4 ; warps
- warp 3, 7, 1, LANCES_ROOM
- warp 4, 7, 2, LANCES_ROOM
- warp 3, 0, 0, HALL_OF_FAME
- warp 4, 0, 0, HALL_OF_FAME
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person
- object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person
-
- ; warp-to
- warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
- warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
- warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
- warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
--- a/data/mapObjects/CinnabarGym.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-CinnabarGym_Object:
- db $2e ; border block
-
- db 2 ; warps
- warp 16, 17, 1, -1
- warp 17, 17, 1, -1
-
- db 0 ; signs
-
- db 9 ; objects
- object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
- object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
- object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
- object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
- object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
- object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
- object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
- object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
- object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person
-
- ; warp-to
- warp_to 16, 17, CINNABAR_GYM_WIDTH
- warp_to 17, 17, CINNABAR_GYM_WIDTH
--- a/data/mapObjects/CinnabarIsland.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-CinnabarIsland_Object:
- db $43 ; border block
-
- db 5 ; warps
- warp 6, 3, 1, POKEMON_MANSION_1F
- warp 18, 3, 0, CINNABAR_GYM
- warp 6, 9, 0, CINNABAR_LAB
- warp 11, 11, 0, CINNABAR_POKECENTER
- warp 15, 11, 0, CINNABAR_MART
-
- db 5 ; signs
- sign 9, 5, 3 ; CinnabarIslandText3
- sign 16, 11, 4 ; MartSignText
- sign 12, 11, 5 ; PokeCenterSignText
- sign 9, 11, 6 ; CinnabarIslandText6
- sign 13, 3, 7 ; CinnabarIslandText7
-
- db 2 ; objects
- object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person
- object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
- warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
- warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
- warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
- warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART
--- a/data/mapObjects/CinnabarLab.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-CinnabarLab_Object:
- db $17 ; border block
-
- db 5 ; warps
- warp 2, 7, 2, -1
- warp 3, 7, 2, -1
- warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
- warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
- warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
-
- db 4 ; signs
- sign 3, 2, 2 ; Lab1Text2
- sign 9, 4, 3 ; Lab1Text3
- sign 13, 4, 4 ; Lab1Text4
- sign 17, 4, 5 ; Lab1Text5
-
- db 1 ; objects
- object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_WIDTH
- warp_to 3, 7, CINNABAR_LAB_WIDTH
- warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM
- warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM
- warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM
--- a/data/mapObjects/CinnabarLabFossilRoom.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-CinnabarLabFossilRoom_Object:
- db $17 ; border block
-
- db 2 ; warps
- warp 2, 7, 4, CINNABAR_LAB
- warp 3, 7, 4, CINNABAR_LAB
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
- object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
-
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
- warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
--- a/data/mapObjects/CinnabarLabMetronomeRoom.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-CinnabarLabMetronomeRoom_Object:
- db $17 ; border block
-
- db 2 ; warps
- warp 2, 7, 3, CINNABAR_LAB
- warp 3, 7, 3, CINNABAR_LAB
-
- db 3 ; signs
- sign 0, 4, 3 ; Lab3Text3
- sign 1, 4, 4 ; Lab3Text4
- sign 2, 1, 5 ; Lab3Text5
-
- db 2 ; objects
- object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person
- object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person
-
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
- warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
--- a/data/mapObjects/CinnabarLabTradeRoom.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-CinnabarLabTradeRoom_Object:
- db $17 ; border block
-
- db 2 ; warps
- warp 2, 7, 2, CINNABAR_LAB
- warp 3, 7, 2, CINNABAR_LAB
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person
- object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person
- object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person
-
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
- warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
--- a/data/mapObjects/CinnabarMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-CinnabarMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 4, -1
- warp 4, 7, 4, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person
- object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 3, 7, CINNABAR_MART_WIDTH
- warp_to 4, 7, CINNABAR_MART_WIDTH
--- a/data/mapObjects/CinnabarPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-CinnabarPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 3, -1
- warp 4, 7, 3, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person
- object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, CINNABAR_POKECENTER_WIDTH
- warp_to 4, 7, CINNABAR_POKECENTER_WIDTH
--- a/data/mapObjects/Colosseum.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-Colosseum_Object:
- db $e ; border block
-
- db 0 ; warps
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_RED, 2, 2, STAY, 0, 1 ; person
--- a/data/mapObjects/CopycatsHouse1F.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-CopycatsHouse1F_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 2, 7, 0, -1
- warp 3, 7, 0, -1
- warp 7, 1, 0, COPYCATS_HOUSE_2F
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person
- object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person
- object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person
-
- ; warp-to
- warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH
- warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH
- warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F
--- a/data/mapObjects/CopycatsHouse2F.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-CopycatsHouse2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 1, 2, COPYCATS_HOUSE_1F
-
- db 2 ; signs
- sign 3, 5, 6 ; CopycatsHouse2FText6
- sign 0, 1, 7 ; CopycatsHouse2FText7
-
- db 5 ; objects
- object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person
- object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person
- object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person
- object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person
- object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person
-
- ; warp-to
- warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F
--- a/data/mapObjects/Daycare.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-Daycare_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 4, -1
- warp 3, 7, 4, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person
-
- ; warp-to
- warp_to 2, 7, DAYCARE_WIDTH
- warp_to 3, 7, DAYCARE_WIDTH
--- a/data/mapObjects/DiglettsCave.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-DiglettsCave_Object:
- db $19 ; border block
-
- db 2 ; warps
- warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
- warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2
- warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11
--- a/data/mapObjects/DiglettsCaveRoute11.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-DiglettsCaveRoute11_Object:
- db $7d ; border block
-
- db 3 ; warps
- warp 2, 7, 4, -1
- warp 3, 7, 4, -1
- warp 4, 4, 1, DIGLETTS_CAVE
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
- warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
- warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE
--- a/data/mapObjects/DiglettsCaveRoute2.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-DiglettsCaveRoute2_Object:
- db $7d ; border block
-
- db 3 ; warps
- warp 2, 7, 0, -1
- warp 3, 7, 0, -1
- warp 4, 4, 0, DIGLETTS_CAVE
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
- warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
- warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE
--- a/data/mapObjects/FightingDojo.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-FightingDojo_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 11, 1, -1
- warp 5, 11, 1, -1
-
- db 0 ; signs
-
- db 7 ; objects
- object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1
- object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2
- object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3
- object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4
- object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5
- object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person
- object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person
-
- ; warp-to
- warp_to 4, 11, FIGHTING_DOJO_WIDTH
- warp_to 5, 11, FIGHTING_DOJO_WIDTH
--- a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-FuchsiaBillsGrandpasHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 1, -1
- warp 3, 7, 1, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person
- object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person
- object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
- warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
--- a/data/mapObjects/FuchsiaCity.asm
+++ /dev/null
@@ -1,52 +1,0 @@
-FuchsiaCity_Object:
- db $f ; border block
-
- db 9 ; warps
- warp 5, 13, 0, FUCHSIA_MART
- warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
- warp 19, 27, 0, FUCHSIA_POKECENTER
- warp 27, 27, 0, WARDENS_HOUSE
- warp 18, 3, 0, SAFARI_ZONE_GATE
- warp 5, 27, 0, FUCHSIA_GYM
- warp 22, 13, 0, FUCHSIA_MEETING_ROOM
- warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
- warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
-
- db 14 ; signs
- sign 15, 23, 11 ; FuchsiaCityText11
- sign 25, 15, 12 ; FuchsiaCityText12
- sign 17, 5, 13 ; FuchsiaCityText13
- sign 6, 13, 14 ; MartSignText
- sign 20, 27, 15 ; PokeCenterSignText
- sign 27, 29, 16 ; FuchsiaCityText16
- sign 21, 15, 17 ; FuchsiaCityText17
- sign 5, 29, 18 ; FuchsiaCityText18
- sign 33, 7, 19 ; FuchsiaCityText19
- sign 27, 7, 20 ; FuchsiaCityText20
- sign 13, 7, 21 ; FuchsiaCityText21
- sign 31, 13, 22 ; FuchsiaCityText22
- sign 13, 15, 23 ; FuchsiaCityText23
- sign 7, 7, 24 ; FuchsiaCityText24
-
- db 10 ; objects
- object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person
- object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person
- object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person
- object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person
- object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person
- object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person
- object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person
- object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person
- object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person
- object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person
-
- ; warp-to
- warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART
- warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE
- warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER
- warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE
- warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE
- warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM
- warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM
- warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
- warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
--- a/data/mapObjects/FuchsiaGoodRodHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-FuchsiaGoodRodHouse_Object:
- db $c ; border block
-
- db 3 ; warps
- warp 2, 0, 8, -1
- warp 2, 7, 7, -1
- warp 3, 7, 7, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person
-
- ; warp-to
- warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
- warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
- warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
--- a/data/mapObjects/FuchsiaGym.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-FuchsiaGym_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 17, 5, -1
- warp 5, 17, 5, -1
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1
- object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7
- object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3
- object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8
- object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1
- object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2
- object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4
- object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person
-
- ; warp-to
- warp_to 4, 17, FUCHSIA_GYM_WIDTH
- warp_to 5, 17, FUCHSIA_GYM_WIDTH
--- a/data/mapObjects/FuchsiaMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-FuchsiaMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 0, -1
- warp 4, 7, 0, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person
- object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person
-
- ; warp-to
- warp_to 3, 7, FUCHSIA_MART_WIDTH
- warp_to 4, 7, FUCHSIA_MART_WIDTH
--- a/data/mapObjects/FuchsiaMeetingRoom.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-FuchsiaMeetingRoom_Object:
- db $17 ; border block
-
- db 2 ; warps
- warp 4, 7, 6, -1
- warp 5, 7, 6, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person
- object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person
- object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person
-
- ; warp-to
- warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH
- warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH
--- a/data/mapObjects/FuchsiaPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-FuchsiaPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 2, -1
- warp 4, 7, 2, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person
- object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH
- warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH
--- a/data/mapObjects/GameCorner.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-GameCorner_Object:
- db $f ; border block
-
- db 3 ; warps
- warp 15, 17, 7, -1
- warp 16, 17, 7, -1
- warp 17, 4, 1, ROCKET_HIDEOUT_B1F
-
- db 1 ; signs
- sign 9, 4, 12 ; CeladonGameCornerText12
-
- db 11 ; objects
- object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person
- object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person
- object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person
- object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person
- object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person
- object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person
- object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person
- object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person
- object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person
- object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person
- object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7
-
- ; warp-to
- warp_to 15, 17, GAME_CORNER_WIDTH
- warp_to 16, 17, GAME_CORNER_WIDTH
- warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F
--- a/data/mapObjects/GameCornerPrizeRoom.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-GameCornerPrizeRoom_Object:
- db $f ; border block
-
- db 2 ; warps
- warp 4, 7, 9, -1
- warp 5, 7, 9, -1
-
- db 3 ; signs
- sign 2, 2, 3 ; CeladonPrizeRoomText3
- sign 4, 2, 4 ; CeladonPrizeRoomText4
- sign 6, 2, 5 ; CeladonPrizeRoomText5
-
- db 2 ; objects
- object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person
- object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person
-
- ; warp-to
- warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
- warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
--- a/data/mapObjects/HallOfFame.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-HallOfFame_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 7, 2, CHAMPIONS_ROOM
- warp 5, 7, 3, CHAMPIONS_ROOM
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person
-
- ; warp-to
- warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
- warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
--- a/data/mapObjects/IndigoPlateau.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-IndigoPlateau_Object:
- db $e ; border block
-
- db 2 ; warps
- warp 9, 5, 0, INDIGO_PLATEAU_LOBBY
- warp 10, 5, 0, INDIGO_PLATEAU_LOBBY
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY
- warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY
--- a/data/mapObjects/IndigoPlateauLobby.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-IndigoPlateauLobby_Object:
- db $0 ; border block
-
- db 3 ; warps
- warp 7, 11, 0, -1
- warp 8, 11, 1, -1
- warp 8, 0, 0, LORELEIS_ROOM
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person
- object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person
- object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person
-
- ; warp-to
- warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH
- warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH
- warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM
--- a/data/mapObjects/LancesRoom.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-LancesRoom_Object:
- db $3 ; border block
-
- db 3 ; warps
- warp 24, 16, 2, AGATHAS_ROOM
- warp 5, 0, 0, CHAMPIONS_ROOM
- warp 6, 0, 0, CHAMPIONS_ROOM
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1
-
- ; warp-to
- warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM
- warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
- warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
--- a/data/mapObjects/LavenderCuboneHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-LavenderCuboneHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 4, -1
- warp 3, 7, 4, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person
- object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
-
- ; warp-to
- warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH
- warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH
--- a/data/mapObjects/LavenderMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-LavenderMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 3, -1
- warp 4, 7, 3, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 3, 7, LAVENDER_MART_WIDTH
- warp_to 4, 7, LAVENDER_MART_WIDTH
--- a/data/mapObjects/LavenderPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-LavenderPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 0, -1
- warp 4, 7, 0, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person
- object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, LAVENDER_POKECENTER_WIDTH
- warp_to 4, 7, LAVENDER_POKECENTER_WIDTH
--- a/data/mapObjects/LavenderTown.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-LavenderTown_Object:
- db $2c ; border block
-
- db 6 ; warps
- warp 3, 5, 0, LAVENDER_POKECENTER
- warp 14, 5, 0, POKEMON_TOWER_1F
- warp 7, 9, 0, MR_FUJIS_HOUSE
- warp 15, 13, 0, LAVENDER_MART
- warp 3, 13, 0, LAVENDER_CUBONE_HOUSE
- warp 7, 13, 0, NAME_RATERS_HOUSE
-
- db 6 ; signs
- sign 11, 9, 4 ; LavenderTownText4
- sign 9, 3, 5 ; LavenderTownText5
- sign 16, 13, 6 ; MartSignText
- sign 4, 5, 7 ; PokeCenterSignText
- sign 5, 9, 8 ; LavenderTownText8
- sign 17, 7, 9 ; LavenderTownText9
-
- db 3 ; objects
- object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person
-
- ; warp-to
- warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
- warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F
- warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE
- warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART
- warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE
- warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE
--- a/data/mapObjects/LoreleisRoom.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-LoreleisRoom_Object:
- db $3 ; border block
-
- db 4 ; warps
- warp 4, 11, 2, INDIGO_PLATEAU_LOBBY
- warp 5, 11, 2, INDIGO_PLATEAU_LOBBY
- warp 4, 0, 0, BRUNOS_ROOM
- warp 5, 0, 1, BRUNOS_ROOM
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1
-
- ; warp-to
- warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
- warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
- warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
- warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
--- a/data/mapObjects/MrFujisHouse.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-MrFujisHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 2, -1
- warp 3, 7, 2, -1
-
- db 0 ; signs
-
- db 6 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person
- object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person
- object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person
- object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person
- object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person
- object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person
-
- ; warp-to
- warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH
- warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH
--- a/data/mapObjects/MrPsychicsHouse.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-MrPsychicsHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 7, -1
- warp 3, 7, 7, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person
-
- ; warp-to
- warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH
- warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH
--- a/data/mapObjects/MtMoon1F.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-MtMoon1F_Object:
- db $3 ; border block
-
- db 5 ; warps
- warp 14, 35, 1, -1
- warp 15, 35, 1, -1
- warp 5, 5, 0, MT_MOON_B1F
- warp 17, 11, 2, MT_MOON_B1F
- warp 25, 15, 3, MT_MOON_B1F
-
- db 1 ; signs
- sign 15, 23, 14 ; MtMoon1Text14
-
- db 13 ; objects
- object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1
- object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
- object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
- object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1
- object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6
- object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
- object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
- object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION
- object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE
- object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY
- object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE
- object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION
- object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12
-
- ; warp-to
- warp_to 14, 35, MT_MOON_1F_WIDTH
- warp_to 15, 35, MT_MOON_1F_WIDTH
- warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F
- warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F
- warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F
--- a/data/mapObjects/MtMoonB1F.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-MtMoonB1F_Object:
- db $3 ; border block
-
- db 8 ; warps
- warp 5, 5, 2, MT_MOON_1F
- warp 17, 11, 0, MT_MOON_B2F
- warp 25, 9, 3, MT_MOON_1F
- warp 25, 15, 4, MT_MOON_1F
- warp 21, 17, 1, MT_MOON_B2F
- warp 13, 27, 2, MT_MOON_B2F
- warp 23, 3, 3, MT_MOON_B2F
- warp 27, 3, 2, -1
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F
- warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
- warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F
- warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F
- warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
- warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
- warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
- warp_to 27, 3, MT_MOON_B1F_WIDTH
--- a/data/mapObjects/MtMoonB2F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-MtMoonB2F_Object:
- db $3 ; border block
-
- db 4 ; warps
- warp 25, 9, 1, MT_MOON_B1F
- warp 21, 17, 4, MT_MOON_B1F
- warp 15, 27, 5, MT_MOON_B1F
- warp 5, 7, 6, MT_MOON_B1F
-
- db 0 ; signs
-
- db 9 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
- object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1
- object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2
- object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3
- object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4
- object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person
- object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person
- object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP
- object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01
-
- ; warp-to
- warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
- warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
- warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
- warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
--- a/data/mapObjects/MtMoonPokecenter.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-MtMoonPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 0, -1
- warp 4, 7, 0, -1
-
- db 0 ; signs
-
- db 6 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person
- object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person
- object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person
- object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person
-
- ; warp-to
- warp_to 3, 7, MT_MOON_POKECENTER_WIDTH
- warp_to 4, 7, MT_MOON_POKECENTER_WIDTH
--- a/data/mapObjects/Museum1F.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-Museum1F_Object:
- db $a ; border block
-
- db 5 ; warps
- warp 10, 7, 0, -1
- warp 11, 7, 0, -1
- warp 16, 7, 1, -1
- warp 17, 7, 1, -1
- warp 7, 7, 0, MUSEUM_2F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person
- object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
- object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person
- object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person
- object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
-
- ; warp-to
- warp_to 10, 7, MUSEUM_1F_WIDTH
- warp_to 11, 7, MUSEUM_1F_WIDTH
- warp_to 16, 7, MUSEUM_1F_WIDTH
- warp_to 17, 7, MUSEUM_1F_WIDTH
- warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F
--- a/data/mapObjects/Museum2F.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Museum2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 7, 4, MUSEUM_1F
-
- db 2 ; signs
- sign 11, 2, 6 ; Museum2FText6
- sign 2, 5, 7 ; Museum2FText7
-
- db 5 ; objects
- object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person
- object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person
- object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person
- object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
- object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person
-
- ; warp-to
- warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F
--- a/data/mapObjects/NameRatersHouse.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-NameRatersHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 5, -1
- warp 3, 7, 5, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person
-
- ; warp-to
- warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH
- warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH
--- a/data/mapObjects/OaksLab.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-OaksLab_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 11, 2, -1
- warp 5, 11, 2, -1
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1
- object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person
- object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person
- object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person
- object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person
- object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person
- object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person
- object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person
- object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person
- object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person
- object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person
-
- ; warp-to
- warp_to 4, 11, OAKS_LAB_WIDTH
- warp_to 5, 11, OAKS_LAB_WIDTH
--- a/data/mapObjects/PalletTown.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-PalletTown_Object:
- db $b ; border block
-
- db 3 ; warps
- warp 5, 5, 0, REDS_HOUSE_1F
- warp 13, 5, 0, BLUES_HOUSE
- warp 12, 11, 1, OAKS_LAB
-
- db 4 ; signs
- sign 13, 13, 4 ; PalletTownText4
- sign 7, 9, 5 ; PalletTownText5
- sign 3, 5, 6 ; PalletTownText6
- sign 11, 5, 7 ; PalletTownText7
-
- db 3 ; objects
- object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
- object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person
- object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person
-
- ; warp-to
- warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F
- warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE
- warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB
--- a/data/mapObjects/PewterCity.asm
+++ /dev/null
@@ -1,36 +1,0 @@
-PewterCity_Object:
- db $a ; border block
-
- db 7 ; warps
- warp 14, 7, 0, MUSEUM_1F
- warp 19, 5, 2, MUSEUM_1F
- warp 16, 17, 0, PEWTER_GYM
- warp 29, 13, 0, PEWTER_NIDORAN_HOUSE
- warp 23, 17, 0, PEWTER_MART
- warp 7, 29, 0, PEWTER_SPEECH_HOUSE
- warp 13, 25, 0, PEWTER_POKECENTER
-
- db 7 ; signs
- sign 19, 29, 6 ; PewterCityText6
- sign 33, 19, 7 ; PewterCityText7
- sign 24, 17, 8 ; MartSignText
- sign 14, 25, 9 ; PokeCenterSignText
- sign 15, 9, 10 ; PewterCityText10
- sign 11, 17, 11 ; PewterCityText11
- sign 25, 23, 12 ; PewterCityText12
-
- db 5 ; objects
- object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person
- object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person
-
- ; warp-to
- warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F
- warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F
- warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM
- warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE
- warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART
- warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE
- warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER
--- a/data/mapObjects/PewterGym.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-PewterGym_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 13, 2, -1
- warp 5, 13, 2, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1
- object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
- object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person
-
- ; warp-to
- warp_to 4, 13, PEWTER_GYM_WIDTH
- warp_to 5, 13, PEWTER_GYM_WIDTH
--- a/data/mapObjects/PewterMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-PewterMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 4, -1
- warp 4, 7, 4, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 3, 7, PEWTER_MART_WIDTH
- warp_to 4, 7, PEWTER_MART_WIDTH
--- a/data/mapObjects/PewterNidoranHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-PewterNidoranHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 3, -1
- warp 3, 7, 3, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person
- object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person
- object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH
- warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH
--- a/data/mapObjects/PewterPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-PewterPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 6, -1
- warp 4, 7, 6, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person
- object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, PEWTER_POKECENTER_WIDTH
- warp_to 4, 7, PEWTER_POKECENTER_WIDTH
--- a/data/mapObjects/PewterSpeechHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-PewterSpeechHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 5, -1
- warp 3, 7, 5, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person
- object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH
- warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH
--- a/data/mapObjects/PokemonFanClub.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-PokemonFanClub_Object:
- db $d ; border block
-
- db 2 ; warps
- warp 2, 7, 1, -1
- warp 3, 7, 1, -1
-
- db 2 ; signs
- sign 1, 0, 7 ; FanClubText7
- sign 6, 0, 8 ; FanClubText8
-
- db 6 ; objects
- object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person
- object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person
- object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person
- object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person
- object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person
-
- ; warp-to
- warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH
- warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH
--- a/data/mapObjects/PokemonMansion1F.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-PokemonMansion1F_Object:
- db $2e ; border block
-
- db 8 ; warps
- warp 4, 27, 0, -1
- warp 5, 27, 0, -1
- warp 6, 27, 0, -1
- warp 7, 27, 0, -1
- warp 5, 10, 0, POKEMON_MANSION_2F
- warp 21, 23, 0, POKEMON_MANSION_B1F
- warp 26, 27, 0, -1
- warp 27, 27, 0, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
- object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
- object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
-
- ; warp-to
- warp_to 4, 27, POKEMON_MANSION_1F_WIDTH
- warp_to 5, 27, POKEMON_MANSION_1F_WIDTH
- warp_to 6, 27, POKEMON_MANSION_1F_WIDTH
- warp_to 7, 27, POKEMON_MANSION_1F_WIDTH
- warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F
- warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F
- warp_to 26, 27, POKEMON_MANSION_1F_WIDTH
- warp_to 27, 27, POKEMON_MANSION_1F_WIDTH
--- a/data/mapObjects/PokemonMansion2F.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-PokemonMansion2F_Object:
- db $1 ; border block
-
- db 4 ; warps
- warp 5, 10, 4, POKEMON_MANSION_1F
- warp 7, 10, 0, POKEMON_MANSION_3F
- warp 25, 14, 2, POKEMON_MANSION_3F
- warp 6, 1, 1, POKEMON_MANSION_3F
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
- object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
- object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
- object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
-
- ; warp-to
- warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F
- warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
- warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
- warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
--- a/data/mapObjects/PokemonMansion3F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-PokemonMansion3F_Object:
- db $1 ; border block
-
- db 3 ; warps
- warp 7, 10, 1, POKEMON_MANSION_2F
- warp 6, 1, 3, POKEMON_MANSION_2F
- warp 25, 14, 2, POKEMON_MANSION_2F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
- object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
- object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
- object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON
- object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person
-
- ; warp-to
- warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
- warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
- warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
--- a/data/mapObjects/PokemonMansionB1F.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-PokemonMansionB1F_Object:
- db $1 ; border block
-
- db 1 ; warps
- warp 23, 22, 5, POKEMON_MANSION_1F
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
- object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
- object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
- object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
- object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14
- object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22
- object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person
- object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
-
- ; warp-to
- warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F
--- a/data/mapObjects/PokemonTower1F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-PokemonTower1F_Object:
- db $1 ; border block
-
- db 3 ; warps
- warp 10, 17, 1, -1
- warp 11, 17, 1, -1
- warp 18, 9, 1, POKEMON_TOWER_2F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person
- object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person
- object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person
- object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person
- object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person
-
- ; warp-to
- warp_to 10, 17, POKEMON_TOWER_1F_WIDTH
- warp_to 11, 17, POKEMON_TOWER_1F_WIDTH
- warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F
--- a/data/mapObjects/PokemonTower2F.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-PokemonTower2F_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 3, 9, 0, POKEMON_TOWER_3F
- warp 18, 9, 2, POKEMON_TOWER_1F
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
- object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
-
- ; warp-to
- warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F
- warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F
--- a/data/mapObjects/PokemonTower3F.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-PokemonTower3F_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 3, 9, 0, POKEMON_TOWER_2F
- warp 18, 9, 1, POKEMON_TOWER_4F
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
- object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
- object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
- object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
-
- ; warp-to
- warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F
- warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F
--- a/data/mapObjects/PokemonTower4F.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-PokemonTower4F_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 3, 9, 0, POKEMON_TOWER_5F
- warp 18, 9, 1, POKEMON_TOWER_3F
-
- db 0 ; signs
-
- db 6 ; objects
- object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
- object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
- object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
- object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER
- object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
- object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP
-
- ; warp-to
- warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
- warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F
--- a/data/mapObjects/PokemonTower5F.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-PokemonTower5F_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 3, 9, 0, POKEMON_TOWER_4F
- warp 18, 9, 0, POKEMON_TOWER_6F
-
- db 0 ; signs
-
- db 6 ; objects
- object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person
- object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
- object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
- object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17
- object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
- object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
-
- ; warp-to
- warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
- warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F
--- a/data/mapObjects/PokemonTower6F.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-PokemonTower6F_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 18, 9, 1, POKEMON_TOWER_5F
- warp 9, 16, 0, POKEMON_TOWER_7F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
- object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
- object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
- object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
- object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
-
- ; warp-to
- warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
- warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F
--- a/data/mapObjects/PokemonTower7F.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-PokemonTower7F_Object:
- db $1 ; border block
-
- db 1 ; warps
- warp 9, 16, 1, POKEMON_TOWER_6F
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19
- object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20
- object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21
- object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F
--- a/data/mapObjects/PowerPlant.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-PowerPlant_Object:
- db $2e ; border block
-
- db 3 ; warps
- warp 4, 35, 3, -1
- warp 5, 35, 3, -1
- warp 0, 11, 3, -1
-
- db 0 ; signs
-
- db 14 ; objects
- object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
- object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
- object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
- object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43
- object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40
- object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40
- object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43
- object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40
- object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50
- object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS
- object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP
- object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
- object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25
- object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33
-
- ; warp-to
- warp_to 4, 35, POWER_PLANT_WIDTH
- warp_to 5, 35, POWER_PLANT_WIDTH
- warp_to 0, 11, POWER_PLANT_WIDTH
--- a/data/mapObjects/RedsHouse1F.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-RedsHouse1F_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 2, 7, 0, -1 ; exit1
- warp 3, 7, 0, -1 ; exit2
- warp 7, 1, 0, REDS_HOUSE_2F ; staircase
-
- db 1 ; signs
- sign 3, 1, 2 ; TV
-
- db 1 ; objects
- object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom
-
- ; warp-to
- warp_to 2, 7, REDS_HOUSE_1F_WIDTH
- warp_to 3, 7, REDS_HOUSE_1F_WIDTH
- warp_to 7, 1, REDS_HOUSE_1F_WIDTH
--- a/data/mapObjects/RedsHouse2F.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-RedsHouse2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 1, 2, REDS_HOUSE_1F
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 7, 1, REDS_HOUSE_2F_WIDTH
--- a/data/mapObjects/RockTunnel1F.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-RockTunnel1F_Object:
- db $3 ; border block
-
- db 8 ; warps
- warp 15, 3, 1, -1
- warp 15, 0, 1, -1
- warp 15, 33, 2, -1
- warp 15, 35, 2, -1
- warp 37, 3, 0, ROCK_TUNNEL_B1F
- warp 5, 3, 1, ROCK_TUNNEL_B1F
- warp 17, 11, 2, ROCK_TUNNEL_B1F
- warp 37, 17, 3, ROCK_TUNNEL_B1F
-
- db 1 ; signs
- sign 11, 29, 8 ; RockTunnel1Text8
-
- db 7 ; objects
- object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12
- object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13
- object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14
- object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7
- object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
- object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
- object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
-
- ; warp-to
- warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH
- warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH
- warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH
- warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH
- warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
- warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
- warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
- warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
--- a/data/mapObjects/RockTunnelB1F.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-RockTunnelB1F_Object:
- db $3 ; border block
-
- db 4 ; warps
- warp 33, 25, 4, ROCK_TUNNEL_1F
- warp 27, 3, 5, ROCK_TUNNEL_1F
- warp 23, 11, 6, ROCK_TUNNEL_1F
- warp 3, 3, 7, ROCK_TUNNEL_1F
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
- object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9
- object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3
- object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
- object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10
- object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
- object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11
- object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
-
- ; warp-to
- warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
- warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
- warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
- warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
--- a/data/mapObjects/RockTunnelPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-RockTunnelPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 0, -1
- warp 4, 7, 0, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
- object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH
- warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH
--- a/data/mapObjects/RocketHideoutB1F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-RocketHideoutB1F_Object:
- db $2e ; border block
-
- db 5 ; warps
- warp 23, 2, 0, ROCKET_HIDEOUT_B2F
- warp 21, 2, 2, GAME_CORNER
- warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
- warp 21, 24, 3, ROCKET_HIDEOUT_B2F
- warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
-
- db 0 ; signs
-
- db 7 ; objects
- object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8
- object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9
- object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10
- object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11
- object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12
- object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE
- object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION
-
- ; warp-to
- warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
- warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER
- warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
- warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
- warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
--- a/data/mapObjects/RocketHideoutB2F.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-RocketHideoutB2F_Object:
- db $2e ; border block
-
- db 5 ; warps
- warp 27, 8, 0, ROCKET_HIDEOUT_B1F
- warp 21, 8, 0, ROCKET_HIDEOUT_B3F
- warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
- warp 21, 22, 3, ROCKET_HIDEOUT_B1F
- warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
- object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
- object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
- object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07
- object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
-
- ; warp-to
- warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
- warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F
- warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
- warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
- warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
--- a/data/mapObjects/RocketHideoutB3F.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-RocketHideoutB3F_Object:
- db $2e ; border block
-
- db 2 ; warps
- warp 25, 6, 1, ROCKET_HIDEOUT_B2F
- warp 19, 18, 0, ROCKET_HIDEOUT_B4F
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14
- object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15
- object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10
- object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY
-
- ; warp-to
- warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F
- warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F
--- a/data/mapObjects/RocketHideoutB4F.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-RocketHideoutB4F_Object:
- db $2e ; border block
-
- db 3 ; warps
- warp 19, 10, 1, ROCKET_HIDEOUT_B3F
- warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR
- warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR
-
- db 0 ; signs
-
- db 9 ; objects
- object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1
- object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16
- object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17
- object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18
- object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP
- object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02
- object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON
- object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE
- object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
-
- ; warp-to
- warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F
- warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
- warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
--- a/data/mapObjects/RocketHideoutElevator.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-RocketHideoutElevator_Object:
- db $f ; border block
-
- db 2 ; warps
- warp 2, 1, 2, ROCKET_HIDEOUT_B1F
- warp 3, 1, 4, ROCKET_HIDEOUT_B1F
-
- db 1 ; signs
- sign 1, 1, 1 ; RocketHideoutElevatorText1
-
- db 0 ; objects
-
- ; warp-to
- warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F
- warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F
--- a/data/mapObjects/Route1.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-Route1_Object:
- db $b ; border block
-
- db 0 ; warps
-
- db 1 ; signs
- sign 9, 27, 3 ; Route1Text3
-
- db 2 ; objects
- object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person
- object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person
-
- ; warp-to (unused)
- warp_to 2, 7, 4
--- a/data/mapObjects/Route10.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-Route10_Object:
- db $2c ; border block
-
- db 4 ; warps
- warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
- warp 8, 17, 0, ROCK_TUNNEL_1F
- warp 8, 53, 2, ROCK_TUNNEL_1F
- warp 6, 39, 0, POWER_PLANT
-
- db 4 ; signs
- sign 7, 19, 7 ; Route10Text7
- sign 12, 19, 8 ; PokeCenterSignText
- sign 9, 55, 9 ; Route10Text9
- sign 5, 41, 10 ; Route10Text10
-
- db 6 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1
- object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7
- object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2
- object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
- object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8
- object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
-
- ; warp-to
- warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER
- warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F
- warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F
- warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT
--- a/data/mapObjects/Route11.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-Route11_Object:
- db $f ; border block
-
- db 5 ; warps
- warp 49, 8, 0, ROUTE_11_GATE_1F
- warp 49, 9, 1, ROUTE_11_GATE_1F
- warp 58, 8, 2, ROUTE_11_GATE_1F
- warp 58, 9, 3, ROUTE_11_GATE_1F
- warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11
-
- db 1 ; signs
- sign 1, 5, 11 ; Route11Text11
-
- db 10 ; objects
- object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1
- object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2
- object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9
- object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2
- object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10
- object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3
- object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4
- object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11
- object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3
- object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12
-
- ; warp-to
- warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
- warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
- warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
- warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
- warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ROUTE_11
--- a/data/mapObjects/Route11Gate1F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route11Gate1F_Object:
- db $a ; border block
-
- db 5 ; warps
- warp 0, 4, 0, -1
- warp 0, 5, 1, -1
- warp 7, 4, 2, -1
- warp 7, 5, 3, -1
- warp 6, 8, 0, ROUTE_11_GATE_2F
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH
- warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH
- warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH
- warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH
- warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F
--- a/data/mapObjects/Route11Gate2F.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-Route11Gate2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 7, 4, ROUTE_11_GATE_1F
-
- db 2 ; signs
- sign 1, 2, 3 ; Route11GateUpstairsText3
- sign 6, 2, 4 ; Route11GateUpstairsText4
-
- db 2 ; objects
- object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person
- object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F
--- a/data/mapObjects/Route12.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-Route12_Object:
- db $43 ; border block
-
- db 4 ; warps
- warp 10, 15, 0, ROUTE_12_GATE_1F
- warp 11, 15, 1, ROUTE_12_GATE_1F
- warp 10, 21, 2, ROUTE_12_GATE_1F
- warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE
-
- db 2 ; signs
- sign 13, 13, 11 ; Route12Text11
- sign 11, 63, 12 ; Route12Text12
-
- db 10 ; objects
- object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person
- object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3
- object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
- object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2
- object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
- object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
- object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
- object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16
- object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON
-
- ; warp-to
- warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
- warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
- warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
- warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE
--- a/data/mapObjects/Route12Gate1F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route12Gate1F_Object:
- db $a ; border block
-
- db 5 ; warps
- warp 4, 0, 0, -1
- warp 5, 0, 1, -1
- warp 4, 7, 2, -1
- warp 5, 7, 2, -1
- warp 8, 6, 0, ROUTE_12_GATE_2F
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 4, 0, ROUTE_12_GATE_1F_WIDTH
- warp_to 5, 0, ROUTE_12_GATE_1F_WIDTH
- warp_to 4, 7, ROUTE_12_GATE_1F_WIDTH
- warp_to 5, 7, ROUTE_12_GATE_1F_WIDTH
- warp_to 8, 6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F
--- a/data/mapObjects/Route12Gate2F.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-Route12Gate2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 7, 4, ROUTE_12_GATE_1F
-
- db 2 ; signs
- sign 1, 2, 2 ; Route12GateUpstairsText2
- sign 6, 2, 3 ; Route12GateUpstairsText3
-
- db 1 ; objects
- object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person
-
- ; warp-to
- warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F
--- a/data/mapObjects/Route12SuperRodHouse.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-Route12SuperRodHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 3, -1
- warp 3, 7, 3, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
-
- ; warp-to
- warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
- warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
--- a/data/mapObjects/Route13.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route13_Object:
- db $43 ; border block
-
- db 0 ; warps
-
- db 3 ; signs
- sign 15, 13, 11 ; Route13Text11
- sign 33, 5, 12 ; Route13Text12
- sign 31, 11, 13 ; Route13Text13
-
- db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1
- object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12
- object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13
- object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14
- object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15
- object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2
- object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4
- object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5
- object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1
- object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3
--- a/data/mapObjects/Route14.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Route14_Object:
- db $43 ; border block
-
- db 0 ; warps
-
- db 1 ; signs
- sign 17, 13, 11 ; Route14Text11
-
- db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14
- object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15
- object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16
- object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17
- object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5
- object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13
- object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14
- object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15
- object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2
--- a/data/mapObjects/Route15.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-Route15_Object:
- db $43 ; border block
-
- db 4 ; warps
- warp 7, 8, 0, ROUTE_15_GATE_1F
- warp 7, 9, 1, ROUTE_15_GATE_1F
- warp 14, 8, 2, ROUTE_15_GATE_1F
- warp 14, 9, 3, ROUTE_15_GATE_1F
-
- db 1 ; signs
- sign 39, 9, 12 ; Route15Text12
-
- db 11 ; objects
- object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
- object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21
- object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6
- object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7
- object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9
- object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10
- object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3
- object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4
- object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
- object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23
- object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20
-
- ; warp-to
- warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
- warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
- warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
- warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
--- a/data/mapObjects/Route15Gate1F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route15Gate1F_Object:
- db $a ; border block
-
- db 5 ; warps
- warp 0, 4, 0, -1
- warp 0, 5, 1, -1
- warp 7, 4, 2, -1
- warp 7, 5, 3, -1
- warp 6, 8, 0, ROUTE_15_GATE_2F
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH
- warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH
- warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH
- warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH
- warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F
--- a/data/mapObjects/Route15Gate2F.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-Route15Gate2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 7, 4, ROUTE_15_GATE_1F
-
- db 1 ; signs
- sign 6, 2, 2 ; Route15GateUpstairsText2
-
- db 1 ; objects
- object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1
-
- ; warp-to
- warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F
--- a/data/mapObjects/Route16.asm
+++ /dev/null
@@ -1,37 +1,0 @@
-Route16_Object:
- db $f ; border block
-
- db 9 ; warps
- warp 17, 10, 0, ROUTE_16_GATE_1F
- warp 17, 11, 1, ROUTE_16_GATE_1F
- warp 24, 10, 2, ROUTE_16_GATE_1F
- warp 24, 11, 3, ROUTE_16_GATE_1F
- warp 17, 4, 4, ROUTE_16_GATE_1F
- warp 17, 5, 5, ROUTE_16_GATE_1F
- warp 24, 4, 6, ROUTE_16_GATE_1F
- warp 24, 5, 7, ROUTE_16_GATE_1F
- warp 7, 5, 0, ROUTE_16_FLY_HOUSE
-
- db 2 ; signs
- sign 27, 11, 8 ; Route16Text8
- sign 5, 17, 9 ; Route16Text9
-
- db 7 ; objects
- object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5
- object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1
- object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2
- object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6
- object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3
- object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7
- object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person
-
- ; warp-to
- warp_to 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE
--- a/data/mapObjects/Route16FlyHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-Route16FlyHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 8, -1
- warp 3, 7, 8, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
- object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person
-
- ; warp-to
- warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH
- warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH
--- a/data/mapObjects/Route16Gate1F.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-Route16Gate1F_Object:
- db $a ; border block
-
- db 9 ; warps
- warp 0, 8, 0, -1
- warp 0, 9, 1, -1
- warp 7, 8, 2, -1
- warp 7, 9, 2, -1
- warp 0, 2, 4, -1
- warp 0, 3, 5, -1
- warp 7, 2, 6, -1
- warp 7, 3, 7, -1
- warp 6, 12, 0, ROUTE_16_GATE_2F
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person
- object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 0, 8, ROUTE_16_GATE_1F_WIDTH
- warp_to 0, 9, ROUTE_16_GATE_1F_WIDTH
- warp_to 7, 8, ROUTE_16_GATE_1F_WIDTH
- warp_to 7, 9, ROUTE_16_GATE_1F_WIDTH
- warp_to 0, 2, ROUTE_16_GATE_1F_WIDTH
- warp_to 0, 3, ROUTE_16_GATE_1F_WIDTH
- warp_to 7, 2, ROUTE_16_GATE_1F_WIDTH
- warp_to 7, 3, ROUTE_16_GATE_1F_WIDTH
- warp_to 6, 12, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F
--- a/data/mapObjects/Route16Gate2F.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-Route16Gate2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 7, 8, ROUTE_16_GATE_1F
-
- db 2 ; signs
- sign 1, 2, 3 ; Route16GateUpstairsText3
- sign 6, 2, 4 ; Route16GateUpstairsText4
-
- db 2 ; objects
- object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person
- object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person
-
- ; warp-to
- warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F
--- a/data/mapObjects/Route17.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-Route17_Object:
- db $43 ; border block
-
- db 0 ; warps
-
- db 6 ; signs
- sign 9, 51, 11 ; Route17Text11
- sign 9, 63, 12 ; Route17Text12
- sign 9, 75, 13 ; Route17Text13
- sign 9, 87, 14 ; Route17Text14
- sign 9, 111, 15 ; Route17Text15
- sign 9, 141, 16 ; Route17Text16
-
- db 10 ; objects
- object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4
- object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5
- object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8
- object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9
- object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10
- object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6
- object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7
- object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8
- object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11
- object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12
--- a/data/mapObjects/Route18.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-Route18_Object:
- db $43 ; border block
-
- db 4 ; warps
- warp 33, 8, 0, ROUTE_18_GATE_1F
- warp 33, 9, 1, ROUTE_18_GATE_1F
- warp 40, 8, 2, ROUTE_18_GATE_1F
- warp 40, 9, 3, ROUTE_18_GATE_1F
-
- db 2 ; signs
- sign 43, 7, 4 ; Route18Text4
- sign 33, 5, 5 ; Route18Text5
-
- db 3 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
- object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
- object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10
-
- ; warp-to
- warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
- warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
- warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
- warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
--- a/data/mapObjects/Route18Gate1F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route18Gate1F_Object:
- db $a ; border block
-
- db 5 ; warps
- warp 0, 4, 0, -1
- warp 0, 5, 1, -1
- warp 7, 4, 2, -1
- warp 7, 5, 3, -1
- warp 6, 8, 0, ROUTE_18_GATE_2F
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person
-
- ; warp-to
- warp_to 0, 4, ROUTE_18_GATE_1F_WIDTH
- warp_to 0, 5, ROUTE_18_GATE_1F_WIDTH
- warp_to 7, 4, ROUTE_18_GATE_1F_WIDTH
- warp_to 7, 5, ROUTE_18_GATE_1F_WIDTH
- warp_to 6, 8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F
--- a/data/mapObjects/Route18Gate2F.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-Route18Gate2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 7, 4, ROUTE_18_GATE_1F
-
- db 2 ; signs
- sign 1, 2, 2 ; Route18GateUpstairsText2
- sign 6, 2, 3 ; Route18GateUpstairsText3
-
- db 1 ; objects
- object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person
-
- ; warp-to
- warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F
--- a/data/mapObjects/Route19.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route19_Object:
- db $43 ; border block
-
- db 0 ; warps
-
- db 1 ; signs
- sign 11, 9, 11 ; Route19Text11
-
- db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2
- object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3
- object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4
- object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5
- object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6
- object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7
- object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12
- object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13
- object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8
- object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14
-
- ; warp-to
--- a/data/mapObjects/Route2.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-Route2_Object:
- db $f ; border block
-
- db 6 ; warps
- warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2
- warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE
- warp 15, 19, 0, ROUTE_2_TRADE_HOUSE
- warp 16, 35, 1, ROUTE_2_GATE
- warp 15, 39, 2, ROUTE_2_GATE
- warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE
-
- db 2 ; signs
- sign 5, 65, 3 ; Route2Text3
- sign 11, 11, 4 ; Route2Text4
-
- db 2 ; objects
- object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE
- object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP
-
- ; warp-to
- warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2
- warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
- warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE
- warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE
- warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE
- warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
-
- ; unused
- warp_to 2, 7, 4
- db $12, $c7, $9, $7
- warp_to 2, 7, 4
- warp_to 2, 7, 4
- warp_to 2, 7, 4
--- a/data/mapObjects/Route20.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-Route20_Object:
- db $43 ; border block
-
- db 2 ; warps
- warp 48, 5, 0, SEAFOAM_ISLANDS_1F
- warp 58, 9, 2, SEAFOAM_ISLANDS_1F
-
- db 2 ; signs
- sign 51, 7, 11 ; Route20Text11
- sign 57, 11, 12 ; Route20Text12
-
- db 10 ; objects
- object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9
- object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15
- object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6
- object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
- object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10
- object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11
- object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11
- object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7
- object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
- object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8
-
- ; warp-to
- warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F
- warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F
--- a/data/mapObjects/Route21.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-Route21_Object:
- db $43 ; border block
-
- db 0 ; warps
-
- db 0 ; signs
-
- db 9 ; objects
- object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7
- object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9
- object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12
- object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9
- object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13
- object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14
- object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15
- object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8
- object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10
--- a/data/mapObjects/Route22.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-Route22_Object:
- db $2c ; border block
-
- db 1 ; warps
- warp 8, 5, 0, ROUTE_22_GATE
-
- db 1 ; signs
- sign 7, 11, 3 ; Route22FrontGateText
-
- db 2 ; objects
- object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person
- object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE
--- a/data/mapObjects/Route22Gate.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Route22Gate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 4, 7, 0, -1
- warp 5, 7, 0, -1
- warp 4, 0, 0, -1
- warp 5, 0, 1, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person
-
- ; warp-to
- warp_to 4, 7, ROUTE_22_GATE_WIDTH
- warp_to 5, 7, ROUTE_22_GATE_WIDTH
- warp_to 4, 0, ROUTE_22_GATE_WIDTH
- warp_to 5, 0, ROUTE_22_GATE_WIDTH
--- a/data/mapObjects/Route23.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-Route23_Object:
- db $f ; border block
-
- db 4 ; warps
- warp 7, 139, 2, ROUTE_22_GATE
- warp 8, 139, 3, ROUTE_22_GATE
- warp 4, 31, 0, VICTORY_ROAD_1F
- warp 14, 31, 1, VICTORY_ROAD_2F
-
- db 1 ; signs
- sign 3, 33, 8 ; Route23Text8
-
- db 7 ; objects
- object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person
- object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person
- object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person
- object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person
- object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person
- object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person
- object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person
-
- ; warp-to
- warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
- warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
- warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F
- warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F
--- a/data/mapObjects/Route24.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-Route24_Object:
- db $2c ; border block
-
- db 0 ; warps
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6
- object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2
- object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3
- object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7
- object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4
- object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8
- object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
- object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45
--- a/data/mapObjects/Route25.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-Route25_Object:
- db $2c ; border block
-
- db 1 ; warps
- warp 45, 3, 0, BILLS_HOUSE
-
- db 1 ; signs
- sign 43, 3, 11 ; Route25Text11
-
- db 10 ; objects
- object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
- object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6
- object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
- object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9
- object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7
- object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10
- object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2
- object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3
- object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4
- object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19
-
- ; warp-to
- warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE
--- a/data/mapObjects/Route2Gate.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-Route2Gate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 4, 0, 3, -1
- warp 5, 0, 3, -1
- warp 4, 7, 4, -1
- warp 5, 7, 4, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person
- object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person
-
- ; warp-to
- warp_to 4, 0, ROUTE_2_GATE_WIDTH
- warp_to 5, 0, ROUTE_2_GATE_WIDTH
- warp_to 4, 7, ROUTE_2_GATE_WIDTH
- warp_to 5, 7, ROUTE_2_GATE_WIDTH
--- a/data/mapObjects/Route2TradeHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-Route2TradeHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 2, -1
- warp 3, 7, 2, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person
- object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person
-
- ; warp-to
- warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH
- warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH
--- a/data/mapObjects/Route3.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-Route3_Object:
- db $2c ; border block
-
- db 0 ; warps
-
- db 1 ; signs
- sign 59, 9, 10 ; Route3Text10
-
- db 9 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person
- object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
- object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1
- object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1
- object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
- object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2
- object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2
- object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
- object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3
--- a/data/mapObjects/Route4.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-Route4_Object:
- db $2c ; border block
-
- db 3 ; warps
- warp 11, 5, 0, MT_MOON_POKECENTER
- warp 18, 5, 0, MT_MOON_1F
- warp 24, 5, 7, MT_MOON_B1F
-
- db 3 ; signs
- sign 12, 5, 4 ; PokeCenterSignText
- sign 17, 7, 5 ; Route4Text5
- sign 27, 7, 6 ; Route4Text6
-
- db 3 ; objects
- object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person
- object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
- object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_04
-
- ; warp-to
- warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER
- warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F
- warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F
--- a/data/mapObjects/Route5.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route5_Object:
- db $a ; border block
-
- db 5 ; warps
- warp 10, 29, 3, ROUTE_5_GATE
- warp 9, 29, 2, ROUTE_5_GATE
- warp 10, 33, 0, ROUTE_5_GATE
- warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5
- warp 10, 21, 0, DAYCARE
-
- db 1 ; signs
- sign 17, 29, 1 ; Route5Text1
-
- db 0 ; objects
-
- ; warp-to
- warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5
- warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE
--- a/data/mapObjects/Route5Gate.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Route5Gate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 3, 5, 2, -1
- warp 4, 5, 2, -1
- warp 3, 0, 1, -1
- warp 4, 0, 0, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person
-
- ; warp-to
- warp_to 3, 5, ROUTE_5_GATE_WIDTH
- warp_to 4, 5, ROUTE_5_GATE_WIDTH
- warp_to 3, 0, ROUTE_5_GATE_WIDTH
- warp_to 4, 0, ROUTE_5_GATE_WIDTH
--- a/data/mapObjects/Route6.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-Route6_Object:
- db $f ; border block
-
- db 4 ; warps
- warp 9, 1, 2, ROUTE_6_GATE
- warp 10, 1, 2, ROUTE_6_GATE
- warp 10, 7, 0, ROUTE_6_GATE
- warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6
-
- db 1 ; signs
- sign 19, 15, 7 ; Route6Text7
-
- db 6 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4
- object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2
- object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10
- object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5
- object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3
- object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11
-
- ; warp-to
- warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE
- warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE
- warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE
- warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6
--- a/data/mapObjects/Route6Gate.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Route6Gate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 3, 5, 2, -1
- warp 4, 5, 2, -1
- warp 3, 0, 1, -1
- warp 4, 0, 1, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person
-
- ; warp-to
- warp_to 3, 5, ROUTE_6_GATE_WIDTH
- warp_to 4, 5, ROUTE_6_GATE_WIDTH
- warp_to 3, 0, ROUTE_6_GATE_WIDTH
- warp_to 4, 0, ROUTE_6_GATE_WIDTH
--- a/data/mapObjects/Route7.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-Route7_Object:
- db $f ; border block
-
- db 5 ; warps
- warp 18, 9, 2, ROUTE_7_GATE
- warp 18, 10, 3, ROUTE_7_GATE
- warp 11, 9, 0, ROUTE_7_GATE
- warp 11, 10, 1, ROUTE_7_GATE
- warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7
-
- db 1 ; signs
- sign 3, 13, 1 ; Route7Text1
-
- db 0 ; objects
-
- ; warp-to
- warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
- warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7
--- a/data/mapObjects/Route7Gate.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Route7Gate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 0, 3, 3, -1
- warp 0, 4, 3, -1
- warp 5, 3, 0, -1
- warp 5, 4, 1, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person
-
- ; warp-to
- warp_to 0, 3, ROUTE_7_GATE_WIDTH
- warp_to 0, 4, ROUTE_7_GATE_WIDTH
- warp_to 5, 3, ROUTE_7_GATE_WIDTH
- warp_to 5, 4, ROUTE_7_GATE_WIDTH
--- a/data/mapObjects/Route8.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-Route8_Object:
- db $2c ; border block
-
- db 5 ; warps
- warp 1, 9, 0, ROUTE_8_GATE
- warp 1, 10, 1, ROUTE_8_GATE
- warp 8, 9, 2, ROUTE_8_GATE
- warp 8, 10, 3, ROUTE_8_GATE
- warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8
-
- db 1 ; signs
- sign 17, 3, 10 ; Route8Text10
-
- db 9 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
- object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5
- object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4
- object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13
- object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
- object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14
- object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15
- object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7
- object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16
-
- ; warp-to
- warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE
- warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE
- warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE
- warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE
- warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8
--- a/data/mapObjects/Route8Gate.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Route8Gate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 0, 3, 0, -1
- warp 0, 4, 1, -1
- warp 5, 3, 2, -1
- warp 5, 4, 3, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person
-
- ; warp-to
- warp_to 0, 3, ROUTE_8_GATE_WIDTH
- warp_to 0, 4, ROUTE_8_GATE_WIDTH
- warp_to 5, 3, ROUTE_8_GATE_WIDTH
- warp_to 5, 4, ROUTE_8_GATE_WIDTH
--- a/data/mapObjects/Route9.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-Route9_Object:
- db $2c ; border block
-
- db 0 ; warps
-
- db 1 ; signs
- sign 25, 7, 11 ; Route9Text11
-
- db 10 ; objects
- object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
- object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
- object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
- object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
- object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11
- object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6
- object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
- object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5
- object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
- object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_30
--- a/data/mapObjects/SSAnne1F.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SSAnne1F_Object:
- db $c ; border block
-
- db 11 ; warps
- warp 26, 0, 1, VERMILION_DOCK
- warp 27, 0, 1, VERMILION_DOCK
- warp 31, 8, 0, SS_ANNE_1F_ROOMS
- warp 23, 8, 1, SS_ANNE_1F_ROOMS
- warp 19, 8, 2, SS_ANNE_1F_ROOMS
- warp 15, 8, 3, SS_ANNE_1F_ROOMS
- warp 11, 8, 4, SS_ANNE_1F_ROOMS
- warp 7, 8, 5, SS_ANNE_1F_ROOMS
- warp 2, 6, 6, SS_ANNE_2F
- warp 37, 15, 5, SS_ANNE_B1F
- warp 3, 16, 0, SS_ANNE_KITCHEN
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
- object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
- warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
- warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F
- warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F
- warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN
--- a/data/mapObjects/SSAnne1FRooms.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-SSAnne1FRooms_Object:
- db $c ; border block
-
- db 6 ; warps
- warp 0, 0, 2, SS_ANNE_1F
- warp 10, 0, 3, SS_ANNE_1F
- warp 20, 0, 4, SS_ANNE_1F
- warp 0, 10, 5, SS_ANNE_1F
- warp 10, 10, 6, SS_ANNE_1F
- warp 20, 10, 7, SS_ANNE_1F
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1
- object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2
- object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8
- object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11
- object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person
- object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person
- object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person
- object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person
- object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person
- object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08
- object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person
-
- ; warp-to
- warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
- warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
- warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
- warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
- warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
- warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
--- a/data/mapObjects/SSAnne2F.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SSAnne2F_Object:
- db $c ; border block
-
- db 9 ; warps
- warp 9, 11, 0, SS_ANNE_2F_ROOMS
- warp 13, 11, 2, SS_ANNE_2F_ROOMS
- warp 17, 11, 4, SS_ANNE_2F_ROOMS
- warp 21, 11, 6, SS_ANNE_2F_ROOMS
- warp 25, 11, 8, SS_ANNE_2F_ROOMS
- warp 29, 11, 10, SS_ANNE_2F_ROOMS
- warp 2, 4, 8, SS_ANNE_1F
- warp 2, 12, 1, SS_ANNE_3F
- warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
- object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
-
- ; warp-to
- warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F
- warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F
- warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM
--- a/data/mapObjects/SSAnne2FRooms.asm
+++ /dev/null
@@ -1,47 +1,0 @@
-SSAnne2FRooms_Object:
- db $c ; border block
-
- db 12 ; warps
- warp 2, 5, 0, SS_ANNE_2F
- warp 3, 5, 0, SS_ANNE_2F
- warp 12, 5, 1, SS_ANNE_2F
- warp 13, 5, 1, SS_ANNE_2F
- warp 22, 5, 2, SS_ANNE_2F
- warp 23, 5, 2, SS_ANNE_2F
- warp 2, 15, 3, SS_ANNE_2F
- warp 3, 15, 3, SS_ANNE_2F
- warp 12, 15, 4, SS_ANNE_2F
- warp 13, 15, 4, SS_ANNE_2F
- warp 22, 15, 5, SS_ANNE_2F
- warp 23, 15, 5, SS_ANNE_2F
-
- db 0 ; signs
-
- db 13 ; objects
- object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
- object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
- object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
- object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
- object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person
- object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
- object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person
- object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person
- object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
- object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person
- object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person
- object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person
- object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person
-
- ; warp-to
- warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
- warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
--- a/data/mapObjects/SSAnne3F.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-SSAnne3F_Object:
- db $c ; border block
-
- db 2 ; warps
- warp 0, 3, 0, SS_ANNE_BOW
- warp 19, 3, 7, SS_ANNE_2F
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person
-
- ; warp-to
- warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW
- warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F
--- a/data/mapObjects/SSAnneB1F.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-SSAnneB1F_Object:
- db $c ; border block
-
- db 6 ; warps
- warp 23, 3, 8, SS_ANNE_B1F_ROOMS
- warp 19, 3, 6, SS_ANNE_B1F_ROOMS
- warp 15, 3, 4, SS_ANNE_B1F_ROOMS
- warp 11, 3, 2, SS_ANNE_B1F_ROOMS
- warp 7, 3, 0, SS_ANNE_B1F_ROOMS
- warp 27, 5, 9, SS_ANNE_1F
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
- warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F
--- a/data/mapObjects/SSAnneB1FRooms.asm
+++ /dev/null
@@ -1,41 +1,0 @@
-SSAnneB1FRooms_Object:
- db $c ; border block
-
- db 10 ; warps
- warp 2, 5, 4, SS_ANNE_B1F
- warp 3, 5, 4, SS_ANNE_B1F
- warp 12, 5, 3, SS_ANNE_B1F
- warp 13, 5, 3, SS_ANNE_B1F
- warp 22, 5, 2, SS_ANNE_B1F
- warp 23, 5, 2, SS_ANNE_B1F
- warp 2, 15, 1, SS_ANNE_B1F
- warp 3, 15, 1, SS_ANNE_B1F
- warp 12, 15, 0, SS_ANNE_B1F
- warp 13, 15, 0, SS_ANNE_B1F
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
- object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
- object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
- object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
- object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
- object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
- object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
- object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
- object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
- object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44
- object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
-
- ; warp-to
- warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
--- a/data/mapObjects/SSAnneBow.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-SSAnneBow_Object:
- db $23 ; border block
-
- db 2 ; warps
- warp 13, 6, 0, SS_ANNE_3F
- warp 13, 7, 0, SS_ANNE_3F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person
- object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person
- object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1
- object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2
-
- ; warp-to
- warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
- warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
--- a/data/mapObjects/SSAnneCaptainsRoom.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-SSAnneCaptainsRoom_Object:
- db $c ; border block
-
- db 1 ; warps
- warp 0, 7, 8, SS_ANNE_2F
-
- db 2 ; signs
- sign 4, 1, 2 ; SSAnne7Text2
- sign 1, 2, 3 ; SSAnne7Text3
-
- db 1 ; objects
- object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person
-
- ; warp-to
- warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F
--- a/data/mapObjects/SSAnneKitchen.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-SSAnneKitchen_Object:
- db $c ; border block
-
- db 1 ; warps
- warp 6, 0, 10, SS_ANNE_1F
-
- db 0 ; signs
-
- db 7 ; objects
- object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person
- object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person
- object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person
- object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person
- object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person
- object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person
- object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person
-
- ; warp-to
- warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F
--- a/data/mapObjects/SafariZoneCenter.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SafariZoneCenter_Object:
- db $0 ; border block
-
- db 9 ; warps
- warp 14, 25, 2, SAFARI_ZONE_GATE
- warp 15, 25, 3, SAFARI_ZONE_GATE
- warp 0, 10, 4, SAFARI_ZONE_WEST
- warp 0, 11, 5, SAFARI_ZONE_WEST
- warp 14, 0, 4, SAFARI_ZONE_NORTH
- warp 15, 0, 5, SAFARI_ZONE_NORTH
- warp 29, 10, 2, SAFARI_ZONE_EAST
- warp 29, 11, 3, SAFARI_ZONE_EAST
- warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE
-
- db 2 ; signs
- sign 18, 20, 2 ; SafariZoneCenterText2
- sign 14, 22, 3 ; SafariZoneCenterText3
-
- db 1 ; objects
- object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET
-
- ; warp-to
- warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE
- warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE
- warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
- warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
- warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
- warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
- warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_CENTER_REST_HOUSE
--- a/data/mapObjects/SafariZoneCenterRestHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-SafariZoneCenterRestHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 8, SAFARI_ZONE_CENTER
- warp 3, 7, 8, SAFARI_ZONE_CENTER
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person
- object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person
-
- ; warp-to
- warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
--- a/data/mapObjects/SafariZoneEast.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-SafariZoneEast_Object:
- db $0 ; border block
-
- db 5 ; warps
- warp 0, 4, 6, SAFARI_ZONE_NORTH
- warp 0, 5, 7, SAFARI_ZONE_NORTH
- warp 0, 22, 6, SAFARI_ZONE_CENTER
- warp 0, 23, 6, SAFARI_ZONE_CENTER
- warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE
-
- db 3 ; signs
- sign 26, 10, 5 ; SafariZoneEastText5
- sign 6, 4, 6 ; SafariZoneEastText6
- sign 5, 23, 7 ; SafariZoneEastText7
-
- db 4 ; objects
- object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
- object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION
- object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS
- object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_37
-
- ; warp-to
- warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_EAST_REST_HOUSE
--- a/data/mapObjects/SafariZoneEastRestHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-SafariZoneEastRestHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 4, SAFARI_ZONE_EAST
- warp 3, 7, 4, SAFARI_ZONE_EAST
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person
- object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person
- object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
- warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
--- a/data/mapObjects/SafariZoneGate.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-SafariZoneGate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 3, 5, 4, -1
- warp 4, 5, 4, -1
- warp 3, 0, 0, SAFARI_ZONE_CENTER
- warp 4, 0, 1, SAFARI_ZONE_CENTER
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person
- object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person
-
- ; warp-to
- warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH
- warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH
- warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
--- a/data/mapObjects/SafariZoneNorth.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SafariZoneNorth_Object:
- db $0 ; border block
-
- db 9 ; warps
- warp 2, 35, 0, SAFARI_ZONE_WEST
- warp 3, 35, 1, SAFARI_ZONE_WEST
- warp 8, 35, 2, SAFARI_ZONE_WEST
- warp 9, 35, 3, SAFARI_ZONE_WEST
- warp 20, 35, 4, SAFARI_ZONE_CENTER
- warp 21, 35, 5, SAFARI_ZONE_CENTER
- warp 39, 30, 0, SAFARI_ZONE_EAST
- warp 39, 31, 1, SAFARI_ZONE_EAST
- warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE
-
- db 5 ; signs
- sign 36, 4, 3 ; SafariZoneNorthText3
- sign 4, 25, 4 ; SafariZoneNorthText4
- sign 13, 31, 5 ; SafariZoneNorthText5
- sign 19, 33, 6 ; SafariZoneNorthText6
- sign 26, 28, 7 ; SafariZoneNorthText7
-
- db 2 ; objects
- object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN
- object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40
-
- ; warp-to
- warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
- warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
- warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE
--- a/data/mapObjects/SafariZoneNorthRestHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-SafariZoneNorthRestHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 8, SAFARI_ZONE_NORTH
- warp 3, 7, 8, SAFARI_ZONE_NORTH
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person
- object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person
- object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person
-
- ; warp-to
- warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
--- a/data/mapObjects/SafariZoneSecretHouse.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-SafariZoneSecretHouse_Object:
- db $17 ; border block
-
- db 2 ; warps
- warp 2, 7, 6, SAFARI_ZONE_WEST
- warp 3, 7, 6, SAFARI_ZONE_WEST
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person
-
- ; warp-to
- warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST
- warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST
--- a/data/mapObjects/SafariZoneWest.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SafariZoneWest_Object:
- db $0 ; border block
-
- db 8 ; warps
- warp 20, 0, 0, SAFARI_ZONE_NORTH
- warp 21, 0, 1, SAFARI_ZONE_NORTH
- warp 26, 0, 2, SAFARI_ZONE_NORTH
- warp 27, 0, 3, SAFARI_ZONE_NORTH
- warp 29, 22, 2, SAFARI_ZONE_CENTER
- warp 29, 23, 3, SAFARI_ZONE_CENTER
- warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE
- warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE
-
- db 4 ; signs
- sign 12, 12, 5 ; SafariZoneWestText5
- sign 17, 3, 6 ; SafariZoneWestText6
- sign 26, 4, 7 ; SafariZoneWestText7
- sign 24, 22, 8 ; SafariZoneWestText8
-
- db 4 ; objects
- object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION
- object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_32
- object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE
- object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH
-
- ; warp-to
- warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
- warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
- warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE
- warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE
--- a/data/mapObjects/SafariZoneWestRestHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-SafariZoneWestRestHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 7, SAFARI_ZONE_WEST
- warp 3, 7, 7, SAFARI_ZONE_WEST
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person
- object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
-
- ; warp-to
- warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
- warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
--- a/data/mapObjects/SaffronCity.asm
+++ /dev/null
@@ -1,51 +1,0 @@
-SaffronCity_Object:
- db $f ; border block
-
- db 8 ; warps
- warp 7, 5, 0, COPYCATS_HOUSE_1F
- warp 26, 3, 0, FIGHTING_DOJO
- warp 34, 3, 0, SAFFRON_GYM
- warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE
- warp 25, 11, 0, SAFFRON_MART
- warp 18, 21, 0, SILPH_CO_1F
- warp 9, 29, 0, SAFFRON_POKECENTER
- warp 29, 29, 0, MR_PSYCHICS_HOUSE
-
- db 10 ; signs
- sign 17, 5, 16 ; SaffronCityText16
- sign 27, 5, 17 ; SaffronCityText17
- sign 35, 5, 18 ; SaffronCityText18
- sign 26, 11, 19 ; MartSignText
- sign 39, 19, 20 ; SaffronCityText20
- sign 5, 21, 21 ; SaffronCityText21
- sign 15, 21, 22 ; SaffronCityText22
- sign 10, 29, 23 ; PokeCenterSignText
- sign 27, 29, 24 ; SaffronCityText24
- sign 1, 19, 25 ; SaffronCityText25
-
- db 15 ; objects
- object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person
- object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person
- object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person
- object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person
- object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person
- object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person
- object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person
- object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person
- object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person
- object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person
- object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person
- object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person
- object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person
- object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person
- object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person
-
- ; warp-to
- warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F
- warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO
- warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM
- warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE
- warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART
- warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F
- warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER
- warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE
--- a/data/mapObjects/SaffronGym.asm
+++ /dev/null
@@ -1,83 +1,0 @@
-SaffronGym_Object:
- db $2e ; border block
-
- db 32 ; warps
- warp 8, 17, 2, -1
- warp 9, 17, 2, -1
- warp 1, 3, 22, SAFFRON_GYM
- warp 5, 3, 15, SAFFRON_GYM
- warp 1, 5, 18, SAFFRON_GYM
- warp 5, 5, 8, SAFFRON_GYM
- warp 1, 9, 27, SAFFRON_GYM
- warp 5, 9, 16, SAFFRON_GYM
- warp 1, 11, 5, SAFFRON_GYM
- warp 5, 11, 13, SAFFRON_GYM
- warp 1, 15, 23, SAFFRON_GYM
- warp 5, 15, 30, SAFFRON_GYM
- warp 1, 17, 17, SAFFRON_GYM
- warp 5, 17, 9, SAFFRON_GYM
- warp 9, 3, 26, SAFFRON_GYM
- warp 11, 3, 3, SAFFRON_GYM
- warp 9, 5, 7, SAFFRON_GYM
- warp 11, 5, 12, SAFFRON_GYM
- warp 11, 11, 4, SAFFRON_GYM
- warp 11, 15, 31, SAFFRON_GYM
- warp 15, 3, 24, SAFFRON_GYM
- warp 19, 3, 28, SAFFRON_GYM
- warp 15, 5, 2, SAFFRON_GYM
- warp 19, 5, 10, SAFFRON_GYM
- warp 15, 9, 20, SAFFRON_GYM
- warp 19, 9, 29, SAFFRON_GYM
- warp 15, 11, 14, SAFFRON_GYM
- warp 19, 11, 6, SAFFRON_GYM
- warp 15, 15, 21, SAFFRON_GYM
- warp 19, 15, 25, SAFFRON_GYM
- warp 15, 17, 11, SAFFRON_GYM
- warp 19, 17, 19, SAFFRON_GYM
-
- db 0 ; signs
-
- db 9 ; objects
- object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1
- object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22
- object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
- object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23
- object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
- object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24
- object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
- object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
- object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person
-
- ; warp-to
- warp_to 8, 17, SAFFRON_GYM_WIDTH
- warp_to 9, 17, SAFFRON_GYM_WIDTH
- warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
- warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
--- a/data/mapObjects/SaffronMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-SaffronMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 4, -1
- warp 4, 7, 4, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person
- object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person
-
- ; warp-to
- warp_to 3, 7, SAFFRON_MART_WIDTH
- warp_to 4, 7, SAFFRON_MART_WIDTH
--- a/data/mapObjects/SaffronPidgeyHouse.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SaffronPidgeyHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 3, -1
- warp 3, 7, 3, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
- object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person
- object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person
- object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person
-
- ; warp-to
- warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
- warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
--- a/data/mapObjects/SaffronPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SaffronPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 6, -1
- warp 4, 7, 6, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person
- object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, SAFFRON_POKECENTER_WIDTH
- warp_to 4, 7, SAFFRON_POKECENTER_WIDTH
--- a/data/mapObjects/SeafoamIslands1F.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SeafoamIslands1F_Object:
- db $7d ; border block
-
- db 7 ; warps
- warp 4, 17, 0, -1
- warp 5, 17, 0, -1
- warp 26, 17, 1, -1
- warp 27, 17, 1, -1
- warp 7, 5, 1, SEAFOAM_ISLANDS_B1F
- warp 25, 3, 6, SEAFOAM_ISLANDS_B1F
- warp 23, 15, 4, SEAFOAM_ISLANDS_B1F
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
- object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
- ; warp-to
- warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
-
- ; holes
- warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH
- warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH
--- a/data/mapObjects/SeafoamIslandsB1F.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SeafoamIslandsB1F_Object:
- db $7d ; border block
-
- db 7 ; warps
- warp 4, 2, 0, SEAFOAM_ISLANDS_B2F
- warp 7, 5, 4, SEAFOAM_ISLANDS_1F
- warp 13, 7, 2, SEAFOAM_ISLANDS_B2F
- warp 19, 15, 3, SEAFOAM_ISLANDS_B2F
- warp 23, 15, 6, SEAFOAM_ISLANDS_1F
- warp 25, 11, 5, SEAFOAM_ISLANDS_B2F
- warp 25, 3, 5, SEAFOAM_ISLANDS_1F
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
- object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
- ; warp-to
- warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
- warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
- warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
--- a/data/mapObjects/SeafoamIslandsB2F.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SeafoamIslandsB2F_Object:
- db $7d ; border block
-
- db 7 ; warps
- warp 5, 3, 0, SEAFOAM_ISLANDS_B1F
- warp 5, 13, 0, SEAFOAM_ISLANDS_B3F
- warp 13, 7, 2, SEAFOAM_ISLANDS_B1F
- warp 19, 15, 3, SEAFOAM_ISLANDS_B1F
- warp 25, 3, 3, SEAFOAM_ISLANDS_B3F
- warp 25, 11, 5, SEAFOAM_ISLANDS_B1F
- warp 25, 14, 4, SEAFOAM_ISLANDS_B3F
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
- object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
- ; warp-to
- warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
- warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
- warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
- warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
--- a/data/mapObjects/SeafoamIslandsB3F.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SeafoamIslandsB3F_Object:
- db $7d ; border block
-
- db 7 ; warps
- warp 5, 12, 1, SEAFOAM_ISLANDS_B2F
- warp 8, 6, 2, SEAFOAM_ISLANDS_B4F
- warp 25, 4, 3, SEAFOAM_ISLANDS_B4F
- warp 25, 3, 4, SEAFOAM_ISLANDS_B2F
- warp 25, 14, 6, SEAFOAM_ISLANDS_B2F
- warp 20, 17, 0, SEAFOAM_ISLANDS_B4F
- warp 21, 17, 1, SEAFOAM_ISLANDS_B4F
-
- db 0 ; signs
-
- db 6 ; objects
- object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
- object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
- object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
- object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
- object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person
- object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person
-
- ; warp-to
- warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
- warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
- warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
- warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
- warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
--- a/data/mapObjects/SeafoamIslandsB4F.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SeafoamIslandsB4F_Object:
- db $7d ; border block
-
- db 4 ; warps
- warp 20, 17, 5, SEAFOAM_ISLANDS_B3F
- warp 21, 17, 6, SEAFOAM_ISLANDS_B3F
- warp 11, 7, 1, SEAFOAM_ISLANDS_B3F
- warp 25, 4, 2, SEAFOAM_ISLANDS_B3F
-
- db 2 ; signs
- sign 9, 15, 4 ; SeafoamIslands5Text4
- sign 23, 1, 5 ; SeafoamIslands5Text5
-
- db 3 ; objects
- object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
- object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person
- object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50
-
- ; warp-to
- warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
- warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
- warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
- warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
--- a/data/mapObjects/SilphCo10F.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-SilphCo10F_Object:
- db $2e ; border block
-
- db 6 ; warps
- warp 8, 0, 0, SILPH_CO_9F
- warp 10, 0, 0, SILPH_CO_11F
- warp 12, 0, 0, SILPH_CO_ELEVATOR
- warp 9, 11, 3, SILPH_CO_4F
- warp 13, 15, 5, SILPH_CO_4F
- warp 13, 7, 6, SILPH_CO_4F
-
- db 0 ; signs
-
- db 6 ; objects
- object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39
- object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11
- object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person
- object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26
- object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY
- object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS
-
- ; warp-to
- warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F
- warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F
- warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F
- warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F
- warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F
--- a/data/mapObjects/SilphCo11F.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SilphCo11F_Object:
- db $d ; border block
-
- db 4 ; warps
- warp 9, 0, 1, SILPH_CO_10F
- warp 13, 0, 0, SILPH_CO_ELEVATOR
- warp 5, 5, 9, -1
- warp 3, 2, 3, SILPH_CO_7F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person
- object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person
- object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2
- object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41
- object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40
-
- ; warp-to
- warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F
- warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 5, 5, SILPH_CO_11F_WIDTH
- warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F
--- a/data/mapObjects/SilphCo1F.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SilphCo1F_Object:
- db $2e ; border block
-
- db 5 ; warps
- warp 10, 17, 5, -1
- warp 11, 17, 5, -1
- warp 26, 0, 0, SILPH_CO_2F
- warp 20, 0, 0, SILPH_CO_ELEVATOR
- warp 16, 10, 6, SILPH_CO_3F
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person
-
- ; warp-to
- warp_to 10, 17, SILPH_CO_1F_WIDTH
- warp_to 11, 17, SILPH_CO_1F_WIDTH
- warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F
- warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F
--- a/data/mapObjects/SilphCo2F.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SilphCo2F_Object:
- db $2e ; border block
-
- db 7 ; warps
- warp 24, 0, 2, SILPH_CO_1F
- warp 26, 0, 0, SILPH_CO_3F
- warp 20, 0, 0, SILPH_CO_ELEVATOR
- warp 3, 3, 6, SILPH_CO_3F
- warp 13, 3, 4, SILPH_CO_8F
- warp 27, 15, 5, SILPH_CO_8F
- warp 9, 15, 4, SILPH_CO_6F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person
- object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2
- object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3
- object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23
- object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24
-
- ; warp-to
- warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F
- warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F
- warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F
- warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F
- warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F
- warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F
--- a/data/mapObjects/SilphCo3F.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SilphCo3F_Object:
- db $2e ; border block
-
- db 10 ; warps
- warp 26, 0, 1, SILPH_CO_2F
- warp 24, 0, 0, SILPH_CO_4F
- warp 20, 0, 0, SILPH_CO_ELEVATOR
- warp 23, 11, 9, SILPH_CO_3F
- warp 3, 3, 5, SILPH_CO_5F
- warp 3, 15, 6, SILPH_CO_5F
- warp 27, 3, 3, SILPH_CO_2F
- warp 3, 11, 3, SILPH_CO_9F
- warp 11, 11, 4, SILPH_CO_7F
- warp 27, 15, 3, SILPH_CO_3F
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person
- object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25
- object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4
- object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION
-
- ; warp-to
- warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F
- warp_to 24, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F
- warp_to 20, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 23, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_3F
- warp_to 3, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F
- warp_to 3, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_5F
- warp_to 27, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F
- warp_to 3, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_9F
- warp_to 11, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_7F
- warp_to 27, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_3F
--- a/data/mapObjects/SilphCo4F.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SilphCo4F_Object:
- db $2e ; border block
-
- db 7 ; warps
- warp 24, 0, 1, SILPH_CO_3F
- warp 26, 0, 1, SILPH_CO_5F
- warp 20, 0, 0, SILPH_CO_ELEVATOR
- warp 11, 7, 3, SILPH_CO_10F
- warp 17, 3, 3, SILPH_CO_6F
- warp 3, 15, 4, SILPH_CO_10F
- warp 17, 11, 5, SILPH_CO_10F
-
- db 0 ; signs
-
- db 7 ; objects
- object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person
- object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26
- object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5
- object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27
- object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL
- object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE
- object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE
-
- ; warp-to
- warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F
- warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F
- warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F
- warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F
- warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F
- warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F
--- a/data/mapObjects/SilphCo5F.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SilphCo5F_Object:
- db $2e ; border block
-
- db 7 ; warps
- warp 24, 0, 1, SILPH_CO_6F
- warp 26, 0, 1, SILPH_CO_4F
- warp 20, 0, 0, SILPH_CO_ELEVATOR
- warp 27, 3, 5, SILPH_CO_7F
- warp 9, 15, 4, SILPH_CO_9F
- warp 11, 5, 4, SILPH_CO_3F
- warp 3, 15, 5, SILPH_CO_3F
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person
- object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28
- object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6
- object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1
- object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29
- object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09
- object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN
- object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY
- object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person
- object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person
- object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person
-
- ; warp-to
- warp_to 24, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F
- warp_to 26, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F
- warp_to 20, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 27, 3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F
- warp_to 9, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_9F
- warp_to 11, 5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F
- warp_to 3, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_3F
--- a/data/mapObjects/SilphCo6F.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SilphCo6F_Object:
- db $2e ; border block
-
- db 5 ; warps
- warp 16, 0, 1, SILPH_CO_7F
- warp 14, 0, 0, SILPH_CO_5F
- warp 18, 0, 0, SILPH_CO_ELEVATOR
- warp 3, 3, 4, SILPH_CO_4F
- warp 23, 3, 6, SILPH_CO_2F
-
- db 0 ; signs
-
- db 10 ; objects
- object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person
- object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person
- object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person
- object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person
- object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person
- object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30
- object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7
- object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31
- object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP
- object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY
-
- ; warp-to
- warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F
- warp_to 14, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F
- warp_to 18, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 3, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F
- warp_to 23, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F
--- a/data/mapObjects/SilphCo7F.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-SilphCo7F_Object:
- db $2e ; border block
-
- db 6 ; warps
- warp 16, 0, 1, SILPH_CO_8F
- warp 22, 0, 0, SILPH_CO_6F
- warp 18, 0, 0, SILPH_CO_ELEVATOR
- warp 5, 7, 3, SILPH_CO_11F
- warp 5, 3, 8, SILPH_CO_3F
- warp 21, 15, 3, SILPH_CO_5F
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person
- object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person
- object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person
- object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person
- object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32
- object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8
- object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33
- object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34
- object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person
- object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM
- object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_03
-
- ; warp-to
- warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F
- warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F
- warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F
- warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F
- warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F
--- a/data/mapObjects/SilphCo8F.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-SilphCo8F_Object:
- db $2e ; border block
-
- db 7 ; warps
- warp 16, 0, 1, SILPH_CO_9F
- warp 14, 0, 0, SILPH_CO_7F
- warp 18, 0, 0, SILPH_CO_ELEVATOR
- warp 3, 11, 6, SILPH_CO_8F
- warp 3, 15, 4, SILPH_CO_2F
- warp 11, 5, 5, SILPH_CO_2F
- warp 11, 9, 3, SILPH_CO_8F
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person
- object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35
- object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
- object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36
-
- ; warp-to
- warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F
- warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F
- warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F
- warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
- warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
- warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH
--- a/data/mapObjects/SilphCo9F.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SilphCo9F_Object:
- db $2e ; border block
-
- db 5 ; warps
- warp 14, 0, 0, SILPH_CO_10F
- warp 16, 0, 0, SILPH_CO_8F
- warp 18, 0, 0, SILPH_CO_ELEVATOR
- warp 9, 3, 7, SILPH_CO_3F
- warp 17, 15, 4, SILPH_CO_5F
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person
- object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37
- object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10
- object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38
-
- ; warp-to
- warp_to 14, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F
- warp_to 16, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F
- warp_to 18, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR
- warp_to 9, 3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F
- warp_to 17, 15, SILPH_CO_9F_WIDTH ; SILPH_CO_5F
--- a/data/mapObjects/SilphCoElevator.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-SilphCoElevator_Object:
- db $f ; border block
-
- db 2 ; warps
- warp 1, 3, 0, 237
- warp 2, 3, 0, 237
-
- db 1 ; signs
- sign 3, 0, 1 ; SilphCoElevatorText1
-
- db 0 ; objects
-
- ; warp-to
- warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH
- warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH
--- a/data/mapObjects/TradeCenter.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-TradeCenter_Object:
- db $e ; border block
-
- db 0 ; warps
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_RED, 2, 2, STAY, 0, 1 ; person
--- a/data/mapObjects/UndergroundPathNorthSouth.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-UndergroundPathNorthSouth_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5
- warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5
- warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6
--- a/data/mapObjects/UndergroundPathRoute5.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-UndergroundPathRoute5_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 3, 7, 3, -1
- warp 4, 7, 3, -1
- warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
- warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
- warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
--- a/data/mapObjects/UndergroundPathRoute6.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-UndergroundPathRoute6_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 3, 7, 3, -1
- warp 4, 7, 3, -1
- warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
- warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
- warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
--- a/data/mapObjects/UndergroundPathRoute7.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-UndergroundPathRoute7_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 3, 7, 4, -1
- warp 4, 7, 4, -1
- warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
- warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
- warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST
--- a/data/mapObjects/UndergroundPathRoute7Copy.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-UndergroundPathRoute7Copy_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 3, 7, 5, -1
- warp 4, 7, 5, -1
- warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person
- object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
- warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
- warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST
--- a/data/mapObjects/UndergroundPathRoute8.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-UndergroundPathRoute8_Object:
- db $a ; border block
-
- db 3 ; warps
- warp 3, 7, 4, -1
- warp 4, 7, 4, -1
- warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
- warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
- warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST
--- a/data/mapObjects/UndergroundPathWestEast.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-UndergroundPathWestEast_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7
- warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7
- warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8
--- a/data/mapObjects/VermilionCity.asm
+++ /dev/null
@@ -1,41 +1,0 @@
-VermilionCity_Object:
- db $43 ; border block
-
- db 9 ; warps
- warp 11, 3, 0, VERMILION_POKECENTER
- warp 9, 13, 0, POKEMON_FAN_CLUB
- warp 23, 13, 0, VERMILION_MART
- warp 12, 19, 0, VERMILION_GYM
- warp 23, 19, 0, VERMILION_PIDGEY_HOUSE
- warp 18, 31, 0, VERMILION_DOCK
- warp 19, 31, 0, VERMILION_DOCK
- warp 15, 13, 0, VERMILION_TRADE_HOUSE
- warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE
-
- db 7 ; signs
- sign 27, 3, 7 ; VermilionCityText7
- sign 37, 13, 8 ; VermilionCityText8
- sign 24, 13, 9 ; MartSignText
- sign 12, 3, 10 ; PokeCenterSignText
- sign 7, 13, 11 ; VermilionCityText11
- sign 7, 19, 12 ; VermilionCityText12
- sign 29, 15, 13 ; VermilionCityText13
-
- db 6 ; objects
- object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person
- object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
- object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person
- object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person
- object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person
- object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person
-
- ; warp-to
- warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER
- warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB
- warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART
- warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM
- warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE
- warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
- warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
- warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE
- warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE
--- a/data/mapObjects/VermilionDock.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-VermilionDock_Object:
- db $f ; border block
-
- db 2 ; warps
- warp 14, 0, 5, -1
- warp 14, 2, 1, SS_ANNE_1F
-
- db 0 ; signs
-
- db 0 ; objects
-
- ; warp-to
- warp_to 14, 0, VERMILION_DOCK_WIDTH
- warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F
--- a/data/mapObjects/VermilionGym.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-VermilionGym_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 17, 3, -1
- warp 5, 17, 3, -1
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1
- object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3
- object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1
- object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8
- object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person
-
- ; warp-to
- warp_to 4, 17, VERMILION_GYM_WIDTH
- warp_to 5, 17, VERMILION_GYM_WIDTH
--- a/data/mapObjects/VermilionMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-VermilionMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 2, -1
- warp 4, 7, 2, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person
- object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person
-
- ; warp-to
- warp_to 3, 7, VERMILION_MART_WIDTH
- warp_to 4, 7, VERMILION_MART_WIDTH
--- a/data/mapObjects/VermilionOldRodHouse.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-VermilionOldRodHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 8, -1
- warp 3, 7, 8, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
-
- ; warp-to
- warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
- warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
--- a/data/mapObjects/VermilionPidgeyHouse.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-VermilionPidgeyHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 4, -1
- warp 3, 7, 4, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person
- object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person
- object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH
- warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH
--- a/data/mapObjects/VermilionPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-VermilionPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 0, -1
- warp 4, 7, 0, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person
- object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, VERMILION_POKECENTER_WIDTH
- warp_to 4, 7, VERMILION_POKECENTER_WIDTH
--- a/data/mapObjects/VermilionTradeHouse.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-VermilionTradeHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 7, -1
- warp 3, 7, 7, -1
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person
-
- ; warp-to
- warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH
- warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH
--- a/data/mapObjects/VictoryRoad1F.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-VictoryRoad1F_Object:
- db $7d ; border block
-
- db 3 ; warps
- warp 8, 17, 2, -1
- warp 9, 17, 2, -1
- warp 1, 1, 0, VICTORY_ROAD_2F
-
- db 0 ; signs
-
- db 7 ; objects
- object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
- object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
- object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43
- object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
- object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
- object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
- object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
-
- ; warp-to
- warp_to 8, 17, VICTORY_ROAD_1F_WIDTH
- warp_to 9, 17, VICTORY_ROAD_1F_WIDTH
- warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F
--- a/data/mapObjects/VictoryRoad2F.asm
+++ /dev/null
@@ -1,37 +1,0 @@
-VictoryRoad2F_Object:
- db $7d ; border block
-
- db 7 ; warps
- warp 0, 8, 2, VICTORY_ROAD_1F
- warp 29, 7, 3, -1
- warp 29, 8, 3, -1
- warp 23, 7, 0, VICTORY_ROAD_3F
- warp 25, 14, 2, VICTORY_ROAD_3F
- warp 27, 7, 1, VICTORY_ROAD_3F
- warp 1, 1, 3, VICTORY_ROAD_3F
-
- db 0 ; signs
-
- db 13 ; objects
- object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9
- object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2
- object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5
- object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6
- object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5
- object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50
- object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_17
- object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL
- object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_05
- object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC
- object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
- object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
- object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
-
- ; warp-to
- warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F
- warp_to 29, 7, VICTORY_ROAD_2F_WIDTH
- warp_to 29, 8, VICTORY_ROAD_2F_WIDTH
- warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
- warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
- warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
- warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
--- a/data/mapObjects/VictoryRoad3F.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-VictoryRoad3F_Object:
- db $7d ; border block
-
- db 4 ; warps
- warp 23, 7, 3, VICTORY_ROAD_2F
- warp 26, 8, 5, VICTORY_ROAD_2F
- warp 27, 15, 4, VICTORY_ROAD_2F
- warp 2, 0, 6, VICTORY_ROAD_2F
-
- db 0 ; signs
-
- db 10 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
- object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
- object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
- object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
- object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE
- object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47
- object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
- object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
- object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
- object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
-
- ; warp-to
- warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
- warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
- warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
- warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
--- a/data/mapObjects/ViridianCity.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-ViridianCity_Object:
- db $f ; border block
-
- db 5 ; warps
- warp 23, 25, 0, VIRIDIAN_POKECENTER
- warp 29, 19, 0, VIRIDIAN_MART
- warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE
- warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE
- warp 32, 7, 0, VIRIDIAN_GYM
-
- db 6 ; signs
- sign 17, 17, 8 ; ViridianCityText8
- sign 19, 1, 9 ; ViridianCityText9
- sign 21, 29, 10 ; ViridianCityText10
- sign 30, 19, 11 ; MartSignText
- sign 24, 25, 12 ; PokeCenterSignText
- sign 27, 7, 13 ; ViridianCityText13
-
- db 7 ; objects
- object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person
- object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person
- object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person
- object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person
- object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person
- object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person
- object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person
-
- ; warp-to
- warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER
- warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART
- warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE
- warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE
- warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM
--- a/data/mapObjects/ViridianForest.asm
+++ /dev/null
@@ -1,36 +1,0 @@
-ViridianForest_Object:
- db $3 ; border block
-
- db 6 ; warps
- warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
- warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE
- warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
- warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
- warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
- warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
-
- db 6 ; signs
- sign 24, 40, 9 ; ViridianForestText9
- sign 16, 32, 10 ; ViridianForestText10
- sign 26, 17, 11 ; ViridianForestText11
- sign 4, 24, 12 ; ViridianForestText12
- sign 18, 45, 13 ; ViridianForestText13
- sign 2, 1, 14 ; ViridianForestText14
-
- db 8 ; objects
- object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person
- object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
- object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
- object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
- object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE
- object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION
- object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL
- object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person
-
- ; warp-to
- warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
- warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
- warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
- warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
- warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
- warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
--- a/data/mapObjects/ViridianForestNorthGate.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-ViridianForestNorthGate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 4, 0, 1, -1
- warp 5, 0, 1, -1
- warp 4, 7, 0, VIRIDIAN_FOREST
- warp 5, 7, 0, VIRIDIAN_FOREST
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person
- object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
- warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
- warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
- warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
--- a/data/mapObjects/ViridianForestSouthGate.asm
+++ /dev/null
@@ -1,20 +1,0 @@
-ViridianForestSouthGate_Object:
- db $a ; border block
-
- db 4 ; warps
- warp 4, 0, 3, VIRIDIAN_FOREST
- warp 5, 0, 4, VIRIDIAN_FOREST
- warp 4, 7, 5, -1
- warp 5, 7, 5, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person
- object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person
-
- ; warp-to
- warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
- warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
- warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
- warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
--- a/data/mapObjects/ViridianGym.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-ViridianGym_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 16, 17, 4, -1
- warp 17, 17, 4, -1
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3
- object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
- object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6
- object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3
- object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7
- object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
- object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8
- object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
- object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person
- object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE
-
- ; warp-to
- warp_to 16, 17, VIRIDIAN_GYM_WIDTH
- warp_to 17, 17, VIRIDIAN_GYM_WIDTH
--- a/data/mapObjects/ViridianMart.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-ViridianMart_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 1, -1
- warp 4, 7, 1, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person
-
- ; warp-to
- warp_to 3, 7, VIRIDIAN_MART_WIDTH
- warp_to 4, 7, VIRIDIAN_MART_WIDTH
--- a/data/mapObjects/ViridianNicknameHouse.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-ViridianNicknameHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 3, -1
- warp 3, 7, 3, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person
- object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person
- object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person
- object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person
-
- ; warp-to
- warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
- warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
--- a/data/mapObjects/ViridianPokecenter.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-ViridianPokecenter_Object:
- db $0 ; border block
-
- db 2 ; warps
- warp 3, 7, 0, -1
- warp 4, 7, 0, -1
-
- db 0 ; signs
-
- db 4 ; objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
-
- ; warp-to
- warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH
- warp_to 4, 7, VIRIDIAN_POKECENTER_WIDTH
--- a/data/mapObjects/ViridianSchoolHouse.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-ViridianSchoolHouse_Object:
- db $a ; border block
-
- db 2 ; warps
- warp 2, 7, 2, -1
- warp 3, 7, 2, -1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person
- object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person
-
- ; warp-to
- warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
- warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
--- a/data/mapObjects/WardensHouse.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-WardensHouse_Object:
- db $17 ; border block
-
- db 2 ; warps
- warp 4, 7, 3, -1
- warp 5, 7, 3, -1
-
- db 2 ; signs
- sign 4, 3, 4 ; FuchsiaHouse2Text4
- sign 5, 3, 5 ; FuchsiaHouse2Text5
-
- db 3 ; objects
- object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person
- object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY
- object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
-
- ; warp-to
- warp_to 4, 7, WARDENS_HOUSE_WIDTH
- warp_to 5, 7, WARDENS_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/headers/AgathasRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header AgathasRoom, AGATHAS_ROOM, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/BikeShop.asm
@@ -1,0 +1,3 @@
+
+ map_header BikeShop, BIKE_SHOP, CLUB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/BillsHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header BillsHouse, BILLS_HOUSE, INTERIOR, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/BluesHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header BluesHouse, BLUES_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/BrunosRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header BrunosRoom, BRUNOS_ROOM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonChiefHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonCity.asm
@@ -1,0 +1,5 @@
+
+ map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST
+ connection west, Route16, ROUTE_16, 4
+ connection east, Route7, ROUTE_7, 4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonDiner.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonDiner, CELADON_DINER, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonGym.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonGym, CELADON_GYM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonHotel.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonHotel, CELADON_HOTEL, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMansion1F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMansion2F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMansion3F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMansionRoof.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMansionRoofHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMart1F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMart1F, CELADON_MART_1F, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMart2F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMart2F, CELADON_MART_2F, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMart3F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMart3F, CELADON_MART_3F, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMart4F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMart4F, CELADON_MART_4F, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMart5F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMart5F, CELADON_MART_5F, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMartElevator.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonMartRoof.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeladonPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanBadgeHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanCave1F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanCave2F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanCaveB1F.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanCity.asm
@@ -1,0 +1,7 @@
+
+ map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
+ connection north, Route24, ROUTE_24, 5
+ connection south, Route5, ROUTE_5, 5
+ connection west, Route4, ROUTE_4, 4
+ connection east, Route9, ROUTE_9, 4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanGym.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanGym, CERULEAN_GYM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanMart.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanMart, CERULEAN_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanTradeHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CeruleanTrashedHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ChampionsRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header ChampionsRoom, CHAMPIONS_ROOM, GYM, $0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarGym.asm
@@ -1,0 +1,3 @@
+
+ map_header CinnabarGym, CINNABAR_GYM, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarIsland.asm
@@ -1,0 +1,5 @@
+
+ map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD, NORTH | EAST
+ connection north, Route21, ROUTE_21, 0
+ connection east, Route20, ROUTE_20, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarLab.asm
@@ -1,0 +1,3 @@
+
+ map_header CinnabarLab, CINNABAR_LAB, LAB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarLabFossilRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarLabMetronomeRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarLabTradeRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarMart.asm
@@ -1,0 +1,3 @@
+
+ map_header CinnabarMart, CINNABAR_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CinnabarPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Colosseum.asm
@@ -1,0 +1,3 @@
+
+ map_header Colosseum, COLOSSEUM, CLUB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CopycatsHouse1F.asm
@@ -1,0 +1,3 @@
+
+ map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/CopycatsHouse2F.asm
@@ -1,0 +1,3 @@
+
+ map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Daycare.asm
@@ -1,0 +1,3 @@
+
+ map_header Daycare, DAYCARE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/DiglettsCave.asm
@@ -1,0 +1,3 @@
+
+ map_header DiglettsCave, DIGLETTS_CAVE, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/DiglettsCaveRoute11.asm
@@ -1,0 +1,3 @@
+
+ map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/DiglettsCaveRoute2.asm
@@ -1,0 +1,3 @@
+
+ map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FightingDojo.asm
@@ -1,0 +1,3 @@
+
+ map_header FightingDojo, FIGHTING_DOJO, DOJO, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FuchsiaCity.asm
@@ -1,0 +1,6 @@
+
+ map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD, SOUTH | WEST | EAST
+ connection south, Route19, ROUTE_19, 5
+ connection west, Route18, ROUTE_18, 4
+ connection east, Route15, ROUTE_15, 4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FuchsiaGoodRodHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FuchsiaGym.asm
@@ -1,0 +1,3 @@
+
+ map_header FuchsiaGym, FUCHSIA_GYM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FuchsiaMart.asm
@@ -1,0 +1,3 @@
+
+ map_header FuchsiaMart, FUCHSIA_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FuchsiaMeetingRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/FuchsiaPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/GameCorner.asm
@@ -1,0 +1,3 @@
+
+ map_header GameCorner, GAME_CORNER, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/GameCornerPrizeRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/HallOfFame.asm
@@ -1,0 +1,3 @@
+
+ map_header HallOfFame, HALL_OF_FAME, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/IndigoPlateau.asm
@@ -1,0 +1,4 @@
+
+ map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU, SOUTH
+ connection south, Route23, ROUTE_23, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/IndigoPlateauLobby.asm
@@ -1,0 +1,3 @@
+
+ map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/LancesRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header LancesRoom, LANCES_ROOM, DOJO, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/LavenderCuboneHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/LavenderMart.asm
@@ -1,0 +1,3 @@
+
+ map_header LavenderMart, LAVENDER_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/LavenderPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/LavenderTown.asm
@@ -1,0 +1,6 @@
+
+ map_header LavenderTown, LAVENDER_TOWN, OVERWORLD, NORTH | SOUTH | WEST
+ connection north, Route10, ROUTE_10, 0
+ connection south, Route12, ROUTE_12, 0
+ connection west, Route8, ROUTE_8, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/LoreleisRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header LoreleisRoom, LORELEIS_ROOM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/MrFujisHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/MrPsychicsHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/MtMoon1F.asm
@@ -1,0 +1,3 @@
+
+ map_header MtMoon1F, MT_MOON_1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/MtMoonB1F.asm
@@ -1,0 +1,3 @@
+
+ map_header MtMoonB1F, MT_MOON_B1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/MtMoonB2F.asm
@@ -1,0 +1,3 @@
+
+ map_header MtMoonB2F, MT_MOON_B2F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/MtMoonPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Museum1F.asm
@@ -1,0 +1,3 @@
+
+ map_header Museum1F, MUSEUM_1F, MUSEUM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Museum2F.asm
@@ -1,0 +1,3 @@
+
+ map_header Museum2F, MUSEUM_2F, MUSEUM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/NameRatersHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/OaksLab.asm
@@ -1,0 +1,3 @@
+
+ map_header OaksLab, OAKS_LAB, DOJO, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PalletTown.asm
@@ -1,0 +1,5 @@
+
+ map_header PalletTown, PALLET_TOWN, OVERWORLD, NORTH | SOUTH
+ connection north, Route1, ROUTE_1, 0
+ connection south, Route21, ROUTE_21, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PewterCity.asm
@@ -1,0 +1,5 @@
+
+ map_header PewterCity, PEWTER_CITY, OVERWORLD, SOUTH | EAST
+ connection south, Route2, ROUTE_2, 5
+ connection east, Route3, ROUTE_3, 4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PewterGym.asm
@@ -1,0 +1,3 @@
+
+ map_header PewterGym, PEWTER_GYM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PewterMart.asm
@@ -1,0 +1,3 @@
+
+ map_header PewterMart, PEWTER_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PewterNidoranHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PewterPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PewterSpeechHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonFanClub.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonMansion1F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonMansion2F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonMansion3F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonMansionB1F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonTower1F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonTower2F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonTower3F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonTower4F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonTower5F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonTower6F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PokemonTower7F.asm
@@ -1,0 +1,3 @@
+
+ map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/PowerPlant.asm
@@ -1,0 +1,3 @@
+
+ map_header PowerPlant, POWER_PLANT, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RedsHouse1F.asm
@@ -1,0 +1,3 @@
+
+ map_header RedsHouse1F, REDS_HOUSE_1F, REDS_HOUSE_1, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RedsHouse2F.asm
@@ -1,0 +1,3 @@
+
+ map_header RedsHouse2F, REDS_HOUSE_2F, REDS_HOUSE_2, $00
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RockTunnel1F.asm
@@ -1,0 +1,3 @@
+
+ map_header RockTunnel1F, ROCK_TUNNEL_1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RockTunnelB1F.asm
@@ -1,0 +1,3 @@
+
+ map_header RockTunnelB1F, ROCK_TUNNEL_B1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RockTunnelPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header RockTunnelPokecenter, ROCK_TUNNEL_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB1F.asm
@@ -1,0 +1,3 @@
+
+ map_header RocketHideoutB1F, ROCKET_HIDEOUT_B1F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB2F.asm
@@ -1,0 +1,3 @@
+
+ map_header RocketHideoutB2F, ROCKET_HIDEOUT_B2F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB3F.asm
@@ -1,0 +1,3 @@
+
+ map_header RocketHideoutB3F, ROCKET_HIDEOUT_B3F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RocketHideoutB4F.asm
@@ -1,0 +1,3 @@
+
+ map_header RocketHideoutB4F, ROCKET_HIDEOUT_B4F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/RocketHideoutElevator.asm
@@ -1,0 +1,3 @@
+
+ map_header RocketHideoutElevator, ROCKET_HIDEOUT_ELEVATOR, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route1.asm
@@ -1,0 +1,5 @@
+
+ map_header Route1, ROUTE_1, OVERWORLD, NORTH | SOUTH
+ connection north, ViridianCity, VIRIDIAN_CITY, -5
+ connection south, PalletTown, PALLET_TOWN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route10.asm
@@ -1,0 +1,5 @@
+
+ map_header Route10, ROUTE_10, OVERWORLD, SOUTH | WEST
+ connection south, LavenderTown, LAVENDER_TOWN, 0
+ connection west, Route9, ROUTE_9, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route11.asm
@@ -1,0 +1,5 @@
+
+ map_header Route11, ROUTE_11, OVERWORLD, WEST | EAST
+ connection west, VermilionCity, VERMILION_CITY, -4
+ connection east, Route12, ROUTE_12, -27
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route11Gate1F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route11Gate1F, ROUTE_11_GATE_1F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route11Gate2F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route11Gate2F, ROUTE_11_GATE_2F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route12.asm
@@ -1,0 +1,6 @@
+
+ map_header Route12, ROUTE_12, OVERWORLD, NORTH | SOUTH | WEST
+ connection north, LavenderTown, LAVENDER_TOWN, 0
+ connection south, Route13, ROUTE_13, -20
+ connection west, Route11, ROUTE_11, 27
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route12Gate1F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route12Gate1F, ROUTE_12_GATE_1F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route12Gate2F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route12Gate2F, ROUTE_12_GATE_2F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route12SuperRodHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route13.asm
@@ -1,0 +1,5 @@
+
+ map_header Route13, ROUTE_13, OVERWORLD, NORTH | WEST
+ connection north, Route12, ROUTE_12, 20
+ connection west, Route14, ROUTE_14, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route14.asm
@@ -1,0 +1,5 @@
+
+ map_header Route14, ROUTE_14, OVERWORLD, WEST | EAST
+ connection west, Route15, ROUTE_15, 18
+ connection east, Route13, ROUTE_13, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route15.asm
@@ -1,0 +1,5 @@
+
+ map_header Route15, ROUTE_15, OVERWORLD, WEST | EAST
+ connection west, FuchsiaCity, FUCHSIA_CITY, -4
+ connection east, Route14, ROUTE_14, -18
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route15Gate1F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route15Gate1F, ROUTE_15_GATE_1F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route15Gate2F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route15Gate2F, ROUTE_15_GATE_2F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route16.asm
@@ -1,0 +1,5 @@
+
+ map_header Route16, ROUTE_16, OVERWORLD, SOUTH | EAST
+ connection south, Route17, ROUTE_17, 0
+ connection east, CeladonCity, CELADON_CITY, -4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route16FlyHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header Route16FlyHouse, ROUTE_16_FLY_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route16Gate1F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route16Gate1F, ROUTE_16_GATE_1F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route16Gate2F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route16Gate2F, ROUTE_16_GATE_2F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route17.asm
@@ -1,0 +1,5 @@
+
+ map_header Route17, ROUTE_17, OVERWORLD, NORTH | SOUTH
+ connection north, Route16, ROUTE_16, 0
+ connection south, Route18, ROUTE_18, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route18.asm
@@ -1,0 +1,5 @@
+
+ map_header Route18, ROUTE_18, OVERWORLD, NORTH | EAST
+ connection north, Route17, ROUTE_17, 0
+ connection east, FuchsiaCity, FUCHSIA_CITY, -4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route18Gate1F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route18Gate1F, ROUTE_18_GATE_1F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route18Gate2F.asm
@@ -1,0 +1,3 @@
+
+ map_header Route18Gate2F, ROUTE_18_GATE_2F, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route19.asm
@@ -1,0 +1,5 @@
+
+ map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST
+ connection north, FuchsiaCity, FUCHSIA_CITY, -5
+ connection west, Route20, ROUTE_20, 18
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route2.asm
@@ -1,0 +1,5 @@
+
+ map_header Route2, ROUTE_2, OVERWORLD, NORTH | SOUTH
+ connection north, PewterCity, PEWTER_CITY, -5
+ connection south, ViridianCity, VIRIDIAN_CITY, -5
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route20.asm
@@ -1,0 +1,5 @@
+
+ map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST
+ connection west, CinnabarIsland, CINNABAR_ISLAND, 0
+ connection east, Route19, ROUTE_19, -18
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route21.asm
@@ -1,0 +1,5 @@
+
+ map_header Route21, ROUTE_21, OVERWORLD, NORTH | SOUTH
+ connection north, PalletTown, PALLET_TOWN, 0
+ connection south, CinnabarIsland, CINNABAR_ISLAND, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route22.asm
@@ -1,0 +1,5 @@
+
+ map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST
+ connection north, Route23, ROUTE_23, 0
+ connection east, ViridianCity, VIRIDIAN_CITY, -4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route22Gate.asm
@@ -1,0 +1,3 @@
+
+ map_header Route22Gate, ROUTE_22_GATE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route23.asm
@@ -1,0 +1,5 @@
+
+ map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH
+ connection north, IndigoPlateau, INDIGO_PLATEAU, 0
+ connection south, Route22, ROUTE_22, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route24.asm
@@ -1,0 +1,5 @@
+
+ map_header Route24, ROUTE_24, OVERWORLD, SOUTH | EAST
+ connection south, CeruleanCity, CERULEAN_CITY, -5
+ connection east, Route25, ROUTE_25, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route25.asm
@@ -1,0 +1,4 @@
+
+ map_header Route25, ROUTE_25, OVERWORLD, WEST
+ connection west, Route24, ROUTE_24, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route2Gate.asm
@@ -1,0 +1,3 @@
+
+ map_header Route2Gate, ROUTE_2_GATE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route2TradeHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header Route2TradeHouse, ROUTE_2_TRADE_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route3.asm
@@ -1,0 +1,5 @@
+
+ map_header Route3, ROUTE_3, OVERWORLD, NORTH | WEST
+ connection north, Route4, ROUTE_4, 25
+ connection west, PewterCity, PEWTER_CITY, -4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route4.asm
@@ -1,0 +1,5 @@
+
+ map_header Route4, ROUTE_4, OVERWORLD, SOUTH | EAST
+ connection south, Route3, ROUTE_3, -25
+ connection east, CeruleanCity, CERULEAN_CITY, -4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route5.asm
@@ -1,0 +1,5 @@
+
+ map_header Route5, ROUTE_5, OVERWORLD, NORTH | SOUTH
+ connection north, CeruleanCity, CERULEAN_CITY, -5
+ connection south, SaffronCity, SAFFRON_CITY, -5
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route5Gate.asm
@@ -1,0 +1,3 @@
+
+ map_header Route5Gate, ROUTE_5_GATE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route6.asm
@@ -1,0 +1,5 @@
+
+ map_header Route6, ROUTE_6, OVERWORLD, NORTH | SOUTH
+ connection north, SaffronCity, SAFFRON_CITY, -5
+ connection south, VermilionCity, VERMILION_CITY, -5
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route6Gate.asm
@@ -1,0 +1,3 @@
+
+ map_header Route6Gate, ROUTE_6_GATE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route7.asm
@@ -1,0 +1,5 @@
+
+ map_header Route7, ROUTE_7, OVERWORLD, WEST | EAST
+ connection west, CeladonCity, CELADON_CITY, -4
+ connection east, SaffronCity, SAFFRON_CITY, -4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route7Gate.asm
@@ -1,0 +1,3 @@
+
+ map_header Route7Gate, ROUTE_7_GATE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route8.asm
@@ -1,0 +1,5 @@
+
+ map_header Route8, ROUTE_8, OVERWORLD, WEST | EAST
+ connection west, SaffronCity, SAFFRON_CITY, -4
+ connection east, LavenderTown, LAVENDER_TOWN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route8Gate.asm
@@ -1,0 +1,3 @@
+
+ map_header Route8Gate, ROUTE_8_GATE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/Route9.asm
@@ -1,0 +1,5 @@
+
+ map_header Route9, ROUTE_9, OVERWORLD, WEST | EAST
+ connection west, CeruleanCity, CERULEAN_CITY, -4
+ connection east, Route10, ROUTE_10, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnne1F.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnne1F, SS_ANNE_1F, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnne1FRooms.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnne1FRooms, SS_ANNE_1F_ROOMS, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnne2F.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnne2F, SS_ANNE_2F, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnne2FRooms.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnne2FRooms, SS_ANNE_2F_ROOMS, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnne3F.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnne3F, SS_ANNE_3F, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnneB1F.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnneB1F, SS_ANNE_B1F, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnneB1FRooms.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnneB1FRooms, SS_ANNE_B1F_ROOMS, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnneBow.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnneBow, SS_ANNE_BOW, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnneCaptainsRoom.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnneCaptainsRoom, SS_ANNE_CAPTAINS_ROOM, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SSAnneKitchen.asm
@@ -1,0 +1,3 @@
+
+ map_header SSAnneKitchen, SS_ANNE_KITCHEN, SHIP, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneCenter.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneCenter, SAFARI_ZONE_CENTER, FOREST, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneCenterRestHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneEast.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneEast, SAFARI_ZONE_EAST, FOREST, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneEastRestHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneGate.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneGate, SAFARI_ZONE_GATE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneNorth.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneNorth, SAFARI_ZONE_NORTH, FOREST, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneNorthRestHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneSecretHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneSecretHouse, SAFARI_ZONE_SECRET_HOUSE, LAB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneWest.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneWest, SAFARI_ZONE_WEST, FOREST, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SafariZoneWestRestHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SaffronCity.asm
@@ -1,0 +1,7 @@
+
+ map_header SaffronCity, SAFFRON_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
+ connection north, Route5, ROUTE_5, 5
+ connection south, Route6, ROUTE_6, 5
+ connection west, Route7, ROUTE_7, 4
+ connection east, Route8, ROUTE_8, 4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SaffronGym.asm
@@ -1,0 +1,3 @@
+
+ map_header SaffronGym, SAFFRON_GYM, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SaffronMart.asm
@@ -1,0 +1,3 @@
+
+ map_header SaffronMart, SAFFRON_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SaffronPidgeyHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header SaffronPidgeyHouse, SAFFRON_PIDGEY_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SaffronPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header SaffronPokecenter, SAFFRON_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SeafoamIslands1F.asm
@@ -1,0 +1,3 @@
+
+ map_header SeafoamIslands1F, SEAFOAM_ISLANDS_1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB1F.asm
@@ -1,0 +1,3 @@
+
+ map_header SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB2F.asm
@@ -1,0 +1,3 @@
+
+ map_header SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB3F.asm
@@ -1,0 +1,3 @@
+
+ map_header SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SeafoamIslandsB4F.asm
@@ -1,0 +1,3 @@
+
+ map_header SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo10F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo10F, SILPH_CO_10F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo11F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo11F, SILPH_CO_11F, INTERIOR, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo1F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo1F, SILPH_CO_1F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo2F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo2F, SILPH_CO_2F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo3F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo3F, SILPH_CO_3F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo4F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo4F, SILPH_CO_4F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo5F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo5F, SILPH_CO_5F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo6F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo6F, SILPH_CO_6F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo7F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo7F, SILPH_CO_7F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo8F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo8F, SILPH_CO_8F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCo9F.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCo9F, SILPH_CO_9F, FACILITY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/SilphCoElevator.asm
@@ -1,0 +1,3 @@
+
+ map_header SilphCoElevator, SILPH_CO_ELEVATOR, LOBBY, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/TradeCenter.asm
@@ -1,0 +1,3 @@
+
+ map_header TradeCenter, TRADE_CENTER, CLUB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/UndergroundPathNorthSouth.asm
@@ -1,0 +1,3 @@
+
+ map_header UndergroundPathNorthSouth, UNDERGROUND_PATH_NORTH_SOUTH, UNDERGROUND, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute5.asm
@@ -1,0 +1,3 @@
+
+ map_header UndergroundPathRoute5, UNDERGROUND_PATH_ROUTE_5, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute6.asm
@@ -1,0 +1,3 @@
+
+ map_header UndergroundPathRoute6, UNDERGROUND_PATH_ROUTE_6, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute7.asm
@@ -1,0 +1,3 @@
+
+ map_header UndergroundPathRoute7, UNDERGROUND_PATH_ROUTE_7, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute7Copy.asm
@@ -1,0 +1,3 @@
+
+ map_header UndergroundPathRoute7Copy, UNDERGROUND_PATH_ROUTE_7, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/UndergroundPathRoute8.asm
@@ -1,0 +1,3 @@
+
+ map_header UndergroundPathRoute8, UNDERGROUND_PATH_ROUTE_8, GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/UndergroundPathWestEast.asm
@@ -1,0 +1,3 @@
+
+ map_header UndergroundPathWestEast, UNDERGROUND_PATH_WEST_EAST, UNDERGROUND, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionCity.asm
@@ -1,0 +1,5 @@
+
+ map_header VermilionCity, VERMILION_CITY, OVERWORLD, NORTH | EAST
+ connection north, Route6, ROUTE_6, 5
+ connection east, Route11, ROUTE_11, 4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionDock.asm
@@ -1,0 +1,3 @@
+
+ map_header VermilionDock, VERMILION_DOCK, SHIP_PORT, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionGym.asm
@@ -1,0 +1,3 @@
+
+ map_header VermilionGym, VERMILION_GYM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionMart.asm
@@ -1,0 +1,3 @@
+
+ map_header VermilionMart, VERMILION_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionOldRodHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header VermilionOldRodHouse, VERMILION_OLD_ROD_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionPidgeyHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header VermilionPidgeyHouse, VERMILION_PIDGEY_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header VermilionPokecenter, VERMILION_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VermilionTradeHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header VermilionTradeHouse, VERMILION_TRADE_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VictoryRoad1F.asm
@@ -1,0 +1,3 @@
+
+ map_header VictoryRoad1F, VICTORY_ROAD_1F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VictoryRoad2F.asm
@@ -1,0 +1,3 @@
+
+ map_header VictoryRoad2F, VICTORY_ROAD_2F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/VictoryRoad3F.asm
@@ -1,0 +1,3 @@
+
+ map_header VictoryRoad3F, VICTORY_ROAD_3F, CAVERN, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianCity.asm
@@ -1,0 +1,6 @@
+
+ map_header ViridianCity, VIRIDIAN_CITY, OVERWORLD, NORTH | SOUTH | WEST
+ connection north, Route2, ROUTE_2, 5
+ connection south, Route1, ROUTE_1, 5
+ connection west, Route22, ROUTE_22, 4
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianForest.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianForest, VIRIDIAN_FOREST, FOREST, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianForestNorthGate.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianForestNorthGate, VIRIDIAN_FOREST_NORTH_GATE, FOREST_GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianForestSouthGate.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianForestSouthGate, VIRIDIAN_FOREST_SOUTH_GATE, FOREST_GATE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianGym.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianGym, VIRIDIAN_GYM, GYM, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianMart.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianMart, VIRIDIAN_MART, MART, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianNicknameHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianNicknameHouse, VIRIDIAN_NICKNAME_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianPokecenter.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianPokecenter, VIRIDIAN_POKECENTER, POKECENTER, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/ViridianSchoolHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header ViridianSchoolHouse, VIRIDIAN_SCHOOL_HOUSE, HOUSE, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/headers/WardensHouse.asm
@@ -1,0 +1,3 @@
+
+ map_header WardensHouse, WARDENS_HOUSE, LAB, 0
+ end_map_header
--- /dev/null
+++ b/data/maps/objects/AgathasRoom.asm
@@ -1,0 +1,19 @@
+AgathasRoom_Object:
+ db $0 ; border block
+
+ db 4 ; warps
+ warp 4, 11, 2, BRUNOS_ROOM
+ warp 5, 11, 3, BRUNOS_ROOM
+ warp 4, 0, 0, LANCES_ROOM
+ warp 5, 0, 0, LANCES_ROOM
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1
+
+ ; warp-to
+ warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
+ warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
+ warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
+ warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
--- /dev/null
+++ b/data/maps/objects/BikeShop.asm
@@ -1,0 +1,17 @@
+BikeShop_Object:
+ db $e ; border block
+
+ db 2 ; warps
+ warp 2, 7, 4, -1
+ warp 3, 7, 4, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person
+ object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person
+ object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, BIKE_SHOP_WIDTH
+ warp_to 3, 7, BIKE_SHOP_WIDTH
--- /dev/null
+++ b/data/maps/objects/BillsHouse.asm
@@ -1,0 +1,17 @@
+BillsHouse_Object:
+ db $d ; border block
+
+ db 2 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, BILLS_HOUSE_WIDTH
+ warp_to 3, 7, BILLS_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/BluesHouse.asm
@@ -1,0 +1,17 @@
+BluesHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 1, -1
+ warp 3, 7, 1, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map
+ object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around
+ object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table
+
+ ; warp-to
+ warp_to 2, 7, BLUES_HOUSE_WIDTH
+ warp_to 3, 7, BLUES_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/BrunosRoom.asm
@@ -1,0 +1,19 @@
+BrunosRoom_Object:
+ db $3 ; border block
+
+ db 4 ; warps
+ warp 4, 11, 2, LORELEIS_ROOM
+ warp 5, 11, 3, LORELEIS_ROOM
+ warp 4, 0, 0, AGATHAS_ROOM
+ warp 5, 0, 1, AGATHAS_ROOM
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1
+
+ ; warp-to
+ warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
+ warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
+ warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
+ warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
--- /dev/null
+++ b/data/maps/objects/CeladonChiefHouse.asm
@@ -1,0 +1,17 @@
+CeladonChiefHouse_Object:
+ db $f ; border block
+
+ db 2 ; warps
+ warp 2, 7, 11, -1
+ warp 3, 7, 11, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person
+ object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person
+ object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH
+ warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeladonCity.asm
@@ -1,0 +1,54 @@
+CeladonCity_Object:
+ db $f ; border block
+
+ db 13 ; warps
+ warp 8, 13, 0, CELADON_MART_1F
+ warp 10, 13, 2, CELADON_MART_1F
+ warp 24, 9, 0, CELADON_MANSION_1F
+ warp 24, 3, 2, CELADON_MANSION_1F
+ warp 25, 3, 2, CELADON_MANSION_1F
+ warp 41, 9, 0, CELADON_POKECENTER
+ warp 12, 27, 0, CELADON_GYM
+ warp 28, 19, 0, GAME_CORNER
+ warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used
+ warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM
+ warp 31, 27, 0, CELADON_DINER
+ warp 35, 27, 0, CELADON_CHIEF_HOUSE
+ warp 43, 27, 0, CELADON_HOTEL
+
+ db 9 ; signs
+ sign 27, 15, 10 ; CeladonCityText10
+ sign 19, 15, 11 ; CeladonCityText11
+ sign 42, 9, 12 ; PokeCenterSignText
+ sign 13, 29, 13 ; CeladonCityText13
+ sign 21, 9, 14 ; CeladonCityText14
+ sign 12, 13, 15 ; CeladonCityText15
+ sign 39, 21, 16 ; CeladonCityText16
+ sign 33, 21, 17 ; CeladonCityText17
+ sign 27, 21, 18 ; CeladonCityText18
+
+ db 9 ; objects
+ object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person
+ object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person
+ object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person
+ object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person
+ object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person
+ object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person
+ object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person
+ object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person
+ object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person
+
+ ; warp-to
+ warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
+ warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
+ warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
+ warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
+ warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
+ warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER
+ warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM
+ warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER
+ warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F
+ warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM
+ warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER
+ warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE
+ warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL
--- /dev/null
+++ b/data/maps/objects/CeladonDiner.asm
@@ -1,0 +1,19 @@
+CeladonDiner_Object:
+ db $f ; border block
+
+ db 2 ; warps
+ warp 3, 7, 10, -1
+ warp 4, 7, 10, -1
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person
+ object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person
+ object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person
+ object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person
+ object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person
+
+ ; warp-to
+ warp_to 3, 7, CELADON_DINER_WIDTH
+ warp_to 4, 7, CELADON_DINER_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeladonGym.asm
@@ -1,0 +1,22 @@
+CeladonGym_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 17, 6, -1
+ warp 5, 17, 6, -1
+
+ db 0 ; signs
+
+ db 8 ; objects
+ object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1
+ object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
+ object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
+ object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
+ object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2
+ object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18
+ object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
+ object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
+
+ ; warp-to
+ warp_to 4, 17, CELADON_GYM_WIDTH
+ warp_to 5, 17, CELADON_GYM_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeladonHotel.asm
@@ -1,0 +1,17 @@
+CeladonHotel_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 12, -1
+ warp 4, 7, 12, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, CELADON_HOTEL_WIDTH
+ warp_to 4, 7, CELADON_HOTEL_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeladonMansion1F.asm
@@ -1,0 +1,25 @@
+CeladonMansion1F_Object:
+ db $f ; border block
+
+ db 5 ; warps
+ warp 4, 11, 2, -1
+ warp 5, 11, 2, -1
+ warp 4, 0, 4, -1
+ warp 7, 1, 1, CELADON_MANSION_2F
+ warp 2, 1, 2, CELADON_MANSION_2F
+
+ db 1 ; signs
+ sign 4, 9, 5 ; CeladonMansion1Text5
+
+ db 4 ; objects
+ object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person
+ object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person
+ object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person
+
+ ; warp-to
+ warp_to 4, 11, CELADON_MANSION_1F_WIDTH
+ warp_to 5, 11, CELADON_MANSION_1F_WIDTH
+ warp_to 4, 0, CELADON_MANSION_1F_WIDTH
+ warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
+ warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
--- /dev/null
+++ b/data/maps/objects/CeladonMansion2F.asm
@@ -1,0 +1,19 @@
+CeladonMansion2F_Object:
+ db $f ; border block
+
+ db 4 ; warps
+ warp 6, 1, 0, CELADON_MANSION_3F
+ warp 7, 1, 3, CELADON_MANSION_1F
+ warp 2, 1, 4, CELADON_MANSION_1F
+ warp 4, 1, 3, CELADON_MANSION_3F
+
+ db 1 ; signs
+ sign 4, 9, 1 ; CeladonMansion2Text1
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
+ warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
+ warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
+ warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
--- /dev/null
+++ b/data/maps/objects/CeladonMansion3F.asm
@@ -1,0 +1,26 @@
+CeladonMansion3F_Object:
+ db $f ; border block
+
+ db 4 ; warps
+ warp 6, 1, 0, CELADON_MANSION_2F
+ warp 7, 1, 0, CELADON_MANSION_ROOF
+ warp 2, 1, 1, CELADON_MANSION_ROOF
+ warp 4, 1, 3, CELADON_MANSION_2F
+
+ db 4 ; signs
+ sign 1, 3, 5 ; CeladonMansion3Text5
+ sign 4, 3, 6 ; CeladonMansion3Text6
+ sign 1, 6, 7 ; CeladonMansion3Text7
+ sign 4, 9, 8 ; CeladonMansion3Text8
+
+ db 4 ; objects
+ object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person
+ object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person
+ object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person
+
+ ; warp-to
+ warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
+ warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
+ warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
+ warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
--- /dev/null
+++ b/data/maps/objects/CeladonMansionRoof.asm
@@ -1,0 +1,17 @@
+CeladonMansionRoof_Object:
+ db $9 ; border block
+
+ db 3 ; warps
+ warp 6, 1, 1, CELADON_MANSION_3F
+ warp 2, 1, 2, CELADON_MANSION_3F
+ warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
+
+ db 1 ; signs
+ sign 3, 7, 1 ; CeladonMansion4Text1
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
+ warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
+ warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE
--- /dev/null
+++ b/data/maps/objects/CeladonMansionRoofHouse.asm
@@ -1,0 +1,16 @@
+CeladonMansionRoofHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 2, CELADON_MANSION_ROOF
+ warp 3, 7, 2, CELADON_MANSION_ROOF
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
+ object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
+ warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
--- /dev/null
+++ b/data/maps/objects/CeladonMart1F.asm
@@ -1,0 +1,25 @@
+CeladonMart1F_Object:
+ db $f ; border block
+
+ db 6 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
+ warp 16, 7, 1, -1
+ warp 17, 7, 1, -1
+ warp 12, 1, 0, CELADON_MART_2F
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
+
+ db 2 ; signs
+ sign 11, 4, 2 ; CeladonMart1Text2
+ sign 14, 1, 3 ; CeladonMart1Text3
+
+ db 1 ; objects
+ object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, CELADON_MART_1F_WIDTH
+ warp_to 3, 7, CELADON_MART_1F_WIDTH
+ warp_to 16, 7, CELADON_MART_1F_WIDTH
+ warp_to 17, 7, CELADON_MART_1F_WIDTH
+ warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F
+ warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -1,0 +1,21 @@
+CeladonMart2F_Object:
+ db $f ; border block
+
+ db 3 ; warps
+ warp 12, 1, 4, CELADON_MART_1F
+ warp 16, 1, 1, CELADON_MART_3F
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
+
+ db 1 ; signs
+ sign 14, 1, 5 ; CeladonMart2Text5
+
+ db 4 ; objects
+ object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person
+ object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person
+ object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person
+ object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person
+
+ ; warp-to
+ warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
+ warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F
+ warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/CeladonMart3F.asm
@@ -1,0 +1,33 @@
+CeladonMart3F_Object:
+ db $f ; border block
+
+ db 3 ; warps
+ warp 12, 1, 0, CELADON_MART_4F
+ warp 16, 1, 1, CELADON_MART_2F
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
+
+ db 12 ; signs
+ sign 2, 4, 6 ; CeladonMart3Text6
+ sign 3, 4, 7 ; CeladonMart3Text7
+ sign 5, 4, 8 ; CeladonMart3Text8
+ sign 6, 4, 9 ; CeladonMart3Text9
+ sign 2, 6, 10 ; CeladonMart3Text10
+ sign 3, 6, 11 ; CeladonMart3Text11
+ sign 5, 6, 12 ; CeladonMart3Text12
+ sign 6, 6, 13 ; CeladonMart3Text13
+ sign 14, 1, 14 ; CeladonMart3Text14
+ sign 4, 1, 15 ; CeladonMart3Text15
+ sign 6, 1, 16 ; CeladonMart3Text16
+ sign 10, 1, 17 ; CeladonMart3Text17
+
+ db 5 ; objects
+ object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person
+ object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person
+ object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person
+ object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person
+ object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person
+
+ ; warp-to
+ warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F
+ warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F
+ warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/CeladonMart4F.asm
@@ -1,0 +1,20 @@
+CeladonMart4F_Object:
+ db $f ; border block
+
+ db 3 ; warps
+ warp 12, 1, 0, CELADON_MART_3F
+ warp 16, 1, 1, CELADON_MART_5F
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
+
+ db 1 ; signs
+ sign 14, 1, 4 ; CeladonMart4Text4
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person
+ object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person
+
+ ; warp-to
+ warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
+ warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F
+ warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -1,0 +1,21 @@
+CeladonMart5F_Object:
+ db $f ; border block
+
+ db 3 ; warps
+ warp 12, 1, 0, CELADON_MART_ROOF
+ warp 16, 1, 1, CELADON_MART_4F
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
+
+ db 1 ; signs
+ sign 14, 1, 5 ; CeladonMart5Text5
+
+ db 4 ; objects
+ object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person
+ object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
+ object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person
+ object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF
+ warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F
+ warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/CeladonMartElevator.asm
@@ -1,0 +1,15 @@
+CeladonMartElevator_Object:
+ db $f ; border block
+
+ db 2 ; warps
+ warp 1, 3, 5, CELADON_MART_1F
+ warp 2, 3, 5, CELADON_MART_1F
+
+ db 1 ; signs
+ sign 3, 0, 1 ; CeladonMartElevatorText1
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
+ warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
--- /dev/null
+++ b/data/maps/objects/CeladonMartRoof.asm
@@ -1,0 +1,18 @@
+CeladonMartRoof_Object:
+ db $42 ; border block
+
+ db 1 ; warps
+ warp 15, 2, 0, CELADON_MART_5F
+
+ db 4 ; signs
+ sign 10, 1, 3 ; CeladonMartRoofText3
+ sign 11, 1, 4 ; CeladonMartRoofText4
+ sign 12, 2, 5 ; CeladonMartRoofText5
+ sign 13, 2, 6 ; CeladonMartRoofText6
+
+ db 2 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person
+ object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person
+
+ ; warp-to
+ warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F
--- /dev/null
+++ b/data/maps/objects/CeladonPokecenter.asm
@@ -1,0 +1,18 @@
+CeladonPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 5, -1
+ warp 4, 7, 5, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
+ object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, CELADON_POKECENTER_WIDTH
+ warp_to 4, 7, CELADON_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeruleanBadgeHouse.asm
@@ -1,0 +1,17 @@
+CeruleanBadgeHouse_Object:
+ db $c ; border block
+
+ db 3 ; warps
+ warp 2, 0, 9, -1
+ warp 2, 7, 8, -1
+ warp 3, 7, 8, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person
+
+ ; warp-to
+ warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH
+ warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH
+ warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeruleanCave1F.asm
@@ -1,0 +1,31 @@
+CeruleanCave1F_Object:
+ db $7d ; border block
+
+ db 9 ; warps
+ warp 24, 17, 6, -1
+ warp 25, 17, 6, -1
+ warp 27, 1, 0, CERULEAN_CAVE_2F
+ warp 23, 7, 1, CERULEAN_CAVE_2F
+ warp 18, 9, 2, CERULEAN_CAVE_2F
+ warp 7, 1, 3, CERULEAN_CAVE_2F
+ warp 1, 3, 4, CERULEAN_CAVE_2F
+ warp 3, 11, 5, CERULEAN_CAVE_2F
+ warp 0, 6, 0, CERULEAN_CAVE_B1F
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
+ object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
+ object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET
+
+ ; warp-to
+ warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH
+ warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH
+ warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+ warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+ warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+ warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+ warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+ warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+ warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F
--- /dev/null
+++ b/data/maps/objects/CeruleanCave2F.asm
@@ -1,0 +1,25 @@
+CeruleanCave2F_Object:
+ db $7d ; border block
+
+ db 6 ; warps
+ warp 29, 1, 2, CERULEAN_CAVE_1F
+ warp 22, 6, 3, CERULEAN_CAVE_1F
+ warp 19, 7, 4, CERULEAN_CAVE_1F
+ warp 9, 1, 5, CERULEAN_CAVE_1F
+ warp 1, 3, 6, CERULEAN_CAVE_1F
+ warp 3, 11, 7, CERULEAN_CAVE_1F
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP
+ object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
+ object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
+
+ ; warp-to
+ warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+ warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+ warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+ warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+ warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+ warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
--- /dev/null
+++ b/data/maps/objects/CeruleanCaveB1F.asm
@@ -1,0 +1,15 @@
+CeruleanCaveB1F_Object:
+ db $7d ; border block
+
+ db 1 ; warps
+ warp 3, 6, 8, CERULEAN_CAVE_1F
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70
+ object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL
+ object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
+
+ ; warp-to
+ warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F
--- /dev/null
+++ b/data/maps/objects/CeruleanCity.asm
@@ -1,0 +1,47 @@
+CeruleanCity_Object:
+ db $f ; border block
+
+ db 10 ; warps
+ warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
+ warp 13, 15, 0, CERULEAN_TRADE_HOUSE
+ warp 19, 17, 0, CERULEAN_POKECENTER
+ warp 30, 19, 0, CERULEAN_GYM
+ warp 13, 25, 0, BIKE_SHOP
+ warp 25, 25, 0, CERULEAN_MART
+ warp 4, 11, 0, CERULEAN_CAVE_1F
+ warp 27, 9, 2, CERULEAN_TRASHED_HOUSE
+ warp 9, 11, 1, CERULEAN_BADGE_HOUSE
+ warp 9, 9, 0, CERULEAN_BADGE_HOUSE
+
+ db 6 ; signs
+ sign 23, 19, 12 ; CeruleanCityText12
+ sign 17, 29, 13 ; CeruleanCityText13
+ sign 26, 25, 14 ; MartSignText
+ sign 20, 17, 15 ; PokeCenterSignText
+ sign 11, 25, 16 ; CeruleanCityText16
+ sign 27, 21, 17 ; CeruleanCityText17
+
+ db 11 ; objects
+ object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person
+ object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5
+ object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person
+ object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person
+ object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person
+ object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person
+ object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person
+ object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
+
+ ; warp-to
+ warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
+ warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE
+ warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
+ warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
+ warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP
+ warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART
+ warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F
+ warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
+ warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
+ warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
--- /dev/null
+++ b/data/maps/objects/CeruleanGym.asm
@@ -1,0 +1,18 @@
+CeruleanGym_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 13, 3, -1
+ warp 5, 13, 3, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1
+ object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
+ object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1
+ object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 4, 13, CERULEAN_GYM_WIDTH
+ warp_to 5, 13, CERULEAN_GYM_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeruleanMart.asm
@@ -1,0 +1,17 @@
+CeruleanMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 5, -1
+ warp 4, 7, 5, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person
+ object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, CERULEAN_MART_WIDTH
+ warp_to 4, 7, CERULEAN_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeruleanPokecenter.asm
@@ -1,0 +1,18 @@
+CeruleanPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 2, -1
+ warp 4, 7, 2, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person
+ object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, CERULEAN_POKECENTER_WIDTH
+ warp_to 4, 7, CERULEAN_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeruleanTradeHouse.asm
@@ -1,0 +1,16 @@
+CeruleanTradeHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 1, -1
+ warp 3, 7, 1, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person
+ object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH
+ warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
@@ -1,0 +1,19 @@
+CeruleanTrashedHouse_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
+ warp 3, 0, 7, -1
+
+ db 1 ; signs
+ sign 3, 0, 3 ; CeruleanHouseTrashedText3
+
+ db 2 ; objects
+ object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH
+ warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH
+ warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/ChampionsRoom.asm
@@ -1,0 +1,20 @@
+ChampionsRoom_Object:
+ db $3 ; border block
+
+ db 4 ; warps
+ warp 3, 7, 1, LANCES_ROOM
+ warp 4, 7, 2, LANCES_ROOM
+ warp 3, 0, 0, HALL_OF_FAME
+ warp 4, 0, 0, HALL_OF_FAME
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person
+
+ ; warp-to
+ warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
+ warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
+ warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
+ warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
--- /dev/null
+++ b/data/maps/objects/CinnabarGym.asm
@@ -1,0 +1,23 @@
+CinnabarGym_Object:
+ db $2e ; border block
+
+ db 2 ; warps
+ warp 16, 17, 1, -1
+ warp 17, 17, 1, -1
+
+ db 0 ; signs
+
+ db 9 ; objects
+ object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
+ object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
+ object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
+ object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
+ object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
+ object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
+ object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person
+
+ ; warp-to
+ warp_to 16, 17, CINNABAR_GYM_WIDTH
+ warp_to 17, 17, CINNABAR_GYM_WIDTH
--- /dev/null
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -1,0 +1,27 @@
+CinnabarIsland_Object:
+ db $43 ; border block
+
+ db 5 ; warps
+ warp 6, 3, 1, POKEMON_MANSION_1F
+ warp 18, 3, 0, CINNABAR_GYM
+ warp 6, 9, 0, CINNABAR_LAB
+ warp 11, 11, 0, CINNABAR_POKECENTER
+ warp 15, 11, 0, CINNABAR_MART
+
+ db 5 ; signs
+ sign 9, 5, 3 ; CinnabarIslandText3
+ sign 16, 11, 4 ; MartSignText
+ sign 12, 11, 5 ; PokeCenterSignText
+ sign 9, 11, 6 ; CinnabarIslandText6
+ sign 13, 3, 7 ; CinnabarIslandText7
+
+ db 2 ; objects
+ object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person
+ object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
+ warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
+ warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
+ warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
+ warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART
--- /dev/null
+++ b/data/maps/objects/CinnabarLab.asm
@@ -1,0 +1,25 @@
+CinnabarLab_Object:
+ db $17 ; border block
+
+ db 5 ; warps
+ warp 2, 7, 2, -1
+ warp 3, 7, 2, -1
+ warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
+ warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
+ warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
+
+ db 4 ; signs
+ sign 3, 2, 2 ; Lab1Text2
+ sign 9, 4, 3 ; Lab1Text3
+ sign 13, 4, 4 ; Lab1Text4
+ sign 17, 4, 5 ; Lab1Text5
+
+ db 1 ; objects
+ object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, CINNABAR_LAB_WIDTH
+ warp_to 3, 7, CINNABAR_LAB_WIDTH
+ warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM
+ warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM
+ warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM
--- /dev/null
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
@@ -1,0 +1,16 @@
+CinnabarLabFossilRoom_Object:
+ db $17 ; border block
+
+ db 2 ; warps
+ warp 2, 7, 4, CINNABAR_LAB
+ warp 3, 7, 4, CINNABAR_LAB
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
+ object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
+ warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
--- /dev/null
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
@@ -1,0 +1,19 @@
+CinnabarLabMetronomeRoom_Object:
+ db $17 ; border block
+
+ db 2 ; warps
+ warp 2, 7, 3, CINNABAR_LAB
+ warp 3, 7, 3, CINNABAR_LAB
+
+ db 3 ; signs
+ sign 0, 4, 3 ; Lab3Text3
+ sign 1, 4, 4 ; Lab3Text4
+ sign 2, 1, 5 ; Lab3Text5
+
+ db 2 ; objects
+ object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
+ warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
--- /dev/null
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
@@ -1,0 +1,17 @@
+CinnabarLabTradeRoom_Object:
+ db $17 ; border block
+
+ db 2 ; warps
+ warp 2, 7, 2, CINNABAR_LAB
+ warp 3, 7, 2, CINNABAR_LAB
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person
+ object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
+ warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
--- /dev/null
+++ b/data/maps/objects/CinnabarMart.asm
@@ -1,0 +1,17 @@
+CinnabarMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 4, -1
+ warp 4, 7, 4, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person
+ object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, CINNABAR_MART_WIDTH
+ warp_to 4, 7, CINNABAR_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/CinnabarPokecenter.asm
@@ -1,0 +1,18 @@
+CinnabarPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 3, -1
+ warp 4, 7, 3, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person
+ object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, CINNABAR_POKECENTER_WIDTH
+ warp_to 4, 7, CINNABAR_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/Colosseum.asm
@@ -1,0 +1,9 @@
+Colosseum_Object:
+ db $e ; border block
+
+ db 0 ; warps
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_RED, 2, 2, STAY, 0, 1 ; person
--- /dev/null
+++ b/data/maps/objects/CopycatsHouse1F.asm
@@ -1,0 +1,19 @@
+CopycatsHouse1F_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
+ warp 7, 1, 0, COPYCATS_HOUSE_2F
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person
+ object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person
+ object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH
+ warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH
+ warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F
--- /dev/null
+++ b/data/maps/objects/CopycatsHouse2F.asm
@@ -1,0 +1,19 @@
+CopycatsHouse2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 1, 2, COPYCATS_HOUSE_1F
+
+ db 2 ; signs
+ sign 3, 5, 6 ; CopycatsHouse2FText6
+ sign 0, 1, 7 ; CopycatsHouse2FText7
+
+ db 5 ; objects
+ object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person
+ object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person
+ object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person
+ object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person
+ object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person
+
+ ; warp-to
+ warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F
--- /dev/null
+++ b/data/maps/objects/Daycare.asm
@@ -1,0 +1,15 @@
+Daycare_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 4, -1
+ warp 3, 7, 4, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, DAYCARE_WIDTH
+ warp_to 3, 7, DAYCARE_WIDTH
--- /dev/null
+++ b/data/maps/objects/DiglettsCave.asm
@@ -1,0 +1,14 @@
+DiglettsCave_Object:
+ db $19 ; border block
+
+ db 2 ; warps
+ warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
+ warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2
+ warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11
--- /dev/null
+++ b/data/maps/objects/DiglettsCaveRoute11.asm
@@ -1,0 +1,17 @@
+DiglettsCaveRoute11_Object:
+ db $7d ; border block
+
+ db 3 ; warps
+ warp 2, 7, 4, -1
+ warp 3, 7, 4, -1
+ warp 4, 4, 1, DIGLETTS_CAVE
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+ warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+ warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE
--- /dev/null
+++ b/data/maps/objects/DiglettsCaveRoute2.asm
@@ -1,0 +1,17 @@
+DiglettsCaveRoute2_Object:
+ db $7d ; border block
+
+ db 3 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
+ warp 4, 4, 0, DIGLETTS_CAVE
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
+ warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
+ warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE
--- /dev/null
+++ b/data/maps/objects/FightingDojo.asm
@@ -1,0 +1,21 @@
+FightingDojo_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 11, 1, -1
+ warp 5, 11, 1, -1
+
+ db 0 ; signs
+
+ db 7 ; objects
+ object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1
+ object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2
+ object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3
+ object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4
+ object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5
+ object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person
+ object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person
+
+ ; warp-to
+ warp_to 4, 11, FIGHTING_DOJO_WIDTH
+ warp_to 5, 11, FIGHTING_DOJO_WIDTH
--- /dev/null
+++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
@@ -1,0 +1,17 @@
+FuchsiaBillsGrandpasHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 1, -1
+ warp 3, 7, 1, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person
+ object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
+ warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/FuchsiaCity.asm
@@ -1,0 +1,52 @@
+FuchsiaCity_Object:
+ db $f ; border block
+
+ db 9 ; warps
+ warp 5, 13, 0, FUCHSIA_MART
+ warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
+ warp 19, 27, 0, FUCHSIA_POKECENTER
+ warp 27, 27, 0, WARDENS_HOUSE
+ warp 18, 3, 0, SAFARI_ZONE_GATE
+ warp 5, 27, 0, FUCHSIA_GYM
+ warp 22, 13, 0, FUCHSIA_MEETING_ROOM
+ warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
+ warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
+
+ db 14 ; signs
+ sign 15, 23, 11 ; FuchsiaCityText11
+ sign 25, 15, 12 ; FuchsiaCityText12
+ sign 17, 5, 13 ; FuchsiaCityText13
+ sign 6, 13, 14 ; MartSignText
+ sign 20, 27, 15 ; PokeCenterSignText
+ sign 27, 29, 16 ; FuchsiaCityText16
+ sign 21, 15, 17 ; FuchsiaCityText17
+ sign 5, 29, 18 ; FuchsiaCityText18
+ sign 33, 7, 19 ; FuchsiaCityText19
+ sign 27, 7, 20 ; FuchsiaCityText20
+ sign 13, 7, 21 ; FuchsiaCityText21
+ sign 31, 13, 22 ; FuchsiaCityText22
+ sign 13, 15, 23 ; FuchsiaCityText23
+ sign 7, 7, 24 ; FuchsiaCityText24
+
+ db 10 ; objects
+ object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person
+ object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person
+ object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person
+ object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person
+ object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person
+ object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person
+ object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person
+ object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person
+ object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person
+ object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person
+
+ ; warp-to
+ warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART
+ warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE
+ warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER
+ warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE
+ warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE
+ warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM
+ warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM
+ warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
+ warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
--- /dev/null
+++ b/data/maps/objects/FuchsiaGoodRodHouse.asm
@@ -1,0 +1,17 @@
+FuchsiaGoodRodHouse_Object:
+ db $c ; border block
+
+ db 3 ; warps
+ warp 2, 0, 8, -1
+ warp 2, 7, 7, -1
+ warp 3, 7, 7, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person
+
+ ; warp-to
+ warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+ warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+ warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -1,0 +1,22 @@
+FuchsiaGym_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 17, 5, -1
+ warp 5, 17, 5, -1
+
+ db 0 ; signs
+
+ db 8 ; objects
+ object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1
+ object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7
+ object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3
+ object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8
+ object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1
+ object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2
+ object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4
+ object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person
+
+ ; warp-to
+ warp_to 4, 17, FUCHSIA_GYM_WIDTH
+ warp_to 5, 17, FUCHSIA_GYM_WIDTH
--- /dev/null
+++ b/data/maps/objects/FuchsiaMart.asm
@@ -1,0 +1,17 @@
+FuchsiaMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, FUCHSIA_MART_WIDTH
+ warp_to 4, 7, FUCHSIA_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/FuchsiaMeetingRoom.asm
@@ -1,0 +1,17 @@
+FuchsiaMeetingRoom_Object:
+ db $17 ; border block
+
+ db 2 ; warps
+ warp 4, 7, 6, -1
+ warp 5, 7, 6, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person
+ object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person
+ object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person
+
+ ; warp-to
+ warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH
+ warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH
--- /dev/null
+++ b/data/maps/objects/FuchsiaPokecenter.asm
@@ -1,0 +1,18 @@
+FuchsiaPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 2, -1
+ warp 4, 7, 2, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person
+ object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH
+ warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/GameCorner.asm
@@ -1,0 +1,28 @@
+GameCorner_Object:
+ db $f ; border block
+
+ db 3 ; warps
+ warp 15, 17, 7, -1
+ warp 16, 17, 7, -1
+ warp 17, 4, 1, ROCKET_HIDEOUT_B1F
+
+ db 1 ; signs
+ sign 9, 4, 12 ; CeladonGameCornerText12
+
+ db 11 ; objects
+ object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person
+ object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person
+ object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person
+ object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person
+ object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person
+ object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person
+ object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person
+ object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person
+ object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person
+ object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person
+ object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7
+
+ ; warp-to
+ warp_to 15, 17, GAME_CORNER_WIDTH
+ warp_to 16, 17, GAME_CORNER_WIDTH
+ warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F
--- /dev/null
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
@@ -1,0 +1,19 @@
+GameCornerPrizeRoom_Object:
+ db $f ; border block
+
+ db 2 ; warps
+ warp 4, 7, 9, -1
+ warp 5, 7, 9, -1
+
+ db 3 ; signs
+ sign 2, 2, 3 ; CeladonPrizeRoomText3
+ sign 4, 2, 4 ; CeladonPrizeRoomText4
+ sign 6, 2, 5 ; CeladonPrizeRoomText5
+
+ db 2 ; objects
+ object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person
+ object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person
+
+ ; warp-to
+ warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
+ warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
--- /dev/null
+++ b/data/maps/objects/HallOfFame.asm
@@ -1,0 +1,15 @@
+HallOfFame_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 7, 2, CHAMPIONS_ROOM
+ warp 5, 7, 3, CHAMPIONS_ROOM
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person
+
+ ; warp-to
+ warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
+ warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
--- /dev/null
+++ b/data/maps/objects/IndigoPlateau.asm
@@ -1,0 +1,14 @@
+IndigoPlateau_Object:
+ db $e ; border block
+
+ db 2 ; warps
+ warp 9, 5, 0, INDIGO_PLATEAU_LOBBY
+ warp 10, 5, 0, INDIGO_PLATEAU_LOBBY
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY
+ warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY
--- /dev/null
+++ b/data/maps/objects/IndigoPlateauLobby.asm
@@ -1,0 +1,21 @@
+IndigoPlateauLobby_Object:
+ db $0 ; border block
+
+ db 3 ; warps
+ warp 7, 11, 0, -1
+ warp 8, 11, 1, -1
+ warp 8, 0, 0, LORELEIS_ROOM
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person
+ object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person
+ object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person
+
+ ; warp-to
+ warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH
+ warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH
+ warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM
--- /dev/null
+++ b/data/maps/objects/LancesRoom.asm
@@ -1,0 +1,17 @@
+LancesRoom_Object:
+ db $3 ; border block
+
+ db 3 ; warps
+ warp 24, 16, 2, AGATHAS_ROOM
+ warp 5, 0, 0, CHAMPIONS_ROOM
+ warp 6, 0, 0, CHAMPIONS_ROOM
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1
+
+ ; warp-to
+ warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM
+ warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
+ warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
--- /dev/null
+++ b/data/maps/objects/LavenderCuboneHouse.asm
@@ -1,0 +1,16 @@
+LavenderCuboneHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 4, -1
+ warp 3, 7, 4, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person
+ object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH
+ warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/LavenderMart.asm
@@ -1,0 +1,17 @@
+LavenderMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 3, -1
+ warp 4, 7, 3, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, LAVENDER_MART_WIDTH
+ warp_to 4, 7, LAVENDER_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/LavenderPokecenter.asm
@@ -1,0 +1,18 @@
+LavenderPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person
+ object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, LAVENDER_POKECENTER_WIDTH
+ warp_to 4, 7, LAVENDER_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/LavenderTown.asm
@@ -1,0 +1,31 @@
+LavenderTown_Object:
+ db $2c ; border block
+
+ db 6 ; warps
+ warp 3, 5, 0, LAVENDER_POKECENTER
+ warp 14, 5, 0, POKEMON_TOWER_1F
+ warp 7, 9, 0, MR_FUJIS_HOUSE
+ warp 15, 13, 0, LAVENDER_MART
+ warp 3, 13, 0, LAVENDER_CUBONE_HOUSE
+ warp 7, 13, 0, NAME_RATERS_HOUSE
+
+ db 6 ; signs
+ sign 11, 9, 4 ; LavenderTownText4
+ sign 9, 3, 5 ; LavenderTownText5
+ sign 16, 13, 6 ; MartSignText
+ sign 4, 5, 7 ; PokeCenterSignText
+ sign 5, 9, 8 ; LavenderTownText8
+ sign 17, 7, 9 ; LavenderTownText9
+
+ db 3 ; objects
+ object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person
+
+ ; warp-to
+ warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
+ warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F
+ warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE
+ warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART
+ warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE
+ warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE
--- /dev/null
+++ b/data/maps/objects/LoreleisRoom.asm
@@ -1,0 +1,19 @@
+LoreleisRoom_Object:
+ db $3 ; border block
+
+ db 4 ; warps
+ warp 4, 11, 2, INDIGO_PLATEAU_LOBBY
+ warp 5, 11, 2, INDIGO_PLATEAU_LOBBY
+ warp 4, 0, 0, BRUNOS_ROOM
+ warp 5, 0, 1, BRUNOS_ROOM
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1
+
+ ; warp-to
+ warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
+ warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
+ warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
+ warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
--- /dev/null
+++ b/data/maps/objects/MrFujisHouse.asm
@@ -1,0 +1,20 @@
+MrFujisHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 2, -1
+ warp 3, 7, 2, -1
+
+ db 0 ; signs
+
+ db 6 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person
+ object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person
+ object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person
+ object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person
+ object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person
+ object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person
+
+ ; warp-to
+ warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH
+ warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/MrPsychicsHouse.asm
@@ -1,0 +1,15 @@
+MrPsychicsHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 7, -1
+ warp 3, 7, 7, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH
+ warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/MtMoon1F.asm
@@ -1,0 +1,34 @@
+MtMoon1F_Object:
+ db $3 ; border block
+
+ db 5 ; warps
+ warp 14, 35, 1, -1
+ warp 15, 35, 1, -1
+ warp 5, 5, 0, MT_MOON_B1F
+ warp 17, 11, 2, MT_MOON_B1F
+ warp 25, 15, 3, MT_MOON_B1F
+
+ db 1 ; signs
+ sign 15, 23, 14 ; MtMoon1Text14
+
+ db 13 ; objects
+ object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1
+ object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
+ object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
+ object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1
+ object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6
+ object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
+ object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
+ object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION
+ object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE
+ object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY
+ object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE
+ object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION
+ object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12
+
+ ; warp-to
+ warp_to 14, 35, MT_MOON_1F_WIDTH
+ warp_to 15, 35, MT_MOON_1F_WIDTH
+ warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F
+ warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F
+ warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F
--- /dev/null
+++ b/data/maps/objects/MtMoonB1F.asm
@@ -1,0 +1,26 @@
+MtMoonB1F_Object:
+ db $3 ; border block
+
+ db 8 ; warps
+ warp 5, 5, 2, MT_MOON_1F
+ warp 17, 11, 0, MT_MOON_B2F
+ warp 25, 9, 3, MT_MOON_1F
+ warp 25, 15, 4, MT_MOON_1F
+ warp 21, 17, 1, MT_MOON_B2F
+ warp 13, 27, 2, MT_MOON_B2F
+ warp 23, 3, 3, MT_MOON_B2F
+ warp 27, 3, 2, -1
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+ warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+ warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+ warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+ warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+ warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+ warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+ warp_to 27, 3, MT_MOON_B1F_WIDTH
--- /dev/null
+++ b/data/maps/objects/MtMoonB2F.asm
@@ -1,0 +1,27 @@
+MtMoonB2F_Object:
+ db $3 ; border block
+
+ db 4 ; warps
+ warp 25, 9, 1, MT_MOON_B1F
+ warp 21, 17, 4, MT_MOON_B1F
+ warp 15, 27, 5, MT_MOON_B1F
+ warp 5, 7, 6, MT_MOON_B1F
+
+ db 0 ; signs
+
+ db 9 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
+ object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1
+ object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2
+ object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3
+ object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4
+ object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person
+ object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person
+ object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP
+ object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01
+
+ ; warp-to
+ warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+ warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+ warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+ warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
--- /dev/null
+++ b/data/maps/objects/MtMoonPokecenter.asm
@@ -1,0 +1,20 @@
+MtMoonPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
+
+ db 0 ; signs
+
+ db 6 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person
+ object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person
+ object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person
+ object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person
+
+ ; warp-to
+ warp_to 3, 7, MT_MOON_POKECENTER_WIDTH
+ warp_to 4, 7, MT_MOON_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/Museum1F.asm
@@ -1,0 +1,25 @@
+Museum1F_Object:
+ db $a ; border block
+
+ db 5 ; warps
+ warp 10, 7, 0, -1
+ warp 11, 7, 0, -1
+ warp 16, 7, 1, -1
+ warp 17, 7, 1, -1
+ warp 7, 7, 0, MUSEUM_2F
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person
+ object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
+ object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person
+ object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person
+ object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
+
+ ; warp-to
+ warp_to 10, 7, MUSEUM_1F_WIDTH
+ warp_to 11, 7, MUSEUM_1F_WIDTH
+ warp_to 16, 7, MUSEUM_1F_WIDTH
+ warp_to 17, 7, MUSEUM_1F_WIDTH
+ warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F
--- /dev/null
+++ b/data/maps/objects/Museum2F.asm
@@ -1,0 +1,19 @@
+Museum2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 7, 4, MUSEUM_1F
+
+ db 2 ; signs
+ sign 11, 2, 6 ; Museum2FText6
+ sign 2, 5, 7 ; Museum2FText7
+
+ db 5 ; objects
+ object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person
+ object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person
+ object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person
+ object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
+ object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person
+
+ ; warp-to
+ warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F
--- /dev/null
+++ b/data/maps/objects/NameRatersHouse.asm
@@ -1,0 +1,15 @@
+NameRatersHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 5, -1
+ warp 3, 7, 5, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH
+ warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/OaksLab.asm
@@ -1,0 +1,25 @@
+OaksLab_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 11, 2, -1
+ warp 5, 11, 2, -1
+
+ db 0 ; signs
+
+ db 11 ; objects
+ object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1
+ object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person
+ object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person
+ object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person
+ object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person
+ object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person
+ object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person
+ object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person
+ object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person
+ object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person
+ object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person
+
+ ; warp-to
+ warp_to 4, 11, OAKS_LAB_WIDTH
+ warp_to 5, 11, OAKS_LAB_WIDTH
--- /dev/null
+++ b/data/maps/objects/PalletTown.asm
@@ -1,0 +1,23 @@
+PalletTown_Object:
+ db $b ; border block
+
+ db 3 ; warps
+ warp 5, 5, 0, REDS_HOUSE_1F
+ warp 13, 5, 0, BLUES_HOUSE
+ warp 12, 11, 1, OAKS_LAB
+
+ db 4 ; signs
+ sign 13, 13, 4 ; PalletTownText4
+ sign 7, 9, 5 ; PalletTownText5
+ sign 3, 5, 6 ; PalletTownText6
+ sign 11, 5, 7 ; PalletTownText7
+
+ db 3 ; objects
+ object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
+ object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person
+ object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person
+
+ ; warp-to
+ warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F
+ warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE
+ warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB
--- /dev/null
+++ b/data/maps/objects/PewterCity.asm
@@ -1,0 +1,36 @@
+PewterCity_Object:
+ db $a ; border block
+
+ db 7 ; warps
+ warp 14, 7, 0, MUSEUM_1F
+ warp 19, 5, 2, MUSEUM_1F
+ warp 16, 17, 0, PEWTER_GYM
+ warp 29, 13, 0, PEWTER_NIDORAN_HOUSE
+ warp 23, 17, 0, PEWTER_MART
+ warp 7, 29, 0, PEWTER_SPEECH_HOUSE
+ warp 13, 25, 0, PEWTER_POKECENTER
+
+ db 7 ; signs
+ sign 19, 29, 6 ; PewterCityText6
+ sign 33, 19, 7 ; PewterCityText7
+ sign 24, 17, 8 ; MartSignText
+ sign 14, 25, 9 ; PokeCenterSignText
+ sign 15, 9, 10 ; PewterCityText10
+ sign 11, 17, 11 ; PewterCityText11
+ sign 25, 23, 12 ; PewterCityText12
+
+ db 5 ; objects
+ object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person
+ object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person
+
+ ; warp-to
+ warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F
+ warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F
+ warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM
+ warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE
+ warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART
+ warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE
+ warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER
--- /dev/null
+++ b/data/maps/objects/PewterGym.asm
@@ -1,0 +1,17 @@
+PewterGym_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 13, 2, -1
+ warp 5, 13, 2, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1
+ object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
+ object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person
+
+ ; warp-to
+ warp_to 4, 13, PEWTER_GYM_WIDTH
+ warp_to 5, 13, PEWTER_GYM_WIDTH
--- /dev/null
+++ b/data/maps/objects/PewterMart.asm
@@ -1,0 +1,17 @@
+PewterMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 4, -1
+ warp 4, 7, 4, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, PEWTER_MART_WIDTH
+ warp_to 4, 7, PEWTER_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/PewterNidoranHouse.asm
@@ -1,0 +1,17 @@
+PewterNidoranHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 3, -1
+ warp 3, 7, 3, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person
+ object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person
+ object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH
+ warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/PewterPokecenter.asm
@@ -1,0 +1,18 @@
+PewterPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 6, -1
+ warp 4, 7, 6, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person
+ object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, PEWTER_POKECENTER_WIDTH
+ warp_to 4, 7, PEWTER_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/PewterSpeechHouse.asm
@@ -1,0 +1,16 @@
+PewterSpeechHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 5, -1
+ warp 3, 7, 5, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH
+ warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/PokemonFanClub.asm
@@ -1,0 +1,22 @@
+PokemonFanClub_Object:
+ db $d ; border block
+
+ db 2 ; warps
+ warp 2, 7, 1, -1
+ warp 3, 7, 1, -1
+
+ db 2 ; signs
+ sign 1, 0, 7 ; FanClubText7
+ sign 6, 0, 8 ; FanClubText8
+
+ db 6 ; objects
+ object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person
+ object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person
+ object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person
+ object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person
+ object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person
+
+ ; warp-to
+ warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH
+ warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH
--- /dev/null
+++ b/data/maps/objects/PokemonMansion1F.asm
@@ -1,0 +1,29 @@
+PokemonMansion1F_Object:
+ db $2e ; border block
+
+ db 8 ; warps
+ warp 4, 27, 0, -1
+ warp 5, 27, 0, -1
+ warp 6, 27, 0, -1
+ warp 7, 27, 0, -1
+ warp 5, 10, 0, POKEMON_MANSION_2F
+ warp 21, 23, 0, POKEMON_MANSION_B1F
+ warp 26, 27, 0, -1
+ warp 27, 27, 0, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
+ object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
+ object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
+
+ ; warp-to
+ warp_to 4, 27, POKEMON_MANSION_1F_WIDTH
+ warp_to 5, 27, POKEMON_MANSION_1F_WIDTH
+ warp_to 6, 27, POKEMON_MANSION_1F_WIDTH
+ warp_to 7, 27, POKEMON_MANSION_1F_WIDTH
+ warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F
+ warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F
+ warp_to 26, 27, POKEMON_MANSION_1F_WIDTH
+ warp_to 27, 27, POKEMON_MANSION_1F_WIDTH
--- /dev/null
+++ b/data/maps/objects/PokemonMansion2F.asm
@@ -1,0 +1,22 @@
+PokemonMansion2F_Object:
+ db $1 ; border block
+
+ db 4 ; warps
+ warp 5, 10, 4, POKEMON_MANSION_1F
+ warp 7, 10, 0, POKEMON_MANSION_3F
+ warp 25, 14, 2, POKEMON_MANSION_3F
+ warp 6, 1, 1, POKEMON_MANSION_3F
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
+ object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
+ object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
+ object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
+
+ ; warp-to
+ warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F
+ warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
+ warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
+ warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
--- /dev/null
+++ b/data/maps/objects/PokemonMansion3F.asm
@@ -1,0 +1,21 @@
+PokemonMansion3F_Object:
+ db $1 ; border block
+
+ db 3 ; warps
+ warp 7, 10, 1, POKEMON_MANSION_2F
+ warp 6, 1, 3, POKEMON_MANSION_2F
+ warp 25, 14, 2, POKEMON_MANSION_2F
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
+ object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
+ object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
+ object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON
+ object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person
+
+ ; warp-to
+ warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
+ warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
+ warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
--- /dev/null
+++ b/data/maps/objects/PokemonMansionB1F.asm
@@ -1,0 +1,20 @@
+PokemonMansionB1F_Object:
+ db $1 ; border block
+
+ db 1 ; warps
+ warp 23, 22, 5, POKEMON_MANSION_1F
+
+ db 0 ; signs
+
+ db 8 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
+ object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
+ object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
+ object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
+ object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14
+ object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22
+ object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person
+ object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
+
+ ; warp-to
+ warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F
--- /dev/null
+++ b/data/maps/objects/PokemonTower1F.asm
@@ -1,0 +1,21 @@
+PokemonTower1F_Object:
+ db $1 ; border block
+
+ db 3 ; warps
+ warp 10, 17, 1, -1
+ warp 11, 17, 1, -1
+ warp 18, 9, 1, POKEMON_TOWER_2F
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person
+ object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person
+ object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person
+ object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person
+ object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person
+
+ ; warp-to
+ warp_to 10, 17, POKEMON_TOWER_1F_WIDTH
+ warp_to 11, 17, POKEMON_TOWER_1F_WIDTH
+ warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F
--- /dev/null
+++ b/data/maps/objects/PokemonTower2F.asm
@@ -1,0 +1,16 @@
+PokemonTower2F_Object:
+ db $1 ; border block
+
+ db 2 ; warps
+ warp 3, 9, 0, POKEMON_TOWER_3F
+ warp 18, 9, 2, POKEMON_TOWER_1F
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
+ object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
+
+ ; warp-to
+ warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F
+ warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F
--- /dev/null
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -1,0 +1,18 @@
+PokemonTower3F_Object:
+ db $1 ; border block
+
+ db 2 ; warps
+ warp 3, 9, 0, POKEMON_TOWER_2F
+ warp 18, 9, 1, POKEMON_TOWER_4F
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
+ object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
+ object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
+ object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
+
+ ; warp-to
+ warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F
+ warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F
--- /dev/null
+++ b/data/maps/objects/PokemonTower4F.asm
@@ -1,0 +1,20 @@
+PokemonTower4F_Object:
+ db $1 ; border block
+
+ db 2 ; warps
+ warp 3, 9, 0, POKEMON_TOWER_5F
+ warp 18, 9, 1, POKEMON_TOWER_3F
+
+ db 0 ; signs
+
+ db 6 ; objects
+ object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
+ object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
+ object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
+ object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER
+ object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
+ object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP
+
+ ; warp-to
+ warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
+ warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F
--- /dev/null
+++ b/data/maps/objects/PokemonTower5F.asm
@@ -1,0 +1,20 @@
+PokemonTower5F_Object:
+ db $1 ; border block
+
+ db 2 ; warps
+ warp 3, 9, 0, POKEMON_TOWER_4F
+ warp 18, 9, 0, POKEMON_TOWER_6F
+
+ db 0 ; signs
+
+ db 6 ; objects
+ object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person
+ object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
+ object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
+ object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17
+ object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
+ object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
+
+ ; warp-to
+ warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
+ warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F
--- /dev/null
+++ b/data/maps/objects/PokemonTower6F.asm
@@ -1,0 +1,19 @@
+PokemonTower6F_Object:
+ db $1 ; border block
+
+ db 2 ; warps
+ warp 18, 9, 1, POKEMON_TOWER_5F
+ warp 9, 16, 0, POKEMON_TOWER_7F
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
+ object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
+ object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
+ object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
+
+ ; warp-to
+ warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
+ warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F
--- /dev/null
+++ b/data/maps/objects/PokemonTower7F.asm
@@ -1,0 +1,16 @@
+PokemonTower7F_Object:
+ db $1 ; border block
+
+ db 1 ; warps
+ warp 9, 16, 1, POKEMON_TOWER_6F
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19
+ object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20
+ object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21
+ object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F
--- /dev/null
+++ b/data/maps/objects/PowerPlant.asm
@@ -1,0 +1,30 @@
+PowerPlant_Object:
+ db $2e ; border block
+
+ db 3 ; warps
+ warp 4, 35, 3, -1
+ warp 5, 35, 3, -1
+ warp 0, 11, 3, -1
+
+ db 0 ; signs
+
+ db 14 ; objects
+ object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
+ object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
+ object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
+ object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43
+ object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40
+ object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40
+ object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43
+ object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40
+ object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50
+ object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS
+ object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP
+ object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
+ object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25
+ object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33
+
+ ; warp-to
+ warp_to 4, 35, POWER_PLANT_WIDTH
+ warp_to 5, 35, POWER_PLANT_WIDTH
+ warp_to 0, 11, POWER_PLANT_WIDTH
--- /dev/null
+++ b/data/maps/objects/RedsHouse1F.asm
@@ -1,0 +1,18 @@
+RedsHouse1F_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 2, 7, 0, -1 ; exit1
+ warp 3, 7, 0, -1 ; exit2
+ warp 7, 1, 0, REDS_HOUSE_2F ; staircase
+
+ db 1 ; signs
+ sign 3, 1, 2 ; TV
+
+ db 1 ; objects
+ object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom
+
+ ; warp-to
+ warp_to 2, 7, REDS_HOUSE_1F_WIDTH
+ warp_to 3, 7, REDS_HOUSE_1F_WIDTH
+ warp_to 7, 1, REDS_HOUSE_1F_WIDTH
--- /dev/null
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -1,0 +1,12 @@
+RedsHouse2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 1, 2, REDS_HOUSE_1F
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 7, 1, REDS_HOUSE_2F_WIDTH
--- /dev/null
+++ b/data/maps/objects/RockTunnel1F.asm
@@ -1,0 +1,34 @@
+RockTunnel1F_Object:
+ db $3 ; border block
+
+ db 8 ; warps
+ warp 15, 3, 1, -1
+ warp 15, 0, 1, -1
+ warp 15, 33, 2, -1
+ warp 15, 35, 2, -1
+ warp 37, 3, 0, ROCK_TUNNEL_B1F
+ warp 5, 3, 1, ROCK_TUNNEL_B1F
+ warp 17, 11, 2, ROCK_TUNNEL_B1F
+ warp 37, 17, 3, ROCK_TUNNEL_B1F
+
+ db 1 ; signs
+ sign 11, 29, 8 ; RockTunnel1Text8
+
+ db 7 ; objects
+ object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12
+ object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13
+ object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14
+ object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7
+ object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
+ object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
+ object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
+
+ ; warp-to
+ warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH
+ warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH
+ warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH
+ warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH
+ warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+ warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+ warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+ warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
--- /dev/null
+++ b/data/maps/objects/RockTunnelB1F.asm
@@ -1,0 +1,26 @@
+RockTunnelB1F_Object:
+ db $3 ; border block
+
+ db 4 ; warps
+ warp 33, 25, 4, ROCK_TUNNEL_1F
+ warp 27, 3, 5, ROCK_TUNNEL_1F
+ warp 23, 11, 6, ROCK_TUNNEL_1F
+ warp 3, 3, 7, ROCK_TUNNEL_1F
+
+ db 0 ; signs
+
+ db 8 ; objects
+ object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
+ object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3
+ object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
+ object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10
+ object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
+ object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11
+ object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
+
+ ; warp-to
+ warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+ warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+ warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+ warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
--- /dev/null
+++ b/data/maps/objects/RockTunnelPokecenter.asm
@@ -1,0 +1,18 @@
+RockTunnelPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person
+ object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH
+ warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/RocketHideoutB1F.asm
@@ -1,0 +1,27 @@
+RocketHideoutB1F_Object:
+ db $2e ; border block
+
+ db 5 ; warps
+ warp 23, 2, 0, ROCKET_HIDEOUT_B2F
+ warp 21, 2, 2, GAME_CORNER
+ warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
+ warp 21, 24, 3, ROCKET_HIDEOUT_B2F
+ warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
+
+ db 0 ; signs
+
+ db 7 ; objects
+ object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8
+ object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9
+ object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10
+ object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11
+ object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12
+ object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE
+ object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION
+
+ ; warp-to
+ warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
+ warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER
+ warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+ warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
+ warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/RocketHideoutB2F.asm
@@ -1,0 +1,25 @@
+RocketHideoutB2F_Object:
+ db $2e ; border block
+
+ db 5 ; warps
+ warp 27, 8, 0, ROCKET_HIDEOUT_B1F
+ warp 21, 8, 0, ROCKET_HIDEOUT_B3F
+ warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
+ warp 21, 22, 3, ROCKET_HIDEOUT_B1F
+ warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
+ object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
+ object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
+ object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07
+ object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
+
+ ; warp-to
+ warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
+ warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F
+ warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+ warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
+ warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/RocketHideoutB3F.asm
@@ -1,0 +1,18 @@
+RocketHideoutB3F_Object:
+ db $2e ; border block
+
+ db 2 ; warps
+ warp 25, 6, 1, ROCKET_HIDEOUT_B2F
+ warp 19, 18, 0, ROCKET_HIDEOUT_B4F
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14
+ object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15
+ object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10
+ object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY
+
+ ; warp-to
+ warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F
+ warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F
--- /dev/null
+++ b/data/maps/objects/RocketHideoutB4F.asm
@@ -1,0 +1,25 @@
+RocketHideoutB4F_Object:
+ db $2e ; border block
+
+ db 3 ; warps
+ warp 19, 10, 1, ROCKET_HIDEOUT_B3F
+ warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR
+ warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR
+
+ db 0 ; signs
+
+ db 9 ; objects
+ object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1
+ object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16
+ object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17
+ object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18
+ object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP
+ object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02
+ object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON
+ object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE
+ object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
+
+ ; warp-to
+ warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F
+ warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+ warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
--- /dev/null
+++ b/data/maps/objects/RocketHideoutElevator.asm
@@ -1,0 +1,15 @@
+RocketHideoutElevator_Object:
+ db $f ; border block
+
+ db 2 ; warps
+ warp 2, 1, 2, ROCKET_HIDEOUT_B1F
+ warp 3, 1, 4, ROCKET_HIDEOUT_B1F
+
+ db 1 ; signs
+ sign 1, 1, 1 ; RocketHideoutElevatorText1
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F
+ warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F
--- /dev/null
+++ b/data/maps/objects/Route1.asm
@@ -1,0 +1,14 @@
+Route1_Object:
+ db $b ; border block
+
+ db 0 ; warps
+
+ db 1 ; signs
+ sign 9, 27, 3 ; Route1Text3
+
+ db 2 ; objects
+ object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person
+ object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person
+
+ ; warp-to (unused)
+ warp_to 2, 7, 4
--- /dev/null
+++ b/data/maps/objects/Route10.asm
@@ -1,0 +1,28 @@
+Route10_Object:
+ db $2c ; border block
+
+ db 4 ; warps
+ warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
+ warp 8, 17, 0, ROCK_TUNNEL_1F
+ warp 8, 53, 2, ROCK_TUNNEL_1F
+ warp 6, 39, 0, POWER_PLANT
+
+ db 4 ; signs
+ sign 7, 19, 7 ; Route10Text7
+ sign 12, 19, 8 ; PokeCenterSignText
+ sign 9, 55, 9 ; Route10Text9
+ sign 5, 41, 10 ; Route10Text10
+
+ db 6 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1
+ object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7
+ object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2
+ object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
+ object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8
+ object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
+
+ ; warp-to
+ warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER
+ warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F
+ warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F
+ warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT
--- /dev/null
+++ b/data/maps/objects/Route11.asm
@@ -1,0 +1,31 @@
+Route11_Object:
+ db $f ; border block
+
+ db 5 ; warps
+ warp 49, 8, 0, ROUTE_11_GATE_1F
+ warp 49, 9, 1, ROUTE_11_GATE_1F
+ warp 58, 8, 2, ROUTE_11_GATE_1F
+ warp 58, 9, 3, ROUTE_11_GATE_1F
+ warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11
+
+ db 1 ; signs
+ sign 1, 5, 11 ; Route11Text11
+
+ db 10 ; objects
+ object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1
+ object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2
+ object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9
+ object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2
+ object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10
+ object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3
+ object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4
+ object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11
+ object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3
+ object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12
+
+ ; warp-to
+ warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
+ warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
+ warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
+ warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
+ warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ROUTE_11
--- /dev/null
+++ b/data/maps/objects/Route11Gate1F.asm
@@ -1,0 +1,21 @@
+Route11Gate1F_Object:
+ db $a ; border block
+
+ db 5 ; warps
+ warp 0, 4, 0, -1
+ warp 0, 5, 1, -1
+ warp 7, 4, 2, -1
+ warp 7, 5, 3, -1
+ warp 6, 8, 0, ROUTE_11_GATE_2F
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH
+ warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH
+ warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH
+ warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH
+ warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F
--- /dev/null
+++ b/data/maps/objects/Route11Gate2F.asm
@@ -1,0 +1,16 @@
+Route11Gate2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 7, 4, ROUTE_11_GATE_1F
+
+ db 2 ; signs
+ sign 1, 2, 3 ; Route11GateUpstairsText3
+ sign 6, 2, 4 ; Route11GateUpstairsText4
+
+ db 2 ; objects
+ object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person
+ object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F
--- /dev/null
+++ b/data/maps/objects/Route12.asm
@@ -1,0 +1,30 @@
+Route12_Object:
+ db $43 ; border block
+
+ db 4 ; warps
+ warp 10, 15, 0, ROUTE_12_GATE_1F
+ warp 11, 15, 1, ROUTE_12_GATE_1F
+ warp 10, 21, 2, ROUTE_12_GATE_1F
+ warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE
+
+ db 2 ; signs
+ sign 13, 13, 11 ; Route12Text11
+ sign 11, 63, 12 ; Route12Text12
+
+ db 10 ; objects
+ object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person
+ object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3
+ object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4
+ object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9
+ object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2
+ object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
+ object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
+ object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
+ object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16
+ object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON
+
+ ; warp-to
+ warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
+ warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
+ warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
+ warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE
--- /dev/null
+++ b/data/maps/objects/Route12Gate1F.asm
@@ -1,0 +1,21 @@
+Route12Gate1F_Object:
+ db $a ; border block
+
+ db 5 ; warps
+ warp 4, 0, 0, -1
+ warp 5, 0, 1, -1
+ warp 4, 7, 2, -1
+ warp 5, 7, 2, -1
+ warp 8, 6, 0, ROUTE_12_GATE_2F
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 4, 0, ROUTE_12_GATE_1F_WIDTH
+ warp_to 5, 0, ROUTE_12_GATE_1F_WIDTH
+ warp_to 4, 7, ROUTE_12_GATE_1F_WIDTH
+ warp_to 5, 7, ROUTE_12_GATE_1F_WIDTH
+ warp_to 8, 6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F
--- /dev/null
+++ b/data/maps/objects/Route12Gate2F.asm
@@ -1,0 +1,15 @@
+Route12Gate2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 7, 4, ROUTE_12_GATE_1F
+
+ db 2 ; signs
+ sign 1, 2, 2 ; Route12GateUpstairsText2
+ sign 6, 2, 3 ; Route12GateUpstairsText3
+
+ db 1 ; objects
+ object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person
+
+ ; warp-to
+ warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F
--- /dev/null
+++ b/data/maps/objects/Route12SuperRodHouse.asm
@@ -1,0 +1,15 @@
+Route12SuperRodHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 3, -1
+ warp 3, 7, 3, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
+ warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route13.asm
@@ -1,0 +1,21 @@
+Route13_Object:
+ db $43 ; border block
+
+ db 0 ; warps
+
+ db 3 ; signs
+ sign 15, 13, 11 ; Route13Text11
+ sign 33, 5, 12 ; Route13Text12
+ sign 31, 11, 13 ; Route13Text13
+
+ db 10 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1
+ object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12
+ object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13
+ object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14
+ object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15
+ object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2
+ object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4
+ object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5
+ object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1
+ object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3
--- /dev/null
+++ b/data/maps/objects/Route14.asm
@@ -1,0 +1,19 @@
+Route14_Object:
+ db $43 ; border block
+
+ db 0 ; warps
+
+ db 1 ; signs
+ sign 17, 13, 11 ; Route14Text11
+
+ db 10 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14
+ object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15
+ object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16
+ object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17
+ object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4
+ object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5
+ object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13
+ object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14
+ object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15
+ object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2
--- /dev/null
+++ b/data/maps/objects/Route15.asm
@@ -1,0 +1,30 @@
+Route15_Object:
+ db $43 ; border block
+
+ db 4 ; warps
+ warp 7, 8, 0, ROUTE_15_GATE_1F
+ warp 7, 9, 1, ROUTE_15_GATE_1F
+ warp 14, 8, 2, ROUTE_15_GATE_1F
+ warp 14, 9, 3, ROUTE_15_GATE_1F
+
+ db 1 ; signs
+ sign 39, 9, 12 ; Route15Text12
+
+ db 11 ; objects
+ object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
+ object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21
+ object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6
+ object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7
+ object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9
+ object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10
+ object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3
+ object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4
+ object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
+ object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23
+ object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20
+
+ ; warp-to
+ warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
+ warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
+ warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
+ warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
--- /dev/null
+++ b/data/maps/objects/Route15Gate1F.asm
@@ -1,0 +1,21 @@
+Route15Gate1F_Object:
+ db $a ; border block
+
+ db 5 ; warps
+ warp 0, 4, 0, -1
+ warp 0, 5, 1, -1
+ warp 7, 4, 2, -1
+ warp 7, 5, 3, -1
+ warp 6, 8, 0, ROUTE_15_GATE_2F
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH
+ warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH
+ warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH
+ warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH
+ warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F
--- /dev/null
+++ b/data/maps/objects/Route15Gate2F.asm
@@ -1,0 +1,14 @@
+Route15Gate2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 7, 4, ROUTE_15_GATE_1F
+
+ db 1 ; signs
+ sign 6, 2, 2 ; Route15GateUpstairsText2
+
+ db 1 ; objects
+ object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1
+
+ ; warp-to
+ warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F
--- /dev/null
+++ b/data/maps/objects/Route16.asm
@@ -1,0 +1,37 @@
+Route16_Object:
+ db $f ; border block
+
+ db 9 ; warps
+ warp 17, 10, 0, ROUTE_16_GATE_1F
+ warp 17, 11, 1, ROUTE_16_GATE_1F
+ warp 24, 10, 2, ROUTE_16_GATE_1F
+ warp 24, 11, 3, ROUTE_16_GATE_1F
+ warp 17, 4, 4, ROUTE_16_GATE_1F
+ warp 17, 5, 5, ROUTE_16_GATE_1F
+ warp 24, 4, 6, ROUTE_16_GATE_1F
+ warp 24, 5, 7, ROUTE_16_GATE_1F
+ warp 7, 5, 0, ROUTE_16_FLY_HOUSE
+
+ db 2 ; signs
+ sign 27, 11, 8 ; Route16Text8
+ sign 5, 17, 9 ; Route16Text9
+
+ db 7 ; objects
+ object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5
+ object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1
+ object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2
+ object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6
+ object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3
+ object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7
+ object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person
+
+ ; warp-to
+ warp_to 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE
--- /dev/null
+++ b/data/maps/objects/Route16FlyHouse.asm
@@ -1,0 +1,16 @@
+Route16FlyHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 8, -1
+ warp 3, 7, 8, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH
+ warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route16Gate1F.asm
@@ -1,0 +1,30 @@
+Route16Gate1F_Object:
+ db $a ; border block
+
+ db 9 ; warps
+ warp 0, 8, 0, -1
+ warp 0, 9, 1, -1
+ warp 7, 8, 2, -1
+ warp 7, 9, 2, -1
+ warp 0, 2, 4, -1
+ warp 0, 3, 5, -1
+ warp 7, 2, 6, -1
+ warp 7, 3, 7, -1
+ warp 6, 12, 0, ROUTE_16_GATE_2F
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person
+ object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 0, 8, ROUTE_16_GATE_1F_WIDTH
+ warp_to 0, 9, ROUTE_16_GATE_1F_WIDTH
+ warp_to 7, 8, ROUTE_16_GATE_1F_WIDTH
+ warp_to 7, 9, ROUTE_16_GATE_1F_WIDTH
+ warp_to 0, 2, ROUTE_16_GATE_1F_WIDTH
+ warp_to 0, 3, ROUTE_16_GATE_1F_WIDTH
+ warp_to 7, 2, ROUTE_16_GATE_1F_WIDTH
+ warp_to 7, 3, ROUTE_16_GATE_1F_WIDTH
+ warp_to 6, 12, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F
--- /dev/null
+++ b/data/maps/objects/Route16Gate2F.asm
@@ -1,0 +1,16 @@
+Route16Gate2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 7, 8, ROUTE_16_GATE_1F
+
+ db 2 ; signs
+ sign 1, 2, 3 ; Route16GateUpstairsText3
+ sign 6, 2, 4 ; Route16GateUpstairsText4
+
+ db 2 ; objects
+ object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person
+ object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person
+
+ ; warp-to
+ warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F
--- /dev/null
+++ b/data/maps/objects/Route17.asm
@@ -1,0 +1,24 @@
+Route17_Object:
+ db $43 ; border block
+
+ db 0 ; warps
+
+ db 6 ; signs
+ sign 9, 51, 11 ; Route17Text11
+ sign 9, 63, 12 ; Route17Text12
+ sign 9, 75, 13 ; Route17Text13
+ sign 9, 87, 14 ; Route17Text14
+ sign 9, 111, 15 ; Route17Text15
+ sign 9, 141, 16 ; Route17Text16
+
+ db 10 ; objects
+ object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4
+ object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5
+ object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8
+ object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9
+ object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10
+ object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6
+ object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7
+ object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8
+ object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11
+ object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12
--- /dev/null
+++ b/data/maps/objects/Route18.asm
@@ -1,0 +1,23 @@
+Route18_Object:
+ db $43 ; border block
+
+ db 4 ; warps
+ warp 33, 8, 0, ROUTE_18_GATE_1F
+ warp 33, 9, 1, ROUTE_18_GATE_1F
+ warp 40, 8, 2, ROUTE_18_GATE_1F
+ warp 40, 9, 3, ROUTE_18_GATE_1F
+
+ db 2 ; signs
+ sign 43, 7, 4 ; Route18Text4
+ sign 33, 5, 5 ; Route18Text5
+
+ db 3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
+ object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
+ object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10
+
+ ; warp-to
+ warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
+ warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
+ warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
+ warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
--- /dev/null
+++ b/data/maps/objects/Route18Gate1F.asm
@@ -1,0 +1,21 @@
+Route18Gate1F_Object:
+ db $a ; border block
+
+ db 5 ; warps
+ warp 0, 4, 0, -1
+ warp 0, 5, 1, -1
+ warp 7, 4, 2, -1
+ warp 7, 5, 3, -1
+ warp 6, 8, 0, ROUTE_18_GATE_2F
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person
+
+ ; warp-to
+ warp_to 0, 4, ROUTE_18_GATE_1F_WIDTH
+ warp_to 0, 5, ROUTE_18_GATE_1F_WIDTH
+ warp_to 7, 4, ROUTE_18_GATE_1F_WIDTH
+ warp_to 7, 5, ROUTE_18_GATE_1F_WIDTH
+ warp_to 6, 8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F
--- /dev/null
+++ b/data/maps/objects/Route18Gate2F.asm
@@ -1,0 +1,15 @@
+Route18Gate2F_Object:
+ db $a ; border block
+
+ db 1 ; warps
+ warp 7, 7, 4, ROUTE_18_GATE_1F
+
+ db 2 ; signs
+ sign 1, 2, 2 ; Route18GateUpstairsText2
+ sign 6, 2, 3 ; Route18GateUpstairsText3
+
+ db 1 ; objects
+ object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person
+
+ ; warp-to
+ warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F
--- /dev/null
+++ b/data/maps/objects/Route19.asm
@@ -1,0 +1,21 @@
+Route19_Object:
+ db $43 ; border block
+
+ db 0 ; warps
+
+ db 1 ; signs
+ sign 11, 9, 11 ; Route19Text11
+
+ db 10 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2
+ object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3
+ object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4
+ object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5
+ object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6
+ object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7
+ object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12
+ object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13
+ object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8
+ object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14
+
+ ; warp-to
--- /dev/null
+++ b/data/maps/objects/Route2.asm
@@ -1,0 +1,33 @@
+Route2_Object:
+ db $f ; border block
+
+ db 6 ; warps
+ warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2
+ warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE
+ warp 15, 19, 0, ROUTE_2_TRADE_HOUSE
+ warp 16, 35, 1, ROUTE_2_GATE
+ warp 15, 39, 2, ROUTE_2_GATE
+ warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE
+
+ db 2 ; signs
+ sign 5, 65, 3 ; Route2Text3
+ sign 11, 11, 4 ; Route2Text4
+
+ db 2 ; objects
+ object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE
+ object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP
+
+ ; warp-to
+ warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2
+ warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+ warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE
+ warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE
+ warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE
+ warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+
+ ; unused
+ warp_to 2, 7, 4
+ db $12, $c7, $9, $7
+ warp_to 2, 7, 4
+ warp_to 2, 7, 4
+ warp_to 2, 7, 4
--- /dev/null
+++ b/data/maps/objects/Route20.asm
@@ -1,0 +1,26 @@
+Route20_Object:
+ db $43 ; border block
+
+ db 2 ; warps
+ warp 48, 5, 0, SEAFOAM_ISLANDS_1F
+ warp 58, 9, 2, SEAFOAM_ISLANDS_1F
+
+ db 2 ; signs
+ sign 51, 7, 11 ; Route20Text11
+ sign 57, 11, 12 ; Route20Text12
+
+ db 10 ; objects
+ object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9
+ object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15
+ object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6
+ object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
+ object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10
+ object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11
+ object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11
+ object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7
+ object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
+ object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8
+
+ ; warp-to
+ warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F
+ warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F
--- /dev/null
+++ b/data/maps/objects/Route21.asm
@@ -1,0 +1,17 @@
+Route21_Object:
+ db $43 ; border block
+
+ db 0 ; warps
+
+ db 0 ; signs
+
+ db 9 ; objects
+ object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7
+ object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9
+ object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12
+ object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9
+ object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13
+ object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14
+ object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15
+ object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8
+ object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10
--- /dev/null
+++ b/data/maps/objects/Route22.asm
@@ -1,0 +1,15 @@
+Route22_Object:
+ db $2c ; border block
+
+ db 1 ; warps
+ warp 8, 5, 0, ROUTE_22_GATE
+
+ db 1 ; signs
+ sign 7, 11, 3 ; Route22FrontGateText
+
+ db 2 ; objects
+ object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person
+ object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE
--- /dev/null
+++ b/data/maps/objects/Route22Gate.asm
@@ -1,0 +1,19 @@
+Route22Gate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 4, 7, 0, -1
+ warp 5, 7, 0, -1
+ warp 4, 0, 0, -1
+ warp 5, 0, 1, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person
+
+ ; warp-to
+ warp_to 4, 7, ROUTE_22_GATE_WIDTH
+ warp_to 5, 7, ROUTE_22_GATE_WIDTH
+ warp_to 4, 0, ROUTE_22_GATE_WIDTH
+ warp_to 5, 0, ROUTE_22_GATE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route23.asm
@@ -1,0 +1,26 @@
+Route23_Object:
+ db $f ; border block
+
+ db 4 ; warps
+ warp 7, 139, 2, ROUTE_22_GATE
+ warp 8, 139, 3, ROUTE_22_GATE
+ warp 4, 31, 0, VICTORY_ROAD_1F
+ warp 14, 31, 1, VICTORY_ROAD_2F
+
+ db 1 ; signs
+ sign 3, 33, 8 ; Route23Text8
+
+ db 7 ; objects
+ object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person
+ object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person
+ object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person
+ object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person
+ object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person
+ object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person
+ object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person
+
+ ; warp-to
+ warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
+ warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
+ warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F
+ warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F
--- /dev/null
+++ b/data/maps/objects/Route24.asm
@@ -1,0 +1,16 @@
+Route24_Object:
+ db $2c ; border block
+
+ db 0 ; warps
+
+ db 0 ; signs
+
+ db 8 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6
+ object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2
+ object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3
+ object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7
+ object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4
+ object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8
+ object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
+ object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45
--- /dev/null
+++ b/data/maps/objects/Route25.asm
@@ -1,0 +1,23 @@
+Route25_Object:
+ db $2c ; border block
+
+ db 1 ; warps
+ warp 45, 3, 0, BILLS_HOUSE
+
+ db 1 ; signs
+ sign 43, 3, 11 ; Route25Text11
+
+ db 10 ; objects
+ object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
+ object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6
+ object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
+ object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9
+ object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7
+ object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10
+ object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2
+ object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3
+ object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4
+ object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19
+
+ ; warp-to
+ warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE
--- /dev/null
+++ b/data/maps/objects/Route2Gate.asm
@@ -1,0 +1,20 @@
+Route2Gate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 4, 0, 3, -1
+ warp 5, 0, 3, -1
+ warp 4, 7, 4, -1
+ warp 5, 7, 4, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person
+ object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person
+
+ ; warp-to
+ warp_to 4, 0, ROUTE_2_GATE_WIDTH
+ warp_to 5, 0, ROUTE_2_GATE_WIDTH
+ warp_to 4, 7, ROUTE_2_GATE_WIDTH
+ warp_to 5, 7, ROUTE_2_GATE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route2TradeHouse.asm
@@ -1,0 +1,16 @@
+Route2TradeHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 2, -1
+ warp 3, 7, 2, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person
+ object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH
+ warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route3.asm
@@ -1,0 +1,18 @@
+Route3_Object:
+ db $2c ; border block
+
+ db 0 ; warps
+
+ db 1 ; signs
+ sign 59, 9, 10 ; Route3Text10
+
+ db 9 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person
+ object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4
+ object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1
+ object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1
+ object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5
+ object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2
+ object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2
+ object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6
+ object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3
--- /dev/null
+++ b/data/maps/objects/Route4.asm
@@ -1,0 +1,22 @@
+Route4_Object:
+ db $2c ; border block
+
+ db 3 ; warps
+ warp 11, 5, 0, MT_MOON_POKECENTER
+ warp 18, 5, 0, MT_MOON_1F
+ warp 24, 5, 7, MT_MOON_B1F
+
+ db 3 ; signs
+ sign 12, 5, 4 ; PokeCenterSignText
+ sign 17, 7, 5 ; Route4Text5
+ sign 27, 7, 6 ; Route4Text6
+
+ db 3 ; objects
+ object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person
+ object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4
+ object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_04
+
+ ; warp-to
+ warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER
+ warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F
+ warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F
--- /dev/null
+++ b/data/maps/objects/Route5.asm
@@ -1,0 +1,21 @@
+Route5_Object:
+ db $a ; border block
+
+ db 5 ; warps
+ warp 10, 29, 3, ROUTE_5_GATE
+ warp 9, 29, 2, ROUTE_5_GATE
+ warp 10, 33, 0, ROUTE_5_GATE
+ warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5
+ warp 10, 21, 0, DAYCARE
+
+ db 1 ; signs
+ sign 17, 29, 1 ; Route5Text1
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5
+ warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE
--- /dev/null
+++ b/data/maps/objects/Route5Gate.asm
@@ -1,0 +1,19 @@
+Route5Gate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 3, 5, 2, -1
+ warp 4, 5, 2, -1
+ warp 3, 0, 1, -1
+ warp 4, 0, 0, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person
+
+ ; warp-to
+ warp_to 3, 5, ROUTE_5_GATE_WIDTH
+ warp_to 4, 5, ROUTE_5_GATE_WIDTH
+ warp_to 3, 0, ROUTE_5_GATE_WIDTH
+ warp_to 4, 0, ROUTE_5_GATE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route6.asm
@@ -1,0 +1,25 @@
+Route6_Object:
+ db $f ; border block
+
+ db 4 ; warps
+ warp 9, 1, 2, ROUTE_6_GATE
+ warp 10, 1, 2, ROUTE_6_GATE
+ warp 10, 7, 0, ROUTE_6_GATE
+ warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6
+
+ db 1 ; signs
+ sign 19, 15, 7 ; Route6Text7
+
+ db 6 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4
+ object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2
+ object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10
+ object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5
+ object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3
+ object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11
+
+ ; warp-to
+ warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE
+ warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE
+ warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE
+ warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6
--- /dev/null
+++ b/data/maps/objects/Route6Gate.asm
@@ -1,0 +1,19 @@
+Route6Gate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 3, 5, 2, -1
+ warp 4, 5, 2, -1
+ warp 3, 0, 1, -1
+ warp 4, 0, 1, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person
+
+ ; warp-to
+ warp_to 3, 5, ROUTE_6_GATE_WIDTH
+ warp_to 4, 5, ROUTE_6_GATE_WIDTH
+ warp_to 3, 0, ROUTE_6_GATE_WIDTH
+ warp_to 4, 0, ROUTE_6_GATE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route7.asm
@@ -1,0 +1,21 @@
+Route7_Object:
+ db $f ; border block
+
+ db 5 ; warps
+ warp 18, 9, 2, ROUTE_7_GATE
+ warp 18, 10, 3, ROUTE_7_GATE
+ warp 11, 9, 0, ROUTE_7_GATE
+ warp 11, 10, 1, ROUTE_7_GATE
+ warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7
+
+ db 1 ; signs
+ sign 3, 13, 1 ; Route7Text1
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE
+ warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
+ warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE
+ warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
+ warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7
--- /dev/null
+++ b/data/maps/objects/Route7Gate.asm
@@ -1,0 +1,19 @@
+Route7Gate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 0, 3, 3, -1
+ warp 0, 4, 3, -1
+ warp 5, 3, 0, -1
+ warp 5, 4, 1, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person
+
+ ; warp-to
+ warp_to 0, 3, ROUTE_7_GATE_WIDTH
+ warp_to 0, 4, ROUTE_7_GATE_WIDTH
+ warp_to 5, 3, ROUTE_7_GATE_WIDTH
+ warp_to 5, 4, ROUTE_7_GATE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route8.asm
@@ -1,0 +1,30 @@
+Route8_Object:
+ db $2c ; border block
+
+ db 5 ; warps
+ warp 1, 9, 0, ROUTE_8_GATE
+ warp 1, 10, 1, ROUTE_8_GATE
+ warp 8, 9, 2, ROUTE_8_GATE
+ warp 8, 10, 3, ROUTE_8_GATE
+ warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8
+
+ db 1 ; signs
+ sign 17, 3, 10 ; Route8Text10
+
+ db 9 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3
+ object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5
+ object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4
+ object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13
+ object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5
+ object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14
+ object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15
+ object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7
+ object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16
+
+ ; warp-to
+ warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE
+ warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE
+ warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE
+ warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE
+ warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8
--- /dev/null
+++ b/data/maps/objects/Route8Gate.asm
@@ -1,0 +1,19 @@
+Route8Gate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 0, 3, 0, -1
+ warp 0, 4, 1, -1
+ warp 5, 3, 2, -1
+ warp 5, 4, 3, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person
+
+ ; warp-to
+ warp_to 0, 3, ROUTE_8_GATE_WIDTH
+ warp_to 0, 4, ROUTE_8_GATE_WIDTH
+ warp_to 5, 3, ROUTE_8_GATE_WIDTH
+ warp_to 5, 4, ROUTE_8_GATE_WIDTH
--- /dev/null
+++ b/data/maps/objects/Route9.asm
@@ -1,0 +1,19 @@
+Route9_Object:
+ db $2c ; border block
+
+ db 0 ; warps
+
+ db 1 ; signs
+ sign 25, 7, 11 ; Route9Text11
+
+ db 10 ; objects
+ object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
+ object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
+ object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
+ object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
+ object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11
+ object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6
+ object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
+ object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5
+ object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
+ object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_30
--- /dev/null
+++ b/data/maps/objects/SSAnne1F.asm
@@ -1,0 +1,34 @@
+SSAnne1F_Object:
+ db $c ; border block
+
+ db 11 ; warps
+ warp 26, 0, 1, VERMILION_DOCK
+ warp 27, 0, 1, VERMILION_DOCK
+ warp 31, 8, 0, SS_ANNE_1F_ROOMS
+ warp 23, 8, 1, SS_ANNE_1F_ROOMS
+ warp 19, 8, 2, SS_ANNE_1F_ROOMS
+ warp 15, 8, 3, SS_ANNE_1F_ROOMS
+ warp 11, 8, 4, SS_ANNE_1F_ROOMS
+ warp 7, 8, 5, SS_ANNE_1F_ROOMS
+ warp 2, 6, 6, SS_ANNE_2F
+ warp 37, 15, 5, SS_ANNE_B1F
+ warp 3, 16, 0, SS_ANNE_KITCHEN
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
+ object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
+ warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
+ warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+ warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+ warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+ warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+ warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+ warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+ warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F
+ warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F
+ warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN
--- /dev/null
+++ b/data/maps/objects/SSAnne1FRooms.asm
@@ -1,0 +1,33 @@
+SSAnne1FRooms_Object:
+ db $c ; border block
+
+ db 6 ; warps
+ warp 0, 0, 2, SS_ANNE_1F
+ warp 10, 0, 3, SS_ANNE_1F
+ warp 20, 0, 4, SS_ANNE_1F
+ warp 0, 10, 5, SS_ANNE_1F
+ warp 10, 10, 6, SS_ANNE_1F
+ warp 20, 10, 7, SS_ANNE_1F
+
+ db 0 ; signs
+
+ db 11 ; objects
+ object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1
+ object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2
+ object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8
+ object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11
+ object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person
+ object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person
+ object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person
+ object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person
+ object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person
+ object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08
+ object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person
+
+ ; warp-to
+ warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+ warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+ warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+ warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+ warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+ warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
--- /dev/null
+++ b/data/maps/objects/SSAnne2F.asm
@@ -1,0 +1,30 @@
+SSAnne2F_Object:
+ db $c ; border block
+
+ db 9 ; warps
+ warp 9, 11, 0, SS_ANNE_2F_ROOMS
+ warp 13, 11, 2, SS_ANNE_2F_ROOMS
+ warp 17, 11, 4, SS_ANNE_2F_ROOMS
+ warp 21, 11, 6, SS_ANNE_2F_ROOMS
+ warp 25, 11, 8, SS_ANNE_2F_ROOMS
+ warp 29, 11, 10, SS_ANNE_2F_ROOMS
+ warp 2, 4, 8, SS_ANNE_1F
+ warp 2, 12, 1, SS_ANNE_3F
+ warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
+ object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
+
+ ; warp-to
+ warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+ warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+ warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+ warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+ warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+ warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+ warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F
+ warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F
+ warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM
--- /dev/null
+++ b/data/maps/objects/SSAnne2FRooms.asm
@@ -1,0 +1,47 @@
+SSAnne2FRooms_Object:
+ db $c ; border block
+
+ db 12 ; warps
+ warp 2, 5, 0, SS_ANNE_2F
+ warp 3, 5, 0, SS_ANNE_2F
+ warp 12, 5, 1, SS_ANNE_2F
+ warp 13, 5, 1, SS_ANNE_2F
+ warp 22, 5, 2, SS_ANNE_2F
+ warp 23, 5, 2, SS_ANNE_2F
+ warp 2, 15, 3, SS_ANNE_2F
+ warp 3, 15, 3, SS_ANNE_2F
+ warp 12, 15, 4, SS_ANNE_2F
+ warp 13, 15, 4, SS_ANNE_2F
+ warp 22, 15, 5, SS_ANNE_2F
+ warp 23, 15, 5, SS_ANNE_2F
+
+ db 0 ; signs
+
+ db 13 ; objects
+ object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
+ object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
+ object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
+ object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
+ object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person
+ object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
+ object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person
+ object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person
+ object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
+ object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person
+ object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person
+ object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person
+ object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person
+
+ ; warp-to
+ warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+ warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
--- /dev/null
+++ b/data/maps/objects/SSAnne3F.asm
@@ -1,0 +1,15 @@
+SSAnne3F_Object:
+ db $c ; border block
+
+ db 2 ; warps
+ warp 0, 3, 0, SS_ANNE_BOW
+ warp 19, 3, 7, SS_ANNE_2F
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person
+
+ ; warp-to
+ warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW
+ warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F
--- /dev/null
+++ b/data/maps/objects/SSAnneB1F.asm
@@ -1,0 +1,22 @@
+SSAnneB1F_Object:
+ db $c ; border block
+
+ db 6 ; warps
+ warp 23, 3, 8, SS_ANNE_B1F_ROOMS
+ warp 19, 3, 6, SS_ANNE_B1F_ROOMS
+ warp 15, 3, 4, SS_ANNE_B1F_ROOMS
+ warp 11, 3, 2, SS_ANNE_B1F_ROOMS
+ warp 7, 3, 0, SS_ANNE_B1F_ROOMS
+ warp 27, 5, 9, SS_ANNE_1F
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+ warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F
--- /dev/null
+++ b/data/maps/objects/SSAnneB1FRooms.asm
@@ -1,0 +1,41 @@
+SSAnneB1FRooms_Object:
+ db $c ; border block
+
+ db 10 ; warps
+ warp 2, 5, 4, SS_ANNE_B1F
+ warp 3, 5, 4, SS_ANNE_B1F
+ warp 12, 5, 3, SS_ANNE_B1F
+ warp 13, 5, 3, SS_ANNE_B1F
+ warp 22, 5, 2, SS_ANNE_B1F
+ warp 23, 5, 2, SS_ANNE_B1F
+ warp 2, 15, 1, SS_ANNE_B1F
+ warp 3, 15, 1, SS_ANNE_B1F
+ warp 12, 15, 0, SS_ANNE_B1F
+ warp 13, 15, 0, SS_ANNE_B1F
+
+ db 0 ; signs
+
+ db 11 ; objects
+ object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
+ object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
+ object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
+ object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
+ object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
+ object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
+ object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
+ object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
+ object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
+ object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44
+ object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
+
+ ; warp-to
+ warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+ warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
--- /dev/null
+++ b/data/maps/objects/SSAnneBow.asm
@@ -1,0 +1,19 @@
+SSAnneBow_Object:
+ db $23 ; border block
+
+ db 2 ; warps
+ warp 13, 6, 0, SS_ANNE_3F
+ warp 13, 7, 0, SS_ANNE_3F
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person
+ object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person
+ object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1
+ object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2
+
+ ; warp-to
+ warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
+ warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
--- /dev/null
+++ b/data/maps/objects/SSAnneCaptainsRoom.asm
@@ -1,0 +1,15 @@
+SSAnneCaptainsRoom_Object:
+ db $c ; border block
+
+ db 1 ; warps
+ warp 0, 7, 8, SS_ANNE_2F
+
+ db 2 ; signs
+ sign 4, 1, 2 ; SSAnne7Text2
+ sign 1, 2, 3 ; SSAnne7Text3
+
+ db 1 ; objects
+ object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person
+
+ ; warp-to
+ warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F
--- /dev/null
+++ b/data/maps/objects/SSAnneKitchen.asm
@@ -1,0 +1,19 @@
+SSAnneKitchen_Object:
+ db $c ; border block
+
+ db 1 ; warps
+ warp 6, 0, 10, SS_ANNE_1F
+
+ db 0 ; signs
+
+ db 7 ; objects
+ object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person
+ object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person
+ object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person
+ object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person
+ object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person
+ object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person
+ object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person
+
+ ; warp-to
+ warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F
--- /dev/null
+++ b/data/maps/objects/SafariZoneCenter.asm
@@ -1,0 +1,31 @@
+SafariZoneCenter_Object:
+ db $0 ; border block
+
+ db 9 ; warps
+ warp 14, 25, 2, SAFARI_ZONE_GATE
+ warp 15, 25, 3, SAFARI_ZONE_GATE
+ warp 0, 10, 4, SAFARI_ZONE_WEST
+ warp 0, 11, 5, SAFARI_ZONE_WEST
+ warp 14, 0, 4, SAFARI_ZONE_NORTH
+ warp 15, 0, 5, SAFARI_ZONE_NORTH
+ warp 29, 10, 2, SAFARI_ZONE_EAST
+ warp 29, 11, 3, SAFARI_ZONE_EAST
+ warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE
+
+ db 2 ; signs
+ sign 18, 20, 2 ; SafariZoneCenterText2
+ sign 14, 22, 3 ; SafariZoneCenterText3
+
+ db 1 ; objects
+ object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET
+
+ ; warp-to
+ warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE
+ warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE
+ warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_CENTER_REST_HOUSE
--- /dev/null
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
@@ -1,0 +1,16 @@
+SafariZoneCenterRestHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 8, SAFARI_ZONE_CENTER
+ warp 3, 7, 8, SAFARI_ZONE_CENTER
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
--- /dev/null
+++ b/data/maps/objects/SafariZoneEast.asm
@@ -1,0 +1,27 @@
+SafariZoneEast_Object:
+ db $0 ; border block
+
+ db 5 ; warps
+ warp 0, 4, 6, SAFARI_ZONE_NORTH
+ warp 0, 5, 7, SAFARI_ZONE_NORTH
+ warp 0, 22, 6, SAFARI_ZONE_CENTER
+ warp 0, 23, 6, SAFARI_ZONE_CENTER
+ warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE
+
+ db 3 ; signs
+ sign 26, 10, 5 ; SafariZoneEastText5
+ sign 6, 4, 6 ; SafariZoneEastText6
+ sign 5, 23, 7 ; SafariZoneEastText7
+
+ db 4 ; objects
+ object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
+ object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION
+ object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS
+ object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_37
+
+ ; warp-to
+ warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_EAST_REST_HOUSE
--- /dev/null
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
@@ -1,0 +1,17 @@
+SafariZoneEastRestHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 4, SAFARI_ZONE_EAST
+ warp 3, 7, 4, SAFARI_ZONE_EAST
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person
+ object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
--- /dev/null
+++ b/data/maps/objects/SafariZoneGate.asm
@@ -1,0 +1,20 @@
+SafariZoneGate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 3, 5, 4, -1
+ warp 4, 5, 4, -1
+ warp 3, 0, 0, SAFARI_ZONE_CENTER
+ warp 4, 0, 1, SAFARI_ZONE_CENTER
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person
+ object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person
+
+ ; warp-to
+ warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH
+ warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH
+ warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
--- /dev/null
+++ b/data/maps/objects/SafariZoneNorth.asm
@@ -1,0 +1,35 @@
+SafariZoneNorth_Object:
+ db $0 ; border block
+
+ db 9 ; warps
+ warp 2, 35, 0, SAFARI_ZONE_WEST
+ warp 3, 35, 1, SAFARI_ZONE_WEST
+ warp 8, 35, 2, SAFARI_ZONE_WEST
+ warp 9, 35, 3, SAFARI_ZONE_WEST
+ warp 20, 35, 4, SAFARI_ZONE_CENTER
+ warp 21, 35, 5, SAFARI_ZONE_CENTER
+ warp 39, 30, 0, SAFARI_ZONE_EAST
+ warp 39, 31, 1, SAFARI_ZONE_EAST
+ warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE
+
+ db 5 ; signs
+ sign 36, 4, 3 ; SafariZoneNorthText3
+ sign 4, 25, 4 ; SafariZoneNorthText4
+ sign 13, 31, 5 ; SafariZoneNorthText5
+ sign 19, 33, 6 ; SafariZoneNorthText6
+ sign 26, 28, 7 ; SafariZoneNorthText7
+
+ db 2 ; objects
+ object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN
+ object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40
+
+ ; warp-to
+ warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE
--- /dev/null
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
@@ -1,0 +1,17 @@
+SafariZoneNorthRestHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 8, SAFARI_ZONE_NORTH
+ warp 3, 7, 8, SAFARI_ZONE_NORTH
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person
+ object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person
+ object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
--- /dev/null
+++ b/data/maps/objects/SafariZoneSecretHouse.asm
@@ -1,0 +1,15 @@
+SafariZoneSecretHouse_Object:
+ db $17 ; border block
+
+ db 2 ; warps
+ warp 2, 7, 6, SAFARI_ZONE_WEST
+ warp 3, 7, 6, SAFARI_ZONE_WEST
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST
--- /dev/null
+++ b/data/maps/objects/SafariZoneWest.asm
@@ -1,0 +1,34 @@
+SafariZoneWest_Object:
+ db $0 ; border block
+
+ db 8 ; warps
+ warp 20, 0, 0, SAFARI_ZONE_NORTH
+ warp 21, 0, 1, SAFARI_ZONE_NORTH
+ warp 26, 0, 2, SAFARI_ZONE_NORTH
+ warp 27, 0, 3, SAFARI_ZONE_NORTH
+ warp 29, 22, 2, SAFARI_ZONE_CENTER
+ warp 29, 23, 3, SAFARI_ZONE_CENTER
+ warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE
+ warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE
+
+ db 4 ; signs
+ sign 12, 12, 5 ; SafariZoneWestText5
+ sign 17, 3, 6 ; SafariZoneWestText6
+ sign 26, 4, 7 ; SafariZoneWestText7
+ sign 24, 22, 8 ; SafariZoneWestText8
+
+ db 4 ; objects
+ object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION
+ object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_32
+ object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE
+ object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH
+
+ ; warp-to
+ warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE
+ warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE
--- /dev/null
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -1,0 +1,17 @@
+SafariZoneWestRestHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 7, SAFARI_ZONE_WEST
+ warp 3, 7, 7, SAFARI_ZONE_WEST
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person
+ object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
--- /dev/null
+++ b/data/maps/objects/SaffronCity.asm
@@ -1,0 +1,51 @@
+SaffronCity_Object:
+ db $f ; border block
+
+ db 8 ; warps
+ warp 7, 5, 0, COPYCATS_HOUSE_1F
+ warp 26, 3, 0, FIGHTING_DOJO
+ warp 34, 3, 0, SAFFRON_GYM
+ warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE
+ warp 25, 11, 0, SAFFRON_MART
+ warp 18, 21, 0, SILPH_CO_1F
+ warp 9, 29, 0, SAFFRON_POKECENTER
+ warp 29, 29, 0, MR_PSYCHICS_HOUSE
+
+ db 10 ; signs
+ sign 17, 5, 16 ; SaffronCityText16
+ sign 27, 5, 17 ; SaffronCityText17
+ sign 35, 5, 18 ; SaffronCityText18
+ sign 26, 11, 19 ; MartSignText
+ sign 39, 19, 20 ; SaffronCityText20
+ sign 5, 21, 21 ; SaffronCityText21
+ sign 15, 21, 22 ; SaffronCityText22
+ sign 10, 29, 23 ; PokeCenterSignText
+ sign 27, 29, 24 ; SaffronCityText24
+ sign 1, 19, 25 ; SaffronCityText25
+
+ db 15 ; objects
+ object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person
+ object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person
+ object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person
+ object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person
+ object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person
+ object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person
+ object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person
+ object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person
+ object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person
+ object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person
+ object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person
+ object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person
+ object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person
+ object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person
+ object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person
+
+ ; warp-to
+ warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F
+ warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO
+ warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM
+ warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE
+ warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART
+ warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F
+ warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER
+ warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE
--- /dev/null
+++ b/data/maps/objects/SaffronGym.asm
@@ -1,0 +1,83 @@
+SaffronGym_Object:
+ db $2e ; border block
+
+ db 32 ; warps
+ warp 8, 17, 2, -1
+ warp 9, 17, 2, -1
+ warp 1, 3, 22, SAFFRON_GYM
+ warp 5, 3, 15, SAFFRON_GYM
+ warp 1, 5, 18, SAFFRON_GYM
+ warp 5, 5, 8, SAFFRON_GYM
+ warp 1, 9, 27, SAFFRON_GYM
+ warp 5, 9, 16, SAFFRON_GYM
+ warp 1, 11, 5, SAFFRON_GYM
+ warp 5, 11, 13, SAFFRON_GYM
+ warp 1, 15, 23, SAFFRON_GYM
+ warp 5, 15, 30, SAFFRON_GYM
+ warp 1, 17, 17, SAFFRON_GYM
+ warp 5, 17, 9, SAFFRON_GYM
+ warp 9, 3, 26, SAFFRON_GYM
+ warp 11, 3, 3, SAFFRON_GYM
+ warp 9, 5, 7, SAFFRON_GYM
+ warp 11, 5, 12, SAFFRON_GYM
+ warp 11, 11, 4, SAFFRON_GYM
+ warp 11, 15, 31, SAFFRON_GYM
+ warp 15, 3, 24, SAFFRON_GYM
+ warp 19, 3, 28, SAFFRON_GYM
+ warp 15, 5, 2, SAFFRON_GYM
+ warp 19, 5, 10, SAFFRON_GYM
+ warp 15, 9, 20, SAFFRON_GYM
+ warp 19, 9, 29, SAFFRON_GYM
+ warp 15, 11, 14, SAFFRON_GYM
+ warp 19, 11, 6, SAFFRON_GYM
+ warp 15, 15, 21, SAFFRON_GYM
+ warp 19, 15, 25, SAFFRON_GYM
+ warp 15, 17, 11, SAFFRON_GYM
+ warp 19, 17, 19, SAFFRON_GYM
+
+ db 0 ; signs
+
+ db 9 ; objects
+ object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1
+ object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22
+ object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1
+ object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23
+ object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2
+ object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24
+ object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3
+ object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4
+ object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person
+
+ ; warp-to
+ warp_to 8, 17, SAFFRON_GYM_WIDTH
+ warp_to 9, 17, SAFFRON_GYM_WIDTH
+ warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
+ warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM
--- /dev/null
+++ b/data/maps/objects/SaffronMart.asm
@@ -1,0 +1,17 @@
+SaffronMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 4, -1
+ warp 4, 7, 4, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, SAFFRON_MART_WIDTH
+ warp_to 4, 7, SAFFRON_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
@@ -1,0 +1,18 @@
+SaffronPidgeyHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 3, -1
+ warp 3, 7, 3, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person
+ object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person
+ object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person
+
+ ; warp-to
+ warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
+ warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/SaffronPokecenter.asm
@@ -1,0 +1,18 @@
+SaffronPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 6, -1
+ warp 4, 7, 6, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person
+ object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, SAFFRON_POKECENTER_WIDTH
+ warp_to 4, 7, SAFFRON_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/SeafoamIslands1F.asm
@@ -1,0 +1,30 @@
+SeafoamIslands1F_Object:
+ db $7d ; border block
+
+ db 7 ; warps
+ warp 4, 17, 0, -1
+ warp 5, 17, 0, -1
+ warp 26, 17, 1, -1
+ warp 27, 17, 1, -1
+ warp 7, 5, 1, SEAFOAM_ISLANDS_B1F
+ warp 25, 3, 6, SEAFOAM_ISLANDS_B1F
+ warp 23, 15, 4, SEAFOAM_ISLANDS_B1F
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+ object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+ ; warp-to
+ warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH
+ warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH
+ warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH
+ warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH
+ warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+ warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+ warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+
+ ; holes
+ warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH
+ warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH
--- /dev/null
+++ b/data/maps/objects/SeafoamIslandsB1F.asm
@@ -1,0 +1,26 @@
+SeafoamIslandsB1F_Object:
+ db $7d ; border block
+
+ db 7 ; warps
+ warp 4, 2, 0, SEAFOAM_ISLANDS_B2F
+ warp 7, 5, 4, SEAFOAM_ISLANDS_1F
+ warp 13, 7, 2, SEAFOAM_ISLANDS_B2F
+ warp 19, 15, 3, SEAFOAM_ISLANDS_B2F
+ warp 23, 15, 6, SEAFOAM_ISLANDS_1F
+ warp 25, 11, 5, SEAFOAM_ISLANDS_B2F
+ warp 25, 3, 5, SEAFOAM_ISLANDS_1F
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+ object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+ ; warp-to
+ warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+ warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
+ warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+ warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+ warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
+ warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+ warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
--- /dev/null
+++ b/data/maps/objects/SeafoamIslandsB2F.asm
@@ -1,0 +1,26 @@
+SeafoamIslandsB2F_Object:
+ db $7d ; border block
+
+ db 7 ; warps
+ warp 5, 3, 0, SEAFOAM_ISLANDS_B1F
+ warp 5, 13, 0, SEAFOAM_ISLANDS_B3F
+ warp 13, 7, 2, SEAFOAM_ISLANDS_B1F
+ warp 19, 15, 3, SEAFOAM_ISLANDS_B1F
+ warp 25, 3, 3, SEAFOAM_ISLANDS_B3F
+ warp 25, 11, 5, SEAFOAM_ISLANDS_B1F
+ warp 25, 14, 4, SEAFOAM_ISLANDS_B3F
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+ object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+ ; warp-to
+ warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+ warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
+ warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+ warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+ warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
+ warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+ warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
--- /dev/null
+++ b/data/maps/objects/SeafoamIslandsB3F.asm
@@ -1,0 +1,30 @@
+SeafoamIslandsB3F_Object:
+ db $7d ; border block
+
+ db 7 ; warps
+ warp 5, 12, 1, SEAFOAM_ISLANDS_B2F
+ warp 8, 6, 2, SEAFOAM_ISLANDS_B4F
+ warp 25, 4, 3, SEAFOAM_ISLANDS_B4F
+ warp 25, 3, 4, SEAFOAM_ISLANDS_B2F
+ warp 25, 14, 6, SEAFOAM_ISLANDS_B2F
+ warp 20, 17, 0, SEAFOAM_ISLANDS_B4F
+ warp 21, 17, 1, SEAFOAM_ISLANDS_B4F
+
+ db 0 ; signs
+
+ db 6 ; objects
+ object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+ object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+ object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
+ object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
+ object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person
+ object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person
+
+ ; warp-to
+ warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+ warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+ warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+ warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+ warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+ warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+ warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
--- /dev/null
+++ b/data/maps/objects/SeafoamIslandsB4F.asm
@@ -1,0 +1,23 @@
+SeafoamIslandsB4F_Object:
+ db $7d ; border block
+
+ db 4 ; warps
+ warp 20, 17, 5, SEAFOAM_ISLANDS_B3F
+ warp 21, 17, 6, SEAFOAM_ISLANDS_B3F
+ warp 11, 7, 1, SEAFOAM_ISLANDS_B3F
+ warp 25, 4, 2, SEAFOAM_ISLANDS_B3F
+
+ db 2 ; signs
+ sign 9, 15, 4 ; SeafoamIslands5Text4
+ sign 23, 1, 5 ; SeafoamIslands5Text5
+
+ db 3 ; objects
+ object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
+ object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person
+ object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50
+
+ ; warp-to
+ warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+ warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+ warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+ warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
--- /dev/null
+++ b/data/maps/objects/SilphCo10F.asm
@@ -1,0 +1,28 @@
+SilphCo10F_Object:
+ db $2e ; border block
+
+ db 6 ; warps
+ warp 8, 0, 0, SILPH_CO_9F
+ warp 10, 0, 0, SILPH_CO_11F
+ warp 12, 0, 0, SILPH_CO_ELEVATOR
+ warp 9, 11, 3, SILPH_CO_4F
+ warp 13, 15, 5, SILPH_CO_4F
+ warp 13, 7, 6, SILPH_CO_4F
+
+ db 0 ; signs
+
+ db 6 ; objects
+ object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39
+ object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11
+ object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person
+ object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26
+ object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY
+ object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS
+
+ ; warp-to
+ warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F
+ warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F
+ warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F
+ warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F
+ warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F
--- /dev/null
+++ b/data/maps/objects/SilphCo11F.asm
@@ -1,0 +1,23 @@
+SilphCo11F_Object:
+ db $d ; border block
+
+ db 4 ; warps
+ warp 9, 0, 1, SILPH_CO_10F
+ warp 13, 0, 0, SILPH_CO_ELEVATOR
+ warp 5, 5, 9, -1
+ warp 3, 2, 3, SILPH_CO_7F
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person
+ object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person
+ object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2
+ object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41
+ object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40
+
+ ; warp-to
+ warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F
+ warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 5, 5, SILPH_CO_11F_WIDTH
+ warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F
--- /dev/null
+++ b/data/maps/objects/SilphCo1F.asm
@@ -1,0 +1,21 @@
+SilphCo1F_Object:
+ db $2e ; border block
+
+ db 5 ; warps
+ warp 10, 17, 5, -1
+ warp 11, 17, 5, -1
+ warp 26, 0, 0, SILPH_CO_2F
+ warp 20, 0, 0, SILPH_CO_ELEVATOR
+ warp 16, 10, 6, SILPH_CO_3F
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person
+
+ ; warp-to
+ warp_to 10, 17, SILPH_CO_1F_WIDTH
+ warp_to 11, 17, SILPH_CO_1F_WIDTH
+ warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F
+ warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F
--- /dev/null
+++ b/data/maps/objects/SilphCo2F.asm
@@ -1,0 +1,29 @@
+SilphCo2F_Object:
+ db $2e ; border block
+
+ db 7 ; warps
+ warp 24, 0, 2, SILPH_CO_1F
+ warp 26, 0, 0, SILPH_CO_3F
+ warp 20, 0, 0, SILPH_CO_ELEVATOR
+ warp 3, 3, 6, SILPH_CO_3F
+ warp 13, 3, 4, SILPH_CO_8F
+ warp 27, 15, 5, SILPH_CO_8F
+ warp 9, 15, 4, SILPH_CO_6F
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person
+ object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2
+ object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3
+ object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23
+ object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24
+
+ ; warp-to
+ warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F
+ warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F
+ warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F
+ warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F
+ warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F
+ warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F
--- /dev/null
+++ b/data/maps/objects/SilphCo3F.asm
@@ -1,0 +1,34 @@
+SilphCo3F_Object:
+ db $2e ; border block
+
+ db 10 ; warps
+ warp 26, 0, 1, SILPH_CO_2F
+ warp 24, 0, 0, SILPH_CO_4F
+ warp 20, 0, 0, SILPH_CO_ELEVATOR
+ warp 23, 11, 9, SILPH_CO_3F
+ warp 3, 3, 5, SILPH_CO_5F
+ warp 3, 15, 6, SILPH_CO_5F
+ warp 27, 3, 3, SILPH_CO_2F
+ warp 3, 11, 3, SILPH_CO_9F
+ warp 11, 11, 4, SILPH_CO_7F
+ warp 27, 15, 3, SILPH_CO_3F
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person
+ object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25
+ object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4
+ object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION
+
+ ; warp-to
+ warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F
+ warp_to 24, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F
+ warp_to 20, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 23, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_3F
+ warp_to 3, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F
+ warp_to 3, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_5F
+ warp_to 27, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F
+ warp_to 3, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_9F
+ warp_to 11, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_7F
+ warp_to 27, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_3F
--- /dev/null
+++ b/data/maps/objects/SilphCo4F.asm
@@ -1,0 +1,31 @@
+SilphCo4F_Object:
+ db $2e ; border block
+
+ db 7 ; warps
+ warp 24, 0, 1, SILPH_CO_3F
+ warp 26, 0, 1, SILPH_CO_5F
+ warp 20, 0, 0, SILPH_CO_ELEVATOR
+ warp 11, 7, 3, SILPH_CO_10F
+ warp 17, 3, 3, SILPH_CO_6F
+ warp 3, 15, 4, SILPH_CO_10F
+ warp 17, 11, 5, SILPH_CO_10F
+
+ db 0 ; signs
+
+ db 7 ; objects
+ object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person
+ object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26
+ object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5
+ object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27
+ object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL
+ object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE
+ object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE
+
+ ; warp-to
+ warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F
+ warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F
+ warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F
+ warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F
+ warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F
+ warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F
--- /dev/null
+++ b/data/maps/objects/SilphCo5F.asm
@@ -1,0 +1,35 @@
+SilphCo5F_Object:
+ db $2e ; border block
+
+ db 7 ; warps
+ warp 24, 0, 1, SILPH_CO_6F
+ warp 26, 0, 1, SILPH_CO_4F
+ warp 20, 0, 0, SILPH_CO_ELEVATOR
+ warp 27, 3, 5, SILPH_CO_7F
+ warp 9, 15, 4, SILPH_CO_9F
+ warp 11, 5, 4, SILPH_CO_3F
+ warp 3, 15, 5, SILPH_CO_3F
+
+ db 0 ; signs
+
+ db 11 ; objects
+ object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person
+ object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28
+ object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6
+ object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1
+ object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29
+ object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09
+ object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN
+ object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY
+ object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person
+ object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person
+ object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person
+
+ ; warp-to
+ warp_to 24, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F
+ warp_to 26, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F
+ warp_to 20, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 27, 3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F
+ warp_to 9, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_9F
+ warp_to 11, 5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F
+ warp_to 3, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_3F
--- /dev/null
+++ b/data/maps/objects/SilphCo6F.asm
@@ -1,0 +1,30 @@
+SilphCo6F_Object:
+ db $2e ; border block
+
+ db 5 ; warps
+ warp 16, 0, 1, SILPH_CO_7F
+ warp 14, 0, 0, SILPH_CO_5F
+ warp 18, 0, 0, SILPH_CO_ELEVATOR
+ warp 3, 3, 4, SILPH_CO_4F
+ warp 23, 3, 6, SILPH_CO_2F
+
+ db 0 ; signs
+
+ db 10 ; objects
+ object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person
+ object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person
+ object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person
+ object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person
+ object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person
+ object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30
+ object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7
+ object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31
+ object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP
+ object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY
+
+ ; warp-to
+ warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F
+ warp_to 14, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F
+ warp_to 18, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 3, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F
+ warp_to 23, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F
--- /dev/null
+++ b/data/maps/objects/SilphCo7F.asm
@@ -1,0 +1,33 @@
+SilphCo7F_Object:
+ db $2e ; border block
+
+ db 6 ; warps
+ warp 16, 0, 1, SILPH_CO_8F
+ warp 22, 0, 0, SILPH_CO_6F
+ warp 18, 0, 0, SILPH_CO_ELEVATOR
+ warp 5, 7, 3, SILPH_CO_11F
+ warp 5, 3, 8, SILPH_CO_3F
+ warp 21, 15, 3, SILPH_CO_5F
+
+ db 0 ; signs
+
+ db 11 ; objects
+ object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person
+ object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person
+ object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person
+ object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person
+ object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32
+ object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8
+ object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33
+ object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34
+ object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person
+ object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM
+ object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_03
+
+ ; warp-to
+ warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F
+ warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F
+ warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F
+ warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F
+ warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F
--- /dev/null
+++ b/data/maps/objects/SilphCo8F.asm
@@ -1,0 +1,28 @@
+SilphCo8F_Object:
+ db $2e ; border block
+
+ db 7 ; warps
+ warp 16, 0, 1, SILPH_CO_9F
+ warp 14, 0, 0, SILPH_CO_7F
+ warp 18, 0, 0, SILPH_CO_ELEVATOR
+ warp 3, 11, 6, SILPH_CO_8F
+ warp 3, 15, 4, SILPH_CO_2F
+ warp 11, 5, 5, SILPH_CO_2F
+ warp 11, 9, 3, SILPH_CO_8F
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person
+ object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35
+ object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
+ object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36
+
+ ; warp-to
+ warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F
+ warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F
+ warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F
+ warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
+ warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
+ warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH
--- /dev/null
+++ b/data/maps/objects/SilphCo9F.asm
@@ -1,0 +1,24 @@
+SilphCo9F_Object:
+ db $2e ; border block
+
+ db 5 ; warps
+ warp 14, 0, 0, SILPH_CO_10F
+ warp 16, 0, 0, SILPH_CO_8F
+ warp 18, 0, 0, SILPH_CO_ELEVATOR
+ warp 9, 3, 7, SILPH_CO_3F
+ warp 17, 15, 4, SILPH_CO_5F
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person
+ object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37
+ object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10
+ object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38
+
+ ; warp-to
+ warp_to 14, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F
+ warp_to 16, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F
+ warp_to 18, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 9, 3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F
+ warp_to 17, 15, SILPH_CO_9F_WIDTH ; SILPH_CO_5F
--- /dev/null
+++ b/data/maps/objects/SilphCoElevator.asm
@@ -1,0 +1,15 @@
+SilphCoElevator_Object:
+ db $f ; border block
+
+ db 2 ; warps
+ warp 1, 3, 0, 237
+ warp 2, 3, 0, 237
+
+ db 1 ; signs
+ sign 3, 0, 1 ; SilphCoElevatorText1
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH
+ warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH
--- /dev/null
+++ b/data/maps/objects/TradeCenter.asm
@@ -1,0 +1,9 @@
+TradeCenter_Object:
+ db $e ; border block
+
+ db 0 ; warps
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_RED, 2, 2, STAY, 0, 1 ; person
--- /dev/null
+++ b/data/maps/objects/UndergroundPathNorthSouth.asm
@@ -1,0 +1,14 @@
+UndergroundPathNorthSouth_Object:
+ db $1 ; border block
+
+ db 2 ; warps
+ warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5
+ warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5
+ warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6
--- /dev/null
+++ b/data/maps/objects/UndergroundPathRoute5.asm
@@ -1,0 +1,17 @@
+UndergroundPathRoute5_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 3, 7, 3, -1
+ warp 4, 7, 3, -1
+ warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
+ warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
+ warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
--- /dev/null
+++ b/data/maps/objects/UndergroundPathRoute6.asm
@@ -1,0 +1,17 @@
+UndergroundPathRoute6_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 3, 7, 3, -1
+ warp 4, 7, 3, -1
+ warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
+ warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
+ warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
--- /dev/null
+++ b/data/maps/objects/UndergroundPathRoute7.asm
@@ -1,0 +1,17 @@
+UndergroundPathRoute7_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 3, 7, 4, -1
+ warp 4, 7, 4, -1
+ warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
+ warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
+ warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST
--- /dev/null
+++ b/data/maps/objects/UndergroundPathRoute7Copy.asm
@@ -1,0 +1,18 @@
+UndergroundPathRoute7Copy_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 3, 7, 5, -1
+ warp 4, 7, 5, -1
+ warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person
+ object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
+ warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
+ warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST
--- /dev/null
+++ b/data/maps/objects/UndergroundPathRoute8.asm
@@ -1,0 +1,17 @@
+UndergroundPathRoute8_Object:
+ db $a ; border block
+
+ db 3 ; warps
+ warp 3, 7, 4, -1
+ warp 4, 7, 4, -1
+ warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person
+
+ ; warp-to
+ warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
+ warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
+ warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST
--- /dev/null
+++ b/data/maps/objects/UndergroundPathWestEast.asm
@@ -1,0 +1,14 @@
+UndergroundPathWestEast_Object:
+ db $1 ; border block
+
+ db 2 ; warps
+ warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7
+ warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7
+ warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8
--- /dev/null
+++ b/data/maps/objects/VermilionCity.asm
@@ -1,0 +1,41 @@
+VermilionCity_Object:
+ db $43 ; border block
+
+ db 9 ; warps
+ warp 11, 3, 0, VERMILION_POKECENTER
+ warp 9, 13, 0, POKEMON_FAN_CLUB
+ warp 23, 13, 0, VERMILION_MART
+ warp 12, 19, 0, VERMILION_GYM
+ warp 23, 19, 0, VERMILION_PIDGEY_HOUSE
+ warp 18, 31, 0, VERMILION_DOCK
+ warp 19, 31, 0, VERMILION_DOCK
+ warp 15, 13, 0, VERMILION_TRADE_HOUSE
+ warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE
+
+ db 7 ; signs
+ sign 27, 3, 7 ; VermilionCityText7
+ sign 37, 13, 8 ; VermilionCityText8
+ sign 24, 13, 9 ; MartSignText
+ sign 12, 3, 10 ; PokeCenterSignText
+ sign 7, 13, 11 ; VermilionCityText11
+ sign 7, 19, 12 ; VermilionCityText12
+ sign 29, 15, 13 ; VermilionCityText13
+
+ db 6 ; objects
+ object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person
+ object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
+ object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person
+ object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person
+ object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person
+ object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person
+
+ ; warp-to
+ warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER
+ warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB
+ warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART
+ warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM
+ warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE
+ warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
+ warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
+ warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE
+ warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE
--- /dev/null
+++ b/data/maps/objects/VermilionDock.asm
@@ -1,0 +1,14 @@
+VermilionDock_Object:
+ db $f ; border block
+
+ db 2 ; warps
+ warp 14, 0, 5, -1
+ warp 14, 2, 1, SS_ANNE_1F
+
+ db 0 ; signs
+
+ db 0 ; objects
+
+ ; warp-to
+ warp_to 14, 0, VERMILION_DOCK_WIDTH
+ warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F
--- /dev/null
+++ b/data/maps/objects/VermilionGym.asm
@@ -1,0 +1,19 @@
+VermilionGym_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 4, 17, 3, -1
+ warp 5, 17, 3, -1
+
+ db 0 ; signs
+
+ db 5 ; objects
+ object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1
+ object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1
+ object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8
+ object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person
+
+ ; warp-to
+ warp_to 4, 17, VERMILION_GYM_WIDTH
+ warp_to 5, 17, VERMILION_GYM_WIDTH
--- /dev/null
+++ b/data/maps/objects/VermilionMart.asm
@@ -1,0 +1,17 @@
+VermilionMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 2, -1
+ warp 4, 7, 2, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person
+ object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, VERMILION_MART_WIDTH
+ warp_to 4, 7, VERMILION_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/VermilionOldRodHouse.asm
@@ -1,0 +1,15 @@
+VermilionOldRodHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 8, -1
+ warp 3, 7, 8, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
+ warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
@@ -1,0 +1,17 @@
+VermilionPidgeyHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 4, -1
+ warp 3, 7, 4, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person
+ object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person
+ object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH
+ warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/VermilionPokecenter.asm
@@ -1,0 +1,18 @@
+VermilionPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person
+ object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, VERMILION_POKECENTER_WIDTH
+ warp_to 4, 7, VERMILION_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/VermilionTradeHouse.asm
@@ -1,0 +1,15 @@
+VermilionTradeHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 7, -1
+ warp 3, 7, 7, -1
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person
+
+ ; warp-to
+ warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH
+ warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/VictoryRoad1F.asm
@@ -1,0 +1,23 @@
+VictoryRoad1F_Object:
+ db $7d ; border block
+
+ db 3 ; warps
+ warp 8, 17, 2, -1
+ warp 9, 17, 2, -1
+ warp 1, 1, 0, VICTORY_ROAD_2F
+
+ db 0 ; signs
+
+ db 7 ; objects
+ object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
+ object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
+ object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43
+ object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
+ object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
+ object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
+
+ ; warp-to
+ warp_to 8, 17, VICTORY_ROAD_1F_WIDTH
+ warp_to 9, 17, VICTORY_ROAD_1F_WIDTH
+ warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F
--- /dev/null
+++ b/data/maps/objects/VictoryRoad2F.asm
@@ -1,0 +1,37 @@
+VictoryRoad2F_Object:
+ db $7d ; border block
+
+ db 7 ; warps
+ warp 0, 8, 2, VICTORY_ROAD_1F
+ warp 29, 7, 3, -1
+ warp 29, 8, 3, -1
+ warp 23, 7, 0, VICTORY_ROAD_3F
+ warp 25, 14, 2, VICTORY_ROAD_3F
+ warp 27, 7, 1, VICTORY_ROAD_3F
+ warp 1, 1, 3, VICTORY_ROAD_3F
+
+ db 0 ; signs
+
+ db 13 ; objects
+ object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9
+ object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2
+ object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6
+ object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5
+ object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50
+ object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_17
+ object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL
+ object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_05
+ object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC
+ object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
+ object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
+ object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
+
+ ; warp-to
+ warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F
+ warp_to 29, 7, VICTORY_ROAD_2F_WIDTH
+ warp_to 29, 8, VICTORY_ROAD_2F_WIDTH
+ warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+ warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+ warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+ warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
--- /dev/null
+++ b/data/maps/objects/VictoryRoad3F.asm
@@ -1,0 +1,28 @@
+VictoryRoad3F_Object:
+ db $7d ; border block
+
+ db 4 ; warps
+ warp 23, 7, 3, VICTORY_ROAD_2F
+ warp 26, 8, 5, VICTORY_ROAD_2F
+ warp 27, 15, 4, VICTORY_ROAD_2F
+ warp 2, 0, 6, VICTORY_ROAD_2F
+
+ db 0 ; signs
+
+ db 10 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
+ object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
+ object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
+ object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
+ object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE
+ object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47
+ object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
+ object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
+ object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
+ object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
+
+ ; warp-to
+ warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+ warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+ warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+ warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
--- /dev/null
+++ b/data/maps/objects/ViridianCity.asm
@@ -1,0 +1,33 @@
+ViridianCity_Object:
+ db $f ; border block
+
+ db 5 ; warps
+ warp 23, 25, 0, VIRIDIAN_POKECENTER
+ warp 29, 19, 0, VIRIDIAN_MART
+ warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE
+ warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE
+ warp 32, 7, 0, VIRIDIAN_GYM
+
+ db 6 ; signs
+ sign 17, 17, 8 ; ViridianCityText8
+ sign 19, 1, 9 ; ViridianCityText9
+ sign 21, 29, 10 ; ViridianCityText10
+ sign 30, 19, 11 ; MartSignText
+ sign 24, 25, 12 ; PokeCenterSignText
+ sign 27, 7, 13 ; ViridianCityText13
+
+ db 7 ; objects
+ object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person
+ object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person
+ object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person
+ object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person
+ object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person
+ object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person
+ object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person
+
+ ; warp-to
+ warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER
+ warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART
+ warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE
+ warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE
+ warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM
--- /dev/null
+++ b/data/maps/objects/ViridianForest.asm
@@ -1,0 +1,36 @@
+ViridianForest_Object:
+ db $3 ; border block
+
+ db 6 ; warps
+ warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
+ warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE
+ warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+ warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+ warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+ warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+
+ db 6 ; signs
+ sign 24, 40, 9 ; ViridianForestText9
+ sign 16, 32, 10 ; ViridianForestText10
+ sign 26, 17, 11 ; ViridianForestText11
+ sign 4, 24, 12 ; ViridianForestText12
+ sign 18, 45, 13 ; ViridianForestText13
+ sign 2, 1, 14 ; ViridianForestText14
+
+ db 8 ; objects
+ object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person
+ object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
+ object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
+ object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
+ object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE
+ object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION
+ object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL
+ object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person
+
+ ; warp-to
+ warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+ warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+ warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+ warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+ warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+ warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
--- /dev/null
+++ b/data/maps/objects/ViridianForestNorthGate.asm
@@ -1,0 +1,20 @@
+ViridianForestNorthGate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 4, 0, 1, -1
+ warp 5, 0, 1, -1
+ warp 4, 7, 0, VIRIDIAN_FOREST
+ warp 5, 7, 0, VIRIDIAN_FOREST
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person
+ object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person
+
+ ; warp-to
+ warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+ warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+ warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
+ warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
--- /dev/null
+++ b/data/maps/objects/ViridianForestSouthGate.asm
@@ -1,0 +1,20 @@
+ViridianForestSouthGate_Object:
+ db $a ; border block
+
+ db 4 ; warps
+ warp 4, 0, 3, VIRIDIAN_FOREST
+ warp 5, 0, 4, VIRIDIAN_FOREST
+ warp 4, 7, 5, -1
+ warp 5, 7, 5, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person
+ object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person
+
+ ; warp-to
+ warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
+ warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
+ warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
+ warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
--- /dev/null
+++ b/data/maps/objects/ViridianGym.asm
@@ -1,0 +1,25 @@
+ViridianGym_Object:
+ db $3 ; border block
+
+ db 2 ; warps
+ warp 16, 17, 4, -1
+ warp 17, 17, 4, -1
+
+ db 0 ; signs
+
+ db 11 ; objects
+ object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3
+ object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
+ object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6
+ object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3
+ object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7
+ object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
+ object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8
+ object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4
+ object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
+ object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person
+ object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE
+
+ ; warp-to
+ warp_to 16, 17, VIRIDIAN_GYM_WIDTH
+ warp_to 17, 17, VIRIDIAN_GYM_WIDTH
--- /dev/null
+++ b/data/maps/objects/ViridianMart.asm
@@ -1,0 +1,17 @@
+ViridianMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 1, -1
+ warp 4, 7, 1, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, VIRIDIAN_MART_WIDTH
+ warp_to 4, 7, VIRIDIAN_MART_WIDTH
--- /dev/null
+++ b/data/maps/objects/ViridianNicknameHouse.asm
@@ -1,0 +1,18 @@
+ViridianNicknameHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 3, -1
+ warp 3, 7, 3, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person
+ object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person
+ object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person
+ object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person
+
+ ; warp-to
+ warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
+ warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/ViridianPokecenter.asm
@@ -1,0 +1,18 @@
+ViridianPokecenter_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
+
+ db 0 ; signs
+
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+
+ ; warp-to
+ warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH
+ warp_to 4, 7, VIRIDIAN_POKECENTER_WIDTH
--- /dev/null
+++ b/data/maps/objects/ViridianSchoolHouse.asm
@@ -1,0 +1,16 @@
+ViridianSchoolHouse_Object:
+ db $a ; border block
+
+ db 2 ; warps
+ warp 2, 7, 2, -1
+ warp 3, 7, 2, -1
+
+ db 0 ; signs
+
+ db 2 ; objects
+ object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person
+ object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person
+
+ ; warp-to
+ warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
+ warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
--- /dev/null
+++ b/data/maps/objects/WardensHouse.asm
@@ -1,0 +1,19 @@
+WardensHouse_Object:
+ db $17 ; border block
+
+ db 2 ; warps
+ warp 4, 7, 3, -1
+ warp 5, 7, 3, -1
+
+ db 2 ; signs
+ sign 4, 3, 4 ; FuchsiaHouse2Text4
+ sign 5, 3, 5 ; FuchsiaHouse2Text5
+
+ db 3 ; objects
+ object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person
+ object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY
+ object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
+
+ ; warp-to
+ warp_to 4, 7, WARDENS_HOUSE_WIDTH
+ warp_to 5, 7, WARDENS_HOUSE_WIDTH
--- a/maps.asm
+++ b/maps.asm
@@ -3,33 +3,33 @@
SECTION "Maps 1", ROMX
-INCLUDE "data/mapHeaders/CeladonCity.asm"
-INCLUDE "data/mapObjects/CeladonCity.asm"
+INCLUDE "data/maps/headers/CeladonCity.asm"
+INCLUDE "data/maps/objects/CeladonCity.asm"
CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk"
-INCLUDE "data/mapHeaders/PalletTown.asm"
-INCLUDE "data/mapObjects/PalletTown.asm"
+INCLUDE "data/maps/headers/PalletTown.asm"
+INCLUDE "data/maps/objects/PalletTown.asm"
PalletTown_Blocks: INCBIN "maps/PalletTown.blk"
-INCLUDE "data/mapHeaders/ViridianCity.asm"
-INCLUDE "data/mapObjects/ViridianCity.asm"
+INCLUDE "data/maps/headers/ViridianCity.asm"
+INCLUDE "data/maps/objects/ViridianCity.asm"
ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk"
-INCLUDE "data/mapHeaders/PewterCity.asm"
+INCLUDE "data/maps/headers/PewterCity.asm"
ds 1
-INCLUDE "data/mapObjects/PewterCity.asm"
+INCLUDE "data/maps/objects/PewterCity.asm"
PewterCity_Blocks: INCBIN "maps/PewterCity.blk"
-INCLUDE "data/mapHeaders/CeruleanCity.asm"
-INCLUDE "data/mapObjects/CeruleanCity.asm"
+INCLUDE "data/maps/headers/CeruleanCity.asm"
+INCLUDE "data/maps/objects/CeruleanCity.asm"
CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk"
-INCLUDE "data/mapHeaders/VermilionCity.asm"
-INCLUDE "data/mapObjects/VermilionCity.asm"
+INCLUDE "data/maps/headers/VermilionCity.asm"
+INCLUDE "data/maps/objects/VermilionCity.asm"
VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk"
-INCLUDE "data/mapHeaders/FuchsiaCity.asm"
-INCLUDE "data/mapObjects/FuchsiaCity.asm"
+INCLUDE "data/maps/headers/FuchsiaCity.asm"
+INCLUDE "data/maps/objects/FuchsiaCity.asm"
FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk"
@@ -43,45 +43,45 @@
INCLUDE "scripts/CeladonCity.asm"
INCLUDE "scripts/FuchsiaCity.asm"
-INCLUDE "data/mapHeaders/BluesHouse.asm"
+INCLUDE "data/maps/headers/BluesHouse.asm"
INCLUDE "scripts/BluesHouse.asm"
-INCLUDE "data/mapObjects/BluesHouse.asm"
+INCLUDE "data/maps/objects/BluesHouse.asm"
BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk"
-INCLUDE "data/mapHeaders/VermilionTradeHouse.asm"
+INCLUDE "data/maps/headers/VermilionTradeHouse.asm"
INCLUDE "scripts/VermilionTradeHouse.asm"
-INCLUDE "data/mapObjects/VermilionTradeHouse.asm"
+INCLUDE "data/maps/objects/VermilionTradeHouse.asm"
VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk"
-INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm"
+INCLUDE "data/maps/headers/IndigoPlateauLobby.asm"
INCLUDE "scripts/IndigoPlateauLobby.asm"
-INCLUDE "data/mapObjects/IndigoPlateauLobby.asm"
+INCLUDE "data/maps/objects/IndigoPlateauLobby.asm"
IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk"
-INCLUDE "data/mapHeaders/SilphCo4F.asm"
+INCLUDE "data/maps/headers/SilphCo4F.asm"
INCLUDE "scripts/SilphCo4F.asm"
-INCLUDE "data/mapObjects/SilphCo4F.asm"
+INCLUDE "data/maps/objects/SilphCo4F.asm"
SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk"
-INCLUDE "data/mapHeaders/SilphCo5F.asm"
+INCLUDE "data/maps/headers/SilphCo5F.asm"
INCLUDE "scripts/SilphCo5F.asm"
-INCLUDE "data/mapObjects/SilphCo5F.asm"
+INCLUDE "data/maps/objects/SilphCo5F.asm"
SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk"
-INCLUDE "data/mapHeaders/SilphCo6F.asm"
+INCLUDE "data/maps/headers/SilphCo6F.asm"
INCLUDE "scripts/SilphCo6F.asm"
-INCLUDE "data/mapObjects/SilphCo6F.asm"
+INCLUDE "data/maps/objects/SilphCo6F.asm"
SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk"
SECTION "Maps 3", ROMX
-INCLUDE "data/mapHeaders/CinnabarIsland.asm"
-INCLUDE "data/mapObjects/CinnabarIsland.asm"
+INCLUDE "data/maps/headers/CinnabarIsland.asm"
+INCLUDE "data/maps/objects/CinnabarIsland.asm"
CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk"
-INCLUDE "data/mapHeaders/Route1.asm"
-INCLUDE "data/mapObjects/Route1.asm"
+INCLUDE "data/maps/headers/Route1.asm"
+INCLUDE "data/maps/objects/Route1.asm"
Route1_Blocks: INCBIN "maps/Route1.blk"
UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk"
@@ -116,143 +116,143 @@
INCLUDE "scripts/Route1.asm"
-INCLUDE "data/mapHeaders/OaksLab.asm"
+INCLUDE "data/maps/headers/OaksLab.asm"
INCLUDE "scripts/OaksLab.asm"
-INCLUDE "data/mapObjects/OaksLab.asm"
+INCLUDE "data/maps/objects/OaksLab.asm"
-INCLUDE "data/mapHeaders/ViridianMart.asm"
+INCLUDE "data/maps/headers/ViridianMart.asm"
INCLUDE "scripts/ViridianMart.asm"
-INCLUDE "data/mapObjects/ViridianMart.asm"
+INCLUDE "data/maps/objects/ViridianMart.asm"
ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk"
-INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm"
+INCLUDE "data/maps/headers/ViridianSchoolHouse.asm"
INCLUDE "scripts/ViridianSchoolHouse.asm"
-INCLUDE "data/mapObjects/ViridianSchoolHouse.asm"
+INCLUDE "data/maps/objects/ViridianSchoolHouse.asm"
-INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm"
+INCLUDE "data/maps/headers/ViridianNicknameHouse.asm"
ds 1
INCLUDE "scripts/ViridianNicknameHouse.asm"
-INCLUDE "data/mapObjects/ViridianNicknameHouse.asm"
+INCLUDE "data/maps/objects/ViridianNicknameHouse.asm"
-INCLUDE "data/mapHeaders/PewterNidoranHouse.asm"
+INCLUDE "data/maps/headers/PewterNidoranHouse.asm"
INCLUDE "scripts/PewterNidoranHouse.asm"
-INCLUDE "data/mapObjects/PewterNidoranHouse.asm"
+INCLUDE "data/maps/objects/PewterNidoranHouse.asm"
-INCLUDE "data/mapHeaders/PewterSpeechHouse.asm"
+INCLUDE "data/maps/headers/PewterSpeechHouse.asm"
INCLUDE "scripts/PewterSpeechHouse.asm"
-INCLUDE "data/mapObjects/PewterSpeechHouse.asm"
+INCLUDE "data/maps/objects/PewterSpeechHouse.asm"
-INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm"
+INCLUDE "data/maps/headers/CeruleanTrashedHouse.asm"
INCLUDE "scripts/CeruleanTrashedHouse.asm"
-INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm"
+INCLUDE "data/maps/objects/CeruleanTrashedHouse.asm"
-INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm"
+INCLUDE "data/maps/headers/CeruleanTradeHouse.asm"
INCLUDE "scripts/CeruleanTradeHouse.asm"
-INCLUDE "data/mapObjects/CeruleanTradeHouse.asm"
+INCLUDE "data/maps/objects/CeruleanTradeHouse.asm"
-INCLUDE "data/mapHeaders/BikeShop.asm"
+INCLUDE "data/maps/headers/BikeShop.asm"
INCLUDE "scripts/BikeShop.asm"
-INCLUDE "data/mapObjects/BikeShop.asm"
+INCLUDE "data/maps/objects/BikeShop.asm"
BikeShop_Blocks: INCBIN "maps/BikeShop.blk"
-INCLUDE "data/mapHeaders/MrFujisHouse.asm"
+INCLUDE "data/maps/headers/MrFujisHouse.asm"
INCLUDE "scripts/MrFujisHouse.asm"
-INCLUDE "data/mapObjects/MrFujisHouse.asm"
+INCLUDE "data/maps/objects/MrFujisHouse.asm"
-INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm"
+INCLUDE "data/maps/headers/LavenderCuboneHouse.asm"
INCLUDE "scripts/LavenderCuboneHouse.asm"
-INCLUDE "data/mapObjects/LavenderCuboneHouse.asm"
+INCLUDE "data/maps/objects/LavenderCuboneHouse.asm"
-INCLUDE "data/mapHeaders/NameRatersHouse.asm"
+INCLUDE "data/maps/headers/NameRatersHouse.asm"
INCLUDE "scripts/NameRatersHouse.asm"
-INCLUDE "data/mapObjects/NameRatersHouse.asm"
+INCLUDE "data/maps/objects/NameRatersHouse.asm"
-INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm"
+INCLUDE "data/maps/headers/VermilionPidgeyHouse.asm"
INCLUDE "scripts/VermilionPidgeyHouse.asm"
-INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm"
+INCLUDE "data/maps/objects/VermilionPidgeyHouse.asm"
-INCLUDE "data/mapHeaders/VermilionDock.asm"
+INCLUDE "data/maps/headers/VermilionDock.asm"
INCLUDE "scripts/VermilionDock.asm"
-INCLUDE "data/mapObjects/VermilionDock.asm"
+INCLUDE "data/maps/objects/VermilionDock.asm"
VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk"
-INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm"
+INCLUDE "data/maps/headers/CeladonMansionRoofHouse.asm"
INCLUDE "scripts/CeladonMansionRoofHouse.asm"
-INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm"
+INCLUDE "data/maps/objects/CeladonMansionRoofHouse.asm"
-INCLUDE "data/mapHeaders/FuchsiaMart.asm"
+INCLUDE "data/maps/headers/FuchsiaMart.asm"
INCLUDE "scripts/FuchsiaMart.asm"
-INCLUDE "data/mapObjects/FuchsiaMart.asm"
+INCLUDE "data/maps/objects/FuchsiaMart.asm"
FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk"
-INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm"
+INCLUDE "data/maps/headers/SaffronPidgeyHouse.asm"
INCLUDE "scripts/SaffronPidgeyHouse.asm"
-INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm"
+INCLUDE "data/maps/objects/SaffronPidgeyHouse.asm"
-INCLUDE "data/mapHeaders/MrPsychicsHouse.asm"
+INCLUDE "data/maps/headers/MrPsychicsHouse.asm"
INCLUDE "scripts/MrPsychicsHouse.asm"
-INCLUDE "data/mapObjects/MrPsychicsHouse.asm"
+INCLUDE "data/maps/objects/MrPsychicsHouse.asm"
-INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm"
+INCLUDE "data/maps/headers/DiglettsCaveRoute2.asm"
INCLUDE "scripts/DiglettsCaveRoute2.asm"
-INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm"
+INCLUDE "data/maps/objects/DiglettsCaveRoute2.asm"
-INCLUDE "data/mapHeaders/Route2TradeHouse.asm"
+INCLUDE "data/maps/headers/Route2TradeHouse.asm"
INCLUDE "scripts/Route2TradeHouse.asm"
-INCLUDE "data/mapObjects/Route2TradeHouse.asm"
+INCLUDE "data/maps/objects/Route2TradeHouse.asm"
-INCLUDE "data/mapHeaders/Route5Gate.asm"
+INCLUDE "data/maps/headers/Route5Gate.asm"
INCLUDE "scripts/Route5Gate.asm"
-INCLUDE "data/mapObjects/Route5Gate.asm"
+INCLUDE "data/maps/objects/Route5Gate.asm"
Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk"
-INCLUDE "data/mapHeaders/Route6Gate.asm"
+INCLUDE "data/maps/headers/Route6Gate.asm"
INCLUDE "scripts/Route6Gate.asm"
-INCLUDE "data/mapObjects/Route6Gate.asm"
+INCLUDE "data/maps/objects/Route6Gate.asm"
Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk"
-INCLUDE "data/mapHeaders/Route7Gate.asm"
+INCLUDE "data/maps/headers/Route7Gate.asm"
INCLUDE "scripts/Route7Gate.asm"
-INCLUDE "data/mapObjects/Route7Gate.asm"
+INCLUDE "data/maps/objects/Route7Gate.asm"
Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk"
-INCLUDE "data/mapHeaders/Route8Gate.asm"
+INCLUDE "data/maps/headers/Route8Gate.asm"
INCLUDE "scripts/Route8Gate.asm"
-INCLUDE "data/mapObjects/Route8Gate.asm"
+INCLUDE "data/maps/objects/Route8Gate.asm"
Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk"
-INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute8.asm"
INCLUDE "scripts/UndergroundPathRoute8.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute8.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute8.asm"
-INCLUDE "data/mapHeaders/PowerPlant.asm"
+INCLUDE "data/maps/headers/PowerPlant.asm"
INCLUDE "scripts/PowerPlant.asm"
-INCLUDE "data/mapObjects/PowerPlant.asm"
+INCLUDE "data/maps/objects/PowerPlant.asm"
PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk"
-INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm"
+INCLUDE "data/maps/headers/DiglettsCaveRoute11.asm"
INCLUDE "scripts/DiglettsCaveRoute11.asm"
-INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm"
+INCLUDE "data/maps/objects/DiglettsCaveRoute11.asm"
-INCLUDE "data/mapHeaders/Route16FlyHouse.asm"
+INCLUDE "data/maps/headers/Route16FlyHouse.asm"
INCLUDE "scripts/Route16FlyHouse.asm"
-INCLUDE "data/mapObjects/Route16FlyHouse.asm"
+INCLUDE "data/maps/objects/Route16FlyHouse.asm"
-INCLUDE "data/mapHeaders/Route22Gate.asm"
+INCLUDE "data/maps/headers/Route22Gate.asm"
INCLUDE "scripts/Route22Gate.asm"
-INCLUDE "data/mapObjects/Route22Gate.asm"
+INCLUDE "data/maps/objects/Route22Gate.asm"
Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk"
-INCLUDE "data/mapHeaders/BillsHouse.asm"
+INCLUDE "data/maps/headers/BillsHouse.asm"
INCLUDE "scripts/BillsHouse.asm"
-INCLUDE "data/mapObjects/BillsHouse.asm"
+INCLUDE "data/maps/objects/BillsHouse.asm"
BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk"
SECTION "Maps 5", ROMX
-INCLUDE "data/mapHeaders/LavenderTown.asm"
-INCLUDE "data/mapObjects/LavenderTown.asm"
+INCLUDE "data/maps/headers/LavenderTown.asm"
+INCLUDE "data/maps/objects/LavenderTown.asm"
LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk"
ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk"
@@ -267,136 +267,136 @@
SECTION "Maps 6", ROMX
-INCLUDE "data/mapHeaders/ViridianPokecenter.asm"
+INCLUDE "data/maps/headers/ViridianPokecenter.asm"
INCLUDE "scripts/ViridianPokecenter.asm"
-INCLUDE "data/mapObjects/ViridianPokecenter.asm"
+INCLUDE "data/maps/objects/ViridianPokecenter.asm"
-INCLUDE "data/mapHeaders/PokemonMansion1F.asm"
+INCLUDE "data/maps/headers/PokemonMansion1F.asm"
INCLUDE "scripts/PokemonMansion1F.asm"
-INCLUDE "data/mapObjects/PokemonMansion1F.asm"
+INCLUDE "data/maps/objects/PokemonMansion1F.asm"
PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk"
-INCLUDE "data/mapHeaders/RockTunnel1F.asm"
+INCLUDE "data/maps/headers/RockTunnel1F.asm"
INCLUDE "scripts/RockTunnel1F.asm"
-INCLUDE "data/mapObjects/RockTunnel1F.asm"
+INCLUDE "data/maps/objects/RockTunnel1F.asm"
RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk"
-INCLUDE "data/mapHeaders/SeafoamIslands1F.asm"
+INCLUDE "data/maps/headers/SeafoamIslands1F.asm"
INCLUDE "scripts/SeafoamIslands1F.asm"
-INCLUDE "data/mapObjects/SeafoamIslands1F.asm"
+INCLUDE "data/maps/objects/SeafoamIslands1F.asm"
SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk"
-INCLUDE "data/mapHeaders/SSAnne3F.asm"
+INCLUDE "data/maps/headers/SSAnne3F.asm"
INCLUDE "scripts/SSAnne3F.asm"
-INCLUDE "data/mapObjects/SSAnne3F.asm"
+INCLUDE "data/maps/objects/SSAnne3F.asm"
SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk"
-INCLUDE "data/mapHeaders/VictoryRoad3F.asm"
+INCLUDE "data/maps/headers/VictoryRoad3F.asm"
INCLUDE "scripts/VictoryRoad3F.asm"
-INCLUDE "data/mapObjects/VictoryRoad3F.asm"
+INCLUDE "data/maps/objects/VictoryRoad3F.asm"
VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk"
-INCLUDE "data/mapHeaders/RocketHideoutB1F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB1F.asm"
INCLUDE "scripts/RocketHideoutB1F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB1F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB1F.asm"
RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk"
-INCLUDE "data/mapHeaders/RocketHideoutB2F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB2F.asm"
INCLUDE "scripts/RocketHideoutB2F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB2F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB2F.asm"
RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk"
-INCLUDE "data/mapHeaders/RocketHideoutB3F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB3F.asm"
INCLUDE "scripts/RocketHideoutB3F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB3F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB3F.asm"
RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk"
-INCLUDE "data/mapHeaders/RocketHideoutB4F.asm"
+INCLUDE "data/maps/headers/RocketHideoutB4F.asm"
INCLUDE "scripts/RocketHideoutB4F.asm"
-INCLUDE "data/mapObjects/RocketHideoutB4F.asm"
+INCLUDE "data/maps/objects/RocketHideoutB4F.asm"
RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk"
-INCLUDE "data/mapHeaders/RocketHideoutElevator.asm"
+INCLUDE "data/maps/headers/RocketHideoutElevator.asm"
INCLUDE "scripts/RocketHideoutElevator.asm"
-INCLUDE "data/mapObjects/RocketHideoutElevator.asm"
+INCLUDE "data/maps/objects/RocketHideoutElevator.asm"
RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk"
-INCLUDE "data/mapHeaders/SilphCoElevator.asm"
+INCLUDE "data/maps/headers/SilphCoElevator.asm"
INCLUDE "scripts/SilphCoElevator.asm"
-INCLUDE "data/mapObjects/SilphCoElevator.asm"
+INCLUDE "data/maps/objects/SilphCoElevator.asm"
SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk"
-INCLUDE "data/mapHeaders/SafariZoneEast.asm"
+INCLUDE "data/maps/headers/SafariZoneEast.asm"
INCLUDE "scripts/SafariZoneEast.asm"
-INCLUDE "data/mapObjects/SafariZoneEast.asm"
+INCLUDE "data/maps/objects/SafariZoneEast.asm"
SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk"
-INCLUDE "data/mapHeaders/SafariZoneNorth.asm"
+INCLUDE "data/maps/headers/SafariZoneNorth.asm"
INCLUDE "scripts/SafariZoneNorth.asm"
-INCLUDE "data/mapObjects/SafariZoneNorth.asm"
+INCLUDE "data/maps/objects/SafariZoneNorth.asm"
SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk"
-INCLUDE "data/mapHeaders/SafariZoneCenter.asm"
+INCLUDE "data/maps/headers/SafariZoneCenter.asm"
INCLUDE "scripts/SafariZoneCenter.asm"
-INCLUDE "data/mapObjects/SafariZoneCenter.asm"
+INCLUDE "data/maps/objects/SafariZoneCenter.asm"
SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk"
-INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneCenterRestHouse.asm"
INCLUDE "scripts/SafariZoneCenterRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneCenterRestHouse.asm"
-INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneWestRestHouse.asm"
INCLUDE "scripts/SafariZoneWestRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneWestRestHouse.asm"
-INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneEastRestHouse.asm"
INCLUDE "scripts/SafariZoneEastRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneEastRestHouse.asm"
-INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneNorthRestHouse.asm"
INCLUDE "scripts/SafariZoneNorthRestHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneNorthRestHouse.asm"
-INCLUDE "data/mapHeaders/CeruleanCave2F.asm"
+INCLUDE "data/maps/headers/CeruleanCave2F.asm"
INCLUDE "scripts/CeruleanCave2F.asm"
-INCLUDE "data/mapObjects/CeruleanCave2F.asm"
+INCLUDE "data/maps/objects/CeruleanCave2F.asm"
CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk"
-INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm"
+INCLUDE "data/maps/headers/CeruleanCaveB1F.asm"
INCLUDE "scripts/CeruleanCaveB1F.asm"
-INCLUDE "data/mapObjects/CeruleanCaveB1F.asm"
+INCLUDE "data/maps/objects/CeruleanCaveB1F.asm"
CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk"
-INCLUDE "data/mapHeaders/RockTunnelB1F.asm"
+INCLUDE "data/maps/headers/RockTunnelB1F.asm"
INCLUDE "scripts/RockTunnelB1F.asm"
-INCLUDE "data/mapObjects/RockTunnelB1F.asm"
+INCLUDE "data/maps/objects/RockTunnelB1F.asm"
RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk"
-INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB1F.asm"
INCLUDE "scripts/SeafoamIslandsB1F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB1F.asm"
SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk"
-INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB2F.asm"
INCLUDE "scripts/SeafoamIslandsB2F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB2F.asm"
SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk"
-INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB3F.asm"
INCLUDE "scripts/SeafoamIslandsB3F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB3F.asm"
SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk"
-INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm"
+INCLUDE "data/maps/headers/SeafoamIslandsB4F.asm"
INCLUDE "scripts/SeafoamIslandsB4F.asm"
-INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm"
+INCLUDE "data/maps/objects/SeafoamIslandsB4F.asm"
SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk"
SECTION "Maps 7", ROMX
-INCLUDE "data/mapHeaders/Route7.asm"
-INCLUDE "data/mapObjects/Route7.asm"
+INCLUDE "data/maps/headers/Route7.asm"
+INCLUDE "data/maps/objects/Route7.asm"
Route7_Blocks: INCBIN "maps/Route7.blk"
CeladonPokecenter_Blocks:
@@ -418,203 +418,203 @@
INCLUDE "scripts/Route7.asm"
-INCLUDE "data/mapHeaders/RedsHouse1F.asm"
+INCLUDE "data/maps/headers/RedsHouse1F.asm"
INCLUDE "scripts/RedsHouse1F.asm"
-INCLUDE "data/mapObjects/RedsHouse1F.asm"
+INCLUDE "data/maps/objects/RedsHouse1F.asm"
RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk"
-INCLUDE "data/mapHeaders/CeladonMart3F.asm"
+INCLUDE "data/maps/headers/CeladonMart3F.asm"
INCLUDE "scripts/CeladonMart3F.asm"
-INCLUDE "data/mapObjects/CeladonMart3F.asm"
+INCLUDE "data/maps/objects/CeladonMart3F.asm"
CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk"
-INCLUDE "data/mapHeaders/CeladonMart4F.asm"
+INCLUDE "data/maps/headers/CeladonMart4F.asm"
INCLUDE "scripts/CeladonMart4F.asm"
-INCLUDE "data/mapObjects/CeladonMart4F.asm"
+INCLUDE "data/maps/objects/CeladonMart4F.asm"
CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk"
-INCLUDE "data/mapHeaders/CeladonMartRoof.asm"
+INCLUDE "data/maps/headers/CeladonMartRoof.asm"
INCLUDE "scripts/CeladonMartRoof.asm"
-INCLUDE "data/mapObjects/CeladonMartRoof.asm"
+INCLUDE "data/maps/objects/CeladonMartRoof.asm"
CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk"
-INCLUDE "data/mapHeaders/CeladonMartElevator.asm"
+INCLUDE "data/maps/headers/CeladonMartElevator.asm"
INCLUDE "scripts/CeladonMartElevator.asm"
-INCLUDE "data/mapObjects/CeladonMartElevator.asm"
+INCLUDE "data/maps/objects/CeladonMartElevator.asm"
CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk"
-INCLUDE "data/mapHeaders/CeladonMansion1F.asm"
+INCLUDE "data/maps/headers/CeladonMansion1F.asm"
INCLUDE "scripts/CeladonMansion1F.asm"
-INCLUDE "data/mapObjects/CeladonMansion1F.asm"
+INCLUDE "data/maps/objects/CeladonMansion1F.asm"
CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk"
-INCLUDE "data/mapHeaders/CeladonMansion2F.asm"
+INCLUDE "data/maps/headers/CeladonMansion2F.asm"
INCLUDE "scripts/CeladonMansion2F.asm"
-INCLUDE "data/mapObjects/CeladonMansion2F.asm"
+INCLUDE "data/maps/objects/CeladonMansion2F.asm"
CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk"
-INCLUDE "data/mapHeaders/CeladonMansion3F.asm"
+INCLUDE "data/maps/headers/CeladonMansion3F.asm"
INCLUDE "scripts/CeladonMansion3F.asm"
-INCLUDE "data/mapObjects/CeladonMansion3F.asm"
+INCLUDE "data/maps/objects/CeladonMansion3F.asm"
CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk"
-INCLUDE "data/mapHeaders/CeladonMansionRoof.asm"
+INCLUDE "data/maps/headers/CeladonMansionRoof.asm"
INCLUDE "scripts/CeladonMansionRoof.asm"
-INCLUDE "data/mapObjects/CeladonMansionRoof.asm"
+INCLUDE "data/maps/objects/CeladonMansionRoof.asm"
CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk"
-INCLUDE "data/mapHeaders/CeladonPokecenter.asm"
+INCLUDE "data/maps/headers/CeladonPokecenter.asm"
INCLUDE "scripts/CeladonPokecenter.asm"
-INCLUDE "data/mapObjects/CeladonPokecenter.asm"
+INCLUDE "data/maps/objects/CeladonPokecenter.asm"
-INCLUDE "data/mapHeaders/CeladonGym.asm"
+INCLUDE "data/maps/headers/CeladonGym.asm"
INCLUDE "scripts/CeladonGym.asm"
-INCLUDE "data/mapObjects/CeladonGym.asm"
+INCLUDE "data/maps/objects/CeladonGym.asm"
CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk"
-INCLUDE "data/mapHeaders/GameCorner.asm"
+INCLUDE "data/maps/headers/GameCorner.asm"
INCLUDE "scripts/GameCorner.asm"
-INCLUDE "data/mapObjects/GameCorner.asm"
+INCLUDE "data/maps/objects/GameCorner.asm"
GameCorner_Blocks: INCBIN "maps/GameCorner.blk"
-INCLUDE "data/mapHeaders/CeladonMart5F.asm"
+INCLUDE "data/maps/headers/CeladonMart5F.asm"
INCLUDE "scripts/CeladonMart5F.asm"
-INCLUDE "data/mapObjects/CeladonMart5F.asm"
+INCLUDE "data/maps/objects/CeladonMart5F.asm"
CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk"
-INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm"
+INCLUDE "data/maps/headers/GameCornerPrizeRoom.asm"
INCLUDE "scripts/GameCornerPrizeRoom.asm"
-INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm"
+INCLUDE "data/maps/objects/GameCornerPrizeRoom.asm"
GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk"
-INCLUDE "data/mapHeaders/CeladonDiner.asm"
+INCLUDE "data/maps/headers/CeladonDiner.asm"
INCLUDE "scripts/CeladonDiner.asm"
-INCLUDE "data/mapObjects/CeladonDiner.asm"
+INCLUDE "data/maps/objects/CeladonDiner.asm"
CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk"
-INCLUDE "data/mapHeaders/CeladonChiefHouse.asm"
+INCLUDE "data/maps/headers/CeladonChiefHouse.asm"
INCLUDE "scripts/CeladonChiefHouse.asm"
-INCLUDE "data/mapObjects/CeladonChiefHouse.asm"
+INCLUDE "data/maps/objects/CeladonChiefHouse.asm"
CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk"
-INCLUDE "data/mapHeaders/CeladonHotel.asm"
+INCLUDE "data/maps/headers/CeladonHotel.asm"
INCLUDE "scripts/CeladonHotel.asm"
-INCLUDE "data/mapObjects/CeladonHotel.asm"
+INCLUDE "data/maps/objects/CeladonHotel.asm"
CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk"
-INCLUDE "data/mapHeaders/MtMoonPokecenter.asm"
+INCLUDE "data/maps/headers/MtMoonPokecenter.asm"
INCLUDE "scripts/MtMoonPokecenter.asm"
-INCLUDE "data/mapObjects/MtMoonPokecenter.asm"
+INCLUDE "data/maps/objects/MtMoonPokecenter.asm"
-INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm"
+INCLUDE "data/maps/headers/RockTunnelPokecenter.asm"
INCLUDE "scripts/RockTunnelPokecenter.asm"
-INCLUDE "data/mapObjects/RockTunnelPokecenter.asm"
+INCLUDE "data/maps/objects/RockTunnelPokecenter.asm"
-INCLUDE "data/mapHeaders/Route11Gate1F.asm"
+INCLUDE "data/maps/headers/Route11Gate1F.asm"
INCLUDE "scripts/Route11Gate1F.asm"
-INCLUDE "data/mapObjects/Route11Gate1F.asm"
+INCLUDE "data/maps/objects/Route11Gate1F.asm"
-INCLUDE "data/mapHeaders/Route11Gate2F.asm"
+INCLUDE "data/maps/headers/Route11Gate2F.asm"
INCLUDE "scripts/Route11Gate2F.asm"
-INCLUDE "data/mapObjects/Route11Gate2F.asm"
+INCLUDE "data/maps/objects/Route11Gate2F.asm"
-INCLUDE "data/mapHeaders/Route12Gate1F.asm"
+INCLUDE "data/maps/headers/Route12Gate1F.asm"
INCLUDE "scripts/Route12Gate1F.asm"
-INCLUDE "data/mapObjects/Route12Gate1F.asm"
+INCLUDE "data/maps/objects/Route12Gate1F.asm"
Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk"
-INCLUDE "data/mapHeaders/Route12Gate2F.asm"
+INCLUDE "data/maps/headers/Route12Gate2F.asm"
INCLUDE "scripts/Route12Gate2F.asm"
-INCLUDE "data/mapObjects/Route12Gate2F.asm"
+INCLUDE "data/maps/objects/Route12Gate2F.asm"
-INCLUDE "data/mapHeaders/Route15Gate1F.asm"
+INCLUDE "data/maps/headers/Route15Gate1F.asm"
INCLUDE "scripts/Route15Gate1F.asm"
-INCLUDE "data/mapObjects/Route15Gate1F.asm"
+INCLUDE "data/maps/objects/Route15Gate1F.asm"
-INCLUDE "data/mapHeaders/Route15Gate2F.asm"
+INCLUDE "data/maps/headers/Route15Gate2F.asm"
INCLUDE "scripts/Route15Gate2F.asm"
-INCLUDE "data/mapObjects/Route15Gate2F.asm"
+INCLUDE "data/maps/objects/Route15Gate2F.asm"
-INCLUDE "data/mapHeaders/Route16Gate1F.asm"
+INCLUDE "data/maps/headers/Route16Gate1F.asm"
INCLUDE "scripts/Route16Gate1F.asm"
-INCLUDE "data/mapObjects/Route16Gate1F.asm"
+INCLUDE "data/maps/objects/Route16Gate1F.asm"
Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk"
-INCLUDE "data/mapHeaders/Route16Gate2F.asm"
+INCLUDE "data/maps/headers/Route16Gate2F.asm"
INCLUDE "scripts/Route16Gate2F.asm"
-INCLUDE "data/mapObjects/Route16Gate2F.asm"
+INCLUDE "data/maps/objects/Route16Gate2F.asm"
-INCLUDE "data/mapHeaders/Route18Gate1F.asm"
+INCLUDE "data/maps/headers/Route18Gate1F.asm"
INCLUDE "scripts/Route18Gate1F.asm"
-INCLUDE "data/mapObjects/Route18Gate1F.asm"
+INCLUDE "data/maps/objects/Route18Gate1F.asm"
-INCLUDE "data/mapHeaders/Route18Gate2F.asm"
+INCLUDE "data/maps/headers/Route18Gate2F.asm"
INCLUDE "scripts/Route18Gate2F.asm"
-INCLUDE "data/mapObjects/Route18Gate2F.asm"
+INCLUDE "data/maps/objects/Route18Gate2F.asm"
-INCLUDE "data/mapHeaders/MtMoon1F.asm"
+INCLUDE "data/maps/headers/MtMoon1F.asm"
INCLUDE "scripts/MtMoon1F.asm"
-INCLUDE "data/mapObjects/MtMoon1F.asm"
+INCLUDE "data/maps/objects/MtMoon1F.asm"
MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk"
-INCLUDE "data/mapHeaders/MtMoonB2F.asm"
+INCLUDE "data/maps/headers/MtMoonB2F.asm"
INCLUDE "scripts/MtMoonB2F.asm"
-INCLUDE "data/mapObjects/MtMoonB2F.asm"
+INCLUDE "data/maps/objects/MtMoonB2F.asm"
MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk"
-INCLUDE "data/mapHeaders/SafariZoneWest.asm"
+INCLUDE "data/maps/headers/SafariZoneWest.asm"
INCLUDE "scripts/SafariZoneWest.asm"
-INCLUDE "data/mapObjects/SafariZoneWest.asm"
+INCLUDE "data/maps/objects/SafariZoneWest.asm"
SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk"
-INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm"
+INCLUDE "data/maps/headers/SafariZoneSecretHouse.asm"
INCLUDE "scripts/SafariZoneSecretHouse.asm"
-INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm"
+INCLUDE "data/maps/objects/SafariZoneSecretHouse.asm"
SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk"
SECTION "Maps 9", ROMX
-INCLUDE "data/mapHeaders/TradeCenter.asm"
+INCLUDE "data/maps/headers/TradeCenter.asm"
INCLUDE "scripts/TradeCenter.asm"
-INCLUDE "data/mapObjects/TradeCenter.asm"
+INCLUDE "data/maps/objects/TradeCenter.asm"
TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk"
-INCLUDE "data/mapHeaders/Colosseum.asm"
+INCLUDE "data/maps/headers/Colosseum.asm"
INCLUDE "scripts/Colosseum.asm"
-INCLUDE "data/mapObjects/Colosseum.asm"
+INCLUDE "data/maps/objects/Colosseum.asm"
Colosseum_Blocks: INCBIN "maps/Colosseum.blk"
SECTION "Maps 10", ROMX
-INCLUDE "data/mapHeaders/Route22.asm"
-INCLUDE "data/mapObjects/Route22.asm"
+INCLUDE "data/maps/headers/Route22.asm"
+INCLUDE "data/maps/objects/Route22.asm"
Route22_Blocks: INCBIN "maps/Route22.blk"
-INCLUDE "data/mapHeaders/Route20.asm"
-INCLUDE "data/mapObjects/Route20.asm"
+INCLUDE "data/maps/headers/Route20.asm"
+INCLUDE "data/maps/objects/Route20.asm"
Route20_Blocks: INCBIN "maps/Route20.blk"
-INCLUDE "data/mapHeaders/Route23.asm"
-INCLUDE "data/mapObjects/Route23.asm"
+INCLUDE "data/maps/headers/Route23.asm"
+INCLUDE "data/maps/objects/Route23.asm"
Route23_Blocks: INCBIN "maps/Route23.blk"
-INCLUDE "data/mapHeaders/Route24.asm"
-INCLUDE "data/mapObjects/Route24.asm"
+INCLUDE "data/maps/headers/Route24.asm"
+INCLUDE "data/maps/objects/Route24.asm"
Route24_Blocks: INCBIN "maps/Route24.blk"
-INCLUDE "data/mapHeaders/Route25.asm"
-INCLUDE "data/mapObjects/Route25.asm"
+INCLUDE "data/maps/headers/Route25.asm"
+INCLUDE "data/maps/objects/Route25.asm"
Route25_Blocks: INCBIN "maps/Route25.blk"
-INCLUDE "data/mapHeaders/IndigoPlateau.asm"
+INCLUDE "data/maps/headers/IndigoPlateau.asm"
INCLUDE "scripts/IndigoPlateau.asm"
-INCLUDE "data/mapObjects/IndigoPlateau.asm"
+INCLUDE "data/maps/objects/IndigoPlateau.asm"
IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk"
-INCLUDE "data/mapHeaders/SaffronCity.asm"
-INCLUDE "data/mapObjects/SaffronCity.asm"
+INCLUDE "data/maps/headers/SaffronCity.asm"
+INCLUDE "data/maps/objects/SaffronCity.asm"
SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk"
INCLUDE "scripts/SaffronCity.asm"
@@ -624,77 +624,77 @@
INCLUDE "scripts/Route24.asm"
INCLUDE "scripts/Route25.asm"
-INCLUDE "data/mapHeaders/VictoryRoad2F.asm"
+INCLUDE "data/maps/headers/VictoryRoad2F.asm"
INCLUDE "scripts/VictoryRoad2F.asm"
-INCLUDE "data/mapObjects/VictoryRoad2F.asm"
+INCLUDE "data/maps/objects/VictoryRoad2F.asm"
VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk"
-INCLUDE "data/mapHeaders/MtMoonB1F.asm"
+INCLUDE "data/maps/headers/MtMoonB1F.asm"
INCLUDE "scripts/MtMoonB1F.asm"
-INCLUDE "data/mapObjects/MtMoonB1F.asm"
+INCLUDE "data/maps/objects/MtMoonB1F.asm"
MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk"
-INCLUDE "data/mapHeaders/SilphCo7F.asm"
+INCLUDE "data/maps/headers/SilphCo7F.asm"
INCLUDE "scripts/SilphCo7F.asm"
-INCLUDE "data/mapObjects/SilphCo7F.asm"
+INCLUDE "data/maps/objects/SilphCo7F.asm"
SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk"
-INCLUDE "data/mapHeaders/PokemonMansion2F.asm"
+INCLUDE "data/maps/headers/PokemonMansion2F.asm"
INCLUDE "scripts/PokemonMansion2F.asm"
-INCLUDE "data/mapObjects/PokemonMansion2F.asm"
+INCLUDE "data/maps/objects/PokemonMansion2F.asm"
PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk"
-INCLUDE "data/mapHeaders/PokemonMansion3F.asm"
+INCLUDE "data/maps/headers/PokemonMansion3F.asm"
INCLUDE "scripts/PokemonMansion3F.asm"
-INCLUDE "data/mapObjects/PokemonMansion3F.asm"
+INCLUDE "data/maps/objects/PokemonMansion3F.asm"
PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk"
-INCLUDE "data/mapHeaders/PokemonMansionB1F.asm"
+INCLUDE "data/maps/headers/PokemonMansionB1F.asm"
INCLUDE "scripts/PokemonMansionB1F.asm"
-INCLUDE "data/mapObjects/PokemonMansionB1F.asm"
+INCLUDE "data/maps/objects/PokemonMansionB1F.asm"
PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk"
SECTION "Maps 11", ROMX
-INCLUDE "data/mapHeaders/Route2.asm"
-INCLUDE "data/mapObjects/Route2.asm"
+INCLUDE "data/maps/headers/Route2.asm"
+INCLUDE "data/maps/objects/Route2.asm"
Route2_Blocks: INCBIN "maps/Route2.blk"
-INCLUDE "data/mapHeaders/Route3.asm"
-INCLUDE "data/mapObjects/Route3.asm"
+INCLUDE "data/maps/headers/Route3.asm"
+INCLUDE "data/maps/objects/Route3.asm"
Route3_Blocks: INCBIN "maps/Route3.blk"
-INCLUDE "data/mapHeaders/Route4.asm"
-INCLUDE "data/mapObjects/Route4.asm"
+INCLUDE "data/maps/headers/Route4.asm"
+INCLUDE "data/maps/objects/Route4.asm"
Route4_Blocks: INCBIN "maps/Route4.blk"
-INCLUDE "data/mapHeaders/Route5.asm"
-INCLUDE "data/mapObjects/Route5.asm"
+INCLUDE "data/maps/headers/Route5.asm"
+INCLUDE "data/maps/objects/Route5.asm"
Route5_Blocks: INCBIN "maps/Route5.blk"
-INCLUDE "data/mapHeaders/Route9.asm"
-INCLUDE "data/mapObjects/Route9.asm"
+INCLUDE "data/maps/headers/Route9.asm"
+INCLUDE "data/maps/objects/Route9.asm"
Route9_Blocks: INCBIN "maps/Route9.blk"
-INCLUDE "data/mapHeaders/Route13.asm"
-INCLUDE "data/mapObjects/Route13.asm"
+INCLUDE "data/maps/headers/Route13.asm"
+INCLUDE "data/maps/objects/Route13.asm"
Route13_Blocks: INCBIN "maps/Route13.blk"
-INCLUDE "data/mapHeaders/Route14.asm"
-INCLUDE "data/mapObjects/Route14.asm"
+INCLUDE "data/maps/headers/Route14.asm"
+INCLUDE "data/maps/objects/Route14.asm"
Route14_Blocks: INCBIN "maps/Route14.blk"
-INCLUDE "data/mapHeaders/Route17.asm"
-INCLUDE "data/mapObjects/Route17.asm"
+INCLUDE "data/maps/headers/Route17.asm"
+INCLUDE "data/maps/objects/Route17.asm"
Route17_Blocks: INCBIN "maps/Route17.blk"
-INCLUDE "data/mapHeaders/Route19.asm"
-INCLUDE "data/mapObjects/Route19.asm"
+INCLUDE "data/maps/headers/Route19.asm"
+INCLUDE "data/maps/objects/Route19.asm"
Route19_Blocks: INCBIN "maps/Route19.blk"
-INCLUDE "data/mapHeaders/Route21.asm"
-INCLUDE "data/mapObjects/Route21.asm"
+INCLUDE "data/maps/headers/Route21.asm"
+INCLUDE "data/maps/objects/Route21.asm"
Route21_Blocks: INCBIN "maps/Route21.blk"
VermilionOldRodHouse_Blocks:
@@ -717,65 +717,65 @@
INCLUDE "scripts/Route19.asm"
INCLUDE "scripts/Route21.asm"
-INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm"
+INCLUDE "data/maps/headers/VermilionOldRodHouse.asm"
INCLUDE "scripts/VermilionOldRodHouse.asm"
-INCLUDE "data/mapObjects/VermilionOldRodHouse.asm"
+INCLUDE "data/maps/objects/VermilionOldRodHouse.asm"
-INCLUDE "data/mapHeaders/CeladonMart2F.asm"
+INCLUDE "data/maps/headers/CeladonMart2F.asm"
INCLUDE "scripts/CeladonMart2F.asm"
-INCLUDE "data/mapObjects/CeladonMart2F.asm"
+INCLUDE "data/maps/objects/CeladonMart2F.asm"
CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk"
-INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm"
+INCLUDE "data/maps/headers/FuchsiaGoodRodHouse.asm"
INCLUDE "scripts/FuchsiaGoodRodHouse.asm"
-INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm"
+INCLUDE "data/maps/objects/FuchsiaGoodRodHouse.asm"
-INCLUDE "data/mapHeaders/Daycare.asm"
+INCLUDE "data/maps/headers/Daycare.asm"
INCLUDE "scripts/Daycare.asm"
-INCLUDE "data/mapObjects/Daycare.asm"
+INCLUDE "data/maps/objects/Daycare.asm"
-INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm"
+INCLUDE "data/maps/headers/Route12SuperRodHouse.asm"
INCLUDE "scripts/Route12SuperRodHouse.asm"
-INCLUDE "data/mapObjects/Route12SuperRodHouse.asm"
+INCLUDE "data/maps/objects/Route12SuperRodHouse.asm"
-INCLUDE "data/mapHeaders/SilphCo8F.asm"
+INCLUDE "data/maps/headers/SilphCo8F.asm"
INCLUDE "scripts/SilphCo8F.asm"
-INCLUDE "data/mapObjects/SilphCo8F.asm"
+INCLUDE "data/maps/objects/SilphCo8F.asm"
SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk"
SECTION "Maps 13", ROMX
-INCLUDE "data/mapHeaders/Route6.asm"
-INCLUDE "data/mapObjects/Route6.asm"
+INCLUDE "data/maps/headers/Route6.asm"
+INCLUDE "data/maps/objects/Route6.asm"
Route6_Blocks: INCBIN "maps/Route6.blk"
-INCLUDE "data/mapHeaders/Route8.asm"
-INCLUDE "data/mapObjects/Route8.asm"
+INCLUDE "data/maps/headers/Route8.asm"
+INCLUDE "data/maps/objects/Route8.asm"
Route8_Blocks: INCBIN "maps/Route8.blk"
-INCLUDE "data/mapHeaders/Route10.asm"
-INCLUDE "data/mapObjects/Route10.asm"
+INCLUDE "data/maps/headers/Route10.asm"
+INCLUDE "data/maps/objects/Route10.asm"
Route10_Blocks: INCBIN "maps/Route10.blk"
-INCLUDE "data/mapHeaders/Route11.asm"
-INCLUDE "data/mapObjects/Route11.asm"
+INCLUDE "data/maps/headers/Route11.asm"
+INCLUDE "data/maps/objects/Route11.asm"
Route11_Blocks: INCBIN "maps/Route11.blk"
-INCLUDE "data/mapHeaders/Route12.asm"
-INCLUDE "data/mapObjects/Route12.asm"
+INCLUDE "data/maps/headers/Route12.asm"
+INCLUDE "data/maps/objects/Route12.asm"
Route12_Blocks: INCBIN "maps/Route12.blk"
-INCLUDE "data/mapHeaders/Route15.asm"
-INCLUDE "data/mapObjects/Route15.asm"
+INCLUDE "data/maps/headers/Route15.asm"
+INCLUDE "data/maps/objects/Route15.asm"
Route15_Blocks: INCBIN "maps/Route15.blk"
-INCLUDE "data/mapHeaders/Route16.asm"
-INCLUDE "data/mapObjects/Route16.asm"
+INCLUDE "data/maps/headers/Route16.asm"
+INCLUDE "data/maps/objects/Route16.asm"
Route16_Blocks: INCBIN "maps/Route16.blk"
-INCLUDE "data/mapHeaders/Route18.asm"
-INCLUDE "data/mapObjects/Route18.asm"
+INCLUDE "data/maps/headers/Route18.asm"
+INCLUDE "data/maps/objects/Route18.asm"
Route18_Blocks: INCBIN "maps/Route18.blk"
INCBIN "maps/UnusedPokecenterCopy.blk"
@@ -792,34 +792,34 @@
INCLUDE "scripts/Route16.asm"
INCLUDE "scripts/Route18.asm"
-INCLUDE "data/mapHeaders/PokemonFanClub.asm"
+INCLUDE "data/maps/headers/PokemonFanClub.asm"
INCLUDE "scripts/PokemonFanClub.asm"
-INCLUDE "data/mapObjects/PokemonFanClub.asm"
+INCLUDE "data/maps/objects/PokemonFanClub.asm"
PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk"
-INCLUDE "data/mapHeaders/SilphCo2F.asm"
+INCLUDE "data/maps/headers/SilphCo2F.asm"
INCLUDE "scripts/SilphCo2F.asm"
-INCLUDE "data/mapObjects/SilphCo2F.asm"
+INCLUDE "data/maps/objects/SilphCo2F.asm"
SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk"
-INCLUDE "data/mapHeaders/SilphCo3F.asm"
+INCLUDE "data/maps/headers/SilphCo3F.asm"
INCLUDE "scripts/SilphCo3F.asm"
-INCLUDE "data/mapObjects/SilphCo3F.asm"
+INCLUDE "data/maps/objects/SilphCo3F.asm"
SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk"
-INCLUDE "data/mapHeaders/SilphCo10F.asm"
+INCLUDE "data/maps/headers/SilphCo10F.asm"
INCLUDE "scripts/SilphCo10F.asm"
-INCLUDE "data/mapObjects/SilphCo10F.asm"
+INCLUDE "data/maps/objects/SilphCo10F.asm"
SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk"
-INCLUDE "data/mapHeaders/LancesRoom.asm"
+INCLUDE "data/maps/headers/LancesRoom.asm"
INCLUDE "scripts/LancesRoom.asm"
-INCLUDE "data/mapObjects/LancesRoom.asm"
+INCLUDE "data/maps/objects/LancesRoom.asm"
LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk"
-INCLUDE "data/mapHeaders/HallOfFame.asm"
+INCLUDE "data/maps/headers/HallOfFame.asm"
INCLUDE "scripts/HallOfFame.asm"
-INCLUDE "data/mapObjects/HallOfFame.asm"
+INCLUDE "data/maps/objects/HallOfFame.asm"
HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk"
@@ -851,128 +851,128 @@
ViridianForestSouthGate_Blocks:
ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk"
-INCLUDE "data/mapHeaders/RedsHouse2F.asm"
+INCLUDE "data/maps/headers/RedsHouse2F.asm"
INCLUDE "scripts/RedsHouse2F.asm"
-INCLUDE "data/mapObjects/RedsHouse2F.asm"
+INCLUDE "data/maps/objects/RedsHouse2F.asm"
SECTION "Maps 16", ROMX
-INCLUDE "data/mapHeaders/Museum1F.asm"
+INCLUDE "data/maps/headers/Museum1F.asm"
INCLUDE "scripts/Museum1F.asm"
-INCLUDE "data/mapObjects/Museum1F.asm"
+INCLUDE "data/maps/objects/Museum1F.asm"
-INCLUDE "data/mapHeaders/Museum2F.asm"
+INCLUDE "data/maps/headers/Museum2F.asm"
INCLUDE "scripts/Museum2F.asm"
-INCLUDE "data/mapObjects/Museum2F.asm"
+INCLUDE "data/maps/objects/Museum2F.asm"
-INCLUDE "data/mapHeaders/PewterGym.asm"
+INCLUDE "data/maps/headers/PewterGym.asm"
INCLUDE "scripts/PewterGym.asm"
-INCLUDE "data/mapObjects/PewterGym.asm"
+INCLUDE "data/maps/objects/PewterGym.asm"
PewterGym_Blocks: INCBIN "maps/PewterGym.blk"
-INCLUDE "data/mapHeaders/PewterPokecenter.asm"
+INCLUDE "data/maps/headers/PewterPokecenter.asm"
INCLUDE "scripts/PewterPokecenter.asm"
-INCLUDE "data/mapObjects/PewterPokecenter.asm"
+INCLUDE "data/maps/objects/PewterPokecenter.asm"
-INCLUDE "data/mapHeaders/CeruleanPokecenter.asm"
+INCLUDE "data/maps/headers/CeruleanPokecenter.asm"
INCLUDE "scripts/CeruleanPokecenter.asm"
-INCLUDE "data/mapObjects/CeruleanPokecenter.asm"
+INCLUDE "data/maps/objects/CeruleanPokecenter.asm"
CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk"
-INCLUDE "data/mapHeaders/CeruleanGym.asm"
+INCLUDE "data/maps/headers/CeruleanGym.asm"
INCLUDE "scripts/CeruleanGym.asm"
-INCLUDE "data/mapObjects/CeruleanGym.asm"
+INCLUDE "data/maps/objects/CeruleanGym.asm"
CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk"
-INCLUDE "data/mapHeaders/CeruleanMart.asm"
+INCLUDE "data/maps/headers/CeruleanMart.asm"
INCLUDE "scripts/CeruleanMart.asm"
-INCLUDE "data/mapObjects/CeruleanMart.asm"
+INCLUDE "data/maps/objects/CeruleanMart.asm"
-INCLUDE "data/mapHeaders/LavenderPokecenter.asm"
+INCLUDE "data/maps/headers/LavenderPokecenter.asm"
INCLUDE "scripts/LavenderPokecenter.asm"
-INCLUDE "data/mapObjects/LavenderPokecenter.asm"
+INCLUDE "data/maps/objects/LavenderPokecenter.asm"
-INCLUDE "data/mapHeaders/LavenderMart.asm"
+INCLUDE "data/maps/headers/LavenderMart.asm"
INCLUDE "scripts/LavenderMart.asm"
-INCLUDE "data/mapObjects/LavenderMart.asm"
+INCLUDE "data/maps/objects/LavenderMart.asm"
-INCLUDE "data/mapHeaders/VermilionPokecenter.asm"
+INCLUDE "data/maps/headers/VermilionPokecenter.asm"
INCLUDE "scripts/VermilionPokecenter.asm"
-INCLUDE "data/mapObjects/VermilionPokecenter.asm"
+INCLUDE "data/maps/objects/VermilionPokecenter.asm"
-INCLUDE "data/mapHeaders/VermilionMart.asm"
+INCLUDE "data/maps/headers/VermilionMart.asm"
INCLUDE "scripts/VermilionMart.asm"
-INCLUDE "data/mapObjects/VermilionMart.asm"
+INCLUDE "data/maps/objects/VermilionMart.asm"
-INCLUDE "data/mapHeaders/VermilionGym.asm"
+INCLUDE "data/maps/headers/VermilionGym.asm"
INCLUDE "scripts/VermilionGym.asm"
-INCLUDE "data/mapObjects/VermilionGym.asm"
+INCLUDE "data/maps/objects/VermilionGym.asm"
VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk"
-INCLUDE "data/mapHeaders/CopycatsHouse2F.asm"
+INCLUDE "data/maps/headers/CopycatsHouse2F.asm"
INCLUDE "scripts/CopycatsHouse2F.asm"
-INCLUDE "data/mapObjects/CopycatsHouse2F.asm"
+INCLUDE "data/maps/objects/CopycatsHouse2F.asm"
-INCLUDE "data/mapHeaders/FightingDojo.asm"
+INCLUDE "data/maps/headers/FightingDojo.asm"
INCLUDE "scripts/FightingDojo.asm"
-INCLUDE "data/mapObjects/FightingDojo.asm"
+INCLUDE "data/maps/objects/FightingDojo.asm"
FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk"
-INCLUDE "data/mapHeaders/SaffronGym.asm"
+INCLUDE "data/maps/headers/SaffronGym.asm"
INCLUDE "scripts/SaffronGym.asm"
-INCLUDE "data/mapObjects/SaffronGym.asm"
+INCLUDE "data/maps/objects/SaffronGym.asm"
SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk"
-INCLUDE "data/mapHeaders/SaffronMart.asm"
+INCLUDE "data/maps/headers/SaffronMart.asm"
INCLUDE "scripts/SaffronMart.asm"
-INCLUDE "data/mapObjects/SaffronMart.asm"
+INCLUDE "data/maps/objects/SaffronMart.asm"
-INCLUDE "data/mapHeaders/SilphCo1F.asm"
+INCLUDE "data/maps/headers/SilphCo1F.asm"
INCLUDE "scripts/SilphCo1F.asm"
-INCLUDE "data/mapObjects/SilphCo1F.asm"
+INCLUDE "data/maps/objects/SilphCo1F.asm"
SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk"
-INCLUDE "data/mapHeaders/SaffronPokecenter.asm"
+INCLUDE "data/maps/headers/SaffronPokecenter.asm"
INCLUDE "scripts/SaffronPokecenter.asm"
-INCLUDE "data/mapObjects/SaffronPokecenter.asm"
+INCLUDE "data/maps/objects/SaffronPokecenter.asm"
-INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm"
+INCLUDE "data/maps/headers/ViridianForestNorthGate.asm"
INCLUDE "scripts/ViridianForestNorthGate.asm"
-INCLUDE "data/mapObjects/ViridianForestNorthGate.asm"
+INCLUDE "data/maps/objects/ViridianForestNorthGate.asm"
-INCLUDE "data/mapHeaders/Route2Gate.asm"
+INCLUDE "data/maps/headers/Route2Gate.asm"
INCLUDE "scripts/Route2Gate.asm"
-INCLUDE "data/mapObjects/Route2Gate.asm"
+INCLUDE "data/maps/objects/Route2Gate.asm"
-INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm"
+INCLUDE "data/maps/headers/ViridianForestSouthGate.asm"
INCLUDE "scripts/ViridianForestSouthGate.asm"
-INCLUDE "data/mapObjects/ViridianForestSouthGate.asm"
+INCLUDE "data/maps/objects/ViridianForestSouthGate.asm"
-INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute5.asm"
INCLUDE "scripts/UndergroundPathRoute5.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute5.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute5.asm"
-INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute6.asm"
INCLUDE "scripts/UndergroundPathRoute6.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute6.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute6.asm"
-INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute7.asm"
INCLUDE "scripts/UndergroundPathRoute7.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute7.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute7.asm"
-INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm"
+INCLUDE "data/maps/headers/UndergroundPathRoute7Copy.asm"
INCLUDE "scripts/UndergroundPathRoute7Copy.asm"
-INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm"
+INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm"
-INCLUDE "data/mapHeaders/SilphCo9F.asm"
+INCLUDE "data/maps/headers/SilphCo9F.asm"
INCLUDE "scripts/SilphCo9F.asm"
-INCLUDE "data/mapObjects/SilphCo9F.asm"
+INCLUDE "data/maps/objects/SilphCo9F.asm"
SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk"
-INCLUDE "data/mapHeaders/VictoryRoad1F.asm"
+INCLUDE "data/maps/headers/VictoryRoad1F.asm"
INCLUDE "scripts/VictoryRoad1F.asm"
-INCLUDE "data/mapObjects/VictoryRoad1F.asm"
+INCLUDE "data/maps/objects/VictoryRoad1F.asm"
VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk"
@@ -987,114 +987,114 @@
SSAnneB1FRooms_Blocks:
SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk"
-INCLUDE "data/mapHeaders/PokemonTower1F.asm"
+INCLUDE "data/maps/headers/PokemonTower1F.asm"
INCLUDE "scripts/PokemonTower1F.asm"
-INCLUDE "data/mapObjects/PokemonTower1F.asm"
+INCLUDE "data/maps/objects/PokemonTower1F.asm"
PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk"
-INCLUDE "data/mapHeaders/PokemonTower2F.asm"
+INCLUDE "data/maps/headers/PokemonTower2F.asm"
INCLUDE "scripts/PokemonTower2F.asm"
-INCLUDE "data/mapObjects/PokemonTower2F.asm"
+INCLUDE "data/maps/objects/PokemonTower2F.asm"
PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk"
-INCLUDE "data/mapHeaders/PokemonTower3F.asm"
+INCLUDE "data/maps/headers/PokemonTower3F.asm"
INCLUDE "scripts/PokemonTower3F.asm"
-INCLUDE "data/mapObjects/PokemonTower3F.asm"
+INCLUDE "data/maps/objects/PokemonTower3F.asm"
PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk"
-INCLUDE "data/mapHeaders/PokemonTower4F.asm"
+INCLUDE "data/maps/headers/PokemonTower4F.asm"
INCLUDE "scripts/PokemonTower4F.asm"
-INCLUDE "data/mapObjects/PokemonTower4F.asm"
+INCLUDE "data/maps/objects/PokemonTower4F.asm"
PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk"
-INCLUDE "data/mapHeaders/PokemonTower5F.asm"
+INCLUDE "data/maps/headers/PokemonTower5F.asm"
INCLUDE "scripts/PokemonTower5F.asm"
-INCLUDE "data/mapObjects/PokemonTower5F.asm"
+INCLUDE "data/maps/objects/PokemonTower5F.asm"
PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk"
-INCLUDE "data/mapHeaders/PokemonTower6F.asm"
+INCLUDE "data/maps/headers/PokemonTower6F.asm"
INCLUDE "scripts/PokemonTower6F.asm"
-INCLUDE "data/mapObjects/PokemonTower6F.asm"
+INCLUDE "data/maps/objects/PokemonTower6F.asm"
PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk"
INCBIN "maps/UnusedEmptyMap.blk"
-INCLUDE "data/mapHeaders/PokemonTower7F.asm"
+INCLUDE "data/maps/headers/PokemonTower7F.asm"
INCLUDE "scripts/PokemonTower7F.asm"
-INCLUDE "data/mapObjects/PokemonTower7F.asm"
+INCLUDE "data/maps/objects/PokemonTower7F.asm"
PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk"
-INCLUDE "data/mapHeaders/CeladonMart1F.asm"
+INCLUDE "data/maps/headers/CeladonMart1F.asm"
INCLUDE "scripts/CeladonMart1F.asm"
-INCLUDE "data/mapObjects/CeladonMart1F.asm"
+INCLUDE "data/maps/objects/CeladonMart1F.asm"
CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk"
SECTION "Maps 18", ROMX
-INCLUDE "data/mapHeaders/ViridianForest.asm"
+INCLUDE "data/maps/headers/ViridianForest.asm"
INCLUDE "scripts/ViridianForest.asm"
-INCLUDE "data/mapObjects/ViridianForest.asm"
+INCLUDE "data/maps/objects/ViridianForest.asm"
-INCLUDE "data/mapHeaders/SSAnne1F.asm"
+INCLUDE "data/maps/headers/SSAnne1F.asm"
INCLUDE "scripts/SSAnne1F.asm"
-INCLUDE "data/mapObjects/SSAnne1F.asm"
+INCLUDE "data/maps/objects/SSAnne1F.asm"
SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk"
-INCLUDE "data/mapHeaders/SSAnne2F.asm"
+INCLUDE "data/maps/headers/SSAnne2F.asm"
INCLUDE "scripts/SSAnne2F.asm"
-INCLUDE "data/mapObjects/SSAnne2F.asm"
+INCLUDE "data/maps/objects/SSAnne2F.asm"
SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk"
-INCLUDE "data/mapHeaders/SSAnneB1F.asm"
+INCLUDE "data/maps/headers/SSAnneB1F.asm"
INCLUDE "scripts/SSAnneB1F.asm"
-INCLUDE "data/mapObjects/SSAnneB1F.asm"
+INCLUDE "data/maps/objects/SSAnneB1F.asm"
SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk"
-INCLUDE "data/mapHeaders/SSAnneBow.asm"
+INCLUDE "data/maps/headers/SSAnneBow.asm"
INCLUDE "scripts/SSAnneBow.asm"
-INCLUDE "data/mapObjects/SSAnneBow.asm"
+INCLUDE "data/maps/objects/SSAnneBow.asm"
SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk"
-INCLUDE "data/mapHeaders/SSAnneKitchen.asm"
+INCLUDE "data/maps/headers/SSAnneKitchen.asm"
INCLUDE "scripts/SSAnneKitchen.asm"
-INCLUDE "data/mapObjects/SSAnneKitchen.asm"
+INCLUDE "data/maps/objects/SSAnneKitchen.asm"
SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk"
-INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm"
+INCLUDE "data/maps/headers/SSAnneCaptainsRoom.asm"
INCLUDE "scripts/SSAnneCaptainsRoom.asm"
-INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm"
+INCLUDE "data/maps/objects/SSAnneCaptainsRoom.asm"
SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk"
-INCLUDE "data/mapHeaders/SSAnne1FRooms.asm"
+INCLUDE "data/maps/headers/SSAnne1FRooms.asm"
INCLUDE "scripts/SSAnne1FRooms.asm"
-INCLUDE "data/mapObjects/SSAnne1FRooms.asm"
+INCLUDE "data/maps/objects/SSAnne1FRooms.asm"
SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk"
-INCLUDE "data/mapHeaders/SSAnne2FRooms.asm"
+INCLUDE "data/maps/headers/SSAnne2FRooms.asm"
INCLUDE "scripts/SSAnne2FRooms.asm"
-INCLUDE "data/mapObjects/SSAnne2FRooms.asm"
+INCLUDE "data/maps/objects/SSAnne2FRooms.asm"
-INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm"
+INCLUDE "data/maps/headers/SSAnneB1FRooms.asm"
INCLUDE "scripts/SSAnneB1FRooms.asm"
-INCLUDE "data/mapObjects/SSAnneB1FRooms.asm"
+INCLUDE "data/maps/objects/SSAnneB1FRooms.asm"
-INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm"
+INCLUDE "data/maps/headers/UndergroundPathNorthSouth.asm"
INCLUDE "scripts/UndergroundPathNorthSouth.asm"
-INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm"
+INCLUDE "data/maps/objects/UndergroundPathNorthSouth.asm"
-INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm"
+INCLUDE "data/maps/headers/UndergroundPathWestEast.asm"
INCLUDE "scripts/UndergroundPathWestEast.asm"
-INCLUDE "data/mapObjects/UndergroundPathWestEast.asm"
+INCLUDE "data/maps/objects/UndergroundPathWestEast.asm"
-INCLUDE "data/mapHeaders/DiglettsCave.asm"
+INCLUDE "data/maps/headers/DiglettsCave.asm"
INCLUDE "scripts/DiglettsCave.asm"
-INCLUDE "data/mapObjects/DiglettsCave.asm"
+INCLUDE "data/maps/objects/DiglettsCave.asm"
DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk"
-INCLUDE "data/mapHeaders/SilphCo11F.asm"
+INCLUDE "data/maps/headers/SilphCo11F.asm"
INCLUDE "scripts/SilphCo11F.asm"
-INCLUDE "data/mapObjects/SilphCo11F.asm"
+INCLUDE "data/maps/objects/SilphCo11F.asm"
SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk"
@@ -1117,108 +1117,108 @@
INCLUDE "scripts/CeruleanCity_2.asm"
-INCLUDE "data/mapHeaders/ViridianGym.asm"
+INCLUDE "data/maps/headers/ViridianGym.asm"
INCLUDE "scripts/ViridianGym.asm"
-INCLUDE "data/mapObjects/ViridianGym.asm"
+INCLUDE "data/maps/objects/ViridianGym.asm"
ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk"
-INCLUDE "data/mapHeaders/PewterMart.asm"
+INCLUDE "data/maps/headers/PewterMart.asm"
INCLUDE "scripts/PewterMart.asm"
-INCLUDE "data/mapObjects/PewterMart.asm"
+INCLUDE "data/maps/objects/PewterMart.asm"
-INCLUDE "data/mapHeaders/CeruleanCave1F.asm"
+INCLUDE "data/maps/headers/CeruleanCave1F.asm"
INCLUDE "scripts/CeruleanCave1F.asm"
-INCLUDE "data/mapObjects/CeruleanCave1F.asm"
+INCLUDE "data/maps/objects/CeruleanCave1F.asm"
CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk"
-INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm"
+INCLUDE "data/maps/headers/CeruleanBadgeHouse.asm"
INCLUDE "scripts/CeruleanBadgeHouse.asm"
-INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm"
+INCLUDE "data/maps/objects/CeruleanBadgeHouse.asm"
SECTION "Maps 21", ROMX
-INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "data/maps/headers/FuchsiaBillsGrandpasHouse.asm"
INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "data/maps/objects/FuchsiaBillsGrandpasHouse.asm"
-INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm"
+INCLUDE "data/maps/headers/FuchsiaPokecenter.asm"
INCLUDE "scripts/FuchsiaPokecenter.asm"
-INCLUDE "data/mapObjects/FuchsiaPokecenter.asm"
+INCLUDE "data/maps/objects/FuchsiaPokecenter.asm"
-INCLUDE "data/mapHeaders/WardensHouse.asm"
+INCLUDE "data/maps/headers/WardensHouse.asm"
INCLUDE "scripts/WardensHouse.asm"
-INCLUDE "data/mapObjects/WardensHouse.asm"
+INCLUDE "data/maps/objects/WardensHouse.asm"
WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk"
-INCLUDE "data/mapHeaders/SafariZoneGate.asm"
+INCLUDE "data/maps/headers/SafariZoneGate.asm"
INCLUDE "scripts/SafariZoneGate.asm"
-INCLUDE "data/mapObjects/SafariZoneGate.asm"
+INCLUDE "data/maps/objects/SafariZoneGate.asm"
SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk"
-INCLUDE "data/mapHeaders/FuchsiaGym.asm"
+INCLUDE "data/maps/headers/FuchsiaGym.asm"
INCLUDE "scripts/FuchsiaGym.asm"
-INCLUDE "data/mapObjects/FuchsiaGym.asm"
+INCLUDE "data/maps/objects/FuchsiaGym.asm"
FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk"
-INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm"
+INCLUDE "data/maps/headers/FuchsiaMeetingRoom.asm"
INCLUDE "scripts/FuchsiaMeetingRoom.asm"
-INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm"
+INCLUDE "data/maps/objects/FuchsiaMeetingRoom.asm"
FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk"
-INCLUDE "data/mapHeaders/CinnabarGym.asm"
+INCLUDE "data/maps/headers/CinnabarGym.asm"
INCLUDE "scripts/CinnabarGym.asm"
-INCLUDE "data/mapObjects/CinnabarGym.asm"
+INCLUDE "data/maps/objects/CinnabarGym.asm"
CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk"
-INCLUDE "data/mapHeaders/CinnabarLab.asm"
+INCLUDE "data/maps/headers/CinnabarLab.asm"
INCLUDE "scripts/CinnabarLab.asm"
-INCLUDE "data/mapObjects/CinnabarLab.asm"
+INCLUDE "data/maps/objects/CinnabarLab.asm"
CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk"
-INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm"
+INCLUDE "data/maps/headers/CinnabarLabTradeRoom.asm"
INCLUDE "scripts/CinnabarLabTradeRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm"
+INCLUDE "data/maps/objects/CinnabarLabTradeRoom.asm"
CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk"
-INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm"
+INCLUDE "data/maps/headers/CinnabarLabMetronomeRoom.asm"
INCLUDE "scripts/CinnabarLabMetronomeRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm"
+INCLUDE "data/maps/objects/CinnabarLabMetronomeRoom.asm"
CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk"
-INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm"
+INCLUDE "data/maps/headers/CinnabarLabFossilRoom.asm"
INCLUDE "scripts/CinnabarLabFossilRoom.asm"
-INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm"
+INCLUDE "data/maps/objects/CinnabarLabFossilRoom.asm"
CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk"
-INCLUDE "data/mapHeaders/CinnabarPokecenter.asm"
+INCLUDE "data/maps/headers/CinnabarPokecenter.asm"
INCLUDE "scripts/CinnabarPokecenter.asm"
-INCLUDE "data/mapObjects/CinnabarPokecenter.asm"
+INCLUDE "data/maps/objects/CinnabarPokecenter.asm"
-INCLUDE "data/mapHeaders/CinnabarMart.asm"
+INCLUDE "data/maps/headers/CinnabarMart.asm"
INCLUDE "scripts/CinnabarMart.asm"
-INCLUDE "data/mapObjects/CinnabarMart.asm"
+INCLUDE "data/maps/objects/CinnabarMart.asm"
-INCLUDE "data/mapHeaders/CopycatsHouse1F.asm"
+INCLUDE "data/maps/headers/CopycatsHouse1F.asm"
INCLUDE "scripts/CopycatsHouse1F.asm"
-INCLUDE "data/mapObjects/CopycatsHouse1F.asm"
+INCLUDE "data/maps/objects/CopycatsHouse1F.asm"
-INCLUDE "data/mapHeaders/ChampionsRoom.asm"
+INCLUDE "data/maps/headers/ChampionsRoom.asm"
INCLUDE "scripts/ChampionsRoom.asm"
-INCLUDE "data/mapObjects/ChampionsRoom.asm"
+INCLUDE "data/maps/objects/ChampionsRoom.asm"
ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk"
-INCLUDE "data/mapHeaders/LoreleisRoom.asm"
+INCLUDE "data/maps/headers/LoreleisRoom.asm"
INCLUDE "scripts/LoreleisRoom.asm"
-INCLUDE "data/mapObjects/LoreleisRoom.asm"
+INCLUDE "data/maps/objects/LoreleisRoom.asm"
LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk"
-INCLUDE "data/mapHeaders/BrunosRoom.asm"
+INCLUDE "data/maps/headers/BrunosRoom.asm"
INCLUDE "scripts/BrunosRoom.asm"
-INCLUDE "data/mapObjects/BrunosRoom.asm"
+INCLUDE "data/maps/objects/BrunosRoom.asm"
BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk"
-INCLUDE "data/mapHeaders/AgathasRoom.asm"
+INCLUDE "data/maps/headers/AgathasRoom.asm"
INCLUDE "scripts/AgathasRoom.asm"
-INCLUDE "data/mapObjects/AgathasRoom.asm"
+INCLUDE "data/maps/objects/AgathasRoom.asm"
AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk"