diff --git a/main.asm b/main.asm
index ca2c141a4..5ff629015 100644
--- a/main.asm
+++ b/main.asm
@@ -620,26 +620,14 @@ INCLUDE "event/daycare.asm"
 INCLUDE "event/photo.asm"
 INCLUDE "engine/breeding/egg.asm"
 
-SECTION "Tileset Data 1", ROMX
 
-INCLUDE "tilesets/data_1.asm"
+INCLUDE "tilesets/data.asm"
 
-SECTION "Roofs", ROMX
-
-INCLUDE "tilesets/roofs.asm"
-
-SECTION "Tileset Data 2", ROMX
-
-INCLUDE "tilesets/data_2.asm"
 
 SECTION "bank8", ROMX
 
 INCLUDE "engine/clock_reset.asm"
 
-SECTION "Tileset Data 3", ROMX
-
-INCLUDE "tilesets/data_3.asm"
-
 SECTION "bank9", ROMX
 
 StringBufferPointers:: ; 24000
@@ -1618,10 +1606,6 @@ PlaceGraphic: ; 2ef6e
 	jr nz, .x2
 	ret
 
-SECTION "Tileset Data 4", ROMX
-
-INCLUDE "tilesets/data_4.asm"
-
 SECTION "Effect Commands", ROMX
 
 INCLUDE "battle/effect_commands.asm"
@@ -5032,10 +5016,6 @@ INCLUDE "text/phone/kenji_overworld.asm"
 INCLUDE "text/phone/parry_overworld.asm"
 INCLUDE "text/phone/erin_overworld.asm"
 
-SECTION "Tileset Data 5", ROMX
-
-INCLUDE "tilesets/data_5.asm"
-
 SECTION "bank2E", ROMX
 
 INCLUDE "engine/events_3.asm"
@@ -5318,10 +5298,6 @@ INCLUDE "gfx/pics/johto_frames.asm"
 INCLUDE "gfx/pics/unown_frame_pointers.asm"
 INCLUDE "gfx/pics/unown_frames.asm"
 
-SECTION "Tileset Data 6", ROMX
-
-INCLUDE "tilesets/data_6.asm"
-
 SECTION "bank38", ROMX
 
 RotateUnownFrontpic: ; e0000
@@ -5605,10 +5581,6 @@ INCBIN "gfx/mobile/hp.1bpp"
 MobileLvIcon: ; 1dc599
 INCBIN "gfx/mobile/lv.1bpp"
 
-SECTION "Tileset Data 7", ROMX
-
-INCLUDE "tilesets/data_7.asm"
-
 SECTION "bank77_2", ROMX
 
 Function1dd6a9: ; 1dd6a9
@@ -6040,10 +6012,6 @@ LeggiPostaInglese:
 	jr nz, .loop
 	ret
 
-SECTION "Tileset Data 8", ROMX
-
-INCLUDE "tilesets/data_8.asm"
-
 SECTION "bank7B", ROMX
 
 INCLUDE "text/battle_tower.asm"
diff --git a/maps.asm b/maps.asm
index 5ca9cf0d5..ed36ef4cc 100644
--- a/maps.asm
+++ b/maps.asm
@@ -7,21 +7,7 @@ INCLUDE "maps/map_headers.asm"
 INCLUDE "maps/second_map_headers.asm"
 
 
-
-SECTION "Map Blockdata 1", ROMX
-
-INCLUDE "maps/blockdata_1.asm"
-
-
-SECTION "Map Blockdata 2", ROMX
-
-INCLUDE "maps/blockdata_2.asm"
-
-
-SECTION "Map Blockdata 3", ROMX
-
-INCLUDE "maps/blockdata_3.asm"
-
+INCLUDE "maps/blockdata.asm"
 
 
 SECTION "Map Scripts 1", ROMX
diff --git a/maps/blockdata.asm b/maps/blockdata.asm
new file mode 100644
index 000000000..d1e7b39b7
--- /dev/null
+++ b/maps/blockdata.asm
@@ -0,0 +1,1047 @@
+SECTION "Map Blockdata 1", ROMX
+
+Route32_BlockData:
+	INCBIN "maps/Route32.blk"
+
+Route40_BlockData:
+	INCBIN "maps/Route40.blk"
+
+Route36_BlockData:
+	INCBIN "maps/Route36.blk"
+
+Route44_BlockData:
+	INCBIN "maps/Route44.blk"
+
+Route28_BlockData:
+	INCBIN "maps/Route28.blk"
+
+BetaHerosHouse_BlockData:
+	INCBIN "maps/BetaHerosHouse.blk"
+
+CeladonCity_BlockData:
+	INCBIN "maps/CeladonCity.blk"
+
+SaffronCity_BlockData:
+	INCBIN "maps/SaffronCity.blk"
+
+Route2_BlockData:
+	INCBIN "maps/Route2.blk"
+
+ElmsHouse_BlockData:
+	INCBIN "maps/ElmsHouse.blk"
+
+BetaSproutTower1_BlockData:
+	INCBIN "maps/BetaSproutTower1.blk"
+
+Route11_BlockData:
+	INCBIN "maps/Route11.blk"
+
+BetaSproutTower5_BlockData:
+	INCBIN "maps/BetaSproutTower5.blk"
+
+Route15_BlockData:
+	INCBIN "maps/Route15.blk"
+
+BetaSproutTower9_BlockData:
+	INCBIN "maps/BetaSproutTower9.blk"
+
+Route19_BlockData:
+	INCBIN "maps/Route19.blk"
+
+BetaBlackthornCity_BlockData:
+	INCBIN "maps/BetaBlackthornCity.blk"
+
+Route10South_BlockData:
+	INCBIN "maps/Route10South.blk"
+
+PokeCenter2F_BlockData:
+CinnabarPokeCenter2FBeta_BlockData:
+CeruleanPokeCenter2FBeta_BlockData:
+Route10PokeCenter2FBeta_BlockData:
+VermilionPokeCenter2FBeta_BlockData:
+PewterPokeCenter2FBeta_BlockData:
+FuchsiaPokeCenter2FBeta_BlockData:
+LavenderPokeCenter2FBeta_BlockData:
+CeladonPokeCenter2FBeta_BlockData:
+ViridianPokeCenter2FBeta_BlockData:
+SaffronPokeCenter2FBeta_BlockData:
+	INCBIN "maps/PokeCenter2F.blk"
+
+Route41_BlockData:
+	INCBIN "maps/Route41.blk"
+
+Route33_BlockData:
+	INCBIN "maps/Route33.blk"
+
+Route45_BlockData:
+	INCBIN "maps/Route45.blk"
+
+Route29_BlockData:
+	INCBIN "maps/Route29.blk"
+
+Route37_BlockData:
+	INCBIN "maps/Route37.blk"
+
+LavenderTown_BlockData:
+	INCBIN "maps/LavenderTown.blk"
+
+PalletTown_BlockData:
+	INCBIN "maps/PalletTown.blk"
+
+Route25_BlockData:
+	INCBIN "maps/Route25.blk"
+
+Route24_BlockData:
+	INCBIN "maps/Route24.blk"
+
+BetaVioletCity_BlockData:
+	INCBIN "maps/BetaVioletCity.blk"
+
+Route3_BlockData:
+	INCBIN "maps/Route3.blk"
+
+PewterCity_BlockData:
+	INCBIN "maps/PewterCity.blk"
+
+BetaIlexForest_BlockData:
+	INCBIN "maps/BetaIlexForest.blk"
+
+BetaSproutTower2_BlockData:
+	INCBIN "maps/BetaSproutTower2.blk"
+
+Route12_BlockData:
+	INCBIN "maps/Route12.blk"
+
+BetaGoldenrodCity_BlockData:
+	INCBIN "maps/BetaGoldenrodCity.blk"
+
+Route20_BlockData:
+	INCBIN "maps/Route20.blk"
+
+BetaSproutTower6_BlockData:
+	INCBIN "maps/BetaSproutTower6.blk"
+
+BetaPokeCenterMainHouse_BlockData:
+	INCBIN "maps/BetaPokeCenterMainHouse.blk"
+
+Route30_BlockData:
+	INCBIN "maps/Route30.blk"
+
+Route26_BlockData:
+	INCBIN "maps/Route26.blk"
+
+Route42_BlockData:
+	INCBIN "maps/Route42.blk"
+
+Route34_BlockData:
+	INCBIN "maps/Route34.blk"
+
+Route46_BlockData:
+	INCBIN "maps/Route46.blk"
+
+FuchsiaCity_BlockData:
+	INCBIN "maps/FuchsiaCity.blk"
+
+Route38_BlockData:
+	INCBIN "maps/Route38.blk"
+
+BetaCianwoodCity_BlockData:
+	INCBIN "maps/BetaCianwoodCity.blk"
+
+OlivineTimsHouse_BlockData:
+OlivineHouseBeta_BlockData:
+OlivinePunishmentSpeechHouse_BlockData:
+OlivineGoodRodHouse_BlockData:
+Route39Farmhouse_BlockData:
+MahoganyRedGyaradosSpeechHouse_BlockData:
+BlackthornDragonSpeechHouse_BlockData:
+BlackthornEmysHouse_BlockData:
+MoveDeletersHouse_BlockData:
+CeruleanGymBadgeSpeechHouse_BlockData:
+CeruleanPoliceStation_BlockData:
+CeruleanTradeSpeechHouse_BlockData:
+BillsHouse_BlockData:
+CharcoalKiln_BlockData:
+LakeOfRageHiddenPowerHouse_BlockData:
+LakeOfRageMagikarpHouse_BlockData:
+GoldenrodHappinessRater_BlockData:
+GoldenrodBillsHouse_BlockData:
+GoldenrodPPSpeechHouse_BlockData:
+GoldenrodNameRater_BlockData:
+VermilionHouseFishingSpeechHouse_BlockData:
+VermilionMagnetTrainSpeechHouse_BlockData:
+VermilionHouseDiglettsCaveSpeechHouse_BlockData:
+BluesHouse_BlockData:
+PewterNidoranSpeechHouse_BlockData:
+PewterSnoozeSpeechHouse_BlockData:
+FuchsiaBillSpeechHouse_BlockData:
+LavenderTownSpeechHouse_BlockData:
+LavenderNameRater_BlockData:
+Route12SuperRodHouse_BlockData:
+Route28FamousSpeechHouse_BlockData:
+CeladonMansionRoofHouse_BlockData:
+Route16FuchsiaSpeechHouse_BlockData:
+ManiasHouse_BlockData:
+CianwoodPharmacy_BlockData:
+CianwoodCityPhotoStudio_BlockData:
+CianwoodLugiaSpeechHouse_BlockData:
+PokeSeersHouse_BlockData:
+ViridianNicknameSpeechHouse_BlockData:
+Route2NuggetSpeechHouse_BlockData:
+KrissNeighborsHouse_BlockData:
+Route26HealSpeechHouse_BlockData:
+Route26DayofWeekSiblingsHouse_BlockData:
+Route27SandstormHouse_BlockData:
+MrPsychicsHouse_BlockData:
+Route5CleanseTagSpeechHouse_BlockData:
+CherrygroveGymSpeechHouse_BlockData:
+GuideGentsHouse_BlockData:
+CherrygroveEvolutionSpeechHouse_BlockData:
+Route30BerrySpeechHouse_BlockData:
+	INCBIN "maps/House1.blk"
+
+SafariZoneFuchsiaGateBeta_BlockData:
+Route19FuchsiaGate_BlockData:
+Route43MahoganyGate_BlockData:
+Route43Gate_BlockData:
+Route35GoldenrodGate_BlockData:
+Route36RuinsOfAlphGate_BlockData:
+Route34IlexForestGate_BlockData:
+Route6SaffronGate_BlockData:
+Route40BattleTowerGate_BlockData:
+Route2Gate_BlockData:
+Route2946Gate_BlockData:
+Route5SaffronCityGate_BlockData:
+	INCBIN "maps/NorthSouthGate.blk"
+
+BetaTeakCity_BlockData:
+	INCBIN "maps/BetaTeakCity.blk"
+
+BetaCherrygroveCity_BlockData:
+	INCBIN "maps/BetaCherrygroveCity.blk"
+
+CinnabarIsland_BlockData:
+	INCBIN "maps/CinnabarIsland.blk"
+
+Route4_BlockData:
+	INCBIN "maps/Route4.blk"
+
+Route8_BlockData:
+	INCBIN "maps/Route8.blk"
+
+BetaSproutTower3_BlockData:
+	INCBIN "maps/BetaSproutTower3.blk"
+
+ViridianCity_BlockData:
+	INCBIN "maps/ViridianCity.blk"
+
+Route13_BlockData:
+	INCBIN "maps/Route13.blk"
+
+Route21_BlockData:
+	INCBIN "maps/Route21.blk"
+
+BetaSproutTower7_BlockData:
+	INCBIN "maps/BetaSproutTower7.blk"
+
+Route17_BlockData:
+	INCBIN "maps/Route17.blk"
+
+BetaMahoganyTown_BlockData:
+	INCBIN "maps/BetaMahoganyTown.blk"
+
+Route31_BlockData:
+	INCBIN "maps/Route31.blk"
+
+Route27_BlockData:
+	INCBIN "maps/Route27.blk"
+
+Route35_BlockData:
+	INCBIN "maps/Route35.blk"
+
+Route43_BlockData:
+	INCBIN "maps/Route43.blk"
+
+Route39_BlockData:
+	INCBIN "maps/Route39.blk"
+
+KrissHouse1F_BlockData:
+	INCBIN "maps/KrissHouse1F.blk"
+
+Route38EcruteakGate_BlockData:
+Route42EcruteakGate_BlockData:
+Route32RuinsOfAlphGate_BlockData:
+IlexForestAzaleaGate_BlockData:
+Route15FuchsiaGate_BlockData:
+Route8SaffronGate_BlockData:
+Route16Gate_BlockData:
+Route7SaffronGate_BlockData:
+Route1718Gate_BlockData:
+Route31VioletGate_BlockData:
+	INCBIN "maps/EastWestGate.blk"
+
+BetaAzaleaTown_BlockData:
+	INCBIN "maps/BetaAzaleaTown.blk"
+
+VermilionCity_BlockData:
+	INCBIN "maps/VermilionCity.blk"
+
+BetaOlivineCity_BlockData:
+	INCBIN "maps/BetaOlivineCity.blk"
+
+BetaNewBarkTown_BlockData:
+	INCBIN "maps/BetaNewBarkTown.blk"
+
+ElmsLab_BlockData:
+	INCBIN "maps/ElmsLab.blk"
+
+CeruleanCity_BlockData:
+	INCBIN "maps/CeruleanCity.blk"
+
+Route1_BlockData:
+	INCBIN "maps/Route1.blk"
+
+Route5_BlockData:
+	INCBIN "maps/Route5.blk"
+
+Route9_BlockData:
+	INCBIN "maps/Route9.blk"
+
+Route22_BlockData:
+	INCBIN "maps/Route22.blk"
+
+
+SECTION "Map Blockdata 2", ROMX
+
+Route14_BlockData:
+	INCBIN "maps/Route14.blk"
+
+BetaSproutTower8_BlockData:
+	INCBIN "maps/BetaSproutTower8.blk"
+
+OlivineMart_BlockData:
+EcruteakMart_BlockData:
+BlackthornMart_BlockData:
+CeruleanMart_BlockData:
+AzaleaMart_BlockData:
+VioletMart_BlockData:
+VermilionMart_BlockData:
+PewterMart_BlockData:
+FuchsiaMart_BlockData:
+LavenderMart_BlockData:
+ViridianMart_BlockData:
+SaffronMart_BlockData:
+CherrygroveMart_BlockData:
+	INCBIN "maps/Mart.blk"
+
+Route10North_BlockData:
+	INCBIN "maps/Route10North.blk"
+
+BetaLakeOfRage_BlockData:
+	INCBIN "maps/BetaLakeOfRage.blk"
+
+OlivinePokeCenter1F_BlockData:
+MahoganyPokeCenter1F_BlockData:
+EcruteakPokeCenter1F_BlockData:
+BlackthornPokeCenter1F_BlockData:
+CinnabarPokeCenter1F_BlockData:
+CeruleanPokeCenter1F_BlockData:
+Route10PokeCenter1F_BlockData:
+AzaleaPokeCenter1F_BlockData:
+VioletPokeCenter1F_BlockData:
+Route32PokeCenter1F_BlockData:
+GoldenrodPokeCenter1F_BlockData:
+VermilionPokeCenter1F_BlockData:
+PewterPokeCenter1F_BlockData:
+FuchsiaPokeCenter1F_BlockData:
+LavenderPokeCenter1F_BlockData:
+SilverCavePokeCenter1F_BlockData:
+CeladonPokeCenter1F_BlockData:
+CianwoodPokeCenter1F_BlockData:
+ViridianPokeCenter1F_BlockData:
+SaffronPokeCenter1F_BlockData:
+CherrygrovePokeCenter1F_BlockData:
+	INCBIN "maps/PokeCenter1F.blk"
+
+BetaPewterMuseumOfScience1F_BlockData:
+	INCBIN "maps/BetaPewterMuseumOfScience1F.blk"
+
+BetaPewterMuseumOfScience2F_BlockData:
+	INCBIN "maps/BetaPewterMuseumOfScience2F.blk"
+
+EarlsPokemonAcademy_BlockData:
+	INCBIN "maps/EarlsPokemonAcademy.blk"
+
+BetaCinnabarIslandPokemonLabHallway_BlockData:
+	INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk"
+
+BetaCinnabarIslandPokemonLabRoom1_BlockData:
+	INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk"
+
+BetaCinnabarIslandPokemonLabRoom2_BlockData:
+	INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk"
+
+BetaCinnabarIslandPokemonLabRoom3_BlockData:
+	INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk"
+
+GoldenrodDeptStore1F_BlockData:
+CeladonDeptStore1F_BlockData:
+	INCBIN "maps/DeptStore1F.blk"
+
+GoldenrodDeptStore2F_BlockData:
+CeladonDeptStore2F_BlockData:
+	INCBIN "maps/DeptStore2F.blk"
+
+GoldenrodDeptStore3F_BlockData:
+CeladonDeptStore3F_BlockData:
+	INCBIN "maps/DeptStore3F.blk"
+
+GoldenrodDeptStore4F_BlockData:
+CeladonDeptStore4F_BlockData:
+	INCBIN "maps/DeptStore4F.blk"
+
+GoldenrodDeptStore5F_BlockData:
+CeladonDeptStore5F_BlockData:
+	INCBIN "maps/DeptStore5F.blk"
+
+GoldenrodDeptStore6F_BlockData:
+CeladonDeptStore6F_BlockData:
+	INCBIN "maps/DeptStore6F.blk"
+
+GoldenrodDeptStoreElevator_BlockData:
+CeladonDeptStoreElevator_BlockData:
+	INCBIN "maps/DeptStoreElevator.blk"
+
+CeladonMansion1F_BlockData:
+	INCBIN "maps/CeladonMansion1F.blk"
+
+CeladonMansion2F_BlockData:
+	INCBIN "maps/CeladonMansion2F.blk"
+
+CeladonMansion3F_BlockData:
+	INCBIN "maps/CeladonMansion3F.blk"
+
+CeladonMansionRoof_BlockData:
+	INCBIN "maps/CeladonMansionRoof.blk"
+
+BetaHouse_BlockData:
+	INCBIN "maps/BetaHouse.blk"
+
+CeladonGameCorner_BlockData:
+	INCBIN "maps/CeladonGameCorner.blk"
+
+CeladonGameCornerPrizeRoom_BlockData:
+	INCBIN "maps/CeladonGameCornerPrizeRoom.blk"
+
+Colosseum_BlockData:
+	INCBIN "maps/Colosseum.blk"
+
+TradeCenter_BlockData:
+TimeCapsule_BlockData:
+	INCBIN "maps/TradeCenter.blk"
+
+EcruteakLugiaSpeechHouse_BlockData:
+EcruteakItemfinderHouse_BlockData:
+VioletNicknameSpeechHouse_BlockData:
+VioletOnixTradeHouse_BlockData:
+	INCBIN "maps/House2.blk"
+
+BetaCave_BlockData:
+	INCBIN "maps/BetaCave.blk"
+
+UnionCaveB1F_BlockData:
+	INCBIN "maps/UnionCaveB1F.blk"
+
+UnionCaveB2F_BlockData:
+	INCBIN "maps/UnionCaveB2F.blk"
+
+UnionCave1F_BlockData:
+	INCBIN "maps/UnionCave1F.blk"
+
+NationalPark_BlockData:
+NationalParkBugContest_BlockData:
+	INCBIN "maps/NationalPark.blk"
+
+Route6UndergroundEntrance_BlockData:
+Route5UndergroundEntrance_BlockData:
+	INCBIN "maps/UndergroundPathEntrance.blk"
+
+BetaPokeCenterTradeStation_BlockData:
+	INCBIN "maps/BetaPokeCenterTradeStation.blk"
+
+KurtsHouse_BlockData:
+	INCBIN "maps/KurtsHouse.blk"
+
+GoldenrodMagnetTrainStation_BlockData:
+	INCBIN "maps/GoldenrodMagnetTrainStation.blk"
+
+RuinsOfAlphOutside_BlockData:
+	INCBIN "maps/RuinsOfAlphOutside.blk"
+
+BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData:
+	INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk"
+
+RuinsOfAlphInnerChamber_BlockData:
+	INCBIN "maps/RuinsOfAlphInnerChamber.blk"
+
+RuinsOfAlphHoOhChamber_BlockData:
+RuinsOfAlphKabutoChamber_BlockData:
+RuinsOfAlphOmanyteChamber_BlockData:
+RuinsOfAlphAerodactylChamber_BlockData:
+	INCBIN "maps/RuinsOfAlphPuzzleChamber.blk"
+
+SproutTower1F_BlockData:
+	INCBIN "maps/SproutTower1F.blk"
+
+BetaSproutTowerCutOut1_BlockData:
+	INCBIN "maps/BetaSproutTowerCutOut1.blk"
+
+SproutTower2F_BlockData:
+	INCBIN "maps/SproutTower2F.blk"
+
+BetaSproutTowerCutOut2_BlockData:
+	INCBIN "maps/BetaSproutTowerCutOut2.blk"
+
+SproutTower3F_BlockData:
+	INCBIN "maps/SproutTower3F.blk"
+
+BetaSproutTowerCutOut3_BlockData:
+	INCBIN "maps/BetaSproutTowerCutOut3.blk"
+
+RadioTower1F_BlockData:
+	INCBIN "maps/RadioTower1F.blk"
+
+RadioTower2F_BlockData:
+	INCBIN "maps/RadioTower2F.blk"
+
+RadioTower3F_BlockData:
+	INCBIN "maps/RadioTower3F.blk"
+
+RadioTower4F_BlockData:
+	INCBIN "maps/RadioTower4F.blk"
+
+RadioTower5F_BlockData:
+	INCBIN "maps/RadioTower5F.blk"
+
+NewBarkTown_BlockData:
+	INCBIN "maps/NewBarkTown.blk"
+
+CherrygroveCity_BlockData:
+	INCBIN "maps/CherrygroveCity.blk"
+
+VioletCity_BlockData:
+	INCBIN "maps/VioletCity.blk"
+
+AzaleaTown_BlockData:
+	INCBIN "maps/AzaleaTown.blk"
+
+CianwoodCity_BlockData:
+	INCBIN "maps/CianwoodCity.blk"
+
+GoldenrodCity_BlockData:
+	INCBIN "maps/GoldenrodCity.blk"
+
+OlivineCity_BlockData:
+	INCBIN "maps/OlivineCity.blk"
+
+EcruteakCity_BlockData:
+	INCBIN "maps/EcruteakCity.blk"
+
+MahoganyTown_BlockData:
+	INCBIN "maps/MahoganyTown.blk"
+
+LakeOfRage_BlockData:
+	INCBIN "maps/LakeOfRage.blk"
+
+BlackthornCity_BlockData:
+	INCBIN "maps/BlackthornCity.blk"
+
+SilverCaveOutside_BlockData:
+	INCBIN "maps/SilverCaveOutside.blk"
+
+Route6_BlockData:
+	INCBIN "maps/Route6.blk"
+
+Route7_BlockData:
+	INCBIN "maps/Route7.blk"
+
+Route16_BlockData:
+	INCBIN "maps/Route16.blk"
+
+Route18_BlockData:
+	INCBIN "maps/Route18.blk"
+
+WarehouseEntrance_BlockData:
+	INCBIN "maps/WarehouseEntrance.blk"
+
+UndergroundPathSwitchRoomEntrances_BlockData:
+	INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk"
+
+GoldenrodDeptStoreB1F_BlockData:
+	INCBIN "maps/GoldenrodDeptStoreB1F.blk"
+
+UndergroundWarehouse_BlockData:
+	INCBIN "maps/UndergroundWarehouse.blk"
+
+BetaElevator_BlockData:
+	INCBIN "maps/BetaElevator.blk"
+
+TinTower1F_BlockData:
+	INCBIN "maps/TinTower1F.blk"
+
+TinTower2F_BlockData:
+	INCBIN "maps/TinTower2F.blk"
+
+TinTower3F_BlockData:
+	INCBIN "maps/TinTower3F.blk"
+
+TinTower4F_BlockData:
+	INCBIN "maps/TinTower4F.blk"
+
+TinTower5F_BlockData:
+	INCBIN "maps/TinTower5F.blk"
+
+TinTower6F_BlockData:
+	INCBIN "maps/TinTower6F.blk"
+
+TinTower7F_BlockData:
+	INCBIN "maps/TinTower7F.blk"
+
+TinTower8F_BlockData:
+	INCBIN "maps/TinTower8F.blk"
+
+TinTower9F_BlockData:
+	INCBIN "maps/TinTower9F.blk"
+
+TinTowerRoof_BlockData:
+	INCBIN "maps/TinTowerRoof.blk"
+
+BurnedTower1F_BlockData:
+	INCBIN "maps/BurnedTower1F.blk"
+
+BurnedTowerB1F_BlockData:
+	INCBIN "maps/BurnedTowerB1F.blk"
+
+BetaCaveTestMap_BlockData:
+	INCBIN "maps/BetaCaveTestMap.blk"
+
+MountMortar1FOutside_BlockData:
+	INCBIN "maps/MountMortar1FOutside.blk"
+
+MountMortar1FInside_BlockData:
+	INCBIN "maps/MountMortar1FInside.blk"
+
+MountMortar2FInside_BlockData:
+	INCBIN "maps/MountMortar2FInside.blk"
+
+MountMortarB1F_BlockData:
+	INCBIN "maps/MountMortarB1F.blk"
+
+IcePath1F_BlockData:
+	INCBIN "maps/IcePath1F.blk"
+
+IcePathB1F_BlockData:
+	INCBIN "maps/IcePathB1F.blk"
+
+IcePathB2FMahoganySide_BlockData:
+	INCBIN "maps/IcePathB2FMahoganySide.blk"
+
+IcePathB2FBlackthornSide_BlockData:
+	INCBIN "maps/IcePathB2FBlackthornSide.blk"
+
+IcePathB3F_BlockData:
+	INCBIN "maps/IcePathB3F.blk"
+
+WhirlIslandNW_BlockData:
+	INCBIN "maps/WhirlIslandNW.blk"
+
+WhirlIslandNE_BlockData:
+	INCBIN "maps/WhirlIslandNE.blk"
+
+WhirlIslandSW_BlockData:
+	INCBIN "maps/WhirlIslandSW.blk"
+
+WhirlIslandCave_BlockData:
+	INCBIN "maps/WhirlIslandCave.blk"
+
+WhirlIslandSE_BlockData:
+	INCBIN "maps/WhirlIslandSE.blk"
+
+WhirlIslandB1F_BlockData:
+	INCBIN "maps/WhirlIslandB1F.blk"
+
+WhirlIslandB2F_BlockData:
+	INCBIN "maps/WhirlIslandB2F.blk"
+
+WhirlIslandLugiaChamber_BlockData:
+	INCBIN "maps/WhirlIslandLugiaChamber.blk"
+
+SilverCaveRoom1_BlockData:
+	INCBIN "maps/SilverCaveRoom1.blk"
+
+SilverCaveRoom2_BlockData:
+	INCBIN "maps/SilverCaveRoom2.blk"
+
+SilverCaveRoom3_BlockData:
+	INCBIN "maps/SilverCaveRoom3.blk"
+
+BetaRocketHideout1_BlockData:
+	INCBIN "maps/BetaRocketHideout1.blk"
+
+BetaRocketHideout2_BlockData:
+	INCBIN "maps/BetaRocketHideout2.blk"
+
+BetaEmptyHouse_BlockData:
+	INCBIN "maps/BetaEmptyHouse.blk"
+
+BetaRocketHideout3_BlockData:
+	INCBIN "maps/BetaRocketHideout3.blk"
+
+MahoganyMart1F_BlockData:
+MountMoonGiftShop_BlockData:
+	INCBIN "maps/GiftShop.blk"
+
+TeamRocketBaseB1F_BlockData:
+	INCBIN "maps/TeamRocketBaseB1F.blk"
+
+TeamRocketBaseB2F_BlockData:
+	INCBIN "maps/TeamRocketBaseB2F.blk"
+
+TeamRocketBaseB3F_BlockData:
+	INCBIN "maps/TeamRocketBaseB3F.blk"
+
+BetaRoute23EarlyVersion_BlockData:
+	INCBIN "maps/BetaRoute23EarlyVersion.blk"
+
+IndigoPlateauPokeCenter1F_BlockData:
+	INCBIN "maps/IndigoPlateauPokeCenter1F.blk"
+
+WillsRoom_BlockData:
+	INCBIN "maps/WillsRoom.blk"
+
+KogasRoom_BlockData:
+	INCBIN "maps/KogasRoom.blk"
+
+BrunosRoom_BlockData:
+	INCBIN "maps/BrunosRoom.blk"
+
+KarensRoom_BlockData:
+	INCBIN "maps/KarensRoom.blk"
+
+AzaleaGym_BlockData:
+	INCBIN "maps/AzaleaGym.blk"
+
+VioletGym_BlockData:
+	INCBIN "maps/VioletGym.blk"
+
+GoldenrodGym_BlockData:
+	INCBIN "maps/GoldenrodGym.blk"
+
+EcruteakGym_BlockData:
+	INCBIN "maps/EcruteakGym.blk"
+
+MahoganyGym_BlockData:
+	INCBIN "maps/MahoganyGym.blk"
+
+OlivineGym_BlockData:
+	INCBIN "maps/OlivineGym.blk"
+
+BetaUnknown_BlockData:
+	INCBIN "maps/BetaUnknown.blk"
+
+CianwoodGym_BlockData:
+	INCBIN "maps/CianwoodGym.blk"
+
+BlackthornGym1F_BlockData:
+	INCBIN "maps/BlackthornGym1F.blk"
+
+BlackthornGym2F_BlockData:
+	INCBIN "maps/BlackthornGym2F.blk"
+
+OlivineLighthouse1F_BlockData:
+	INCBIN "maps/OlivineLighthouse1F.blk"
+
+OlivineLighthouse2F_BlockData:
+	INCBIN "maps/OlivineLighthouse2F.blk"
+
+OlivineLighthouse3F_BlockData:
+	INCBIN "maps/OlivineLighthouse3F.blk"
+
+OlivineLighthouse4F_BlockData:
+	INCBIN "maps/OlivineLighthouse4F.blk"
+
+OlivineLighthouse5F_BlockData:
+	INCBIN "maps/OlivineLighthouse5F.blk"
+
+OlivineLighthouse6F_BlockData:
+	INCBIN "maps/OlivineLighthouse6F.blk"
+
+
+SECTION "Map Blockdata 3", ROMX
+
+BetaCave2_BlockData:
+	INCBIN "maps/BetaCave2.blk"
+
+SlowpokeWellB1F_BlockData:
+	INCBIN "maps/SlowpokeWellB1F.blk"
+
+SlowpokeWellB2F_BlockData:
+	INCBIN "maps/SlowpokeWellB2F.blk"
+
+IlexForest_BlockData:
+	INCBIN "maps/IlexForest.blk"
+
+DarkCaveVioletEntrance_BlockData:
+	INCBIN "maps/DarkCaveVioletEntrance.blk"
+
+DarkCaveBlackthornEntrance_BlockData:
+	INCBIN "maps/DarkCaveBlackthornEntrance.blk"
+
+RuinsOfAlphResearchCenter_BlockData:
+	INCBIN "maps/RuinsOfAlphResearchCenter.blk"
+
+GoldenrodBikeShop_BlockData:
+	INCBIN "maps/GoldenrodBikeShop.blk"
+
+DanceTheatre_BlockData:
+	INCBIN "maps/DanceTheatre.blk"
+
+EcruteakHouse_BlockData:
+	INCBIN "maps/EcruteakHouse.blk"
+
+GoldenrodGameCorner_BlockData:
+	INCBIN "maps/GoldenrodGameCorner.blk"
+
+Route35NationalParkGate_BlockData:
+	INCBIN "maps/Route35NationalParkGate.blk"
+
+Route36NationalParkGate_BlockData:
+	INCBIN "maps/Route36NationalParkGate.blk"
+
+FastShip1F_BlockData:
+	INCBIN "maps/FastShip1F.blk"
+
+FastShipB1F_BlockData:
+	INCBIN "maps/FastShipB1F.blk"
+
+BetaSSAquaInsideCutOut_BlockData:
+	INCBIN "maps/BetaSSAquaInsideCutOut.blk"
+
+FastShipCabins_NNW_NNE_NE_BlockData:
+	INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk"
+
+FastShipCabins_SW_SSW_NW_BlockData:
+	INCBIN "maps/FastShipCabins_SW_SSW_NW.blk"
+
+FastShipCabins_SE_SSE_CaptainsCabin_BlockData:
+	INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk"
+
+OlivinePort_BlockData:
+	INCBIN "maps/OlivinePort.blk"
+
+VermilionPort_BlockData:
+	INCBIN "maps/VermilionPort.blk"
+
+OlivineCafe_BlockData:
+SafariZoneMainOffice_BlockData:
+	INCBIN "maps/OlivineCafe.blk"
+
+KrissHouse2F_BlockData:
+	INCBIN "maps/KrissHouse2F.blk"
+
+SaffronTrainStation_BlockData:
+	INCBIN "maps/SaffronTrainStation.blk"
+
+CeruleanGym_BlockData:
+	INCBIN "maps/CeruleanGym.blk"
+
+VermilionGym_BlockData:
+	INCBIN "maps/VermilionGym.blk"
+
+SaffronGym_BlockData:
+	INCBIN "maps/SaffronGym.blk"
+
+PowerPlant_BlockData:
+	INCBIN "maps/PowerPlant.blk"
+
+PokemonFanClub_BlockData:
+SafariZoneWardensHome_BlockData:
+	INCBIN "maps/PokemonFanClub.blk"
+
+FightingDojo_BlockData:
+	INCBIN "maps/FightingDojo.blk"
+
+SilphCo1F_BlockData:
+	INCBIN "maps/SilphCo1F.blk"
+
+ViridianGym_BlockData:
+	INCBIN "maps/ViridianGym.blk"
+
+TrainerHouse1F_BlockData:
+	INCBIN "maps/TrainerHouse1F.blk"
+
+TrainerHouseB1F_BlockData:
+	INCBIN "maps/TrainerHouseB1F.blk"
+
+RedsHouse1F_BlockData:
+	INCBIN "maps/RedsHouse1F.blk"
+
+RedsHouse2F_BlockData:
+	INCBIN "maps/RedsHouse2F.blk"
+
+OaksLab_BlockData:
+	INCBIN "maps/OaksLab.blk"
+
+MrFujisHouse_BlockData:
+	INCBIN "maps/MrFujisHouse.blk"
+
+LavRadioTower1F_BlockData:
+	INCBIN "maps/LavRadioTower1F.blk"
+
+SilverCaveItemRooms_BlockData:
+	INCBIN "maps/SilverCaveItemRooms.blk"
+
+DayCare_BlockData:
+	INCBIN "maps/DayCare.blk"
+
+SoulHouse_BlockData:
+	INCBIN "maps/SoulHouse.blk"
+
+PewterGym_BlockData:
+	INCBIN "maps/PewterGym.blk"
+
+CeladonGym_BlockData:
+	INCBIN "maps/CeladonGym.blk"
+
+BetaHouse2_BlockData:
+	INCBIN "maps/BetaHouse2.blk"
+
+CeladonCafe_BlockData:
+	INCBIN "maps/CeladonCafe.blk"
+
+BetaCeladonMansion_BlockData:
+	INCBIN "maps/BetaCeladonMansion.blk"
+
+RockTunnel1F_BlockData:
+	INCBIN "maps/RockTunnel1F.blk"
+
+RockTunnelB1F_BlockData:
+	INCBIN "maps/RockTunnelB1F.blk"
+
+DiglettsCave_BlockData:
+	INCBIN "maps/DiglettsCave.blk"
+
+MountMoon_BlockData:
+	INCBIN "maps/MountMoon.blk"
+
+SeafoamGym_BlockData:
+	INCBIN "maps/SeafoamGym.blk"
+
+MrPokemonsHouse_BlockData:
+	INCBIN "maps/MrPokemonsHouse.blk"
+
+VictoryRoadGate_BlockData:
+	INCBIN "maps/VictoryRoadGate.blk"
+
+OlivinePortPassage_BlockData:
+VermilionPortPassage_BlockData:
+	INCBIN "maps/PortPassage.blk"
+
+FuchsiaGym_BlockData:
+	INCBIN "maps/FuchsiaGym.blk"
+
+SafariZoneBeta_BlockData:
+	INCBIN "maps/SafariZoneBeta.blk"
+
+Underground_BlockData:
+	INCBIN "maps/Underground.blk"
+
+Route39Barn_BlockData:
+	INCBIN "maps/Route39Barn.blk"
+
+VictoryRoad_BlockData:
+	INCBIN "maps/VictoryRoad.blk"
+
+Route23_BlockData:
+	INCBIN "maps/Route23.blk"
+
+LancesRoom_BlockData:
+	INCBIN "maps/LancesRoom.blk"
+
+HallOfFame_BlockData:
+	INCBIN "maps/HallOfFame.blk"
+
+CopycatsHouse1F_BlockData:
+	INCBIN "maps/CopycatsHouse1F.blk"
+
+CopycatsHouse2F_BlockData:
+	INCBIN "maps/CopycatsHouse2F.blk"
+
+GoldenrodFlowerShop_BlockData:
+	INCBIN "maps/GoldenrodFlowerShop.blk"
+
+MountMoonSquare_BlockData:
+	INCBIN "maps/MountMoonSquare.blk"
+
+WiseTriosRoom_BlockData:
+	INCBIN "maps/WiseTriosRoom.blk"
+
+DragonsDen1F_BlockData:
+	INCBIN "maps/DragonsDen1F.blk"
+
+DragonsDenB1F_BlockData:
+	INCBIN "maps/DragonsDenB1F.blk"
+
+TohjoFalls_BlockData:
+	INCBIN "maps/TohjoFalls.blk"
+
+RuinsOfAlphHoOhItemRoom_BlockData:
+RuinsOfAlphKabutoItemRoom_BlockData:
+RuinsOfAlphOmanyteItemRoom_BlockData:
+RuinsOfAlphAerodactylItemRoom_BlockData:
+	INCBIN "maps/RuinsOfAlphItemRoom.blk"
+
+RuinsOfAlphHoOhWordRoom_BlockData:
+	INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk"
+
+RuinsOfAlphKabutoWordRoom_BlockData:
+	INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk"
+
+RuinsOfAlphOmanyteWordRoom_BlockData:
+	INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk"
+
+RuinsOfAlphAerodactylWordRoom_BlockData:
+	INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk"
+
+DragonShrine_BlockData:
+	INCBIN "maps/DragonShrine.blk"
+
+BattleTower1F_BlockData:
+	INCBIN "maps/BattleTower1F.blk"
+
+BattleTowerBattleRoom_BlockData:
+	INCBIN "maps/BattleTowerBattleRoom.blk"
+
+GoldenrodPokeComCenter2FMobile_BlockData:
+	INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk"
+
+MobileTradeRoomMobile_BlockData:
+	INCBIN "maps/MobileTradeRoomMobile.blk"
+
+MobileBattleRoom_BlockData:
+	INCBIN "maps/MobileBattleRoom.blk"
+
+BattleTowerHallway_BlockData:
+	INCBIN "maps/BattleTowerHallway.blk"
+
+BattleTowerElevator_BlockData:
+	INCBIN "maps/BattleTowerElevator.blk"
+
+BattleTowerOutside_BlockData:
+	INCBIN "maps/BattleTowerOutside.blk"
+
+BetaBlank_BlockData:
+	INCBIN "maps/BetaBlank.blk"
+
+GoldenrodDeptStoreRoof_BlockData:
+	INCBIN "maps/GoldenrodDeptStoreRoof.blk"
diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm
deleted file mode 100644
index c3f363940..000000000
--- a/maps/blockdata_1.asm
+++ /dev/null
@@ -1,309 +0,0 @@
-Route32_BlockData:
-	INCBIN "maps/Route32.blk"
-
-Route40_BlockData:
-	INCBIN "maps/Route40.blk"
-
-Route36_BlockData:
-	INCBIN "maps/Route36.blk"
-
-Route44_BlockData:
-	INCBIN "maps/Route44.blk"
-
-Route28_BlockData:
-	INCBIN "maps/Route28.blk"
-
-BetaHerosHouse_BlockData:
-	INCBIN "maps/BetaHerosHouse.blk"
-
-CeladonCity_BlockData:
-	INCBIN "maps/CeladonCity.blk"
-
-SaffronCity_BlockData:
-	INCBIN "maps/SaffronCity.blk"
-
-Route2_BlockData:
-	INCBIN "maps/Route2.blk"
-
-ElmsHouse_BlockData:
-	INCBIN "maps/ElmsHouse.blk"
-
-BetaSproutTower1_BlockData:
-	INCBIN "maps/BetaSproutTower1.blk"
-
-Route11_BlockData:
-	INCBIN "maps/Route11.blk"
-
-BetaSproutTower5_BlockData:
-	INCBIN "maps/BetaSproutTower5.blk"
-
-Route15_BlockData:
-	INCBIN "maps/Route15.blk"
-
-BetaSproutTower9_BlockData:
-	INCBIN "maps/BetaSproutTower9.blk"
-
-Route19_BlockData:
-	INCBIN "maps/Route19.blk"
-
-BetaBlackthornCity_BlockData:
-	INCBIN "maps/BetaBlackthornCity.blk"
-
-Route10South_BlockData:
-	INCBIN "maps/Route10South.blk"
-
-PokeCenter2F_BlockData:
-CinnabarPokeCenter2FBeta_BlockData:
-CeruleanPokeCenter2FBeta_BlockData:
-Route10PokeCenter2FBeta_BlockData:
-VermilionPokeCenter2FBeta_BlockData:
-PewterPokeCenter2FBeta_BlockData:
-FuchsiaPokeCenter2FBeta_BlockData:
-LavenderPokeCenter2FBeta_BlockData:
-CeladonPokeCenter2FBeta_BlockData:
-ViridianPokeCenter2FBeta_BlockData:
-SaffronPokeCenter2FBeta_BlockData:
-	INCBIN "maps/PokeCenter2F.blk"
-
-Route41_BlockData:
-	INCBIN "maps/Route41.blk"
-
-Route33_BlockData:
-	INCBIN "maps/Route33.blk"
-
-Route45_BlockData:
-	INCBIN "maps/Route45.blk"
-
-Route29_BlockData:
-	INCBIN "maps/Route29.blk"
-
-Route37_BlockData:
-	INCBIN "maps/Route37.blk"
-
-LavenderTown_BlockData:
-	INCBIN "maps/LavenderTown.blk"
-
-PalletTown_BlockData:
-	INCBIN "maps/PalletTown.blk"
-
-Route25_BlockData:
-	INCBIN "maps/Route25.blk"
-
-Route24_BlockData:
-	INCBIN "maps/Route24.blk"
-
-BetaVioletCity_BlockData:
-	INCBIN "maps/BetaVioletCity.blk"
-
-Route3_BlockData:
-	INCBIN "maps/Route3.blk"
-
-PewterCity_BlockData:
-	INCBIN "maps/PewterCity.blk"
-
-BetaIlexForest_BlockData:
-	INCBIN "maps/BetaIlexForest.blk"
-
-BetaSproutTower2_BlockData:
-	INCBIN "maps/BetaSproutTower2.blk"
-
-Route12_BlockData:
-	INCBIN "maps/Route12.blk"
-
-BetaGoldenrodCity_BlockData:
-	INCBIN "maps/BetaGoldenrodCity.blk"
-
-Route20_BlockData:
-	INCBIN "maps/Route20.blk"
-
-BetaSproutTower6_BlockData:
-	INCBIN "maps/BetaSproutTower6.blk"
-
-BetaPokeCenterMainHouse_BlockData:
-	INCBIN "maps/BetaPokeCenterMainHouse.blk"
-
-Route30_BlockData:
-	INCBIN "maps/Route30.blk"
-
-Route26_BlockData:
-	INCBIN "maps/Route26.blk"
-
-Route42_BlockData:
-	INCBIN "maps/Route42.blk"
-
-Route34_BlockData:
-	INCBIN "maps/Route34.blk"
-
-Route46_BlockData:
-	INCBIN "maps/Route46.blk"
-
-FuchsiaCity_BlockData:
-	INCBIN "maps/FuchsiaCity.blk"
-
-Route38_BlockData:
-	INCBIN "maps/Route38.blk"
-
-BetaCianwoodCity_BlockData:
-	INCBIN "maps/BetaCianwoodCity.blk"
-
-OlivineTimsHouse_BlockData:
-OlivineHouseBeta_BlockData:
-OlivinePunishmentSpeechHouse_BlockData:
-OlivineGoodRodHouse_BlockData:
-Route39Farmhouse_BlockData:
-MahoganyRedGyaradosSpeechHouse_BlockData:
-BlackthornDragonSpeechHouse_BlockData:
-BlackthornEmysHouse_BlockData:
-MoveDeletersHouse_BlockData:
-CeruleanGymBadgeSpeechHouse_BlockData:
-CeruleanPoliceStation_BlockData:
-CeruleanTradeSpeechHouse_BlockData:
-BillsHouse_BlockData:
-CharcoalKiln_BlockData:
-LakeOfRageHiddenPowerHouse_BlockData:
-LakeOfRageMagikarpHouse_BlockData:
-GoldenrodHappinessRater_BlockData:
-GoldenrodBillsHouse_BlockData:
-GoldenrodPPSpeechHouse_BlockData:
-GoldenrodNameRater_BlockData:
-VermilionHouseFishingSpeechHouse_BlockData:
-VermilionMagnetTrainSpeechHouse_BlockData:
-VermilionHouseDiglettsCaveSpeechHouse_BlockData:
-BluesHouse_BlockData:
-PewterNidoranSpeechHouse_BlockData:
-PewterSnoozeSpeechHouse_BlockData:
-FuchsiaBillSpeechHouse_BlockData:
-LavenderTownSpeechHouse_BlockData:
-LavenderNameRater_BlockData:
-Route12SuperRodHouse_BlockData:
-Route28FamousSpeechHouse_BlockData:
-CeladonMansionRoofHouse_BlockData:
-Route16FuchsiaSpeechHouse_BlockData:
-ManiasHouse_BlockData:
-CianwoodPharmacy_BlockData:
-CianwoodCityPhotoStudio_BlockData:
-CianwoodLugiaSpeechHouse_BlockData:
-PokeSeersHouse_BlockData:
-ViridianNicknameSpeechHouse_BlockData:
-Route2NuggetSpeechHouse_BlockData:
-KrissNeighborsHouse_BlockData:
-Route26HealSpeechHouse_BlockData:
-Route26DayofWeekSiblingsHouse_BlockData:
-Route27SandstormHouse_BlockData:
-MrPsychicsHouse_BlockData:
-Route5CleanseTagSpeechHouse_BlockData:
-CherrygroveGymSpeechHouse_BlockData:
-GuideGentsHouse_BlockData:
-CherrygroveEvolutionSpeechHouse_BlockData:
-Route30BerrySpeechHouse_BlockData:
-	INCBIN "maps/House1.blk"
-
-SafariZoneFuchsiaGateBeta_BlockData:
-Route19FuchsiaGate_BlockData:
-Route43MahoganyGate_BlockData:
-Route43Gate_BlockData:
-Route35GoldenrodGate_BlockData:
-Route36RuinsOfAlphGate_BlockData:
-Route34IlexForestGate_BlockData:
-Route6SaffronGate_BlockData:
-Route40BattleTowerGate_BlockData:
-Route2Gate_BlockData:
-Route2946Gate_BlockData:
-Route5SaffronCityGate_BlockData:
-	INCBIN "maps/NorthSouthGate.blk"
-
-BetaTeakCity_BlockData:
-	INCBIN "maps/BetaTeakCity.blk"
-
-BetaCherrygroveCity_BlockData:
-	INCBIN "maps/BetaCherrygroveCity.blk"
-
-CinnabarIsland_BlockData:
-	INCBIN "maps/CinnabarIsland.blk"
-
-Route4_BlockData:
-	INCBIN "maps/Route4.blk"
-
-Route8_BlockData:
-	INCBIN "maps/Route8.blk"
-
-BetaSproutTower3_BlockData:
-	INCBIN "maps/BetaSproutTower3.blk"
-
-ViridianCity_BlockData:
-	INCBIN "maps/ViridianCity.blk"
-
-Route13_BlockData:
-	INCBIN "maps/Route13.blk"
-
-Route21_BlockData:
-	INCBIN "maps/Route21.blk"
-
-BetaSproutTower7_BlockData:
-	INCBIN "maps/BetaSproutTower7.blk"
-
-Route17_BlockData:
-	INCBIN "maps/Route17.blk"
-
-BetaMahoganyTown_BlockData:
-	INCBIN "maps/BetaMahoganyTown.blk"
-
-Route31_BlockData:
-	INCBIN "maps/Route31.blk"
-
-Route27_BlockData:
-	INCBIN "maps/Route27.blk"
-
-Route35_BlockData:
-	INCBIN "maps/Route35.blk"
-
-Route43_BlockData:
-	INCBIN "maps/Route43.blk"
-
-Route39_BlockData:
-	INCBIN "maps/Route39.blk"
-
-KrissHouse1F_BlockData:
-	INCBIN "maps/KrissHouse1F.blk"
-
-Route38EcruteakGate_BlockData:
-Route42EcruteakGate_BlockData:
-Route32RuinsOfAlphGate_BlockData:
-IlexForestAzaleaGate_BlockData:
-Route15FuchsiaGate_BlockData:
-Route8SaffronGate_BlockData:
-Route16Gate_BlockData:
-Route7SaffronGate_BlockData:
-Route1718Gate_BlockData:
-Route31VioletGate_BlockData:
-	INCBIN "maps/EastWestGate.blk"
-
-BetaAzaleaTown_BlockData:
-	INCBIN "maps/BetaAzaleaTown.blk"
-
-VermilionCity_BlockData:
-	INCBIN "maps/VermilionCity.blk"
-
-BetaOlivineCity_BlockData:
-	INCBIN "maps/BetaOlivineCity.blk"
-
-BetaNewBarkTown_BlockData:
-	INCBIN "maps/BetaNewBarkTown.blk"
-
-ElmsLab_BlockData:
-	INCBIN "maps/ElmsLab.blk"
-
-CeruleanCity_BlockData:
-	INCBIN "maps/CeruleanCity.blk"
-
-Route1_BlockData:
-	INCBIN "maps/Route1.blk"
-
-Route5_BlockData:
-	INCBIN "maps/Route5.blk"
-
-Route9_BlockData:
-	INCBIN "maps/Route9.blk"
-
-Route22_BlockData:
-	INCBIN "maps/Route22.blk"
diff --git a/maps/blockdata_2.asm b/maps/blockdata_2.asm
deleted file mode 100644
index f88ac4c69..000000000
--- a/maps/blockdata_2.asm
+++ /dev/null
@@ -1,462 +0,0 @@
-Route14_BlockData:
-	INCBIN "maps/Route14.blk"
-
-BetaSproutTower8_BlockData:
-	INCBIN "maps/BetaSproutTower8.blk"
-
-OlivineMart_BlockData:
-EcruteakMart_BlockData:
-BlackthornMart_BlockData:
-CeruleanMart_BlockData:
-AzaleaMart_BlockData:
-VioletMart_BlockData:
-VermilionMart_BlockData:
-PewterMart_BlockData:
-FuchsiaMart_BlockData:
-LavenderMart_BlockData:
-ViridianMart_BlockData:
-SaffronMart_BlockData:
-CherrygroveMart_BlockData:
-	INCBIN "maps/Mart.blk"
-
-Route10North_BlockData:
-	INCBIN "maps/Route10North.blk"
-
-BetaLakeOfRage_BlockData:
-	INCBIN "maps/BetaLakeOfRage.blk"
-
-OlivinePokeCenter1F_BlockData:
-MahoganyPokeCenter1F_BlockData:
-EcruteakPokeCenter1F_BlockData:
-BlackthornPokeCenter1F_BlockData:
-CinnabarPokeCenter1F_BlockData:
-CeruleanPokeCenter1F_BlockData:
-Route10PokeCenter1F_BlockData:
-AzaleaPokeCenter1F_BlockData:
-VioletPokeCenter1F_BlockData:
-Route32PokeCenter1F_BlockData:
-GoldenrodPokeCenter1F_BlockData:
-VermilionPokeCenter1F_BlockData:
-PewterPokeCenter1F_BlockData:
-FuchsiaPokeCenter1F_BlockData:
-LavenderPokeCenter1F_BlockData:
-SilverCavePokeCenter1F_BlockData:
-CeladonPokeCenter1F_BlockData:
-CianwoodPokeCenter1F_BlockData:
-ViridianPokeCenter1F_BlockData:
-SaffronPokeCenter1F_BlockData:
-CherrygrovePokeCenter1F_BlockData:
-	INCBIN "maps/PokeCenter1F.blk"
-
-BetaPewterMuseumOfScience1F_BlockData:
-	INCBIN "maps/BetaPewterMuseumOfScience1F.blk"
-
-BetaPewterMuseumOfScience2F_BlockData:
-	INCBIN "maps/BetaPewterMuseumOfScience2F.blk"
-
-EarlsPokemonAcademy_BlockData:
-	INCBIN "maps/EarlsPokemonAcademy.blk"
-
-BetaCinnabarIslandPokemonLabHallway_BlockData:
-	INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk"
-
-BetaCinnabarIslandPokemonLabRoom1_BlockData:
-	INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk"
-
-BetaCinnabarIslandPokemonLabRoom2_BlockData:
-	INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk"
-
-BetaCinnabarIslandPokemonLabRoom3_BlockData:
-	INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk"
-
-GoldenrodDeptStore1F_BlockData:
-CeladonDeptStore1F_BlockData:
-	INCBIN "maps/DeptStore1F.blk"
-
-GoldenrodDeptStore2F_BlockData:
-CeladonDeptStore2F_BlockData:
-	INCBIN "maps/DeptStore2F.blk"
-
-GoldenrodDeptStore3F_BlockData:
-CeladonDeptStore3F_BlockData:
-	INCBIN "maps/DeptStore3F.blk"
-
-GoldenrodDeptStore4F_BlockData:
-CeladonDeptStore4F_BlockData:
-	INCBIN "maps/DeptStore4F.blk"
-
-GoldenrodDeptStore5F_BlockData:
-CeladonDeptStore5F_BlockData:
-	INCBIN "maps/DeptStore5F.blk"
-
-GoldenrodDeptStore6F_BlockData:
-CeladonDeptStore6F_BlockData:
-	INCBIN "maps/DeptStore6F.blk"
-
-GoldenrodDeptStoreElevator_BlockData:
-CeladonDeptStoreElevator_BlockData:
-	INCBIN "maps/DeptStoreElevator.blk"
-
-CeladonMansion1F_BlockData:
-	INCBIN "maps/CeladonMansion1F.blk"
-
-CeladonMansion2F_BlockData:
-	INCBIN "maps/CeladonMansion2F.blk"
-
-CeladonMansion3F_BlockData:
-	INCBIN "maps/CeladonMansion3F.blk"
-
-CeladonMansionRoof_BlockData:
-	INCBIN "maps/CeladonMansionRoof.blk"
-
-BetaHouse_BlockData:
-	INCBIN "maps/BetaHouse.blk"
-
-CeladonGameCorner_BlockData:
-	INCBIN "maps/CeladonGameCorner.blk"
-
-CeladonGameCornerPrizeRoom_BlockData:
-	INCBIN "maps/CeladonGameCornerPrizeRoom.blk"
-
-Colosseum_BlockData:
-	INCBIN "maps/Colosseum.blk"
-
-TradeCenter_BlockData:
-TimeCapsule_BlockData:
-	INCBIN "maps/TradeCenter.blk"
-
-EcruteakLugiaSpeechHouse_BlockData:
-EcruteakItemfinderHouse_BlockData:
-VioletNicknameSpeechHouse_BlockData:
-VioletOnixTradeHouse_BlockData:
-	INCBIN "maps/House2.blk"
-
-BetaCave_BlockData:
-	INCBIN "maps/BetaCave.blk"
-
-UnionCaveB1F_BlockData:
-	INCBIN "maps/UnionCaveB1F.blk"
-
-UnionCaveB2F_BlockData:
-	INCBIN "maps/UnionCaveB2F.blk"
-
-UnionCave1F_BlockData:
-	INCBIN "maps/UnionCave1F.blk"
-
-NationalPark_BlockData:
-NationalParkBugContest_BlockData:
-	INCBIN "maps/NationalPark.blk"
-
-Route6UndergroundEntrance_BlockData:
-Route5UndergroundEntrance_BlockData:
-	INCBIN "maps/UndergroundPathEntrance.blk"
-
-BetaPokeCenterTradeStation_BlockData:
-	INCBIN "maps/BetaPokeCenterTradeStation.blk"
-
-KurtsHouse_BlockData:
-	INCBIN "maps/KurtsHouse.blk"
-
-GoldenrodMagnetTrainStation_BlockData:
-	INCBIN "maps/GoldenrodMagnetTrainStation.blk"
-
-RuinsOfAlphOutside_BlockData:
-	INCBIN "maps/RuinsOfAlphOutside.blk"
-
-BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData:
-	INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk"
-
-RuinsOfAlphInnerChamber_BlockData:
-	INCBIN "maps/RuinsOfAlphInnerChamber.blk"
-
-RuinsOfAlphHoOhChamber_BlockData:
-RuinsOfAlphKabutoChamber_BlockData:
-RuinsOfAlphOmanyteChamber_BlockData:
-RuinsOfAlphAerodactylChamber_BlockData:
-	INCBIN "maps/RuinsOfAlphPuzzleChamber.blk"
-
-SproutTower1F_BlockData:
-	INCBIN "maps/SproutTower1F.blk"
-
-BetaSproutTowerCutOut1_BlockData:
-	INCBIN "maps/BetaSproutTowerCutOut1.blk"
-
-SproutTower2F_BlockData:
-	INCBIN "maps/SproutTower2F.blk"
-
-BetaSproutTowerCutOut2_BlockData:
-	INCBIN "maps/BetaSproutTowerCutOut2.blk"
-
-SproutTower3F_BlockData:
-	INCBIN "maps/SproutTower3F.blk"
-
-BetaSproutTowerCutOut3_BlockData:
-	INCBIN "maps/BetaSproutTowerCutOut3.blk"
-
-RadioTower1F_BlockData:
-	INCBIN "maps/RadioTower1F.blk"
-
-RadioTower2F_BlockData:
-	INCBIN "maps/RadioTower2F.blk"
-
-RadioTower3F_BlockData:
-	INCBIN "maps/RadioTower3F.blk"
-
-RadioTower4F_BlockData:
-	INCBIN "maps/RadioTower4F.blk"
-
-RadioTower5F_BlockData:
-	INCBIN "maps/RadioTower5F.blk"
-
-NewBarkTown_BlockData:
-	INCBIN "maps/NewBarkTown.blk"
-
-CherrygroveCity_BlockData:
-	INCBIN "maps/CherrygroveCity.blk"
-
-VioletCity_BlockData:
-	INCBIN "maps/VioletCity.blk"
-
-AzaleaTown_BlockData:
-	INCBIN "maps/AzaleaTown.blk"
-
-CianwoodCity_BlockData:
-	INCBIN "maps/CianwoodCity.blk"
-
-GoldenrodCity_BlockData:
-	INCBIN "maps/GoldenrodCity.blk"
-
-OlivineCity_BlockData:
-	INCBIN "maps/OlivineCity.blk"
-
-EcruteakCity_BlockData:
-	INCBIN "maps/EcruteakCity.blk"
-
-MahoganyTown_BlockData:
-	INCBIN "maps/MahoganyTown.blk"
-
-LakeOfRage_BlockData:
-	INCBIN "maps/LakeOfRage.blk"
-
-BlackthornCity_BlockData:
-	INCBIN "maps/BlackthornCity.blk"
-
-SilverCaveOutside_BlockData:
-	INCBIN "maps/SilverCaveOutside.blk"
-
-Route6_BlockData:
-	INCBIN "maps/Route6.blk"
-
-Route7_BlockData:
-	INCBIN "maps/Route7.blk"
-
-Route16_BlockData:
-	INCBIN "maps/Route16.blk"
-
-Route18_BlockData:
-	INCBIN "maps/Route18.blk"
-
-WarehouseEntrance_BlockData:
-	INCBIN "maps/WarehouseEntrance.blk"
-
-UndergroundPathSwitchRoomEntrances_BlockData:
-	INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk"
-
-GoldenrodDeptStoreB1F_BlockData:
-	INCBIN "maps/GoldenrodDeptStoreB1F.blk"
-
-UndergroundWarehouse_BlockData:
-	INCBIN "maps/UndergroundWarehouse.blk"
-
-BetaElevator_BlockData:
-	INCBIN "maps/BetaElevator.blk"
-
-TinTower1F_BlockData:
-	INCBIN "maps/TinTower1F.blk"
-
-TinTower2F_BlockData:
-	INCBIN "maps/TinTower2F.blk"
-
-TinTower3F_BlockData:
-	INCBIN "maps/TinTower3F.blk"
-
-TinTower4F_BlockData:
-	INCBIN "maps/TinTower4F.blk"
-
-TinTower5F_BlockData:
-	INCBIN "maps/TinTower5F.blk"
-
-TinTower6F_BlockData:
-	INCBIN "maps/TinTower6F.blk"
-
-TinTower7F_BlockData:
-	INCBIN "maps/TinTower7F.blk"
-
-TinTower8F_BlockData:
-	INCBIN "maps/TinTower8F.blk"
-
-TinTower9F_BlockData:
-	INCBIN "maps/TinTower9F.blk"
-
-TinTowerRoof_BlockData:
-	INCBIN "maps/TinTowerRoof.blk"
-
-BurnedTower1F_BlockData:
-	INCBIN "maps/BurnedTower1F.blk"
-
-BurnedTowerB1F_BlockData:
-	INCBIN "maps/BurnedTowerB1F.blk"
-
-BetaCaveTestMap_BlockData:
-	INCBIN "maps/BetaCaveTestMap.blk"
-
-MountMortar1FOutside_BlockData:
-	INCBIN "maps/MountMortar1FOutside.blk"
-
-MountMortar1FInside_BlockData:
-	INCBIN "maps/MountMortar1FInside.blk"
-
-MountMortar2FInside_BlockData:
-	INCBIN "maps/MountMortar2FInside.blk"
-
-MountMortarB1F_BlockData:
-	INCBIN "maps/MountMortarB1F.blk"
-
-IcePath1F_BlockData:
-	INCBIN "maps/IcePath1F.blk"
-
-IcePathB1F_BlockData:
-	INCBIN "maps/IcePathB1F.blk"
-
-IcePathB2FMahoganySide_BlockData:
-	INCBIN "maps/IcePathB2FMahoganySide.blk"
-
-IcePathB2FBlackthornSide_BlockData:
-	INCBIN "maps/IcePathB2FBlackthornSide.blk"
-
-IcePathB3F_BlockData:
-	INCBIN "maps/IcePathB3F.blk"
-
-WhirlIslandNW_BlockData:
-	INCBIN "maps/WhirlIslandNW.blk"
-
-WhirlIslandNE_BlockData:
-	INCBIN "maps/WhirlIslandNE.blk"
-
-WhirlIslandSW_BlockData:
-	INCBIN "maps/WhirlIslandSW.blk"
-
-WhirlIslandCave_BlockData:
-	INCBIN "maps/WhirlIslandCave.blk"
-
-WhirlIslandSE_BlockData:
-	INCBIN "maps/WhirlIslandSE.blk"
-
-WhirlIslandB1F_BlockData:
-	INCBIN "maps/WhirlIslandB1F.blk"
-
-WhirlIslandB2F_BlockData:
-	INCBIN "maps/WhirlIslandB2F.blk"
-
-WhirlIslandLugiaChamber_BlockData:
-	INCBIN "maps/WhirlIslandLugiaChamber.blk"
-
-SilverCaveRoom1_BlockData:
-	INCBIN "maps/SilverCaveRoom1.blk"
-
-SilverCaveRoom2_BlockData:
-	INCBIN "maps/SilverCaveRoom2.blk"
-
-SilverCaveRoom3_BlockData:
-	INCBIN "maps/SilverCaveRoom3.blk"
-
-BetaRocketHideout1_BlockData:
-	INCBIN "maps/BetaRocketHideout1.blk"
-
-BetaRocketHideout2_BlockData:
-	INCBIN "maps/BetaRocketHideout2.blk"
-
-BetaEmptyHouse_BlockData:
-	INCBIN "maps/BetaEmptyHouse.blk"
-
-BetaRocketHideout3_BlockData:
-	INCBIN "maps/BetaRocketHideout3.blk"
-
-MahoganyMart1F_BlockData:
-MountMoonGiftShop_BlockData:
-	INCBIN "maps/GiftShop.blk"
-
-TeamRocketBaseB1F_BlockData:
-	INCBIN "maps/TeamRocketBaseB1F.blk"
-
-TeamRocketBaseB2F_BlockData:
-	INCBIN "maps/TeamRocketBaseB2F.blk"
-
-TeamRocketBaseB3F_BlockData:
-	INCBIN "maps/TeamRocketBaseB3F.blk"
-
-BetaRoute23EarlyVersion_BlockData:
-	INCBIN "maps/BetaRoute23EarlyVersion.blk"
-
-IndigoPlateauPokeCenter1F_BlockData:
-	INCBIN "maps/IndigoPlateauPokeCenter1F.blk"
-
-WillsRoom_BlockData:
-	INCBIN "maps/WillsRoom.blk"
-
-KogasRoom_BlockData:
-	INCBIN "maps/KogasRoom.blk"
-
-BrunosRoom_BlockData:
-	INCBIN "maps/BrunosRoom.blk"
-
-KarensRoom_BlockData:
-	INCBIN "maps/KarensRoom.blk"
-
-AzaleaGym_BlockData:
-	INCBIN "maps/AzaleaGym.blk"
-
-VioletGym_BlockData:
-	INCBIN "maps/VioletGym.blk"
-
-GoldenrodGym_BlockData:
-	INCBIN "maps/GoldenrodGym.blk"
-
-EcruteakGym_BlockData:
-	INCBIN "maps/EcruteakGym.blk"
-
-MahoganyGym_BlockData:
-	INCBIN "maps/MahoganyGym.blk"
-
-OlivineGym_BlockData:
-	INCBIN "maps/OlivineGym.blk"
-
-BetaUnknown_BlockData:
-	INCBIN "maps/BetaUnknown.blk"
-
-CianwoodGym_BlockData:
-	INCBIN "maps/CianwoodGym.blk"
-
-BlackthornGym1F_BlockData:
-	INCBIN "maps/BlackthornGym1F.blk"
-
-BlackthornGym2F_BlockData:
-	INCBIN "maps/BlackthornGym2F.blk"
-
-OlivineLighthouse1F_BlockData:
-	INCBIN "maps/OlivineLighthouse1F.blk"
-
-OlivineLighthouse2F_BlockData:
-	INCBIN "maps/OlivineLighthouse2F.blk"
-
-OlivineLighthouse3F_BlockData:
-	INCBIN "maps/OlivineLighthouse3F.blk"
-
-OlivineLighthouse4F_BlockData:
-	INCBIN "maps/OlivineLighthouse4F.blk"
-
-OlivineLighthouse5F_BlockData:
-	INCBIN "maps/OlivineLighthouse5F.blk"
-
-OlivineLighthouse6F_BlockData:
-	INCBIN "maps/OlivineLighthouse6F.blk"
diff --git a/maps/blockdata_3.asm b/maps/blockdata_3.asm
deleted file mode 100644
index 5175f9ce6..000000000
--- a/maps/blockdata_3.asm
+++ /dev/null
@@ -1,266 +0,0 @@
-BetaCave2_BlockData:
-	INCBIN "maps/BetaCave2.blk"
-
-SlowpokeWellB1F_BlockData:
-	INCBIN "maps/SlowpokeWellB1F.blk"
-
-SlowpokeWellB2F_BlockData:
-	INCBIN "maps/SlowpokeWellB2F.blk"
-
-IlexForest_BlockData:
-	INCBIN "maps/IlexForest.blk"
-
-DarkCaveVioletEntrance_BlockData:
-	INCBIN "maps/DarkCaveVioletEntrance.blk"
-
-DarkCaveBlackthornEntrance_BlockData:
-	INCBIN "maps/DarkCaveBlackthornEntrance.blk"
-
-RuinsOfAlphResearchCenter_BlockData:
-	INCBIN "maps/RuinsOfAlphResearchCenter.blk"
-
-GoldenrodBikeShop_BlockData:
-	INCBIN "maps/GoldenrodBikeShop.blk"
-
-DanceTheatre_BlockData:
-	INCBIN "maps/DanceTheatre.blk"
-
-EcruteakHouse_BlockData:
-	INCBIN "maps/EcruteakHouse.blk"
-
-GoldenrodGameCorner_BlockData:
-	INCBIN "maps/GoldenrodGameCorner.blk"
-
-Route35NationalParkGate_BlockData:
-	INCBIN "maps/Route35NationalParkGate.blk"
-
-Route36NationalParkGate_BlockData:
-	INCBIN "maps/Route36NationalParkGate.blk"
-
-FastShip1F_BlockData:
-	INCBIN "maps/FastShip1F.blk"
-
-FastShipB1F_BlockData:
-	INCBIN "maps/FastShipB1F.blk"
-
-BetaSSAquaInsideCutOut_BlockData:
-	INCBIN "maps/BetaSSAquaInsideCutOut.blk"
-
-FastShipCabins_NNW_NNE_NE_BlockData:
-	INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk"
-
-FastShipCabins_SW_SSW_NW_BlockData:
-	INCBIN "maps/FastShipCabins_SW_SSW_NW.blk"
-
-FastShipCabins_SE_SSE_CaptainsCabin_BlockData:
-	INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk"
-
-OlivinePort_BlockData:
-	INCBIN "maps/OlivinePort.blk"
-
-VermilionPort_BlockData:
-	INCBIN "maps/VermilionPort.blk"
-
-OlivineCafe_BlockData:
-SafariZoneMainOffice_BlockData:
-	INCBIN "maps/OlivineCafe.blk"
-
-KrissHouse2F_BlockData:
-	INCBIN "maps/KrissHouse2F.blk"
-
-SaffronTrainStation_BlockData:
-	INCBIN "maps/SaffronTrainStation.blk"
-
-CeruleanGym_BlockData:
-	INCBIN "maps/CeruleanGym.blk"
-
-VermilionGym_BlockData:
-	INCBIN "maps/VermilionGym.blk"
-
-SaffronGym_BlockData:
-	INCBIN "maps/SaffronGym.blk"
-
-PowerPlant_BlockData:
-	INCBIN "maps/PowerPlant.blk"
-
-PokemonFanClub_BlockData:
-SafariZoneWardensHome_BlockData:
-	INCBIN "maps/PokemonFanClub.blk"
-
-FightingDojo_BlockData:
-	INCBIN "maps/FightingDojo.blk"
-
-SilphCo1F_BlockData:
-	INCBIN "maps/SilphCo1F.blk"
-
-ViridianGym_BlockData:
-	INCBIN "maps/ViridianGym.blk"
-
-TrainerHouse1F_BlockData:
-	INCBIN "maps/TrainerHouse1F.blk"
-
-TrainerHouseB1F_BlockData:
-	INCBIN "maps/TrainerHouseB1F.blk"
-
-RedsHouse1F_BlockData:
-	INCBIN "maps/RedsHouse1F.blk"
-
-RedsHouse2F_BlockData:
-	INCBIN "maps/RedsHouse2F.blk"
-
-OaksLab_BlockData:
-	INCBIN "maps/OaksLab.blk"
-
-MrFujisHouse_BlockData:
-	INCBIN "maps/MrFujisHouse.blk"
-
-LavRadioTower1F_BlockData:
-	INCBIN "maps/LavRadioTower1F.blk"
-
-SilverCaveItemRooms_BlockData:
-	INCBIN "maps/SilverCaveItemRooms.blk"
-
-DayCare_BlockData:
-	INCBIN "maps/DayCare.blk"
-
-SoulHouse_BlockData:
-	INCBIN "maps/SoulHouse.blk"
-
-PewterGym_BlockData:
-	INCBIN "maps/PewterGym.blk"
-
-CeladonGym_BlockData:
-	INCBIN "maps/CeladonGym.blk"
-
-BetaHouse2_BlockData:
-	INCBIN "maps/BetaHouse2.blk"
-
-CeladonCafe_BlockData:
-	INCBIN "maps/CeladonCafe.blk"
-
-BetaCeladonMansion_BlockData:
-	INCBIN "maps/BetaCeladonMansion.blk"
-
-RockTunnel1F_BlockData:
-	INCBIN "maps/RockTunnel1F.blk"
-
-RockTunnelB1F_BlockData:
-	INCBIN "maps/RockTunnelB1F.blk"
-
-DiglettsCave_BlockData:
-	INCBIN "maps/DiglettsCave.blk"
-
-MountMoon_BlockData:
-	INCBIN "maps/MountMoon.blk"
-
-SeafoamGym_BlockData:
-	INCBIN "maps/SeafoamGym.blk"
-
-MrPokemonsHouse_BlockData:
-	INCBIN "maps/MrPokemonsHouse.blk"
-
-VictoryRoadGate_BlockData:
-	INCBIN "maps/VictoryRoadGate.blk"
-
-OlivinePortPassage_BlockData:
-VermilionPortPassage_BlockData:
-	INCBIN "maps/PortPassage.blk"
-
-FuchsiaGym_BlockData:
-	INCBIN "maps/FuchsiaGym.blk"
-
-SafariZoneBeta_BlockData:
-	INCBIN "maps/SafariZoneBeta.blk"
-
-Underground_BlockData:
-	INCBIN "maps/Underground.blk"
-
-Route39Barn_BlockData:
-	INCBIN "maps/Route39Barn.blk"
-
-VictoryRoad_BlockData:
-	INCBIN "maps/VictoryRoad.blk"
-
-Route23_BlockData:
-	INCBIN "maps/Route23.blk"
-
-LancesRoom_BlockData:
-	INCBIN "maps/LancesRoom.blk"
-
-HallOfFame_BlockData:
-	INCBIN "maps/HallOfFame.blk"
-
-CopycatsHouse1F_BlockData:
-	INCBIN "maps/CopycatsHouse1F.blk"
-
-CopycatsHouse2F_BlockData:
-	INCBIN "maps/CopycatsHouse2F.blk"
-
-GoldenrodFlowerShop_BlockData:
-	INCBIN "maps/GoldenrodFlowerShop.blk"
-
-MountMoonSquare_BlockData:
-	INCBIN "maps/MountMoonSquare.blk"
-
-WiseTriosRoom_BlockData:
-	INCBIN "maps/WiseTriosRoom.blk"
-
-DragonsDen1F_BlockData:
-	INCBIN "maps/DragonsDen1F.blk"
-
-DragonsDenB1F_BlockData:
-	INCBIN "maps/DragonsDenB1F.blk"
-
-TohjoFalls_BlockData:
-	INCBIN "maps/TohjoFalls.blk"
-
-RuinsOfAlphHoOhItemRoom_BlockData:
-RuinsOfAlphKabutoItemRoom_BlockData:
-RuinsOfAlphOmanyteItemRoom_BlockData:
-RuinsOfAlphAerodactylItemRoom_BlockData:
-	INCBIN "maps/RuinsOfAlphItemRoom.blk"
-
-RuinsOfAlphHoOhWordRoom_BlockData:
-	INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk"
-
-RuinsOfAlphKabutoWordRoom_BlockData:
-	INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk"
-
-RuinsOfAlphOmanyteWordRoom_BlockData:
-	INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk"
-
-RuinsOfAlphAerodactylWordRoom_BlockData:
-	INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk"
-
-DragonShrine_BlockData:
-	INCBIN "maps/DragonShrine.blk"
-
-BattleTower1F_BlockData:
-	INCBIN "maps/BattleTower1F.blk"
-
-BattleTowerBattleRoom_BlockData:
-	INCBIN "maps/BattleTowerBattleRoom.blk"
-
-GoldenrodPokeComCenter2FMobile_BlockData:
-	INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk"
-
-MobileTradeRoomMobile_BlockData:
-	INCBIN "maps/MobileTradeRoomMobile.blk"
-
-MobileBattleRoom_BlockData:
-	INCBIN "maps/MobileBattleRoom.blk"
-
-BattleTowerHallway_BlockData:
-	INCBIN "maps/BattleTowerHallway.blk"
-
-BattleTowerElevator_BlockData:
-	INCBIN "maps/BattleTowerElevator.blk"
-
-BattleTowerOutside_BlockData:
-	INCBIN "maps/BattleTowerOutside.blk"
-
-BetaBlank_BlockData:
-	INCBIN "maps/BetaBlank.blk"
-
-GoldenrodDeptStoreRoof_BlockData:
-	INCBIN "maps/GoldenrodDeptStoreRoof.blk"
diff --git a/tilesets/data.asm b/tilesets/data.asm
new file mode 100644
index 000000000..6d1ead4c0
--- /dev/null
+++ b/tilesets/data.asm
@@ -0,0 +1,434 @@
+SECTION "Roofs", ROMX
+
+INCLUDE "tilesets/roofs.asm"
+
+
+SECTION "Tileset Data 1", ROMX
+
+Tileset03GFX: ; 0x18000
+INCBIN "gfx/tilesets/03.2bpp.lz"
+; 0x18606
+
+Tileset03Meta: ; 0x18606
+INCBIN "tilesets/03_metatiles.bin"
+; 0x18e06
+
+Tileset03Coll: ; 0x18e06
+INCBIN "tilesets/03_collision.bin"
+; 0x19006
+
+Tileset00GFX: ; 0x19006
+Tileset01GFX: ; 0x19006
+INCBIN "gfx/tilesets/01.2bpp.lz"
+; 0x19c0e
+
+Tileset00Meta: ; 0x19c0e
+Tileset01Meta: ; 0x19c0e
+INCBIN "tilesets/01_metatiles.bin"
+; 0x1a40e
+
+Tileset00Coll: ; 0x1a40e
+Tileset01Coll: ; 0x1a40e
+INCBIN "tilesets/01_collision.bin"
+; 0x1a60e
+
+Tileset29GFX: ; 0x1a60e
+INCBIN "gfx/tilesets/29.2bpp.lz"
+; 0x1af3e
+
+Tileset29Meta: ; 0x1af3e
+INCBIN "tilesets/29_metatiles.bin"
+; 0x1b33e
+
+Tileset29Coll: ; 0x1b33e
+INCBIN "tilesets/29_collision.bin"
+; 0x1b43e
+
+Tileset20GFX: ; 0x1b43e
+INCBIN "gfx/tilesets/20.2bpp.lz"
+; 0x1b8fe
+
+Tileset20Meta: ; 0x1b8fe
+INCBIN "tilesets/20_metatiles.bin"
+; 0x1bcfe
+
+Tileset20Coll: ; 0x1bcfe
+INCBIN "tilesets/20_collision.bin"
+; 0x1bdfe
+
+
+SECTION "Tileset Data 2", ROMX
+
+Tileset07GFX: ; 0x1c30c
+INCBIN "gfx/tilesets/07.2bpp.lz"
+; 0x1c73c
+
+Tileset07Meta: ; 0x1c73c
+INCBIN "tilesets/07_metatiles.bin"
+; 0x1cb3c
+
+Tileset07Coll: ; 0x1cb3c
+INCBIN "tilesets/07_collision.bin"
+; 0x1cc3c
+
+Tileset09GFX: ; 0x1cc3c
+INCBIN "gfx/tilesets/09.2bpp.lz"
+; 0x1d04c
+
+Tileset09Meta: ; 0x1d04c
+INCBIN "tilesets/09_metatiles.bin"
+; 0x1d44c
+
+Tileset09Coll: ; 0x1d44c
+INCBIN "tilesets/09_collision.bin"
+; 0x1d54c
+
+Tileset06GFX: ; 0x1d54c
+INCBIN "gfx/tilesets/06.2bpp.lz"
+; 0x1d92c
+
+Tileset06Meta: ; 0x1d92c
+INCBIN "tilesets/06_metatiles.bin"
+; 0x1dd2c
+
+Tileset06Coll: ; 0x1dd2c
+INCBIN "tilesets/06_collision.bin"
+; 0x1de2c
+
+Tileset13GFX: ; 0x1de2c
+INCBIN "gfx/tilesets/13.2bpp.lz"
+; 0x1e58c
+
+Tileset13Meta: ; 0x1e58c
+INCBIN "tilesets/13_metatiles.bin"
+; 0x1e98c
+
+Tileset13Coll: ; 0x1e98c
+INCBIN "tilesets/13_collision.bin"
+; 0x1ea8c
+
+Tileset24GFX: ; 0x1ea8c
+INCBIN "gfx/tilesets/24.2bpp.lz"
+; 0x1ee1c
+
+Tileset24Meta: ; 0x1ee1c
+Tileset30Meta: ; 0x1ee1c
+INCBIN "tilesets/24_metatiles.bin"
+; 0x1f21c
+
+Tileset24Coll: ; 0x1f21c
+Tileset30Coll: ; 0x1f21c
+INCBIN "tilesets/24_collision.bin"
+; 0x1f31c
+
+
+SECTION "Tileset Data 3", ROMX
+
+Tileset23GFX: ; 0x20181
+INCBIN "gfx/tilesets/23.2bpp.lz"
+; 0x206e1
+
+Tileset23Meta: ; 0x206e1
+INCBIN "tilesets/23_metatiles.bin"
+; 0x20ae1
+
+Tileset23Coll: ; 0x20ae1
+INCBIN "tilesets/23_collision.bin"
+; 0x20be1
+
+Tileset10GFX: ; 0x20be1
+INCBIN "gfx/tilesets/10.2bpp.lz"
+; 0x213e1
+
+Tileset10Meta: ; 0x213e1
+INCBIN "tilesets/10_metatiles.bin"
+; 0x217e1
+
+Tileset10Coll: ; 0x217e1
+INCBIN "tilesets/10_collision.bin"
+; 0x218e1
+
+Tileset12GFX: ; 0x218e1
+INCBIN "gfx/tilesets/12.2bpp.lz"
+; 0x22031
+
+Tileset12Meta: ; 0x22031
+INCBIN "tilesets/12_metatiles.bin"
+; 0x22431
+
+Tileset12Coll: ; 0x22431
+INCBIN "tilesets/12_collision.bin"
+; 0x22531
+
+Tileset14GFX: ; 0x22531
+INCBIN "gfx/tilesets/14.2bpp.lz"
+; 0x22af1
+
+Tileset14Meta: ; 0x22af1
+INCBIN "tilesets/14_metatiles.bin"
+; 0x22ef1
+
+Tileset14Coll: ; 0x22ef1
+INCBIN "tilesets/14_collision.bin"
+; 0x22ff1
+
+Tileset17GFX: ; 0x22ff1
+INCBIN "gfx/tilesets/17.2bpp.lz"
+; 0x23391
+
+Tileset17Meta: ; 0x23391
+INCBIN "tilesets/17_metatiles.bin"
+; 0x23791
+
+Tileset17Coll: ; 0x23791
+INCBIN "tilesets/17_collision.bin"
+; 0x23891
+
+Tileset31Meta: ; 0x23891
+INCBIN "tilesets/31_metatiles.bin"
+; 0x23b11
+
+
+SECTION "Tileset Data 4", ROMX
+
+Tileset15GFX: ; 0x30000
+INCBIN "gfx/tilesets/15.2bpp.lz"
+; 0x304e0
+
+Tileset15Meta: ; 0x304e0
+INCBIN "tilesets/15_metatiles.bin"
+; 0x308e0
+
+Tileset15Coll: ; 0x308e0
+INCBIN "tilesets/15_collision.bin"
+; 0x309e0
+
+Tileset25GFX: ; 0x309e0
+INCBIN "gfx/tilesets/25.2bpp.lz"
+; 0x30e80
+
+Tileset25Meta: ; 0x30e80
+INCBIN "tilesets/25_metatiles.bin"
+; 0x31280
+
+Tileset25Coll: ; 0x31280
+INCBIN "tilesets/25_collision.bin"
+; 0x31380
+
+Tileset27GFX: ; 0x31380
+INCBIN "gfx/tilesets/27.2bpp.lz"
+; 0x318e0
+
+Tileset27Meta: ; 0x318e0
+INCBIN "tilesets/27_metatiles.bin"
+; 0x31ce0
+
+Tileset27Coll: ; 0x31ce0
+INCBIN "tilesets/27_collision.bin"
+; 0x31de0
+
+Tileset28GFX: ; 0x31de0
+INCBIN "gfx/tilesets/28.2bpp.lz"
+; 0x321b0
+
+Tileset28Meta: ; 0x321b0
+INCBIN "tilesets/28_metatiles.bin"
+; 0x325b0
+
+Tileset28Coll: ; 0x325b0
+INCBIN "tilesets/28_collision.bin"
+; 0x326b0
+
+Tileset30GFX: ; 0x326b0
+INCBIN "gfx/tilesets/30.2bpp.lz"
+; 0x329f0
+
+UnusedTileset30Meta: ; 0x329f0
+INCBIN "tilesets/unused_30_metatiles.bin"
+; 0x331f0
+
+UnusedTileset30Coll: ; 0x331f0
+INCBIN "tilesets/unused_30_collision.bin"
+; 0x333f0
+
+
+SECTION "Tileset Data 5", ROMX
+
+Tileset21GFX: ; 0xb4000
+INCBIN "gfx/tilesets/21.2bpp.lz"
+; 0xb48a0
+
+Tileset21Meta: ; 0xb48a0
+INCBIN "tilesets/21_metatiles.bin"
+; 0xb4ca0
+
+Tileset21Coll: ; 0xb4ca0
+INCBIN "tilesets/21_collision.bin"
+; 0xb4da0
+
+Tileset22GFX: ; 0xb4da0
+INCBIN "gfx/tilesets/22.2bpp.lz"
+; 0xb50e0
+
+Tileset22Meta: ; 0xb50e0
+INCBIN "tilesets/22_metatiles.bin"
+; 0xb54e0
+
+Tileset22Coll: ; 0xb54e0
+INCBIN "tilesets/22_collision.bin"
+; 0xb55e0
+
+Tileset08GFX: ; 0xb55e0
+INCBIN "gfx/tilesets/08.2bpp.lz"
+; 0xb59e0
+
+Tileset08Meta: ; 0xb59e0
+INCBIN "tilesets/08_metatiles.bin"
+; 0xb5de0
+
+Tileset08Coll: ; 0xb5de0
+INCBIN "tilesets/08_collision.bin"
+; 0xb5ee0
+
+Tileset02GFX: ; 0xb5ee0
+Tileset04GFX: ; 0xb5ee0
+INCBIN "gfx/tilesets/02.2bpp.lz"
+; 0xb6ae8
+
+Tileset02Meta: ; 0xb6ae8
+INCBIN "tilesets/02_metatiles.bin"
+; 0xb72e8
+
+Tileset02Coll: ; 0xb72e8
+INCBIN "tilesets/02_collision.bin"
+; 0xb74e8
+
+Tileset16GFX: ; 0xb74e8
+INCBIN "gfx/tilesets/16.2bpp.lz"
+; 0xb79a8
+
+Tileset16Meta: ; 0xb79a8
+INCBIN "tilesets/16_metatiles.bin"
+; 0xb7da8
+
+Tileset16Coll: ; 0xb7da8
+INCBIN "tilesets/16_collision.bin"
+; 0xb7ea8
+
+
+SECTION "Tileset Data 6", ROMX
+
+Tileset31GFX: ; 0xdc000
+INCBIN "gfx/tilesets/31.2bpp.lz"
+; 0xdc3d0
+
+Tileset18GFX: ; 0xdc3d0
+INCBIN "gfx/tilesets/18.2bpp.lz"
+; 0xdcc50
+
+Tileset18Meta: ; 0xdcc50
+INCBIN "tilesets/18_metatiles.bin"
+; 0xdd050
+
+Tileset18Coll: ; 0xdd050
+INCBIN "tilesets/18_collision.bin"
+; 0xdd150
+
+Tileset05GFX: ; 0xdd150
+INCBIN "gfx/tilesets/05.2bpp.lz"
+; 0xdd600
+
+Tileset05Meta: ; 0xdd600
+INCBIN "tilesets/05_metatiles.bin"
+; 0xdda00
+
+Tileset05Coll: ; 0xdda00
+INCBIN "tilesets/05_collision.bin"
+; 0xddb00
+
+Tileset19GFX: ; 0xddb00
+INCBIN "gfx/tilesets/19.2bpp.lz"
+; 0xddf70
+
+Tileset19Meta: ; 0xddf70
+INCBIN "tilesets/19_metatiles.bin"
+; 0xde370
+
+Tileset19Coll: ; 0xde370
+INCBIN "tilesets/19_collision.bin"
+; 0xde470
+
+Tileset31Coll: ; 0xde470
+INCBIN "tilesets/31_collision.bin"
+; 0xde570
+
+Tileset11GFX: ; 0xde570
+INCBIN "gfx/tilesets/11.2bpp.lz"
+; 0xde990
+
+Tileset11Meta: ; 0xde990
+INCBIN "tilesets/11_metatiles.bin"
+; 0xded90
+
+Tileset11Coll: ; 0xded90
+INCBIN "tilesets/11_collision.bin"
+; 0xdee90
+
+Tileset04Meta: ; 0xdee90
+INCBIN "tilesets/04_metatiles.bin"
+; 0xdf690
+
+Tileset04Coll: ; 0xdf690
+INCBIN "tilesets/04_collision.bin"
+; 0xdf890
+
+Tileset32Meta: ; 0xdf890
+INCBIN "tilesets/32_metatiles.bin"
+; 0xdfc90
+
+Tileset32Coll: ; 0xdfc90
+Tileset33Coll: ; 0xdfc90
+Tileset34Coll: ; 0xdfc90
+Tileset35Coll: ; 0xdfc90
+Tileset36Coll: ; 0xdfc90
+INCBIN "tilesets/32_collision.bin"
+; 0xdfd90
+
+
+SECTION "Tileset Data 7", ROMX
+
+Tileset26GFX: ; 0x1dc5a1
+Tileset32GFX: ; 0x1dc5a1
+Tileset33GFX: ; 0x1dc5a1
+Tileset34GFX: ; 0x1dc5a1
+Tileset35GFX: ; 0x1dc5a1
+Tileset36GFX: ; 0x1dc5a1
+INCBIN "gfx/tilesets/26.2bpp.lz"
+; 0x1dd1a9
+
+Tileset26Meta: ; 0x1dd1a9
+INCBIN "tilesets/26_metatiles.bin"
+; 0x1dd5a9
+
+Tileset26Coll: ; 0x1dd5a9
+INCBIN "tilesets/26_collision.bin"
+; 0x1dd6a9
+
+
+SECTION "Tileset Data 8", ROMX
+
+Tileset33Meta: ; 0x1e0000
+INCBIN "tilesets/33_metatiles.bin"
+; 0x1e0400
+
+Tileset34Meta: ; 0x1e0400
+INCBIN "tilesets/34_metatiles.bin"
+; 0x1e0800
+
+Tileset35Meta: ; 0x1e0800
+INCBIN "tilesets/35_metatiles.bin"
+; 0x1e0c00
+
+Tileset36Meta: ; 0x1e0c00
+INCBIN "tilesets/36_metatiles.bin"
+; 0x1e1000
diff --git a/tilesets/data_1.asm b/tilesets/data_1.asm
deleted file mode 100644
index 307dac666..000000000
--- a/tilesets/data_1.asm
+++ /dev/null
@@ -1,50 +0,0 @@
-Tileset03GFX: ; 0x18000
-INCBIN "gfx/tilesets/03.2bpp.lz"
-; 0x18606
-
-Tileset03Meta: ; 0x18606
-INCBIN "tilesets/03_metatiles.bin"
-; 0x18e06
-
-Tileset03Coll: ; 0x18e06
-INCBIN "tilesets/03_collision.bin"
-; 0x19006
-
-Tileset00GFX: ; 0x19006
-Tileset01GFX: ; 0x19006
-INCBIN "gfx/tilesets/01.2bpp.lz"
-; 0x19c0e
-
-Tileset00Meta: ; 0x19c0e
-Tileset01Meta: ; 0x19c0e
-INCBIN "tilesets/01_metatiles.bin"
-; 0x1a40e
-
-Tileset00Coll: ; 0x1a40e
-Tileset01Coll: ; 0x1a40e
-INCBIN "tilesets/01_collision.bin"
-; 0x1a60e
-
-Tileset29GFX: ; 0x1a60e
-INCBIN "gfx/tilesets/29.2bpp.lz"
-; 0x1af3e
-
-Tileset29Meta: ; 0x1af3e
-INCBIN "tilesets/29_metatiles.bin"
-; 0x1b33e
-
-Tileset29Coll: ; 0x1b33e
-INCBIN "tilesets/29_collision.bin"
-; 0x1b43e
-
-Tileset20GFX: ; 0x1b43e
-INCBIN "gfx/tilesets/20.2bpp.lz"
-; 0x1b8fe
-
-Tileset20Meta: ; 0x1b8fe
-INCBIN "tilesets/20_metatiles.bin"
-; 0x1bcfe
-
-Tileset20Coll: ; 0x1bcfe
-INCBIN "tilesets/20_collision.bin"
-; 0x1bdfe
diff --git a/tilesets/data_2.asm b/tilesets/data_2.asm
deleted file mode 100644
index 9109cc235..000000000
--- a/tilesets/data_2.asm
+++ /dev/null
@@ -1,61 +0,0 @@
-Tileset07GFX: ; 0x1c30c
-INCBIN "gfx/tilesets/07.2bpp.lz"
-; 0x1c73c
-
-Tileset07Meta: ; 0x1c73c
-INCBIN "tilesets/07_metatiles.bin"
-; 0x1cb3c
-
-Tileset07Coll: ; 0x1cb3c
-INCBIN "tilesets/07_collision.bin"
-; 0x1cc3c
-
-Tileset09GFX: ; 0x1cc3c
-INCBIN "gfx/tilesets/09.2bpp.lz"
-; 0x1d04c
-
-Tileset09Meta: ; 0x1d04c
-INCBIN "tilesets/09_metatiles.bin"
-; 0x1d44c
-
-Tileset09Coll: ; 0x1d44c
-INCBIN "tilesets/09_collision.bin"
-; 0x1d54c
-
-Tileset06GFX: ; 0x1d54c
-INCBIN "gfx/tilesets/06.2bpp.lz"
-; 0x1d92c
-
-Tileset06Meta: ; 0x1d92c
-INCBIN "tilesets/06_metatiles.bin"
-; 0x1dd2c
-
-Tileset06Coll: ; 0x1dd2c
-INCBIN "tilesets/06_collision.bin"
-; 0x1de2c
-
-Tileset13GFX: ; 0x1de2c
-INCBIN "gfx/tilesets/13.2bpp.lz"
-; 0x1e58c
-
-Tileset13Meta: ; 0x1e58c
-INCBIN "tilesets/13_metatiles.bin"
-; 0x1e98c
-
-Tileset13Coll: ; 0x1e98c
-INCBIN "tilesets/13_collision.bin"
-; 0x1ea8c
-
-Tileset24GFX: ; 0x1ea8c
-INCBIN "gfx/tilesets/24.2bpp.lz"
-; 0x1ee1c
-
-Tileset24Meta: ; 0x1ee1c
-Tileset30Meta: ; 0x1ee1c
-INCBIN "tilesets/24_metatiles.bin"
-; 0x1f21c
-
-Tileset24Coll: ; 0x1f21c
-Tileset30Coll: ; 0x1f21c
-INCBIN "tilesets/24_collision.bin"
-; 0x1f31c
diff --git a/tilesets/data_3.asm b/tilesets/data_3.asm
deleted file mode 100644
index 72b2b72ff..000000000
--- a/tilesets/data_3.asm
+++ /dev/null
@@ -1,64 +0,0 @@
-Tileset23GFX: ; 0x20181
-INCBIN "gfx/tilesets/23.2bpp.lz"
-; 0x206e1
-
-Tileset23Meta: ; 0x206e1
-INCBIN "tilesets/23_metatiles.bin"
-; 0x20ae1
-
-Tileset23Coll: ; 0x20ae1
-INCBIN "tilesets/23_collision.bin"
-; 0x20be1
-
-Tileset10GFX: ; 0x20be1
-INCBIN "gfx/tilesets/10.2bpp.lz"
-; 0x213e1
-
-Tileset10Meta: ; 0x213e1
-INCBIN "tilesets/10_metatiles.bin"
-; 0x217e1
-
-Tileset10Coll: ; 0x217e1
-INCBIN "tilesets/10_collision.bin"
-; 0x218e1
-
-Tileset12GFX: ; 0x218e1
-INCBIN "gfx/tilesets/12.2bpp.lz"
-; 0x22031
-
-Tileset12Meta: ; 0x22031
-INCBIN "tilesets/12_metatiles.bin"
-; 0x22431
-
-Tileset12Coll: ; 0x22431
-INCBIN "tilesets/12_collision.bin"
-; 0x22531
-
-Tileset14GFX: ; 0x22531
-INCBIN "gfx/tilesets/14.2bpp.lz"
-; 0x22af1
-
-Tileset14Meta: ; 0x22af1
-INCBIN "tilesets/14_metatiles.bin"
-; 0x22ef1
-
-Tileset14Coll: ; 0x22ef1
-INCBIN "tilesets/14_collision.bin"
-; 0x22ff1
-
-Tileset17GFX: ; 0x22ff1
-INCBIN "gfx/tilesets/17.2bpp.lz"
-; 0x23391
-
-Tileset17Meta: ; 0x23391
-INCBIN "tilesets/17_metatiles.bin"
-; 0x23791
-
-Tileset17Coll: ; 0x23791
-INCBIN "tilesets/17_collision.bin"
-; 0x23891
-
-; todo
-Tileset31Meta: ; 0x23891
-INCBIN "tilesets/31_metatiles.bin"
-; 0x23b11
diff --git a/tilesets/data_4.asm b/tilesets/data_4.asm
deleted file mode 100644
index fb61d1f2b..000000000
--- a/tilesets/data_4.asm
+++ /dev/null
@@ -1,59 +0,0 @@
-Tileset15GFX: ; 0x30000
-INCBIN "gfx/tilesets/15.2bpp.lz"
-; 0x304e0
-
-Tileset15Meta: ; 0x304e0
-INCBIN "tilesets/15_metatiles.bin"
-; 0x308e0
-
-Tileset15Coll: ; 0x308e0
-INCBIN "tilesets/15_collision.bin"
-; 0x309e0
-
-Tileset25GFX: ; 0x309e0
-INCBIN "gfx/tilesets/25.2bpp.lz"
-; 0x30e80
-
-Tileset25Meta: ; 0x30e80
-INCBIN "tilesets/25_metatiles.bin"
-; 0x31280
-
-Tileset25Coll: ; 0x31280
-INCBIN "tilesets/25_collision.bin"
-; 0x31380
-
-Tileset27GFX: ; 0x31380
-INCBIN "gfx/tilesets/27.2bpp.lz"
-; 0x318e0
-
-Tileset27Meta: ; 0x318e0
-INCBIN "tilesets/27_metatiles.bin"
-; 0x31ce0
-
-Tileset27Coll: ; 0x31ce0
-INCBIN "tilesets/27_collision.bin"
-; 0x31de0
-
-Tileset28GFX: ; 0x31de0
-INCBIN "gfx/tilesets/28.2bpp.lz"
-; 0x321b0
-
-Tileset28Meta: ; 0x321b0
-INCBIN "tilesets/28_metatiles.bin"
-; 0x325b0
-
-Tileset28Coll: ; 0x325b0
-INCBIN "tilesets/28_collision.bin"
-; 0x326b0
-
-Tileset30GFX: ; 0x326b0
-INCBIN "gfx/tilesets/30.2bpp.lz"
-; 0x329f0
-
-UnusedTileset30Meta: ; 0x329f0
-INCBIN "tilesets/unused_30_metatiles.bin"
-; 0x331f0
-
-UnusedTileset30Coll: ; 0x331f0
-INCBIN "tilesets/unused_30_collision.bin"
-; 0x333f0
diff --git a/tilesets/data_5.asm b/tilesets/data_5.asm
deleted file mode 100644
index 109df2daf..000000000
--- a/tilesets/data_5.asm
+++ /dev/null
@@ -1,60 +0,0 @@
-Tileset21GFX: ; 0xb4000
-INCBIN "gfx/tilesets/21.2bpp.lz"
-; 0xb48a0
-
-Tileset21Meta: ; 0xb48a0
-INCBIN "tilesets/21_metatiles.bin"
-; 0xb4ca0
-
-Tileset21Coll: ; 0xb4ca0
-INCBIN "tilesets/21_collision.bin"
-; 0xb4da0
-
-Tileset22GFX: ; 0xb4da0
-INCBIN "gfx/tilesets/22.2bpp.lz"
-; 0xb50e0
-
-Tileset22Meta: ; 0xb50e0
-INCBIN "tilesets/22_metatiles.bin"
-; 0xb54e0
-
-Tileset22Coll: ; 0xb54e0
-INCBIN "tilesets/22_collision.bin"
-; 0xb55e0
-
-Tileset08GFX: ; 0xb55e0
-INCBIN "gfx/tilesets/08.2bpp.lz"
-; 0xb59e0
-
-Tileset08Meta: ; 0xb59e0
-INCBIN "tilesets/08_metatiles.bin"
-; 0xb5de0
-
-Tileset08Coll: ; 0xb5de0
-INCBIN "tilesets/08_collision.bin"
-; 0xb5ee0
-
-Tileset02GFX: ; 0xb5ee0
-Tileset04GFX: ; 0xb5ee0
-INCBIN "gfx/tilesets/04.2bpp.lz"
-; 0xb6ae8
-
-Tileset02Meta: ; 0xb6ae8
-INCBIN "tilesets/02_metatiles.bin"
-; 0xb72e8
-
-Tileset02Coll: ; 0xb72e8
-INCBIN "tilesets/02_collision.bin"
-; 0xb74e8
-
-Tileset16GFX: ; 0xb74e8
-INCBIN "gfx/tilesets/16.2bpp.lz"
-; 0xb79a8
-
-Tileset16Meta: ; 0xb79a8
-INCBIN "tilesets/16_metatiles.bin"
-; 0xb7da8
-
-Tileset16Coll: ; 0xb7da8
-INCBIN "tilesets/16_collision.bin"
-; 0xb7ea8
diff --git a/tilesets/data_6.asm b/tilesets/data_6.asm
deleted file mode 100644
index 695282bc7..000000000
--- a/tilesets/data_6.asm
+++ /dev/null
@@ -1,75 +0,0 @@
-Tileset31GFX: ; 0xdc000
-INCBIN "gfx/tilesets/31.2bpp.lz"
-; 0xdc3d0
-
-Tileset18GFX: ; 0xdc3d0
-INCBIN "gfx/tilesets/18.2bpp.lz"
-; 0xdcc50
-
-Tileset18Meta: ; 0xdcc50
-INCBIN "tilesets/18_metatiles.bin"
-; 0xdd050
-
-Tileset18Coll: ; 0xdd050
-INCBIN "tilesets/18_collision.bin"
-; 0xdd150
-
-Tileset05GFX: ; 0xdd150
-INCBIN "gfx/tilesets/05.2bpp.lz"
-; 0xdd600
-
-Tileset05Meta: ; 0xdd600
-INCBIN "tilesets/05_metatiles.bin"
-; 0xdda00
-
-Tileset05Coll: ; 0xdda00
-INCBIN "tilesets/05_collision.bin"
-; 0xddb00
-
-Tileset19GFX: ; 0xddb00
-INCBIN "gfx/tilesets/19.2bpp.lz"
-; 0xddf70
-
-Tileset19Meta: ; 0xddf70
-INCBIN "tilesets/19_metatiles.bin"
-; 0xde370
-
-Tileset19Coll: ; 0xde370
-INCBIN "tilesets/19_collision.bin"
-; 0xde470
-
-Tileset31Coll: ; 0xde470
-INCBIN "tilesets/31_collision.bin"
-; 0xde570
-
-Tileset11GFX: ; 0xde570
-INCBIN "gfx/tilesets/11.2bpp.lz"
-; 0xde990
-
-Tileset11Meta: ; 0xde990
-INCBIN "tilesets/11_metatiles.bin"
-; 0xded90
-
-Tileset11Coll: ; 0xded90
-INCBIN "tilesets/11_collision.bin"
-; 0xdee90
-
-Tileset04Meta: ; 0xdee90
-INCBIN "tilesets/04_metatiles.bin"
-; 0xdf690
-
-Tileset04Coll: ; 0xdf690
-INCBIN "tilesets/04_collision.bin"
-; 0xdf890
-
-Tileset32Meta: ; 0xdf890
-INCBIN "tilesets/32_metatiles.bin"
-; 0xdfc90
-
-Tileset32Coll: ; 0xdfc90
-Tileset33Coll: ; 0xdfc90
-Tileset34Coll: ; 0xdfc90
-Tileset35Coll: ; 0xdfc90
-Tileset36Coll: ; 0xdfc90
-INCBIN "tilesets/36_collision.bin"
-; 0xdfd90
diff --git a/tilesets/data_7.asm b/tilesets/data_7.asm
deleted file mode 100644
index d781ab518..000000000
--- a/tilesets/data_7.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-Tileset26GFX: ; 0x1dc5a1
-Tileset32GFX: ; 0x1dc5a1
-Tileset33GFX: ; 0x1dc5a1
-Tileset34GFX: ; 0x1dc5a1
-Tileset35GFX: ; 0x1dc5a1
-Tileset36GFX: ; 0x1dc5a1
-INCBIN "gfx/tilesets/26.2bpp.lz"
-; 0x1dd1a9
-
-Tileset26Meta: ; 0x1dd1a9
-INCBIN "tilesets/26_metatiles.bin"
-; 0x1dd5a9
-
-Tileset26Coll: ; 0x1dd5a9
-INCBIN "tilesets/26_collision.bin"
-; 0x1dd6a9
diff --git a/tilesets/data_8.asm b/tilesets/data_8.asm
deleted file mode 100644
index 7ee2ecf3d..000000000
--- a/tilesets/data_8.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-Tileset33Meta: ; 0x1e0000
-INCBIN "tilesets/33_metatiles.bin"
-; 0x1e0400
-
-Tileset34Meta: ; 0x1e0400
-INCBIN "tilesets/34_metatiles.bin"
-; 0x1e0800
-
-Tileset35Meta: ; 0x1e0800
-INCBIN "tilesets/35_metatiles.bin"
-; 0x1e0c00
-
-Tileset36Meta: ; 0x1e0c00
-INCBIN "tilesets/36_metatiles.bin"
-; 0x1e1000