data/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects

To do: Polished Map support for loading the objects

447 files changed, 446 insertions, 446 deletions

diff --git a/data/mapHeaders/AgathasRoom.asm b/data/maps/headers/AgathasRoom.asm
index d04e0cfd..d04e0cfd 100755
--- a/data/mapHeaders/AgathasRoom.asm
+++ b/data/maps/headers/AgathasRoom.asm
diff --git a/data/mapHeaders/BikeShop.asm b/data/maps/headers/BikeShop.asm
index b4b520e2..b4b520e2 100755
--- a/data/mapHeaders/BikeShop.asm
+++ b/data/maps/headers/BikeShop.asm
diff --git a/data/mapHeaders/BillsHouse.asm b/data/maps/headers/BillsHouse.asm
index 6063175d..6063175d 100755
--- a/data/mapHeaders/BillsHouse.asm
+++ b/data/maps/headers/BillsHouse.asm
diff --git a/data/mapHeaders/BluesHouse.asm b/data/maps/headers/BluesHouse.asm
index 33cee254..33cee254 100755
--- a/data/mapHeaders/BluesHouse.asm
+++ b/data/maps/headers/BluesHouse.asm
diff --git a/data/mapHeaders/BrunosRoom.asm b/data/maps/headers/BrunosRoom.asm
index a0b2d4fd..a0b2d4fd 100755
--- a/data/mapHeaders/BrunosRoom.asm
+++ b/data/maps/headers/BrunosRoom.asm
diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/maps/headers/CeladonChiefHouse.asm
index 34f17273..34f17273 100755
--- a/data/mapHeaders/CeladonChiefHouse.asm
+++ b/data/maps/headers/CeladonChiefHouse.asm
diff --git a/data/mapHeaders/CeladonCity.asm b/data/maps/headers/CeladonCity.asm
index 6faa6f48..6faa6f48 100755
--- a/data/mapHeaders/CeladonCity.asm
+++ b/data/maps/headers/CeladonCity.asm
diff --git a/data/mapHeaders/CeladonDiner.asm b/data/maps/headers/CeladonDiner.asm
index b18d9633..b18d9633 100755
--- a/data/mapHeaders/CeladonDiner.asm
+++ b/data/maps/headers/CeladonDiner.asm
diff --git a/data/mapHeaders/CeladonGym.asm b/data/maps/headers/CeladonGym.asm
index 2302c65a..2302c65a 100755
--- a/data/mapHeaders/CeladonGym.asm
+++ b/data/maps/headers/CeladonGym.asm
diff --git a/data/mapHeaders/CeladonHotel.asm b/data/maps/headers/CeladonHotel.asm
index 2339c14d..2339c14d 100755
--- a/data/mapHeaders/CeladonHotel.asm
+++ b/data/maps/headers/CeladonHotel.asm
diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/maps/headers/CeladonMansion1F.asm
index 45970028..45970028 100755
--- a/data/mapHeaders/CeladonMansion1F.asm
+++ b/data/maps/headers/CeladonMansion1F.asm
diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/maps/headers/CeladonMansion2F.asm
index d5e3e77b..d5e3e77b 100755
--- a/data/mapHeaders/CeladonMansion2F.asm
+++ b/data/maps/headers/CeladonMansion2F.asm
diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/maps/headers/CeladonMansion3F.asm
index 7566caad..7566caad 100755
--- a/data/mapHeaders/CeladonMansion3F.asm
+++ b/data/maps/headers/CeladonMansion3F.asm
diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/maps/headers/CeladonMansionRoof.asm
index 9cbae6f6..9cbae6f6 100755
--- a/data/mapHeaders/CeladonMansionRoof.asm
+++ b/data/maps/headers/CeladonMansionRoof.asm
diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm
index cb80fac8..cb80fac8 100755
--- a/data/mapHeaders/CeladonMansionRoofHouse.asm
+++ b/data/maps/headers/CeladonMansionRoofHouse.asm
diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/maps/headers/CeladonMart1F.asm
index 30bd9ba9..30bd9ba9 100755
--- a/data/mapHeaders/CeladonMart1F.asm
+++ b/data/maps/headers/CeladonMart1F.asm
diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/maps/headers/CeladonMart2F.asm
index d78dfe28..d78dfe28 100755
--- a/data/mapHeaders/CeladonMart2F.asm
+++ b/data/maps/headers/CeladonMart2F.asm
diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/maps/headers/CeladonMart3F.asm
index ad415eee..ad415eee 100755
--- a/data/mapHeaders/CeladonMart3F.asm
+++ b/data/maps/headers/CeladonMart3F.asm
diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/maps/headers/CeladonMart4F.asm
index b9ce5b34..b9ce5b34 100755
--- a/data/mapHeaders/CeladonMart4F.asm
+++ b/data/maps/headers/CeladonMart4F.asm
diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/maps/headers/CeladonMart5F.asm
index 04d65b2b..04d65b2b 100755
--- a/data/mapHeaders/CeladonMart5F.asm
+++ b/data/maps/headers/CeladonMart5F.asm
diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/maps/headers/CeladonMartElevator.asm
index 2a98ccb0..2a98ccb0 100755
--- a/data/mapHeaders/CeladonMartElevator.asm
+++ b/data/maps/headers/CeladonMartElevator.asm
diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/maps/headers/CeladonMartRoof.asm
index 823ff25f..823ff25f 100755
--- a/data/mapHeaders/CeladonMartRoof.asm
+++ b/data/maps/headers/CeladonMartRoof.asm
diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/maps/headers/CeladonPokecenter.asm
index 378a41ec..378a41ec 100755
--- a/data/mapHeaders/CeladonPokecenter.asm
+++ b/data/maps/headers/CeladonPokecenter.asm
diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/maps/headers/CeruleanBadgeHouse.asm
index 47a97b14..47a97b14 100755
--- a/data/mapHeaders/CeruleanBadgeHouse.asm
+++ b/data/maps/headers/CeruleanBadgeHouse.asm
diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/maps/headers/CeruleanCave1F.asm
index 7c80bbeb..7c80bbeb 100755
--- a/data/mapHeaders/CeruleanCave1F.asm
+++ b/data/maps/headers/CeruleanCave1F.asm
diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/maps/headers/CeruleanCave2F.asm
index 353e265b..353e265b 100755
--- a/data/mapHeaders/CeruleanCave2F.asm
+++ b/data/maps/headers/CeruleanCave2F.asm
diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/maps/headers/CeruleanCaveB1F.asm
index d759aa6b..d759aa6b 100755
--- a/data/mapHeaders/CeruleanCaveB1F.asm
+++ b/data/maps/headers/CeruleanCaveB1F.asm
diff --git a/data/mapHeaders/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm
index c925713c..c925713c 100755
--- a/data/mapHeaders/CeruleanCity.asm
+++ b/data/maps/headers/CeruleanCity.asm
diff --git a/data/mapHeaders/CeruleanGym.asm b/data/maps/headers/CeruleanGym.asm
index b1010ac3..b1010ac3 100755
--- a/data/mapHeaders/CeruleanGym.asm
+++ b/data/maps/headers/CeruleanGym.asm
diff --git a/data/mapHeaders/CeruleanMart.asm b/data/maps/headers/CeruleanMart.asm
index 2ee31666..2ee31666 100755
--- a/data/mapHeaders/CeruleanMart.asm
+++ b/data/maps/headers/CeruleanMart.asm
diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/maps/headers/CeruleanPokecenter.asm
index b79e7aff..b79e7aff 100755
--- a/data/mapHeaders/CeruleanPokecenter.asm
+++ b/data/maps/headers/CeruleanPokecenter.asm
diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm
index 20970b77..20970b77 100755
--- a/data/mapHeaders/CeruleanTradeHouse.asm
+++ b/data/maps/headers/CeruleanTradeHouse.asm
diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/maps/headers/CeruleanTrashedHouse.asm
index 192a4195..192a4195 100755
--- a/data/mapHeaders/CeruleanTrashedHouse.asm
+++ b/data/maps/headers/CeruleanTrashedHouse.asm
diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/maps/headers/ChampionsRoom.asm
index aadc70a6..aadc70a6 100755
--- a/data/mapHeaders/ChampionsRoom.asm
+++ b/data/maps/headers/ChampionsRoom.asm
diff --git a/data/mapHeaders/CinnabarGym.asm b/data/maps/headers/CinnabarGym.asm
index cc6dc1d7..cc6dc1d7 100755
--- a/data/mapHeaders/CinnabarGym.asm
+++ b/data/maps/headers/CinnabarGym.asm
diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/maps/headers/CinnabarIsland.asm
index a94498be..a94498be 100755
--- a/data/mapHeaders/CinnabarIsland.asm
+++ b/data/maps/headers/CinnabarIsland.asm
diff --git a/data/mapHeaders/CinnabarLab.asm b/data/maps/headers/CinnabarLab.asm
index e8081e75..e8081e75 100755
--- a/data/mapHeaders/CinnabarLab.asm
+++ b/data/maps/headers/CinnabarLab.asm
diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm
index 3cb88437..3cb88437 100755
--- a/data/mapHeaders/CinnabarLabFossilRoom.asm
+++ b/data/maps/headers/CinnabarLabFossilRoom.asm
diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/maps/headers/CinnabarLabMetronomeRoom.asm
index d77338c8..d77338c8 100755
--- a/data/mapHeaders/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/headers/CinnabarLabMetronomeRoom.asm
diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/maps/headers/CinnabarLabTradeRoom.asm
index c23d9c15..c23d9c15 100755
--- a/data/mapHeaders/CinnabarLabTradeRoom.asm
+++ b/data/maps/headers/CinnabarLabTradeRoom.asm
diff --git a/data/mapHeaders/CinnabarMart.asm b/data/maps/headers/CinnabarMart.asm
index c68d582a..c68d582a 100755
--- a/data/mapHeaders/CinnabarMart.asm
+++ b/data/maps/headers/CinnabarMart.asm
diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/maps/headers/CinnabarPokecenter.asm
index d910133b..d910133b 100755
--- a/data/mapHeaders/CinnabarPokecenter.asm
+++ b/data/maps/headers/CinnabarPokecenter.asm
diff --git a/data/mapHeaders/Colosseum.asm b/data/maps/headers/Colosseum.asm
index faf03eb4..faf03eb4 100755
--- a/data/mapHeaders/Colosseum.asm
+++ b/data/maps/headers/Colosseum.asm
diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/maps/headers/CopycatsHouse1F.asm
index 532cef93..532cef93 100755
--- a/data/mapHeaders/CopycatsHouse1F.asm
+++ b/data/maps/headers/CopycatsHouse1F.asm
diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/maps/headers/CopycatsHouse2F.asm
index 38b1fbbb..38b1fbbb 100755
--- a/data/mapHeaders/CopycatsHouse2F.asm
+++ b/data/maps/headers/CopycatsHouse2F.asm
diff --git a/data/mapHeaders/Daycare.asm b/data/maps/headers/Daycare.asm
index dabeedd9..dabeedd9 100755
--- a/data/mapHeaders/Daycare.asm
+++ b/data/maps/headers/Daycare.asm
diff --git a/data/mapHeaders/DiglettsCave.asm b/data/maps/headers/DiglettsCave.asm
index d3777d31..d3777d31 100755
--- a/data/mapHeaders/DiglettsCave.asm
+++ b/data/maps/headers/DiglettsCave.asm
diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/maps/headers/DiglettsCaveRoute11.asm
index d8bdd704..d8bdd704 100755
--- a/data/mapHeaders/DiglettsCaveRoute11.asm
+++ b/data/maps/headers/DiglettsCaveRoute11.asm
diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/maps/headers/DiglettsCaveRoute2.asm
index 86f5ae35..86f5ae35 100755
--- a/data/mapHeaders/DiglettsCaveRoute2.asm
+++ b/data/maps/headers/DiglettsCaveRoute2.asm
diff --git a/data/mapHeaders/FightingDojo.asm b/data/maps/headers/FightingDojo.asm
index 7ecadc57..7ecadc57 100755
--- a/data/mapHeaders/FightingDojo.asm
+++ b/data/maps/headers/FightingDojo.asm
diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm
index 10ba48e9..10ba48e9 100755
--- a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm
+++ b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm
diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/maps/headers/FuchsiaCity.asm
index 6028bce0..6028bce0 100755
--- a/data/mapHeaders/FuchsiaCity.asm
+++ b/data/maps/headers/FuchsiaCity.asm
diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/maps/headers/FuchsiaGoodRodHouse.asm
index d21611c1..d21611c1 100755
--- a/data/mapHeaders/FuchsiaGoodRodHouse.asm
+++ b/data/maps/headers/FuchsiaGoodRodHouse.asm
diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/maps/headers/FuchsiaGym.asm
index 44be2971..44be2971 100755
--- a/data/mapHeaders/FuchsiaGym.asm
+++ b/data/maps/headers/FuchsiaGym.asm
diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/maps/headers/FuchsiaMart.asm
index 120fe305..120fe305 100755
--- a/data/mapHeaders/FuchsiaMart.asm
+++ b/data/maps/headers/FuchsiaMart.asm
diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/maps/headers/FuchsiaMeetingRoom.asm
index a5ab4f04..a5ab4f04 100755
--- a/data/mapHeaders/FuchsiaMeetingRoom.asm
+++ b/data/maps/headers/FuchsiaMeetingRoom.asm
diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/maps/headers/FuchsiaPokecenter.asm
index c1c683bd..c1c683bd 100755
--- a/data/mapHeaders/FuchsiaPokecenter.asm
+++ b/data/maps/headers/FuchsiaPokecenter.asm
diff --git a/data/mapHeaders/GameCorner.asm b/data/maps/headers/GameCorner.asm
index ad367b93..ad367b93 100755
--- a/data/mapHeaders/GameCorner.asm
+++ b/data/maps/headers/GameCorner.asm
diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/maps/headers/GameCornerPrizeRoom.asm
index 4668cbb8..4668cbb8 100755
--- a/data/mapHeaders/GameCornerPrizeRoom.asm
+++ b/data/maps/headers/GameCornerPrizeRoom.asm
diff --git a/data/mapHeaders/HallOfFame.asm b/data/maps/headers/HallOfFame.asm
index e2dc3fb3..e2dc3fb3 100755
--- a/data/mapHeaders/HallOfFame.asm
+++ b/data/maps/headers/HallOfFame.asm
diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/maps/headers/IndigoPlateau.asm
index ff394dfe..ff394dfe 100755
--- a/data/mapHeaders/IndigoPlateau.asm
+++ b/data/maps/headers/IndigoPlateau.asm
diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/maps/headers/IndigoPlateauLobby.asm
index b13afa12..b13afa12 100755
--- a/data/mapHeaders/IndigoPlateauLobby.asm
+++ b/data/maps/headers/IndigoPlateauLobby.asm
diff --git a/data/mapHeaders/LancesRoom.asm b/data/maps/headers/LancesRoom.asm
index 0b69970e..0b69970e 100755
--- a/data/mapHeaders/LancesRoom.asm
+++ b/data/maps/headers/LancesRoom.asm
diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/maps/headers/LavenderCuboneHouse.asm
index dfd38ff1..dfd38ff1 100755
--- a/data/mapHeaders/LavenderCuboneHouse.asm
+++ b/data/maps/headers/LavenderCuboneHouse.asm
diff --git a/data/mapHeaders/LavenderMart.asm b/data/maps/headers/LavenderMart.asm
index 82c239e6..82c239e6 100755
--- a/data/mapHeaders/LavenderMart.asm
+++ b/data/maps/headers/LavenderMart.asm
diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/maps/headers/LavenderPokecenter.asm
index c0cd0adf..c0cd0adf 100755
--- a/data/mapHeaders/LavenderPokecenter.asm
+++ b/data/maps/headers/LavenderPokecenter.asm
diff --git a/data/mapHeaders/LavenderTown.asm b/data/maps/headers/LavenderTown.asm
index 7c1c9c46..7c1c9c46 100755
--- a/data/mapHeaders/LavenderTown.asm
+++ b/data/maps/headers/LavenderTown.asm
diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/maps/headers/LoreleisRoom.asm
index feff946c..feff946c 100755
--- a/data/mapHeaders/LoreleisRoom.asm
+++ b/data/maps/headers/LoreleisRoom.asm
diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/maps/headers/MrFujisHouse.asm
index 023cb501..023cb501 100755
--- a/data/mapHeaders/MrFujisHouse.asm
+++ b/data/maps/headers/MrFujisHouse.asm
diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/maps/headers/MrPsychicsHouse.asm
index 628db044..628db044 100755
--- a/data/mapHeaders/MrPsychicsHouse.asm
+++ b/data/maps/headers/MrPsychicsHouse.asm
diff --git a/data/mapHeaders/MtMoon1F.asm b/data/maps/headers/MtMoon1F.asm
index 8de2be3e..8de2be3e 100755
--- a/data/mapHeaders/MtMoon1F.asm
+++ b/data/maps/headers/MtMoon1F.asm
diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/maps/headers/MtMoonB1F.asm
index 9c97b5c7..9c97b5c7 100755
--- a/data/mapHeaders/MtMoonB1F.asm
+++ b/data/maps/headers/MtMoonB1F.asm
diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/maps/headers/MtMoonB2F.asm
index 0ed1f96e..0ed1f96e 100755
--- a/data/mapHeaders/MtMoonB2F.asm
+++ b/data/maps/headers/MtMoonB2F.asm
diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/maps/headers/MtMoonPokecenter.asm
index 0425eae7..0425eae7 100755
--- a/data/mapHeaders/MtMoonPokecenter.asm
+++ b/data/maps/headers/MtMoonPokecenter.asm
diff --git a/data/mapHeaders/Museum1F.asm b/data/maps/headers/Museum1F.asm
index d92176d2..d92176d2 100755
--- a/data/mapHeaders/Museum1F.asm
+++ b/data/maps/headers/Museum1F.asm
diff --git a/data/mapHeaders/Museum2F.asm b/data/maps/headers/Museum2F.asm
index d5bf8918..d5bf8918 100755
--- a/data/mapHeaders/Museum2F.asm
+++ b/data/maps/headers/Museum2F.asm
diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/maps/headers/NameRatersHouse.asm
index 3f9010f0..3f9010f0 100755
--- a/data/mapHeaders/NameRatersHouse.asm
+++ b/data/maps/headers/NameRatersHouse.asm
diff --git a/data/mapHeaders/OaksLab.asm b/data/maps/headers/OaksLab.asm
index 42bb76e8..42bb76e8 100755
--- a/data/mapHeaders/OaksLab.asm
+++ b/data/maps/headers/OaksLab.asm
diff --git a/data/mapHeaders/PalletTown.asm b/data/maps/headers/PalletTown.asm
index 2745bdc1..2745bdc1 100755
--- a/data/mapHeaders/PalletTown.asm
+++ b/data/maps/headers/PalletTown.asm
diff --git a/data/mapHeaders/PewterCity.asm b/data/maps/headers/PewterCity.asm
index 268adb7a..268adb7a 100755
--- a/data/mapHeaders/PewterCity.asm
+++ b/data/maps/headers/PewterCity.asm
diff --git a/data/mapHeaders/PewterGym.asm b/data/maps/headers/PewterGym.asm
index a1659e42..a1659e42 100755
--- a/data/mapHeaders/PewterGym.asm
+++ b/data/maps/headers/PewterGym.asm
diff --git a/data/mapHeaders/PewterMart.asm b/data/maps/headers/PewterMart.asm
index c9b24eb2..c9b24eb2 100755
--- a/data/mapHeaders/PewterMart.asm
+++ b/data/maps/headers/PewterMart.asm
diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/maps/headers/PewterNidoranHouse.asm
index ee2e46ca..ee2e46ca 100755
--- a/data/mapHeaders/PewterNidoranHouse.asm
+++ b/data/maps/headers/PewterNidoranHouse.asm
diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/maps/headers/PewterPokecenter.asm
index 4e420bf8..4e420bf8 100755
--- a/data/mapHeaders/PewterPokecenter.asm
+++ b/data/maps/headers/PewterPokecenter.asm
diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/maps/headers/PewterSpeechHouse.asm
index a378d61e..a378d61e 100755
--- a/data/mapHeaders/PewterSpeechHouse.asm
+++ b/data/maps/headers/PewterSpeechHouse.asm
diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/maps/headers/PokemonFanClub.asm
index b4ff8e1c..b4ff8e1c 100755
--- a/data/mapHeaders/PokemonFanClub.asm
+++ b/data/maps/headers/PokemonFanClub.asm
diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/maps/headers/PokemonMansion1F.asm
index 9407f956..9407f956 100755
--- a/data/mapHeaders/PokemonMansion1F.asm
+++ b/data/maps/headers/PokemonMansion1F.asm
diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/maps/headers/PokemonMansion2F.asm
index deb7c84f..deb7c84f 100755
--- a/data/mapHeaders/PokemonMansion2F.asm
+++ b/data/maps/headers/PokemonMansion2F.asm
diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/maps/headers/PokemonMansion3F.asm
index e4baa709..e4baa709 100755
--- a/data/mapHeaders/PokemonMansion3F.asm
+++ b/data/maps/headers/PokemonMansion3F.asm
diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/maps/headers/PokemonMansionB1F.asm
index 0aae67e6..0aae67e6 100755
--- a/data/mapHeaders/PokemonMansionB1F.asm
+++ b/data/maps/headers/PokemonMansionB1F.asm
diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/maps/headers/PokemonTower1F.asm
index 185fd2c0..185fd2c0 100755
--- a/data/mapHeaders/PokemonTower1F.asm
+++ b/data/maps/headers/PokemonTower1F.asm
diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/maps/headers/PokemonTower2F.asm
index 5a6046c8..5a6046c8 100755
--- a/data/mapHeaders/PokemonTower2F.asm
+++ b/data/maps/headers/PokemonTower2F.asm
diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/maps/headers/PokemonTower3F.asm
index 49ebc4e7..49ebc4e7 100755
--- a/data/mapHeaders/PokemonTower3F.asm
+++ b/data/maps/headers/PokemonTower3F.asm
diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/maps/headers/PokemonTower4F.asm
index 0eb9a0d6..0eb9a0d6 100755
--- a/data/mapHeaders/PokemonTower4F.asm
+++ b/data/maps/headers/PokemonTower4F.asm
diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/maps/headers/PokemonTower5F.asm
index e58c63c6..e58c63c6 100755
--- a/data/mapHeaders/PokemonTower5F.asm
+++ b/data/maps/headers/PokemonTower5F.asm
diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/maps/headers/PokemonTower6F.asm
index ba53347b..ba53347b 100755
--- a/data/mapHeaders/PokemonTower6F.asm
+++ b/data/maps/headers/PokemonTower6F.asm
diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/maps/headers/PokemonTower7F.asm
index bd9f839b..bd9f839b 100755
--- a/data/mapHeaders/PokemonTower7F.asm
+++ b/data/maps/headers/PokemonTower7F.asm
diff --git a/data/mapHeaders/PowerPlant.asm b/data/maps/headers/PowerPlant.asm
index 88d82ae2..88d82ae2 100755
--- a/data/mapHeaders/PowerPlant.asm
+++ b/data/maps/headers/PowerPlant.asm
diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/maps/headers/RedsHouse1F.asm
index 018bdc80..018bdc80 100755
--- a/data/mapHeaders/RedsHouse1F.asm
+++ b/data/maps/headers/RedsHouse1F.asm
diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/maps/headers/RedsHouse2F.asm
index 10332e2c..10332e2c 100755
--- a/data/mapHeaders/RedsHouse2F.asm
+++ b/data/maps/headers/RedsHouse2F.asm
diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/maps/headers/RockTunnel1F.asm
index 268ee645..268ee645 100755
--- a/data/mapHeaders/RockTunnel1F.asm
+++ b/data/maps/headers/RockTunnel1F.asm
diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/maps/headers/RockTunnelB1F.asm
index 7b13f647..7b13f647 100755
--- a/data/mapHeaders/RockTunnelB1F.asm
+++ b/data/maps/headers/RockTunnelB1F.asm
diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/maps/headers/RockTunnelPokecenter.asm
index a873854b..a873854b 100755
--- a/data/mapHeaders/RockTunnelPokecenter.asm
+++ b/data/maps/headers/RockTunnelPokecenter.asm
diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/maps/headers/RocketHideoutB1F.asm
index 521a6693..521a6693 100755
--- a/data/mapHeaders/RocketHideoutB1F.asm
+++ b/data/maps/headers/RocketHideoutB1F.asm
diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/maps/headers/RocketHideoutB2F.asm
index ab2a965d..ab2a965d 100755
--- a/data/mapHeaders/RocketHideoutB2F.asm
+++ b/data/maps/headers/RocketHideoutB2F.asm
diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/maps/headers/RocketHideoutB3F.asm
index 0a04b00e..0a04b00e 100755
--- a/data/mapHeaders/RocketHideoutB3F.asm
+++ b/data/maps/headers/RocketHideoutB3F.asm
diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/maps/headers/RocketHideoutB4F.asm
index 11512c01..11512c01 100755
--- a/data/mapHeaders/RocketHideoutB4F.asm
+++ b/data/maps/headers/RocketHideoutB4F.asm
diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/maps/headers/RocketHideoutElevator.asm
index 90ece237..90ece237 100755
--- a/data/mapHeaders/RocketHideoutElevator.asm
+++ b/data/maps/headers/RocketHideoutElevator.asm
diff --git a/data/mapHeaders/Route1.asm b/data/maps/headers/Route1.asm
index 6eeb0347..6eeb0347 100755
--- a/data/mapHeaders/Route1.asm
+++ b/data/maps/headers/Route1.asm
diff --git a/data/mapHeaders/Route10.asm b/data/maps/headers/Route10.asm
index ba498b0a..ba498b0a 100755
--- a/data/mapHeaders/Route10.asm
+++ b/data/maps/headers/Route10.asm
diff --git a/data/mapHeaders/Route11.asm b/data/maps/headers/Route11.asm
index d8f2e72f..d8f2e72f 100755
--- a/data/mapHeaders/Route11.asm
+++ b/data/maps/headers/Route11.asm
diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/maps/headers/Route11Gate1F.asm
index aa97b791..aa97b791 100755
--- a/data/mapHeaders/Route11Gate1F.asm
+++ b/data/maps/headers/Route11Gate1F.asm
diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/maps/headers/Route11Gate2F.asm
index 560d38db..560d38db 100755
--- a/data/mapHeaders/Route11Gate2F.asm
+++ b/data/maps/headers/Route11Gate2F.asm
diff --git a/data/mapHeaders/Route12.asm b/data/maps/headers/Route12.asm
index 931ddf1d..931ddf1d 100755
--- a/data/mapHeaders/Route12.asm
+++ b/data/maps/headers/Route12.asm
diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/maps/headers/Route12Gate1F.asm
index 047a670c..047a670c 100755
--- a/data/mapHeaders/Route12Gate1F.asm
+++ b/data/maps/headers/Route12Gate1F.asm
diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/maps/headers/Route12Gate2F.asm
index e1366736..e1366736 100755
--- a/data/mapHeaders/Route12Gate2F.asm
+++ b/data/maps/headers/Route12Gate2F.asm
diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/maps/headers/Route12SuperRodHouse.asm
index 2195a9b1..2195a9b1 100755
--- a/data/mapHeaders/Route12SuperRodHouse.asm
+++ b/data/maps/headers/Route12SuperRodHouse.asm
diff --git a/data/mapHeaders/Route13.asm b/data/maps/headers/Route13.asm
index 242aaa02..242aaa02 100755
--- a/data/mapHeaders/Route13.asm
+++ b/data/maps/headers/Route13.asm
diff --git a/data/mapHeaders/Route14.asm b/data/maps/headers/Route14.asm
index c0c39c56..c0c39c56 100755
--- a/data/mapHeaders/Route14.asm
+++ b/data/maps/headers/Route14.asm
diff --git a/data/mapHeaders/Route15.asm b/data/maps/headers/Route15.asm
index 28a811d2..28a811d2 100755
--- a/data/mapHeaders/Route15.asm
+++ b/data/maps/headers/Route15.asm
diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/maps/headers/Route15Gate1F.asm
index a23d15a0..a23d15a0 100755
--- a/data/mapHeaders/Route15Gate1F.asm
+++ b/data/maps/headers/Route15Gate1F.asm
diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/maps/headers/Route15Gate2F.asm
index 8ca89872..8ca89872 100755
--- a/data/mapHeaders/Route15Gate2F.asm
+++ b/data/maps/headers/Route15Gate2F.asm
diff --git a/data/mapHeaders/Route16.asm b/data/maps/headers/Route16.asm
index 423c7af2..423c7af2 100755
--- a/data/mapHeaders/Route16.asm
+++ b/data/maps/headers/Route16.asm
diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/maps/headers/Route16FlyHouse.asm
index 240b6df4..240b6df4 100755
--- a/data/mapHeaders/Route16FlyHouse.asm
+++ b/data/maps/headers/Route16FlyHouse.asm
diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/maps/headers/Route16Gate1F.asm
index 74fd1b7f..74fd1b7f 100755
--- a/data/mapHeaders/Route16Gate1F.asm
+++ b/data/maps/headers/Route16Gate1F.asm
diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/maps/headers/Route16Gate2F.asm
index ed889f4b..ed889f4b 100755
--- a/data/mapHeaders/Route16Gate2F.asm
+++ b/data/maps/headers/Route16Gate2F.asm
diff --git a/data/mapHeaders/Route17.asm b/data/maps/headers/Route17.asm
index 5e853299..5e853299 100755
--- a/data/mapHeaders/Route17.asm
+++ b/data/maps/headers/Route17.asm
diff --git a/data/mapHeaders/Route18.asm b/data/maps/headers/Route18.asm
index 34573051..34573051 100755
--- a/data/mapHeaders/Route18.asm
+++ b/data/maps/headers/Route18.asm
diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/maps/headers/Route18Gate1F.asm
index 2847e0e3..2847e0e3 100755
--- a/data/mapHeaders/Route18Gate1F.asm
+++ b/data/maps/headers/Route18Gate1F.asm
diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/maps/headers/Route18Gate2F.asm
index f25fa700..f25fa700 100755
--- a/data/mapHeaders/Route18Gate2F.asm
+++ b/data/maps/headers/Route18Gate2F.asm
diff --git a/data/mapHeaders/Route19.asm b/data/maps/headers/Route19.asm
index 7f01c804..7f01c804 100755
--- a/data/mapHeaders/Route19.asm
+++ b/data/maps/headers/Route19.asm
diff --git a/data/mapHeaders/Route2.asm b/data/maps/headers/Route2.asm
index 521eef69..521eef69 100755
--- a/data/mapHeaders/Route2.asm
+++ b/data/maps/headers/Route2.asm
diff --git a/data/mapHeaders/Route20.asm b/data/maps/headers/Route20.asm
index 3495b785..3495b785 100755
--- a/data/mapHeaders/Route20.asm
+++ b/data/maps/headers/Route20.asm
diff --git a/data/mapHeaders/Route21.asm b/data/maps/headers/Route21.asm
index 803bf217..803bf217 100755
--- a/data/mapHeaders/Route21.asm
+++ b/data/maps/headers/Route21.asm
diff --git a/data/mapHeaders/Route22.asm b/data/maps/headers/Route22.asm
index e235efa1..e235efa1 100755
--- a/data/mapHeaders/Route22.asm
+++ b/data/maps/headers/Route22.asm
diff --git a/data/mapHeaders/Route22Gate.asm b/data/maps/headers/Route22Gate.asm
index a9d1dd37..a9d1dd37 100755
--- a/data/mapHeaders/Route22Gate.asm
+++ b/data/maps/headers/Route22Gate.asm
diff --git a/data/mapHeaders/Route23.asm b/data/maps/headers/Route23.asm
index e1535c9d..e1535c9d 100755
--- a/data/mapHeaders/Route23.asm
+++ b/data/maps/headers/Route23.asm
diff --git a/data/mapHeaders/Route24.asm b/data/maps/headers/Route24.asm
index faf53660..faf53660 100755
--- a/data/mapHeaders/Route24.asm
+++ b/data/maps/headers/Route24.asm
diff --git a/data/mapHeaders/Route25.asm b/data/maps/headers/Route25.asm
index 1873d19b..1873d19b 100755
--- a/data/mapHeaders/Route25.asm
+++ b/data/maps/headers/Route25.asm
diff --git a/data/mapHeaders/Route2Gate.asm b/data/maps/headers/Route2Gate.asm
index 730d8f2d..730d8f2d 100755
--- a/data/mapHeaders/Route2Gate.asm
+++ b/data/maps/headers/Route2Gate.asm
diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/maps/headers/Route2TradeHouse.asm
index b9937dad..b9937dad 100755
--- a/data/mapHeaders/Route2TradeHouse.asm
+++ b/data/maps/headers/Route2TradeHouse.asm
diff --git a/data/mapHeaders/Route3.asm b/data/maps/headers/Route3.asm
index ddbd7783..ddbd7783 100755
--- a/data/mapHeaders/Route3.asm
+++ b/data/maps/headers/Route3.asm
diff --git a/data/mapHeaders/Route4.asm b/data/maps/headers/Route4.asm
index 6c43171a..6c43171a 100755
--- a/data/mapHeaders/Route4.asm
+++ b/data/maps/headers/Route4.asm
diff --git a/data/mapHeaders/Route5.asm b/data/maps/headers/Route5.asm
index ea84090c..ea84090c 100755
--- a/data/mapHeaders/Route5.asm
+++ b/data/maps/headers/Route5.asm
diff --git a/data/mapHeaders/Route5Gate.asm b/data/maps/headers/Route5Gate.asm
index a0115533..a0115533 100755
--- a/data/mapHeaders/Route5Gate.asm
+++ b/data/maps/headers/Route5Gate.asm
diff --git a/data/mapHeaders/Route6.asm b/data/maps/headers/Route6.asm
index 956aa4d6..956aa4d6 100755
--- a/data/mapHeaders/Route6.asm
+++ b/data/maps/headers/Route6.asm
diff --git a/data/mapHeaders/Route6Gate.asm b/data/maps/headers/Route6Gate.asm
index f80b57c8..f80b57c8 100755
--- a/data/mapHeaders/Route6Gate.asm
+++ b/data/maps/headers/Route6Gate.asm
diff --git a/data/mapHeaders/Route7.asm b/data/maps/headers/Route7.asm
index 8368c3fe..8368c3fe 100755
--- a/data/mapHeaders/Route7.asm
+++ b/data/maps/headers/Route7.asm
diff --git a/data/mapHeaders/Route7Gate.asm b/data/maps/headers/Route7Gate.asm
index e9b9b16d..e9b9b16d 100755
--- a/data/mapHeaders/Route7Gate.asm
+++ b/data/maps/headers/Route7Gate.asm
diff --git a/data/mapHeaders/Route8.asm b/data/maps/headers/Route8.asm
index 8df9e023..8df9e023 100755
--- a/data/mapHeaders/Route8.asm
+++ b/data/maps/headers/Route8.asm
diff --git a/data/mapHeaders/Route8Gate.asm b/data/maps/headers/Route8Gate.asm
index f6a320a4..f6a320a4 100755
--- a/data/mapHeaders/Route8Gate.asm
+++ b/data/maps/headers/Route8Gate.asm
diff --git a/data/mapHeaders/Route9.asm b/data/maps/headers/Route9.asm
index c1ed9225..c1ed9225 100755
--- a/data/mapHeaders/Route9.asm
+++ b/data/maps/headers/Route9.asm
diff --git a/data/mapHeaders/SSAnne1F.asm b/data/maps/headers/SSAnne1F.asm
index 80d25e2d..80d25e2d 100755
--- a/data/mapHeaders/SSAnne1F.asm
+++ b/data/maps/headers/SSAnne1F.asm
diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/maps/headers/SSAnne1FRooms.asm
index 8bdd8d00..8bdd8d00 100755
--- a/data/mapHeaders/SSAnne1FRooms.asm
+++ b/data/maps/headers/SSAnne1FRooms.asm
diff --git a/data/mapHeaders/SSAnne2F.asm b/data/maps/headers/SSAnne2F.asm
index b2fe14d7..b2fe14d7 100755
--- a/data/mapHeaders/SSAnne2F.asm
+++ b/data/maps/headers/SSAnne2F.asm
diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/maps/headers/SSAnne2FRooms.asm
index 2d349e4c..2d349e4c 100755
--- a/data/mapHeaders/SSAnne2FRooms.asm
+++ b/data/maps/headers/SSAnne2FRooms.asm
diff --git a/data/mapHeaders/SSAnne3F.asm b/data/maps/headers/SSAnne3F.asm
index f391a0cd..f391a0cd 100755
--- a/data/mapHeaders/SSAnne3F.asm
+++ b/data/maps/headers/SSAnne3F.asm
diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/maps/headers/SSAnneB1F.asm
index c21d7cff..c21d7cff 100755
--- a/data/mapHeaders/SSAnneB1F.asm
+++ b/data/maps/headers/SSAnneB1F.asm
diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/maps/headers/SSAnneB1FRooms.asm
index 1b8b4620..1b8b4620 100755
--- a/data/mapHeaders/SSAnneB1FRooms.asm
+++ b/data/maps/headers/SSAnneB1FRooms.asm
diff --git a/data/mapHeaders/SSAnneBow.asm b/data/maps/headers/SSAnneBow.asm
index 2195e970..2195e970 100755
--- a/data/mapHeaders/SSAnneBow.asm
+++ b/data/maps/headers/SSAnneBow.asm
diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/maps/headers/SSAnneCaptainsRoom.asm
index a24f930d..a24f930d 100755
--- a/data/mapHeaders/SSAnneCaptainsRoom.asm
+++ b/data/maps/headers/SSAnneCaptainsRoom.asm
diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/maps/headers/SSAnneKitchen.asm
index 47e84fbe..47e84fbe 100755
--- a/data/mapHeaders/SSAnneKitchen.asm
+++ b/data/maps/headers/SSAnneKitchen.asm
diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/maps/headers/SafariZoneCenter.asm
index ccc58ed1..ccc58ed1 100755
--- a/data/mapHeaders/SafariZoneCenter.asm
+++ b/data/maps/headers/SafariZoneCenter.asm
diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm
index a866003f..a866003f 100755
--- a/data/mapHeaders/SafariZoneCenterRestHouse.asm
+++ b/data/maps/headers/SafariZoneCenterRestHouse.asm
diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/maps/headers/SafariZoneEast.asm
index c23e9334..c23e9334 100755
--- a/data/mapHeaders/SafariZoneEast.asm
+++ b/data/maps/headers/SafariZoneEast.asm
diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm
index 1f8d76c6..1f8d76c6 100755
--- a/data/mapHeaders/SafariZoneEastRestHouse.asm
+++ b/data/maps/headers/SafariZoneEastRestHouse.asm
diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/maps/headers/SafariZoneGate.asm
index 7816460d..7816460d 100755
--- a/data/mapHeaders/SafariZoneGate.asm
+++ b/data/maps/headers/SafariZoneGate.asm
diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/maps/headers/SafariZoneNorth.asm
index 32639d22..32639d22 100755
--- a/data/mapHeaders/SafariZoneNorth.asm
+++ b/data/maps/headers/SafariZoneNorth.asm
diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm
index ec083803..ec083803 100755
--- a/data/mapHeaders/SafariZoneNorthRestHouse.asm
+++ b/data/maps/headers/SafariZoneNorthRestHouse.asm
diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/maps/headers/SafariZoneSecretHouse.asm
index 630577c4..630577c4 100755
--- a/data/mapHeaders/SafariZoneSecretHouse.asm
+++ b/data/maps/headers/SafariZoneSecretHouse.asm
diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/maps/headers/SafariZoneWest.asm
index a1117d09..a1117d09 100755
--- a/data/mapHeaders/SafariZoneWest.asm
+++ b/data/maps/headers/SafariZoneWest.asm
diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm
index e4618e1d..e4618e1d 100755
--- a/data/mapHeaders/SafariZoneWestRestHouse.asm
+++ b/data/maps/headers/SafariZoneWestRestHouse.asm
diff --git a/data/mapHeaders/SaffronCity.asm b/data/maps/headers/SaffronCity.asm
index ee1f71e4..ee1f71e4 100755
--- a/data/mapHeaders/SaffronCity.asm
+++ b/data/maps/headers/SaffronCity.asm
diff --git a/data/mapHeaders/SaffronGym.asm b/data/maps/headers/SaffronGym.asm
index 14ee3323..14ee3323 100755
--- a/data/mapHeaders/SaffronGym.asm
+++ b/data/maps/headers/SaffronGym.asm
diff --git a/data/mapHeaders/SaffronMart.asm b/data/maps/headers/SaffronMart.asm
index f03132d2..f03132d2 100755
--- a/data/mapHeaders/SaffronMart.asm
+++ b/data/maps/headers/SaffronMart.asm
diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/maps/headers/SaffronPidgeyHouse.asm
index e9f8dde7..e9f8dde7 100755
--- a/data/mapHeaders/SaffronPidgeyHouse.asm
+++ b/data/maps/headers/SaffronPidgeyHouse.asm
diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/maps/headers/SaffronPokecenter.asm
index 9b250050..9b250050 100755
--- a/data/mapHeaders/SaffronPokecenter.asm
+++ b/data/maps/headers/SaffronPokecenter.asm
diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/maps/headers/SeafoamIslands1F.asm
index db530549..db530549 100755
--- a/data/mapHeaders/SeafoamIslands1F.asm
+++ b/data/maps/headers/SeafoamIslands1F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/maps/headers/SeafoamIslandsB1F.asm
index 589eef93..589eef93 100755
--- a/data/mapHeaders/SeafoamIslandsB1F.asm
+++ b/data/maps/headers/SeafoamIslandsB1F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/maps/headers/SeafoamIslandsB2F.asm
index f7e624ed..f7e624ed 100755
--- a/data/mapHeaders/SeafoamIslandsB2F.asm
+++ b/data/maps/headers/SeafoamIslandsB2F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/maps/headers/SeafoamIslandsB3F.asm
index b57da3c0..b57da3c0 100755
--- a/data/mapHeaders/SeafoamIslandsB3F.asm
+++ b/data/maps/headers/SeafoamIslandsB3F.asm
diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/maps/headers/SeafoamIslandsB4F.asm
index bae1e3a2..bae1e3a2 100755
--- a/data/mapHeaders/SeafoamIslandsB4F.asm
+++ b/data/maps/headers/SeafoamIslandsB4F.asm
diff --git a/data/mapHeaders/SilphCo10F.asm b/data/maps/headers/SilphCo10F.asm
index 7a6786e7..7a6786e7 100755
--- a/data/mapHeaders/SilphCo10F.asm
+++ b/data/maps/headers/SilphCo10F.asm
diff --git a/data/mapHeaders/SilphCo11F.asm b/data/maps/headers/SilphCo11F.asm
index 72eaaca2..72eaaca2 100755
--- a/data/mapHeaders/SilphCo11F.asm
+++ b/data/maps/headers/SilphCo11F.asm
diff --git a/data/mapHeaders/SilphCo1F.asm b/data/maps/headers/SilphCo1F.asm
index 4c4ac97d..4c4ac97d 100755
--- a/data/mapHeaders/SilphCo1F.asm
+++ b/data/maps/headers/SilphCo1F.asm
diff --git a/data/mapHeaders/SilphCo2F.asm b/data/maps/headers/SilphCo2F.asm
index 7dc44a55..7dc44a55 100755
--- a/data/mapHeaders/SilphCo2F.asm
+++ b/data/maps/headers/SilphCo2F.asm
diff --git a/data/mapHeaders/SilphCo3F.asm b/data/maps/headers/SilphCo3F.asm
index 99e4aa15..99e4aa15 100755
--- a/data/mapHeaders/SilphCo3F.asm
+++ b/data/maps/headers/SilphCo3F.asm
diff --git a/data/mapHeaders/SilphCo4F.asm b/data/maps/headers/SilphCo4F.asm
index 8eed0f9a..8eed0f9a 100755
--- a/data/mapHeaders/SilphCo4F.asm
+++ b/data/maps/headers/SilphCo4F.asm
diff --git a/data/mapHeaders/SilphCo5F.asm b/data/maps/headers/SilphCo5F.asm
index 3b40c360..3b40c360 100755
--- a/data/mapHeaders/SilphCo5F.asm
+++ b/data/maps/headers/SilphCo5F.asm
diff --git a/data/mapHeaders/SilphCo6F.asm b/data/maps/headers/SilphCo6F.asm
index 3d2b3b8c..3d2b3b8c 100755
--- a/data/mapHeaders/SilphCo6F.asm
+++ b/data/maps/headers/SilphCo6F.asm
diff --git a/data/mapHeaders/SilphCo7F.asm b/data/maps/headers/SilphCo7F.asm
index 1591837a..1591837a 100755
--- a/data/mapHeaders/SilphCo7F.asm
+++ b/data/maps/headers/SilphCo7F.asm
diff --git a/data/mapHeaders/SilphCo8F.asm b/data/maps/headers/SilphCo8F.asm
index e676fa86..e676fa86 100755
--- a/data/mapHeaders/SilphCo8F.asm
+++ b/data/maps/headers/SilphCo8F.asm
diff --git a/data/mapHeaders/SilphCo9F.asm b/data/maps/headers/SilphCo9F.asm
index 89f0300a..89f0300a 100755
--- a/data/mapHeaders/SilphCo9F.asm
+++ b/data/maps/headers/SilphCo9F.asm
diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/maps/headers/SilphCoElevator.asm
index 4dd9cd9f..4dd9cd9f 100755
--- a/data/mapHeaders/SilphCoElevator.asm
+++ b/data/maps/headers/SilphCoElevator.asm
diff --git a/data/mapHeaders/TradeCenter.asm b/data/maps/headers/TradeCenter.asm
index 268d76b2..268d76b2 100755
--- a/data/mapHeaders/TradeCenter.asm
+++ b/data/maps/headers/TradeCenter.asm
diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/maps/headers/UndergroundPathNorthSouth.asm
index 4bb03c79..4bb03c79 100755
--- a/data/mapHeaders/UndergroundPathNorthSouth.asm
+++ b/data/maps/headers/UndergroundPathNorthSouth.asm
diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/maps/headers/UndergroundPathRoute5.asm
index 18287254..18287254 100755
--- a/data/mapHeaders/UndergroundPathRoute5.asm
+++ b/data/maps/headers/UndergroundPathRoute5.asm
diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/maps/headers/UndergroundPathRoute6.asm
index 67772543..67772543 100755
--- a/data/mapHeaders/UndergroundPathRoute6.asm
+++ b/data/maps/headers/UndergroundPathRoute6.asm
diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/maps/headers/UndergroundPathRoute7.asm
index d70548ed..d70548ed 100755
--- a/data/mapHeaders/UndergroundPathRoute7.asm
+++ b/data/maps/headers/UndergroundPathRoute7.asm
diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/maps/headers/UndergroundPathRoute7Copy.asm
index 30bb70a8..30bb70a8 100755
--- a/data/mapHeaders/UndergroundPathRoute7Copy.asm
+++ b/data/maps/headers/UndergroundPathRoute7Copy.asm
diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/maps/headers/UndergroundPathRoute8.asm
index 102d8413..102d8413 100755
--- a/data/mapHeaders/UndergroundPathRoute8.asm
+++ b/data/maps/headers/UndergroundPathRoute8.asm
diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/maps/headers/UndergroundPathWestEast.asm
index 05976e87..05976e87 100755
--- a/data/mapHeaders/UndergroundPathWestEast.asm
+++ b/data/maps/headers/UndergroundPathWestEast.asm
diff --git a/data/mapHeaders/VermilionCity.asm b/data/maps/headers/VermilionCity.asm
index e211562c..e211562c 100755
--- a/data/mapHeaders/VermilionCity.asm
+++ b/data/maps/headers/VermilionCity.asm
diff --git a/data/mapHeaders/VermilionDock.asm b/data/maps/headers/VermilionDock.asm
index 9a9b61c2..9a9b61c2 100755
--- a/data/mapHeaders/VermilionDock.asm
+++ b/data/maps/headers/VermilionDock.asm
diff --git a/data/mapHeaders/VermilionGym.asm b/data/maps/headers/VermilionGym.asm
index ca75b8c1..ca75b8c1 100755
--- a/data/mapHeaders/VermilionGym.asm
+++ b/data/maps/headers/VermilionGym.asm
diff --git a/data/mapHeaders/VermilionMart.asm b/data/maps/headers/VermilionMart.asm
index 5777db4b..5777db4b 100755
--- a/data/mapHeaders/VermilionMart.asm
+++ b/data/maps/headers/VermilionMart.asm
diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/maps/headers/VermilionOldRodHouse.asm
index f9c890e0..f9c890e0 100755
--- a/data/mapHeaders/VermilionOldRodHouse.asm
+++ b/data/maps/headers/VermilionOldRodHouse.asm
diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/maps/headers/VermilionPidgeyHouse.asm
index afb81784..afb81784 100755
--- a/data/mapHeaders/VermilionPidgeyHouse.asm
+++ b/data/maps/headers/VermilionPidgeyHouse.asm
diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/maps/headers/VermilionPokecenter.asm
index af9827ac..af9827ac 100755
--- a/data/mapHeaders/VermilionPokecenter.asm
+++ b/data/maps/headers/VermilionPokecenter.asm
diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/maps/headers/VermilionTradeHouse.asm
index 3cb82c47..3cb82c47 100755
--- a/data/mapHeaders/VermilionTradeHouse.asm
+++ b/data/maps/headers/VermilionTradeHouse.asm
diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/maps/headers/VictoryRoad1F.asm
index dae95f16..dae95f16 100755
--- a/data/mapHeaders/VictoryRoad1F.asm
+++ b/data/maps/headers/VictoryRoad1F.asm
diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/maps/headers/VictoryRoad2F.asm
index 99079ad3..99079ad3 100755
--- a/data/mapHeaders/VictoryRoad2F.asm
+++ b/data/maps/headers/VictoryRoad2F.asm
diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/maps/headers/VictoryRoad3F.asm
index bc15cad7..bc15cad7 100755
--- a/data/mapHeaders/VictoryRoad3F.asm
+++ b/data/maps/headers/VictoryRoad3F.asm
diff --git a/data/mapHeaders/ViridianCity.asm b/data/maps/headers/ViridianCity.asm
index 0771cc81..0771cc81 100755
--- a/data/mapHeaders/ViridianCity.asm
+++ b/data/maps/headers/ViridianCity.asm
diff --git a/data/mapHeaders/ViridianForest.asm b/data/maps/headers/ViridianForest.asm
index d531ec86..d531ec86 100755
--- a/data/mapHeaders/ViridianForest.asm
+++ b/data/maps/headers/ViridianForest.asm
diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/maps/headers/ViridianForestNorthGate.asm
index 5bfcd6ed..5bfcd6ed 100755
--- a/data/mapHeaders/ViridianForestNorthGate.asm
+++ b/data/maps/headers/ViridianForestNorthGate.asm
diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/maps/headers/ViridianForestSouthGate.asm
index 87a49284..87a49284 100755
--- a/data/mapHeaders/ViridianForestSouthGate.asm
+++ b/data/maps/headers/ViridianForestSouthGate.asm
diff --git a/data/mapHeaders/ViridianGym.asm b/data/maps/headers/ViridianGym.asm
index 640a71b6..640a71b6 100755
--- a/data/mapHeaders/ViridianGym.asm
+++ b/data/maps/headers/ViridianGym.asm
diff --git a/data/mapHeaders/ViridianMart.asm b/data/maps/headers/ViridianMart.asm
index 817b5265..817b5265 100755
--- a/data/mapHeaders/ViridianMart.asm
+++ b/data/maps/headers/ViridianMart.asm
diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/maps/headers/ViridianNicknameHouse.asm
index 5a7c272f..5a7c272f 100755
--- a/data/mapHeaders/ViridianNicknameHouse.asm
+++ b/data/maps/headers/ViridianNicknameHouse.asm
diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/maps/headers/ViridianPokecenter.asm
index daac19f3..daac19f3 100755
--- a/data/mapHeaders/ViridianPokecenter.asm
+++ b/data/maps/headers/ViridianPokecenter.asm
diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/maps/headers/ViridianSchoolHouse.asm
index f5b77212..f5b77212 100755
--- a/data/mapHeaders/ViridianSchoolHouse.asm
+++ b/data/maps/headers/ViridianSchoolHouse.asm
diff --git a/data/mapHeaders/WardensHouse.asm b/data/maps/headers/WardensHouse.asm
index 08216f59..08216f59 100755
--- a/data/mapHeaders/WardensHouse.asm
+++ b/data/maps/headers/WardensHouse.asm
diff --git a/data/mapObjects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm
index 4a82e78d..4a82e78d 100755
--- a/data/mapObjects/AgathasRoom.asm
+++ b/data/maps/objects/AgathasRoom.asm
diff --git a/data/mapObjects/BikeShop.asm b/data/maps/objects/BikeShop.asm
index 9f21ab3e..9f21ab3e 100755
--- a/data/mapObjects/BikeShop.asm
+++ b/data/maps/objects/BikeShop.asm
diff --git a/data/mapObjects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm
index c8f708cb..c8f708cb 100755
--- a/data/mapObjects/BillsHouse.asm
+++ b/data/maps/objects/BillsHouse.asm
diff --git a/data/mapObjects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm
index 45ca1286..45ca1286 100755
--- a/data/mapObjects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
diff --git a/data/mapObjects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm
index dde1e2dd..dde1e2dd 100755
--- a/data/mapObjects/BrunosRoom.asm
+++ b/data/maps/objects/BrunosRoom.asm
diff --git a/data/mapObjects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm
index 88850f35..88850f35 100755
--- a/data/mapObjects/CeladonChiefHouse.asm
+++ b/data/maps/objects/CeladonChiefHouse.asm
diff --git a/data/mapObjects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm
index 005fc61e..005fc61e 100755
--- a/data/mapObjects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
diff --git a/data/mapObjects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm
index 0a4a895d..0a4a895d 100755
--- a/data/mapObjects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
diff --git a/data/mapObjects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm
index 98fce576..98fce576 100755
--- a/data/mapObjects/CeladonGym.asm
+++ b/data/maps/objects/CeladonGym.asm
diff --git a/data/mapObjects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm
index f4aa1305..f4aa1305 100755
--- a/data/mapObjects/CeladonHotel.asm
+++ b/data/maps/objects/CeladonHotel.asm
diff --git a/data/mapObjects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm
index 1abd434c..1abd434c 100755
--- a/data/mapObjects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm
index 09c94d29..09c94d29 100755
--- a/data/mapObjects/CeladonMansion2F.asm
+++ b/data/maps/objects/CeladonMansion2F.asm
diff --git a/data/mapObjects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm
index 32701f14..32701f14 100755
--- a/data/mapObjects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm
index 353b0b96..353b0b96 100755
--- a/data/mapObjects/CeladonMansionRoof.asm
+++ b/data/maps/objects/CeladonMansionRoof.asm
diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm
index b6a6149f..b6a6149f 100755
--- a/data/mapObjects/CeladonMansionRoofHouse.asm
+++ b/data/maps/objects/CeladonMansionRoofHouse.asm
diff --git a/data/mapObjects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm
index 2037369a..2037369a 100755
--- a/data/mapObjects/CeladonMart1F.asm
+++ b/data/maps/objects/CeladonMart1F.asm
diff --git a/data/mapObjects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm
index 2f5f428e..2f5f428e 100755
--- a/data/mapObjects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
diff --git a/data/mapObjects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm
index 6dfce535..6dfce535 100755
--- a/data/mapObjects/CeladonMart3F.asm
+++ b/data/maps/objects/CeladonMart3F.asm
diff --git a/data/mapObjects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm
index 18ba3bdc..18ba3bdc 100755
--- a/data/mapObjects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
diff --git a/data/mapObjects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm
index fb1201c9..fb1201c9 100755
--- a/data/mapObjects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm
index 9688daef..9688daef 100755
--- a/data/mapObjects/CeladonMartElevator.asm
+++ b/data/maps/objects/CeladonMartElevator.asm
diff --git a/data/mapObjects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm
index 05cef2d4..05cef2d4 100755
--- a/data/mapObjects/CeladonMartRoof.asm
+++ b/data/maps/objects/CeladonMartRoof.asm
diff --git a/data/mapObjects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm
index da5d595f..da5d595f 100755
--- a/data/mapObjects/CeladonPokecenter.asm
+++ b/data/maps/objects/CeladonPokecenter.asm
diff --git a/data/mapObjects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm
index 62a6873b..62a6873b 100755
--- a/data/mapObjects/CeruleanBadgeHouse.asm
+++ b/data/maps/objects/CeruleanBadgeHouse.asm
diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm
index f9670482..f9670482 100755
--- a/data/mapObjects/CeruleanCave1F.asm
+++ b/data/maps/objects/CeruleanCave1F.asm
diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm
index f8312da0..f8312da0 100755
--- a/data/mapObjects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
diff --git a/data/mapObjects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm
index 461f77aa..461f77aa 100755
--- a/data/mapObjects/CeruleanCaveB1F.asm
+++ b/data/maps/objects/CeruleanCaveB1F.asm
diff --git a/data/mapObjects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index d5adcfd7..d5adcfd7 100755
--- a/data/mapObjects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
diff --git a/data/mapObjects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm
index 96713648..96713648 100755
--- a/data/mapObjects/CeruleanGym.asm
+++ b/data/maps/objects/CeruleanGym.asm
diff --git a/data/mapObjects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm
index 4659375f..4659375f 100755
--- a/data/mapObjects/CeruleanMart.asm
+++ b/data/maps/objects/CeruleanMart.asm
diff --git a/data/mapObjects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm
index f65db52c..f65db52c 100755
--- a/data/mapObjects/CeruleanPokecenter.asm
+++ b/data/maps/objects/CeruleanPokecenter.asm
diff --git a/data/mapObjects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm
index a4a46e9b..a4a46e9b 100755
--- a/data/mapObjects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanTradeHouse.asm
diff --git a/data/mapObjects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm
index 44b7cf20..44b7cf20 100755
--- a/data/mapObjects/CeruleanTrashedHouse.asm
+++ b/data/maps/objects/CeruleanTrashedHouse.asm
diff --git a/data/mapObjects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm
index 1e0cb7f4..1e0cb7f4 100755
--- a/data/mapObjects/ChampionsRoom.asm
+++ b/data/maps/objects/ChampionsRoom.asm
diff --git a/data/mapObjects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm
index ab204d43..ab204d43 100755
--- a/data/mapObjects/CinnabarGym.asm
+++ b/data/maps/objects/CinnabarGym.asm
diff --git a/data/mapObjects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm
index 1932e134..1932e134 100755
--- a/data/mapObjects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
diff --git a/data/mapObjects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm
index deb5d8ed..deb5d8ed 100755
--- a/data/mapObjects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm
index d31502e6..d31502e6 100755
--- a/data/mapObjects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
diff --git a/data/mapObjects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm
index 37f93d43..37f93d43 100755
--- a/data/mapObjects/CinnabarLabMetronomeRoom.asm
+++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm
diff --git a/data/mapObjects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm
index 449cc914..449cc914 100755
--- a/data/mapObjects/CinnabarLabTradeRoom.asm
+++ b/data/maps/objects/CinnabarLabTradeRoom.asm
diff --git a/data/mapObjects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm
index af88ddf0..af88ddf0 100755
--- a/data/mapObjects/CinnabarMart.asm
+++ b/data/maps/objects/CinnabarMart.asm
diff --git a/data/mapObjects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm
index 9583ef2a..9583ef2a 100755
--- a/data/mapObjects/CinnabarPokecenter.asm
+++ b/data/maps/objects/CinnabarPokecenter.asm
diff --git a/data/mapObjects/Colosseum.asm b/data/maps/objects/Colosseum.asm
index 18762584..18762584 100755
--- a/data/mapObjects/Colosseum.asm
+++ b/data/maps/objects/Colosseum.asm
diff --git a/data/mapObjects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm
index cb4dbb0b..cb4dbb0b 100755
--- a/data/mapObjects/CopycatsHouse1F.asm
+++ b/data/maps/objects/CopycatsHouse1F.asm
diff --git a/data/mapObjects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm
index 18b56419..18b56419 100755
--- a/data/mapObjects/CopycatsHouse2F.asm
+++ b/data/maps/objects/CopycatsHouse2F.asm
diff --git a/data/mapObjects/Daycare.asm b/data/maps/objects/Daycare.asm
index c58c83e4..c58c83e4 100755
--- a/data/mapObjects/Daycare.asm
+++ b/data/maps/objects/Daycare.asm
diff --git a/data/mapObjects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm
index b4fd0af8..b4fd0af8 100755
--- a/data/mapObjects/DiglettsCave.asm
+++ b/data/maps/objects/DiglettsCave.asm
diff --git a/data/mapObjects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm
index a4c70f06..a4c70f06 100755
--- a/data/mapObjects/DiglettsCaveRoute11.asm
+++ b/data/maps/objects/DiglettsCaveRoute11.asm
diff --git a/data/mapObjects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm
index 0567fee6..0567fee6 100755
--- a/data/mapObjects/DiglettsCaveRoute2.asm
+++ b/data/maps/objects/DiglettsCaveRoute2.asm
diff --git a/data/mapObjects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm
index fdc7b838..fdc7b838 100755
--- a/data/mapObjects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
diff --git a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
index 363b56f9..363b56f9 100755
--- a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm
+++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm
diff --git a/data/mapObjects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm
index 09c97b02..09c97b02 100755
--- a/data/mapObjects/FuchsiaCity.asm
+++ b/data/maps/objects/FuchsiaCity.asm
diff --git a/data/mapObjects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm
index 390447c8..390447c8 100755
--- a/data/mapObjects/FuchsiaGoodRodHouse.asm
+++ b/data/maps/objects/FuchsiaGoodRodHouse.asm
diff --git a/data/mapObjects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm
index 5d707d53..5d707d53 100755
--- a/data/mapObjects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
diff --git a/data/mapObjects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm
index cfa71d8d..cfa71d8d 100755
--- a/data/mapObjects/FuchsiaMart.asm
+++ b/data/maps/objects/FuchsiaMart.asm
diff --git a/data/mapObjects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm
index 9130d920..9130d920 100755
--- a/data/mapObjects/FuchsiaMeetingRoom.asm
+++ b/data/maps/objects/FuchsiaMeetingRoom.asm
diff --git a/data/mapObjects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm
index 73dc529d..73dc529d 100755
--- a/data/mapObjects/FuchsiaPokecenter.asm
+++ b/data/maps/objects/FuchsiaPokecenter.asm
diff --git a/data/mapObjects/GameCorner.asm b/data/maps/objects/GameCorner.asm
index 2704f6ab..2704f6ab 100755
--- a/data/mapObjects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
diff --git a/data/mapObjects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm
index 35cd3ac8..35cd3ac8 100755
--- a/data/mapObjects/GameCornerPrizeRoom.asm
+++ b/data/maps/objects/GameCornerPrizeRoom.asm
diff --git a/data/mapObjects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm
index 3762d871..3762d871 100755
--- a/data/mapObjects/HallOfFame.asm
+++ b/data/maps/objects/HallOfFame.asm
diff --git a/data/mapObjects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm
index 1447be11..1447be11 100755
--- a/data/mapObjects/IndigoPlateau.asm
+++ b/data/maps/objects/IndigoPlateau.asm
diff --git a/data/mapObjects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm
index ea113a16..ea113a16 100755
--- a/data/mapObjects/IndigoPlateauLobby.asm
+++ b/data/maps/objects/IndigoPlateauLobby.asm
diff --git a/data/mapObjects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm
index 6f22631a..6f22631a 100755
--- a/data/mapObjects/LancesRoom.asm
+++ b/data/maps/objects/LancesRoom.asm
diff --git a/data/mapObjects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm
index 96f1b3ba..96f1b3ba 100755
--- a/data/mapObjects/LavenderCuboneHouse.asm
+++ b/data/maps/objects/LavenderCuboneHouse.asm
diff --git a/data/mapObjects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm
index df14ad39..df14ad39 100755
--- a/data/mapObjects/LavenderMart.asm
+++ b/data/maps/objects/LavenderMart.asm
diff --git a/data/mapObjects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm
index 89e25571..89e25571 100755
--- a/data/mapObjects/LavenderPokecenter.asm
+++ b/data/maps/objects/LavenderPokecenter.asm
diff --git a/data/mapObjects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm
index 4aead666..4aead666 100755
--- a/data/mapObjects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
diff --git a/data/mapObjects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm
index 06450bb4..06450bb4 100755
--- a/data/mapObjects/LoreleisRoom.asm
+++ b/data/maps/objects/LoreleisRoom.asm
diff --git a/data/mapObjects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm
index 5b6ca2a6..5b6ca2a6 100755
--- a/data/mapObjects/MrFujisHouse.asm
+++ b/data/maps/objects/MrFujisHouse.asm
diff --git a/data/mapObjects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm
index 01f9e11c..01f9e11c 100755
--- a/data/mapObjects/MrPsychicsHouse.asm
+++ b/data/maps/objects/MrPsychicsHouse.asm
diff --git a/data/mapObjects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm
index 56820161..56820161 100755
--- a/data/mapObjects/MtMoon1F.asm
+++ b/data/maps/objects/MtMoon1F.asm
diff --git a/data/mapObjects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm
index a8365ba7..a8365ba7 100755
--- a/data/mapObjects/MtMoonB1F.asm
+++ b/data/maps/objects/MtMoonB1F.asm
diff --git a/data/mapObjects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm
index 27b2383f..27b2383f 100755
--- a/data/mapObjects/MtMoonB2F.asm
+++ b/data/maps/objects/MtMoonB2F.asm
diff --git a/data/mapObjects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm
index b23703e6..b23703e6 100755
--- a/data/mapObjects/MtMoonPokecenter.asm
+++ b/data/maps/objects/MtMoonPokecenter.asm
diff --git a/data/mapObjects/Museum1F.asm b/data/maps/objects/Museum1F.asm
index 1cfd2c68..1cfd2c68 100755
--- a/data/mapObjects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
diff --git a/data/mapObjects/Museum2F.asm b/data/maps/objects/Museum2F.asm
index 80815820..80815820 100755
--- a/data/mapObjects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
diff --git a/data/mapObjects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm
index da95bc43..da95bc43 100755
--- a/data/mapObjects/NameRatersHouse.asm
+++ b/data/maps/objects/NameRatersHouse.asm
diff --git a/data/mapObjects/OaksLab.asm b/data/maps/objects/OaksLab.asm
index fa78ccdf..fa78ccdf 100755
--- a/data/mapObjects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
diff --git a/data/mapObjects/PalletTown.asm b/data/maps/objects/PalletTown.asm
index 68b01175..68b01175 100755
--- a/data/mapObjects/PalletTown.asm
+++ b/data/maps/objects/PalletTown.asm
diff --git a/data/mapObjects/PewterCity.asm b/data/maps/objects/PewterCity.asm
index e1a3eecb..e1a3eecb 100755
--- a/data/mapObjects/PewterCity.asm
+++ b/data/maps/objects/PewterCity.asm
diff --git a/data/mapObjects/PewterGym.asm b/data/maps/objects/PewterGym.asm
index 538c3923..538c3923 100755
--- a/data/mapObjects/PewterGym.asm
+++ b/data/maps/objects/PewterGym.asm
diff --git a/data/mapObjects/PewterMart.asm b/data/maps/objects/PewterMart.asm
index 9b983316..9b983316 100755
--- a/data/mapObjects/PewterMart.asm
+++ b/data/maps/objects/PewterMart.asm
diff --git a/data/mapObjects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm
index f00317d1..f00317d1 100755
--- a/data/mapObjects/PewterNidoranHouse.asm
+++ b/data/maps/objects/PewterNidoranHouse.asm
diff --git a/data/mapObjects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm
index 2b375bf9..2b375bf9 100755
--- a/data/mapObjects/PewterPokecenter.asm
+++ b/data/maps/objects/PewterPokecenter.asm
diff --git a/data/mapObjects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm
index e7134cb5..e7134cb5 100755
--- a/data/mapObjects/PewterSpeechHouse.asm
+++ b/data/maps/objects/PewterSpeechHouse.asm
diff --git a/data/mapObjects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm
index e1f175f0..e1f175f0 100755
--- a/data/mapObjects/PokemonFanClub.asm
+++ b/data/maps/objects/PokemonFanClub.asm
diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm
index 109b5b8e..109b5b8e 100755
--- a/data/mapObjects/PokemonMansion1F.asm
+++ b/data/maps/objects/PokemonMansion1F.asm
diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm
index 6c0cc5f8..6c0cc5f8 100755
--- a/data/mapObjects/PokemonMansion2F.asm
+++ b/data/maps/objects/PokemonMansion2F.asm
diff --git a/data/mapObjects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm
index 7c8c9c22..7c8c9c22 100755
--- a/data/mapObjects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
diff --git a/data/mapObjects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm
index ac232799..ac232799 100755
--- a/data/mapObjects/PokemonMansionB1F.asm
+++ b/data/maps/objects/PokemonMansionB1F.asm
diff --git a/data/mapObjects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm
index cf62836b..cf62836b 100755
--- a/data/mapObjects/PokemonTower1F.asm
+++ b/data/maps/objects/PokemonTower1F.asm
diff --git a/data/mapObjects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm
index 5ce437d1..5ce437d1 100755
--- a/data/mapObjects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
diff --git a/data/mapObjects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm
index 79b83f88..79b83f88 100755
--- a/data/mapObjects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
diff --git a/data/mapObjects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm
index db86c02c..db86c02c 100755
--- a/data/mapObjects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
diff --git a/data/mapObjects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm
index b482871f..b482871f 100755
--- a/data/mapObjects/PokemonTower5F.asm
+++ b/data/maps/objects/PokemonTower5F.asm
diff --git a/data/mapObjects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm
index 823fe78a..823fe78a 100755
--- a/data/mapObjects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
diff --git a/data/mapObjects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm
index 79cb5b0d..79cb5b0d 100755
--- a/data/mapObjects/PokemonTower7F.asm
+++ b/data/maps/objects/PokemonTower7F.asm
diff --git a/data/mapObjects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm
index a8548b1c..a8548b1c 100755
--- a/data/mapObjects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
diff --git a/data/mapObjects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm
index a54b5411..a54b5411 100755
--- a/data/mapObjects/RedsHouse1F.asm
+++ b/data/maps/objects/RedsHouse1F.asm
diff --git a/data/mapObjects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
index 98e9c236..98e9c236 100755
--- a/data/mapObjects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
diff --git a/data/mapObjects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm
index 1cf5a12f..1cf5a12f 100755
--- a/data/mapObjects/RockTunnel1F.asm
+++ b/data/maps/objects/RockTunnel1F.asm
diff --git a/data/mapObjects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm
index f562168e..f562168e 100755
--- a/data/mapObjects/RockTunnelB1F.asm
+++ b/data/maps/objects/RockTunnelB1F.asm
diff --git a/data/mapObjects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm
index a7619f7f..a7619f7f 100755
--- a/data/mapObjects/RockTunnelPokecenter.asm
+++ b/data/maps/objects/RockTunnelPokecenter.asm
diff --git a/data/mapObjects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm
index 99537510..99537510 100755
--- a/data/mapObjects/RocketHideoutB1F.asm
+++ b/data/maps/objects/RocketHideoutB1F.asm
diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm
index 36fe9289..36fe9289 100755
--- a/data/mapObjects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
diff --git a/data/mapObjects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm
index 6169dbed..6169dbed 100755
--- a/data/mapObjects/RocketHideoutB3F.asm
+++ b/data/maps/objects/RocketHideoutB3F.asm
diff --git a/data/mapObjects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm
index be353f25..be353f25 100755
--- a/data/mapObjects/RocketHideoutB4F.asm
+++ b/data/maps/objects/RocketHideoutB4F.asm
diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm
index bc4fd7ff..bc4fd7ff 100755
--- a/data/mapObjects/RocketHideoutElevator.asm
+++ b/data/maps/objects/RocketHideoutElevator.asm
diff --git a/data/mapObjects/Route1.asm b/data/maps/objects/Route1.asm
index 0815fe67..0815fe67 100755
--- a/data/mapObjects/Route1.asm
+++ b/data/maps/objects/Route1.asm
diff --git a/data/mapObjects/Route10.asm b/data/maps/objects/Route10.asm
index 12850577..12850577 100755
--- a/data/mapObjects/Route10.asm
+++ b/data/maps/objects/Route10.asm
diff --git a/data/mapObjects/Route11.asm b/data/maps/objects/Route11.asm
index 5ed232f5..5ed232f5 100755
--- a/data/mapObjects/Route11.asm
+++ b/data/maps/objects/Route11.asm
diff --git a/data/mapObjects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm
index 5c4a120c..5c4a120c 100755
--- a/data/mapObjects/Route11Gate1F.asm
+++ b/data/maps/objects/Route11Gate1F.asm
diff --git a/data/mapObjects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm
index bf305bba..bf305bba 100755
--- a/data/mapObjects/Route11Gate2F.asm
+++ b/data/maps/objects/Route11Gate2F.asm
diff --git a/data/mapObjects/Route12.asm b/data/maps/objects/Route12.asm
index a9d84cf0..a9d84cf0 100755
--- a/data/mapObjects/Route12.asm
+++ b/data/maps/objects/Route12.asm
diff --git a/data/mapObjects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm
index 94f6b91a..94f6b91a 100755
--- a/data/mapObjects/Route12Gate1F.asm
+++ b/data/maps/objects/Route12Gate1F.asm
diff --git a/data/mapObjects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm
index cc6c1c19..cc6c1c19 100755
--- a/data/mapObjects/Route12Gate2F.asm
+++ b/data/maps/objects/Route12Gate2F.asm
diff --git a/data/mapObjects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm
index 458378a2..458378a2 100755
--- a/data/mapObjects/Route12SuperRodHouse.asm
+++ b/data/maps/objects/Route12SuperRodHouse.asm
diff --git a/data/mapObjects/Route13.asm b/data/maps/objects/Route13.asm
index 3f460901..3f460901 100755
--- a/data/mapObjects/Route13.asm
+++ b/data/maps/objects/Route13.asm
diff --git a/data/mapObjects/Route14.asm b/data/maps/objects/Route14.asm
index 565e587f..565e587f 100755
--- a/data/mapObjects/Route14.asm
+++ b/data/maps/objects/Route14.asm
diff --git a/data/mapObjects/Route15.asm b/data/maps/objects/Route15.asm
index f52cc1b8..f52cc1b8 100755
--- a/data/mapObjects/Route15.asm
+++ b/data/maps/objects/Route15.asm
diff --git a/data/mapObjects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm
index 23b1f5a7..23b1f5a7 100755
--- a/data/mapObjects/Route15Gate1F.asm
+++ b/data/maps/objects/Route15Gate1F.asm
diff --git a/data/mapObjects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm
index 162f2b1f..162f2b1f 100755
--- a/data/mapObjects/Route15Gate2F.asm
+++ b/data/maps/objects/Route15Gate2F.asm
diff --git a/data/mapObjects/Route16.asm b/data/maps/objects/Route16.asm
index fb23e6ca..fb23e6ca 100755
--- a/data/mapObjects/Route16.asm
+++ b/data/maps/objects/Route16.asm
diff --git a/data/mapObjects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm
index ec493fef..ec493fef 100755
--- a/data/mapObjects/Route16FlyHouse.asm
+++ b/data/maps/objects/Route16FlyHouse.asm
diff --git a/data/mapObjects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm
index 1d5baa1d..1d5baa1d 100755
--- a/data/mapObjects/Route16Gate1F.asm
+++ b/data/maps/objects/Route16Gate1F.asm
diff --git a/data/mapObjects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm
index 5914f854..5914f854 100755
--- a/data/mapObjects/Route16Gate2F.asm
+++ b/data/maps/objects/Route16Gate2F.asm
diff --git a/data/mapObjects/Route17.asm b/data/maps/objects/Route17.asm
index f5bc4307..f5bc4307 100755
--- a/data/mapObjects/Route17.asm
+++ b/data/maps/objects/Route17.asm
diff --git a/data/mapObjects/Route18.asm b/data/maps/objects/Route18.asm
index 8bacd6c0..8bacd6c0 100755
--- a/data/mapObjects/Route18.asm
+++ b/data/maps/objects/Route18.asm
diff --git a/data/mapObjects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm
index 83cb386a..83cb386a 100755
--- a/data/mapObjects/Route18Gate1F.asm
+++ b/data/maps/objects/Route18Gate1F.asm
diff --git a/data/mapObjects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm
index e48ec3b8..e48ec3b8 100755
--- a/data/mapObjects/Route18Gate2F.asm
+++ b/data/maps/objects/Route18Gate2F.asm
diff --git a/data/mapObjects/Route19.asm b/data/maps/objects/Route19.asm
index 9b39618e..9b39618e 100755
--- a/data/mapObjects/Route19.asm
+++ b/data/maps/objects/Route19.asm
diff --git a/data/mapObjects/Route2.asm b/data/maps/objects/Route2.asm
index b27ad199..b27ad199 100755
--- a/data/mapObjects/Route2.asm
+++ b/data/maps/objects/Route2.asm
diff --git a/data/mapObjects/Route20.asm b/data/maps/objects/Route20.asm
index 7bceef97..7bceef97 100755
--- a/data/mapObjects/Route20.asm
+++ b/data/maps/objects/Route20.asm
diff --git a/data/mapObjects/Route21.asm b/data/maps/objects/Route21.asm
index b7759b59..b7759b59 100755
--- a/data/mapObjects/Route21.asm
+++ b/data/maps/objects/Route21.asm
diff --git a/data/mapObjects/Route22.asm b/data/maps/objects/Route22.asm
index 56e759fd..56e759fd 100755
--- a/data/mapObjects/Route22.asm
+++ b/data/maps/objects/Route22.asm
diff --git a/data/mapObjects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm
index 3f693c7f..3f693c7f 100755
--- a/data/mapObjects/Route22Gate.asm
+++ b/data/maps/objects/Route22Gate.asm
diff --git a/data/mapObjects/Route23.asm b/data/maps/objects/Route23.asm
index b510c285..b510c285 100755
--- a/data/mapObjects/Route23.asm
+++ b/data/maps/objects/Route23.asm
diff --git a/data/mapObjects/Route24.asm b/data/maps/objects/Route24.asm
index 8ef0d2b9..8ef0d2b9 100755
--- a/data/mapObjects/Route24.asm
+++ b/data/maps/objects/Route24.asm
diff --git a/data/mapObjects/Route25.asm b/data/maps/objects/Route25.asm
index a85f85ca..a85f85ca 100755
--- a/data/mapObjects/Route25.asm
+++ b/data/maps/objects/Route25.asm
diff --git a/data/mapObjects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm
index a7feb780..a7feb780 100755
--- a/data/mapObjects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
diff --git a/data/mapObjects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm
index 89ece3ea..89ece3ea 100755
--- a/data/mapObjects/Route2TradeHouse.asm
+++ b/data/maps/objects/Route2TradeHouse.asm
diff --git a/data/mapObjects/Route3.asm b/data/maps/objects/Route3.asm
index 372ea6cf..372ea6cf 100755
--- a/data/mapObjects/Route3.asm
+++ b/data/maps/objects/Route3.asm
diff --git a/data/mapObjects/Route4.asm b/data/maps/objects/Route4.asm
index 4ab88f8f..4ab88f8f 100755
--- a/data/mapObjects/Route4.asm
+++ b/data/maps/objects/Route4.asm
diff --git a/data/mapObjects/Route5.asm b/data/maps/objects/Route5.asm
index df2c8c03..df2c8c03 100755
--- a/data/mapObjects/Route5.asm
+++ b/data/maps/objects/Route5.asm
diff --git a/data/mapObjects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm
index e0e06a1d..e0e06a1d 100755
--- a/data/mapObjects/Route5Gate.asm
+++ b/data/maps/objects/Route5Gate.asm
diff --git a/data/mapObjects/Route6.asm b/data/maps/objects/Route6.asm
index fc2d7e24..fc2d7e24 100755
--- a/data/mapObjects/Route6.asm
+++ b/data/maps/objects/Route6.asm
diff --git a/data/mapObjects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm
index 8ed96d04..8ed96d04 100755
--- a/data/mapObjects/Route6Gate.asm
+++ b/data/maps/objects/Route6Gate.asm
diff --git a/data/mapObjects/Route7.asm b/data/maps/objects/Route7.asm
index 182904ef..182904ef 100755
--- a/data/mapObjects/Route7.asm
+++ b/data/maps/objects/Route7.asm
diff --git a/data/mapObjects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm
index 7f1afe0a..7f1afe0a 100755
--- a/data/mapObjects/Route7Gate.asm
+++ b/data/maps/objects/Route7Gate.asm
diff --git a/data/mapObjects/Route8.asm b/data/maps/objects/Route8.asm
index 137d70a0..137d70a0 100755
--- a/data/mapObjects/Route8.asm
+++ b/data/maps/objects/Route8.asm
diff --git a/data/mapObjects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm
index 3bba95a0..3bba95a0 100755
--- a/data/mapObjects/Route8Gate.asm
+++ b/data/maps/objects/Route8Gate.asm
diff --git a/data/mapObjects/Route9.asm b/data/maps/objects/Route9.asm
index a991c0c7..a991c0c7 100755
--- a/data/mapObjects/Route9.asm
+++ b/data/maps/objects/Route9.asm
diff --git a/data/mapObjects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm
index 3e454f06..3e454f06 100755
--- a/data/mapObjects/SSAnne1F.asm
+++ b/data/maps/objects/SSAnne1F.asm
diff --git a/data/mapObjects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm
index 617d2a55..617d2a55 100755
--- a/data/mapObjects/SSAnne1FRooms.asm
+++ b/data/maps/objects/SSAnne1FRooms.asm
diff --git a/data/mapObjects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
index 6abd5ac4..6abd5ac4 100755
--- a/data/mapObjects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm
index ebb053a8..ebb053a8 100755
--- a/data/mapObjects/SSAnne2FRooms.asm
+++ b/data/maps/objects/SSAnne2FRooms.asm
diff --git a/data/mapObjects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm
index f0bfc17b..f0bfc17b 100755
--- a/data/mapObjects/SSAnne3F.asm
+++ b/data/maps/objects/SSAnne3F.asm
diff --git a/data/mapObjects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm
index fe54ea24..fe54ea24 100755
--- a/data/mapObjects/SSAnneB1F.asm
+++ b/data/maps/objects/SSAnneB1F.asm
diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm
index 1d31b89c..1d31b89c 100755
--- a/data/mapObjects/SSAnneB1FRooms.asm
+++ b/data/maps/objects/SSAnneB1FRooms.asm
diff --git a/data/mapObjects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm
index 8873c8f8..8873c8f8 100755
--- a/data/mapObjects/SSAnneBow.asm
+++ b/data/maps/objects/SSAnneBow.asm
diff --git a/data/mapObjects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm
index 545656cc..545656cc 100755
--- a/data/mapObjects/SSAnneCaptainsRoom.asm
+++ b/data/maps/objects/SSAnneCaptainsRoom.asm
diff --git a/data/mapObjects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm
index b5771e68..b5771e68 100755
--- a/data/mapObjects/SSAnneKitchen.asm
+++ b/data/maps/objects/SSAnneKitchen.asm
diff --git a/data/mapObjects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm
index e54cec74..e54cec74 100755
--- a/data/mapObjects/SafariZoneCenter.asm
+++ b/data/maps/objects/SafariZoneCenter.asm
diff --git a/data/mapObjects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm
index 9eda9970..9eda9970 100755
--- a/data/mapObjects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
diff --git a/data/mapObjects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm
index df612ea9..df612ea9 100755
--- a/data/mapObjects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
diff --git a/data/mapObjects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm
index e7c68343..e7c68343 100755
--- a/data/mapObjects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
diff --git a/data/mapObjects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm
index 6749b45b..6749b45b 100755
--- a/data/mapObjects/SafariZoneGate.asm
+++ b/data/maps/objects/SafariZoneGate.asm
diff --git a/data/mapObjects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm
index 9eda7b4b..9eda7b4b 100755
--- a/data/mapObjects/SafariZoneNorth.asm
+++ b/data/maps/objects/SafariZoneNorth.asm
diff --git a/data/mapObjects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm
index 34b3ab4f..34b3ab4f 100755
--- a/data/mapObjects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
diff --git a/data/mapObjects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm
index 2a5fc22d..2a5fc22d 100755
--- a/data/mapObjects/SafariZoneSecretHouse.asm
+++ b/data/maps/objects/SafariZoneSecretHouse.asm
diff --git a/data/mapObjects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm
index 7faced72..7faced72 100755
--- a/data/mapObjects/SafariZoneWest.asm
+++ b/data/maps/objects/SafariZoneWest.asm
diff --git a/data/mapObjects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm
index 9f1bc0ed..9f1bc0ed 100755
--- a/data/mapObjects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
diff --git a/data/mapObjects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm
index b8d3a9cf..b8d3a9cf 100755
--- a/data/mapObjects/SaffronCity.asm
+++ b/data/maps/objects/SaffronCity.asm
diff --git a/data/mapObjects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm
index 1869421a..1869421a 100755
--- a/data/mapObjects/SaffronGym.asm
+++ b/data/maps/objects/SaffronGym.asm
diff --git a/data/mapObjects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm
index c376f2de..c376f2de 100755
--- a/data/mapObjects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
diff --git a/data/mapObjects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm
index 65a851bf..65a851bf 100755
--- a/data/mapObjects/SaffronPidgeyHouse.asm
+++ b/data/maps/objects/SaffronPidgeyHouse.asm
diff --git a/data/mapObjects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm
index e54fd76b..e54fd76b 100755
--- a/data/mapObjects/SaffronPokecenter.asm
+++ b/data/maps/objects/SaffronPokecenter.asm
diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm
index 8707ee0a..8707ee0a 100755
--- a/data/mapObjects/SeafoamIslands1F.asm
+++ b/data/maps/objects/SeafoamIslands1F.asm
diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm
index 426ca0c3..426ca0c3 100755
--- a/data/mapObjects/SeafoamIslandsB1F.asm
+++ b/data/maps/objects/SeafoamIslandsB1F.asm
diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm
index 9c1a7898..9c1a7898 100755
--- a/data/mapObjects/SeafoamIslandsB2F.asm
+++ b/data/maps/objects/SeafoamIslandsB2F.asm
diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm
index d194e1cd..d194e1cd 100755
--- a/data/mapObjects/SeafoamIslandsB3F.asm
+++ b/data/maps/objects/SeafoamIslandsB3F.asm
diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm
index 62d88b0c..62d88b0c 100755
--- a/data/mapObjects/SeafoamIslandsB4F.asm
+++ b/data/maps/objects/SeafoamIslandsB4F.asm
diff --git a/data/mapObjects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm
index 1c8948d3..1c8948d3 100755
--- a/data/mapObjects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
diff --git a/data/mapObjects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm
index 7a1dff73..7a1dff73 100755
--- a/data/mapObjects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
diff --git a/data/mapObjects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm
index fc040091..fc040091 100755
--- a/data/mapObjects/SilphCo1F.asm
+++ b/data/maps/objects/SilphCo1F.asm
diff --git a/data/mapObjects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm
index bc30d78d..bc30d78d 100755
--- a/data/mapObjects/SilphCo2F.asm
+++ b/data/maps/objects/SilphCo2F.asm
diff --git a/data/mapObjects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm
index f45cdf81..f45cdf81 100755
--- a/data/mapObjects/SilphCo3F.asm
+++ b/data/maps/objects/SilphCo3F.asm
diff --git a/data/mapObjects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm
index 3d865bbc..3d865bbc 100755
--- a/data/mapObjects/SilphCo4F.asm
+++ b/data/maps/objects/SilphCo4F.asm
diff --git a/data/mapObjects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm
index c10f17c8..c10f17c8 100755
--- a/data/mapObjects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
diff --git a/data/mapObjects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm
index ad2ac32f..ad2ac32f 100755
--- a/data/mapObjects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
diff --git a/data/mapObjects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm
index 255f4b33..255f4b33 100755
--- a/data/mapObjects/SilphCo7F.asm
+++ b/data/maps/objects/SilphCo7F.asm
diff --git a/data/mapObjects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm
index d05c7844..d05c7844 100755
--- a/data/mapObjects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
diff --git a/data/mapObjects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm
index 28ef5f10..28ef5f10 100755
--- a/data/mapObjects/SilphCo9F.asm
+++ b/data/maps/objects/SilphCo9F.asm
diff --git a/data/mapObjects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm
index 9c4b5a79..9c4b5a79 100755
--- a/data/mapObjects/SilphCoElevator.asm
+++ b/data/maps/objects/SilphCoElevator.asm
diff --git a/data/mapObjects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm
index e6df8087..e6df8087 100755
--- a/data/mapObjects/TradeCenter.asm
+++ b/data/maps/objects/TradeCenter.asm
diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm
index 35e21cca..35e21cca 100755
--- a/data/mapObjects/UndergroundPathNorthSouth.asm
+++ b/data/maps/objects/UndergroundPathNorthSouth.asm
diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm
index af71ebb4..af71ebb4 100755
--- a/data/mapObjects/UndergroundPathRoute5.asm
+++ b/data/maps/objects/UndergroundPathRoute5.asm
diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm
index 5a40ade2..5a40ade2 100755
--- a/data/mapObjects/UndergroundPathRoute6.asm
+++ b/data/maps/objects/UndergroundPathRoute6.asm
diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm
index 4666e0c9..4666e0c9 100755
--- a/data/mapObjects/UndergroundPathRoute7.asm
+++ b/data/maps/objects/UndergroundPathRoute7.asm
diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm
index c020646e..c020646e 100755
--- a/data/mapObjects/UndergroundPathRoute7Copy.asm
+++ b/data/maps/objects/UndergroundPathRoute7Copy.asm
diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm
index 8be0d474..8be0d474 100755
--- a/data/mapObjects/UndergroundPathRoute8.asm
+++ b/data/maps/objects/UndergroundPathRoute8.asm
diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm
index fa064aca..fa064aca 100755
--- a/data/mapObjects/UndergroundPathWestEast.asm
+++ b/data/maps/objects/UndergroundPathWestEast.asm
diff --git a/data/mapObjects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm
index b1e1a005..b1e1a005 100755
--- a/data/mapObjects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
diff --git a/data/mapObjects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm
index 6f07554a..6f07554a 100755
--- a/data/mapObjects/VermilionDock.asm
+++ b/data/maps/objects/VermilionDock.asm
diff --git a/data/mapObjects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm
index 4ace83be..4ace83be 100755
--- a/data/mapObjects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
diff --git a/data/mapObjects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm
index 74bcf35f..74bcf35f 100755
--- a/data/mapObjects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
diff --git a/data/mapObjects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm
index f5b4b96a..f5b4b96a 100755
--- a/data/mapObjects/VermilionOldRodHouse.asm
+++ b/data/maps/objects/VermilionOldRodHouse.asm
diff --git a/data/mapObjects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm
index 0e820f86..0e820f86 100755
--- a/data/mapObjects/VermilionPidgeyHouse.asm
+++ b/data/maps/objects/VermilionPidgeyHouse.asm
diff --git a/data/mapObjects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm
index d2142045..d2142045 100755
--- a/data/mapObjects/VermilionPokecenter.asm
+++ b/data/maps/objects/VermilionPokecenter.asm
diff --git a/data/mapObjects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm
index 30212b2a..30212b2a 100755
--- a/data/mapObjects/VermilionTradeHouse.asm
+++ b/data/maps/objects/VermilionTradeHouse.asm
diff --git a/data/mapObjects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm
index cc0c47ce..cc0c47ce 100755
--- a/data/mapObjects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
diff --git a/data/mapObjects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm
index 55559bca..55559bca 100755
--- a/data/mapObjects/VictoryRoad2F.asm
+++ b/data/maps/objects/VictoryRoad2F.asm
diff --git a/data/mapObjects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm
index 2eb42417..2eb42417 100755
--- a/data/mapObjects/VictoryRoad3F.asm
+++ b/data/maps/objects/VictoryRoad3F.asm
diff --git a/data/mapObjects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm
index 32fe8d3a..32fe8d3a 100755
--- a/data/mapObjects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
diff --git a/data/mapObjects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm
index cbcb6ff8..cbcb6ff8 100755
--- a/data/mapObjects/ViridianForest.asm
+++ b/data/maps/objects/ViridianForest.asm
diff --git a/data/mapObjects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm
index 81e7fece..81e7fece 100755
--- a/data/mapObjects/ViridianForestNorthGate.asm
+++ b/data/maps/objects/ViridianForestNorthGate.asm
diff --git a/data/mapObjects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm
index 76f87e51..76f87e51 100755
--- a/data/mapObjects/ViridianForestSouthGate.asm
+++ b/data/maps/objects/ViridianForestSouthGate.asm
diff --git a/data/mapObjects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm
index e3fd17bd..e3fd17bd 100755
--- a/data/mapObjects/ViridianGym.asm
+++ b/data/maps/objects/ViridianGym.asm
diff --git a/data/mapObjects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm
index b3e7fee5..b3e7fee5 100755
--- a/data/mapObjects/ViridianMart.asm
+++ b/data/maps/objects/ViridianMart.asm
diff --git a/data/mapObjects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm
index aaf20a91..aaf20a91 100755
--- a/data/mapObjects/ViridianNicknameHouse.asm
+++ b/data/maps/objects/ViridianNicknameHouse.asm
diff --git a/data/mapObjects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm
index 43b73e68..43b73e68 100755
--- a/data/mapObjects/ViridianPokecenter.asm
+++ b/data/maps/objects/ViridianPokecenter.asm
diff --git a/data/mapObjects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm
index 01f2465d..01f2465d 100755
--- a/data/mapObjects/ViridianSchoolHouse.asm
+++ b/data/maps/objects/ViridianSchoolHouse.asm
diff --git a/data/mapObjects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm
index d8445738..d8445738 100755
--- a/data/mapObjects/WardensHouse.asm
+++ b/data/maps/objects/WardensHouse.asm
diff --git a/maps.asm b/maps.asm
index 8b3cbea4..4f00f451 100644
--- a/maps.asm
+++ b/maps.asm
@@ -3,33 +3,33 @@ INCLUDE "constants.asm"
 
 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/VermilionCity.asm"
 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/CinnabarIsland.asm"
 
 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 @@ INCLUDE "scripts/LavenderTown.asm"
 
 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 @@ SECTION "Maps 8", ROMX
 
 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/Route23.asm"
 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/Route17.asm"
 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/Route15.asm"
 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 @@ Route2Gate_Blocks:
 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 @@ UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk"
 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 @@ SECTION "Maps 20", ROMX
 
 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"