Lavender houses

3 files changed, 109 insertions, 191 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 8b2d58e2..6a46f4ae 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -149,9 +149,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(PokemonTower5_h)
 	db BANK(PokemonTower6_h)
 	db BANK(PokemonTower7_h)
-	db $07 ; db BANK(LavenderHouse1_h)
+	db BANK(LavenderHouse1_h)
 	db BANK(LavenderMart_h)
-	db $07 ; db BANK(LavenderHouse2_h)
+	db BANK(LavenderHouse2_h)
 	db $07 ; db BANK(FuchsiaMart_h)
 	db $1d ; db BANK(FuchsiaHouse1_h)
 	db $1d ; db BANK(FuchsiaPokecenter_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 82fce791..1c1eb08b 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -149,9 +149,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw PokemonTower5_h
 	dw PokemonTower6_h
 	dw PokemonTower7_h
-	dw $51a4 ; dw LavenderHouse1_h
+	dw LavenderHouse1_h
 	dw LavenderMart_h ;id=150
-	dw $52aa ; dw LavenderHouse2_h
+	dw LavenderHouse2_h
 	dw $5685 ; dw FuchsiaMart_h
 	dw $4851 ; dw FuchsiaHouse1_h
 	dw $489c ; dw FuchsiaPokecenter_h
diff --git a/main.asm b/main.asm
index cde3286b..d0ae00f7 100755
--- a/main.asm
+++ b/main.asm
@@ -271,8 +271,7 @@ INCLUDE "scripts/fuchsiacity.asm"
 INCLUDE "data/mapHeaders/blueshouse.asm"
 INCLUDE "scripts/blueshouse.asm"
 INCLUDE "data/mapObjects/blueshouse.asm"
-BluesHouseBlocks:
-INCBIN "maps/blueshouse.blk"
+BluesHouseBlocks: INCBIN "maps/blueshouse.blk"
 	dr $19d05,$1a4ea
 
 INCLUDE "engine/overworld/npc_movement.asm"
@@ -282,33 +281,28 @@ INCLUDE "engine/overworld/ledges.asm"
 SECTION "bank07",ROMX,BANK[$07]
 INCLUDE "data/mapHeaders/cinnabarisland.asm"
 INCLUDE "data/mapObjects/cinnabarisland.asm"
-CinnabarIslandBlocks:
-INCBIN "maps/cinnabarisland.blk"
+CinnabarIslandBlocks: INCBIN "maps/cinnabarisland.blk"
 
 INCLUDE "data/mapHeaders/route1.asm"
 INCLUDE "data/mapObjects/route1.asm"
 Route1Blocks: ; 1c0fc
 INCBIN "maps/route1.blk"
 
-UndergroundPathEntranceRoute8Blocks:
-INCBIN "maps/undergroundpathentranceroute8.blk"
-OaksLabBlocks:
-INCBIN "maps/oakslab.blk"
+UndergroundPathEntranceRoute8Blocks: INCBIN "maps/undergroundpathentranceroute8.blk"
+OaksLabBlocks: INCBIN "maps/oakslab.blk"
 ViridianHouseBlocks:
 Route2HouseBlocks:
 PewterHouse1Blocks:
 PewterHouse2Blocks:
 CeruleanHouse1Blocks:
 VermilionHouse1Blocks:
-INCBIN "maps/viridianhouse.blk"
+LavenderHouse1Blocks:
+LavenderHouse2Blocks: INCBIN "maps/viridianhouse.blk"
 SchoolBlocks:
-CeladonMansion5Blocks:
-INCBIN "maps/school.blk"
-CeruleanHouseTrashedBlocks:
-INCBIN "maps/ceruleanhousetrashed.blk"
+CeladonMansion5Blocks: INCBIN "maps/school.blk"
+CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk"
 DiglettsCaveRoute2Blocks:
-DiglettsCaveEntranceRoute11Blocks:
-INCBIN "maps/diglettscaveroute2.blk"
+DiglettsCaveEntranceRoute11Blocks: INCBIN "maps/diglettscaveroute2.blk"
 
 INCLUDE "engine/clear_save.asm"
 INCLUDE "engine/predefs7.asm"
@@ -327,8 +321,7 @@ ViridianMartBlocks:
 CeladonMartBlocks:
 SaffronMartBlocks:
 FuchsiaMartBlocks:
-CinnabarMartBlocks:
-INCBIN "maps/viridianmart.blk"
+CinnabarMartBlocks: INCBIN "maps/viridianmart.blk"
 
 INCLUDE "data/mapHeaders/school.asm"
 INCLUDE "scripts/school.asm"
@@ -357,9 +350,16 @@ INCLUDE "data/mapObjects/ceruleanhouse1.asm"
 INCLUDE "data/mapHeaders/bikeshop.asm"
 INCLUDE "scripts/bikeshop.asm"
 INCLUDE "data/mapObjects/bikeshop.asm"
-BikeShopBlocks:
-INCBIN "maps/bikeshop.blk"
-	dr $1d1a4,$1d3f8 ; map scripts
+BikeShopBlocks: INCBIN "maps/bikeshop.blk"
+
+INCLUDE "data/mapHeaders/lavenderhouse1.asm"
+INCLUDE "scripts/lavenderhouse1.asm"
+INCLUDE "data/mapObjects/lavenderhouse1.asm"
+
+INCLUDE "data/mapHeaders/lavenderhouse2.asm"
+INCLUDE "scripts/lavenderhouse2.asm"
+INCLUDE "data/mapObjects/lavenderhouse2.asm"
+	dr $1d30e,$1d3f8 ; map scripts
 
 INCLUDE "data/mapHeaders/vermilionhouse1.asm"
 INCLUDE "scripts/vermilionhouse1.asm"
@@ -368,8 +368,7 @@ INCLUDE "data/mapObjects/vermilionhouse1.asm"
 INCLUDE "data/mapHeaders/vermiliondock.asm"
 INCLUDE "scripts/vermiliondock.asm"
 INCLUDE "data/mapObjects/vermiliondock.asm"
-VermilionDockBlocks:
-INCBIN "maps/vermiliondock.blk"
+VermilionDockBlocks: INCBIN "maps/vermiliondock.blk"
 
 INCLUDE "data/mapHeaders/celadonmansion5.asm"
 INCLUDE "scripts/celadonmansion5.asm"
@@ -415,8 +414,7 @@ INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm"
 INCLUDE "data/mapHeaders/powerplant.asm"
 INCLUDE "scripts/powerplant.asm"
 INCLUDE "data/mapObjects/powerplant.asm"
-PowerPlantBlocks:
-INCBIN "maps/powerplant.blk"
+PowerPlantBlocks: INCBIN "maps/powerplant.blk"
 
 INCLUDE "data/mapHeaders/diglettscaveroute11.asm"
 INCLUDE "scripts/diglettscaveroute11.asm"
@@ -426,8 +424,7 @@ INCLUDE "data/mapObjects/diglettscaveroute11.asm"
 INCLUDE "data/mapHeaders/billshouse.asm"
 INCLUDE "scripts/billshouse.asm"
 INCLUDE "data/mapObjects/billshouse.asm"
-BillsHouseBlocks:
-INCBIN "maps/billshouse.blk"
+BillsHouseBlocks: INCBIN "maps/billshouse.blk"
 
 INCLUDE "engine/menu/oaks_pc.asm"
 
@@ -786,8 +783,7 @@ INCLUDE "data/cries.asm"
 INCLUDE "engine/battle/trainer_ai.asm"
 INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm"
 
-TradingAnimationGraphics:
-	INCBIN "gfx/game_boy.norepeat.2bpp"
+TradingAnimationGraphics: INCBIN "gfx/game_boy.norepeat.2bpp"
 	INCBIN "gfx/link_cable.2bpp"
 TradingAnimationGraphicsEnd:
 
@@ -817,13 +813,11 @@ SECTION "bank11",ROMX,BANK[$11]
 
 INCLUDE "data/mapHeaders/lavendertown.asm"
 INCLUDE "data/mapObjects/lavendertown.asm"
-LavenderTownBlocks:
-INCBIN "maps/lavendertown.blk"
+LavenderTownBlocks: INCBIN "maps/lavendertown.blk"
 ViridianPokecenterBlocks:
 SaffronPokecenterBlocks:
 FuchsiaPokecenterBlocks:
-CinnabarPokecenterBlocks:
-INCBIN "maps/viridianpokecenter.blk"
+CinnabarPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk"
 	dr $440fb,$4410b
 
 INCLUDE "scripts/lavendertown.asm"
@@ -837,8 +831,7 @@ INCLUDE "data/mapObjects/viridianpokecenter.asm"
 INCLUDE "data/mapHeaders/celadonmart1.asm"
 INCLUDE "scripts/celadonmart1.asm"
 INCLUDE "data/mapObjects/celadonmart1.asm"
-CeladonMart1Blocks:
-INCBIN "maps/celadonmart1.blk"
+CeladonMart1Blocks: INCBIN "maps/celadonmart1.blk"
 	dr $44344,$443b7
 Mansion1Script_Switches:
 	dr $443b7,$44571
@@ -846,15 +839,13 @@ Mansion1Script_Switches:
 INCLUDE "data/mapHeaders/rocktunnel1.asm"
 INCLUDE "scripts/rocktunnel1.asm"
 INCLUDE "data/mapObjects/rocktunnel1.asm"
-RockTunnel1Blocks:
-INCBIN "maps/rocktunnel1.blk"
+RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk"
 	dr $4487e,$449bf
 
 INCLUDE "data/mapHeaders/ssanne3.asm"
 INCLUDE "scripts/ssanne3.asm"
 INCLUDE "data/mapObjects/ssanne3.asm"
-SSAnne3Blocks:
-INCBIN "maps/ssanne3.blk"
+SSAnne3Blocks: INCBIN "maps/ssanne3.blk"
 	dr $44a0d,$45077
 
 LoadSpinnerArrowTiles: ; 45077 (11:5077)
@@ -869,68 +860,56 @@ Route7Blocks: ; 48051
 INCBIN "maps/route7.blk"
 MtMoonPokecenterBlocks:
 RockTunnelPokecenterBlocks:
-CeladonPokecenterBlocks:
-INCBIN "maps/mtmoonpokecenter.blk"
-Route11GateBlocks:
-INCBIN "maps/route11gate.blk"
+CeladonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk"
+Route11GateBlocks: INCBIN "maps/route11gate.blk"
 Route11GateUpstairsBlocks:
-Route12GateUpstairsBlocks:
-INCBIN "maps/route11gateupstairs.blk"
+Route12GateUpstairsBlocks: INCBIN "maps/route11gateupstairs.blk"
 INCLUDE "scripts/route7.asm"
 
 INCLUDE "data/mapHeaders/redshouse1f.asm"
 INCLUDE "scripts/redshouse1f.asm"
 INCLUDE "data/mapObjects/redshouse1f.asm"
-RedsHouse1FBlocks:
-INCBIN "maps/redshouse1f.blk"
+RedsHouse1FBlocks: INCBIN "maps/redshouse1f.blk"
 
 INCLUDE "data/mapHeaders/celadonmart3.asm"
 INCLUDE "scripts/celadonmart3.asm"
 INCLUDE "data/mapObjects/celadonmart3.asm"
-CeladonMart3Blocks:
-INCBIN "maps/celadonmart3.blk"
+CeladonMart3Blocks: INCBIN "maps/celadonmart3.blk"
 
 INCLUDE "data/mapHeaders/celadonmart4.asm"
 INCLUDE "scripts/celadonmart4.asm"
 INCLUDE "data/mapObjects/celadonmart4.asm"
-CeladonMart4Blocks:
-INCBIN "maps/celadonmart4.blk"
+CeladonMart4Blocks: INCBIN "maps/celadonmart4.blk"
 
 INCLUDE "data/mapHeaders/celadonmartroof.asm"
 INCLUDE "scripts/celadonmartroof.asm"
 INCLUDE "data/mapObjects/celadonmartroof.asm"
-CeladonMartRoofBlocks:
-INCBIN "maps/celadonmartroof.blk"
+CeladonMartRoofBlocks: INCBIN "maps/celadonmartroof.blk"
 
 INCLUDE "data/mapHeaders/celadonmartelevator.asm"
 INCLUDE "scripts/celadonmartelevator.asm"
 INCLUDE "data/mapObjects/celadonmartelevator.asm"
-CeladonMartElevatorBlocks:
-INCBIN "maps/celadonmartelevator.blk"
+CeladonMartElevatorBlocks: INCBIN "maps/celadonmartelevator.blk"
 
 INCLUDE "data/mapHeaders/celadonmansion1.asm"
 INCLUDE "scripts/celadonmansion1.asm"
 INCLUDE "data/mapObjects/celadonmansion1.asm"
-CeladonMansion1Blocks:
-INCBIN "maps/celadonmansion1.blk"
+CeladonMansion1Blocks: INCBIN "maps/celadonmansion1.blk"
 
 INCLUDE "data/mapHeaders/celadonmansion2.asm"
 INCLUDE "scripts/celadonmansion2.asm"
 INCLUDE "data/mapObjects/celadonmansion2.asm"
-CeladonMansion2Blocks:
-INCBIN "maps/celadonmansion2.blk"
+CeladonMansion2Blocks: INCBIN "maps/celadonmansion2.blk"
 
 INCLUDE "data/mapHeaders/celadonmansion3.asm"
 INCLUDE "scripts/celadonmansion3.asm"
 INCLUDE "data/mapObjects/celadonmansion3.asm"
-CeladonMansion3Blocks:
-INCBIN "maps/celadonmansion3.blk"
+CeladonMansion3Blocks: INCBIN "maps/celadonmansion3.blk"
 
 INCLUDE "data/mapHeaders/celadonmansion4.asm"
 INCLUDE "scripts/celadonmansion4.asm"
 INCLUDE "data/mapObjects/celadonmansion4.asm"
-CeladonMansion4Blocks:
-INCBIN "maps/celadonmansion4.blk"
+CeladonMansion4Blocks: INCBIN "maps/celadonmansion4.blk"
 
 INCLUDE "data/mapHeaders/celadonpokecenter.asm"
 INCLUDE "scripts/celadonpokecenter.asm"
@@ -939,44 +918,37 @@ INCLUDE "data/mapObjects/celadonpokecenter.asm"
 INCLUDE "data/mapHeaders/celadongym.asm"
 INCLUDE "scripts/celadongym.asm"
 INCLUDE "data/mapObjects/celadongym.asm"
-CeladonGymBlocks:
-INCBIN "maps/celadongym.blk"
+CeladonGymBlocks: INCBIN "maps/celadongym.blk"
 
 INCLUDE "data/mapHeaders/celadongamecorner.asm"
 INCLUDE "scripts/celadongamecorner.asm"
 INCLUDE "data/mapObjects/celadongamecorner.asm"
-CeladonGameCornerBlocks:
-INCBIN "maps/celadongamecorner.blk"
+CeladonGameCornerBlocks: INCBIN "maps/celadongamecorner.blk"
 
 INCLUDE "data/mapHeaders/celadonmart5.asm"
 INCLUDE "scripts/celadonmart5.asm"
 INCLUDE "data/mapObjects/celadonmart5.asm"
-CeladonMart5Blocks:
-INCBIN "maps/celadonmart5.blk"
+CeladonMart5Blocks: INCBIN "maps/celadonmart5.blk"
 
 INCLUDE "data/mapHeaders/celadonprizeroom.asm"
 INCLUDE "scripts/celadonprizeroom.asm"
 INCLUDE "data/mapObjects/celadonprizeroom.asm"
-CeladonPrizeRoomBlocks:
-INCBIN "maps/celadonprizeroom.blk"
+CeladonPrizeRoomBlocks: INCBIN "maps/celadonprizeroom.blk"
 
 INCLUDE "data/mapHeaders/celadondiner.asm"
 INCLUDE "scripts/celadondiner.asm"
 INCLUDE "data/mapObjects/celadondiner.asm"
-CeladonDinerBlocks:
-INCBIN "maps/celadondiner.blk"
+CeladonDinerBlocks: INCBIN "maps/celadondiner.blk"
 
 INCLUDE "data/mapHeaders/celadonhouse.asm"
 INCLUDE "scripts/celadonhouse.asm"
 INCLUDE "data/mapObjects/celadonhouse.asm"
-CeladonHouseBlocks:
-INCBIN "maps/celadonhouse.blk"
+CeladonHouseBlocks: INCBIN "maps/celadonhouse.blk"
 
 INCLUDE "data/mapHeaders/celadonhotel.asm"
 INCLUDE "scripts/celadonhotel.asm"
 INCLUDE "data/mapObjects/celadonhotel.asm"
-CeladonHotelBlocks:
-INCBIN "maps/celadonhotel.blk"
+CeladonHotelBlocks: INCBIN "maps/celadonhotel.blk"
 
 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
 INCLUDE "scripts/mtmoonpokecenter.asm"
@@ -997,8 +969,7 @@ INCLUDE "data/mapObjects/route11gateupstairs.asm"
 INCLUDE "data/mapHeaders/route12gate.asm"
 INCLUDE "scripts/route12gate.asm"
 INCLUDE "data/mapObjects/route12gate.asm"
-Route12GateBlocks:
-INCBIN "maps/route12gate.blk"
+Route12GateBlocks: INCBIN "maps/route12gate.blk"
 
 INCLUDE "data/mapHeaders/route12gateupstairs.asm"
 INCLUDE "scripts/route12gateupstairs.asm"
@@ -1008,14 +979,12 @@ INCLUDE "data/mapObjects/route12gateupstairs.asm"
 INCLUDE "data/mapHeaders/mtmoon1.asm"
 INCLUDE "scripts/mtmoon1.asm"
 INCLUDE "data/mapObjects/mtmoon1.asm"
-MtMoon1Blocks:
-INCBIN "maps/mtmoon1.blk"
+MtMoon1Blocks: INCBIN "maps/mtmoon1.blk"
 
 INCLUDE "data/mapHeaders/mtmoon3.asm"
 INCLUDE "scripts/mtmoon3.asm"
 INCLUDE "data/mapObjects/mtmoon3.asm"
-MtMoon3Blocks:
-INCBIN "maps/mtmoon3.blk"
+MtMoon3Blocks: INCBIN "maps/mtmoon3.blk"
 
 MtMoon3Script_4a325: ; pikachu-related function?
 	ld a, [wd472]
@@ -1105,33 +1074,28 @@ JessieJamesPic:   INCBIN "pic/ytrainer/jessiejames.pic"
 INCLUDE "data/mapHeaders/tradecenter.asm"
 INCLUDE "scripts/tradecenter.asm"
 INCLUDE "data/mapObjects/tradecenter.asm"
-TradeCenterBlocks:
-INCBIN "maps/tradecenter.blk"
+TradeCenterBlocks: INCBIN "maps/tradecenter.blk"
 
 ; 4fee6 (13:7ee6)
 
 INCLUDE "data/mapHeaders/colosseum.asm"
 INCLUDE "scripts/colosseum.asm"
 INCLUDE "data/mapObjects/colosseum.asm"
-ColosseumBlocks:
-INCBIN "maps/colosseum.blk"
+ColosseumBlocks: INCBIN "maps/colosseum.blk"
 
 
 SECTION "bank14",ROMX,BANK[$14]
 
 INCLUDE "data/mapHeaders/route22.asm"
 INCLUDE "data/mapObjects/route22.asm"
-Route22Blocks:
-INCBIN "maps/route22.blk"
+Route22Blocks: INCBIN "maps/route22.blk"
 INCLUDE "data/mapHeaders/route20.asm"
 INCLUDE "data/mapObjects/route20.asm"
-Route20Blocks:
-INCBIN "maps/route20.blk"
+Route20Blocks: INCBIN "maps/route20.blk"
 
 INCLUDE "data/mapHeaders/route23.asm"
 INCLUDE "data/mapObjects/route23.asm"
-Route23Blocks:
-INCBIN "maps/route23.blk"
+Route23Blocks: INCBIN "maps/route23.blk"
 
 INCLUDE "data/mapHeaders/route24.asm"
 INCLUDE "data/mapObjects/route24.asm"
@@ -1167,8 +1131,7 @@ INCLUDE "scripts/route25.asm"
 INCLUDE "data/mapHeaders/mtmoon2.asm"
 INCLUDE "scripts/mtmoon2.asm"
 INCLUDE "data/mapObjects/mtmoon2.asm"
-MtMoon2Blocks:
-INCBIN "maps/mtmoon2.blk"
+MtMoon2Blocks: INCBIN "maps/mtmoon2.blk"
 
 	dr $51b97,$52060
 Mansion2Script_Switches:
@@ -1211,30 +1174,25 @@ INCBIN "maps/route9.blk"
 
 INCLUDE "data/mapHeaders/route13.asm"
 INCLUDE "data/mapObjects/route13.asm"
-Route13Blocks:
-INCBIN "maps/route13.blk"
+Route13Blocks: INCBIN "maps/route13.blk"
 
 INCLUDE "data/mapHeaders/route14.asm"
 INCLUDE "data/mapObjects/route14.asm"
-Route14Blocks:
-INCBIN "maps/route14.blk"
+Route14Blocks: INCBIN "maps/route14.blk"
 
 INCLUDE "data/mapHeaders/route17.asm"
 INCLUDE "data/mapObjects/route17.asm"
-Route17Blocks:
-INCBIN "maps/route17.blk"
+Route17Blocks: INCBIN "maps/route17.blk"
 
 INCLUDE "data/mapHeaders/route19.asm"
 INCLUDE "data/mapObjects/route19.asm"
-Route19Blocks:
-INCBIN "maps/route19.blk"
+Route19Blocks: INCBIN "maps/route19.blk"
 INCLUDE "data/mapHeaders/route21.asm"
 INCLUDE "data/mapObjects/route21.asm"
 Route21Blocks: ; 5507d
 INCBIN "maps/route21.blk"
 
-DayCareMBlocks:
-INCBIN "maps/daycarem.blk"
+DayCareMBlocks: INCBIN "maps/daycarem.blk"
 	dr $5524f,$5525f
 
 INCLUDE "engine/battle/experience.asm"
@@ -1256,8 +1214,7 @@ INCLUDE "scripts/route21.asm"
 INCLUDE "data/mapHeaders/celadonmart2.asm"
 INCLUDE "scripts/celadonmart2.asm"
 INCLUDE "data/mapObjects/celadonmart2.asm"
-CeladonMart2Blocks:
-INCBIN "maps/celadonmart2.blk"
+CeladonMart2Blocks: INCBIN "maps/celadonmart2.blk"
 	dr $56160,$56233
 
 INCLUDE "data/mapHeaders/daycarem.asm"
@@ -1284,8 +1241,7 @@ INCBIN "maps/route8.blk"
 
 INCLUDE "data/mapHeaders/route10.asm"
 INCLUDE "data/mapObjects/route10.asm"
-Route10Blocks:
-INCBIN "maps/route10.blk"
+Route10Blocks: INCBIN "maps/route10.blk"
 
 INCLUDE "data/mapHeaders/route11.asm"
 INCLUDE "data/mapObjects/route11.asm"
@@ -1294,13 +1250,11 @@ INCBIN "maps/route11.blk"
 
 INCLUDE "data/mapHeaders/route12.asm"
 INCLUDE "data/mapObjects/route12.asm"
-Route12Blocks:
-INCBIN "maps/route12.blk"
+Route12Blocks: INCBIN "maps/route12.blk"
 
 INCLUDE "data/mapHeaders/route15.asm"
 INCLUDE "data/mapObjects/route15.asm"
-Route15Blocks:
-INCBIN "maps/route15.blk"
+Route15Blocks: INCBIN "maps/route15.blk"
 
 INCLUDE "data/mapHeaders/route16.asm"
 INCLUDE "data/mapObjects/route16.asm"
@@ -1309,8 +1263,7 @@ INCBIN "maps/route16.blk"
 
 INCLUDE "data/mapHeaders/route18.asm"
 INCLUDE "data/mapObjects/route18.asm"
-Route18Blocks:
-INCBIN "maps/route18.blk"
+Route18Blocks: INCBIN "maps/route18.blk"
 	dr $58d7d,$58d99
 
 INCLUDE "engine/experience.asm"
@@ -1331,21 +1284,18 @@ INCLUDE "scripts/route18.asm"
 INCLUDE "data/mapHeaders/fanclub.asm"
 INCLUDE "scripts/fanclub.asm"
 INCLUDE "data/mapObjects/fanclub.asm"
-FanClubBlocks:
-INCBIN "maps/fanclub.blk"
+FanClubBlocks: INCBIN "maps/fanclub.blk"
 	dr $59c80,$5a23d
 
 INCLUDE "data/mapHeaders/lance.asm"
 INCLUDE "scripts/lance.asm"
 INCLUDE "data/mapObjects/lance.asm"
-LanceBlocks:
-INCBIN "maps/lance.blk"
+LanceBlocks: INCBIN "maps/lance.blk"
 
 INCLUDE "data/mapHeaders/halloffameroom.asm"
 INCLUDE "scripts/halloffameroom.asm"
 INCLUDE "data/mapObjects/halloffameroom.asm"
-HallofFameRoomBlocks:
-INCBIN "maps/halloffameroom.blk"
+HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk"
 	
 INCLUDE "engine/overworld/saffron_guards.asm"
 
@@ -1353,27 +1303,20 @@ INCLUDE "engine/overworld/saffron_guards.asm"
 SECTION "bank17",ROMX,BANK[$17]
 CeruleanMartBlocks:
 VermilionMartBlocks:
-LavenderMartBlocks:
-INCBIN "maps/ceruleanmart.blk"
-RedsHouse2FBlocks:
-INCBIN "maps/redshouse2f.blk"
-Museum1FBlocks:
-INCBIN "maps/museum1f.blk"
-Museum2FBlocks:
-INCBIN "maps/museum2f.blk"
+LavenderMartBlocks: INCBIN "maps/ceruleanmart.blk"
+RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk"
+Museum1FBlocks: INCBIN "maps/museum1f.blk"
+Museum2FBlocks: INCBIN "maps/museum2f.blk"
 PewterPokecenterBlocks:
 VermilionPokecenterBlocks:
-LavenderPokecenterBlocks:
-INCBIN "maps/pewterpokecenter.blk"
+LavenderPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk"
 UndergroundPathEntranceRoute5Blocks:
 UndergroundPathEntranceRoute6Blocks:
 UndergroundPathEntranceRoute7Blocks:
-UndergroundPathEntranceRoute7CopyBlocks:
-INCBIN "maps/undergroundpathentranceroute5.blk"
+UndergroundPathEntranceRoute7CopyBlocks: INCBIN "maps/undergroundpathentranceroute5.blk"
 ViridianForestEntranceBlocks:
 ViridianForestExitBlocks:
-Route2GateBlocks:
-INCBIN "maps/viridianforestentrance.blk"
+Route2GateBlocks: INCBIN "maps/viridianforestentrance.blk"
 
 INCLUDE "data/mapHeaders/redshouse2f.asm"
 INCLUDE "scripts/redshouse2f.asm"
@@ -1398,8 +1341,7 @@ INCLUDE "data/mapObjects/museum2f.asm"
 INCLUDE "data/mapHeaders/pewtergym.asm"
 INCLUDE "scripts/pewtergym.asm"
 INCLUDE "data/mapObjects/pewtergym.asm"
-PewterGymBlocks:
-INCBIN "maps/pewtergym.blk"
+PewterGymBlocks: INCBIN "maps/pewtergym.blk"
 
 INCLUDE "data/mapHeaders/pewterpokecenter.asm"
 INCLUDE "scripts/pewterpokecenter.asm"
@@ -1408,14 +1350,12 @@ INCLUDE "data/mapObjects/pewterpokecenter.asm"
 INCLUDE "data/mapHeaders/ceruleanpokecenter.asm"
 INCLUDE "scripts/ceruleanpokecenter.asm"
 INCLUDE "data/mapObjects/ceruleanpokecenter.asm"
-CeruleanPokecenterBlocks:
-INCBIN "maps/ceruleanpokecenter.blk"
+CeruleanPokecenterBlocks: INCBIN "maps/ceruleanpokecenter.blk"
 
 INCLUDE "data/mapHeaders/ceruleangym.asm"
 INCLUDE "scripts/ceruleangym.asm"
 INCLUDE "data/mapObjects/ceruleangym.asm"
-CeruleanGymBlocks:
-INCBIN "maps/ceruleangym.blk"
+CeruleanGymBlocks: INCBIN "maps/ceruleangym.blk"
 
 INCLUDE "data/mapHeaders/ceruleanmart.asm"
 INCLUDE "scripts/ceruleanmart.asm"
@@ -1440,8 +1380,7 @@ INCLUDE "data/mapObjects/vermilionmart.asm"
 INCLUDE "data/mapHeaders/vermiliongym.asm"
 INCLUDE "scripts/vermiliongym.asm"
 INCLUDE "data/mapObjects/vermiliongym.asm"
-VermilionGymBlocks:
-INCBIN "maps/vermiliongym.blk"
+VermilionGymBlocks: INCBIN "maps/vermiliongym.blk"
 	dr $5cb5b,$5d485
 
 INCLUDE "data/mapHeaders/viridianforestexit.asm"
@@ -1476,8 +1415,7 @@ INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm"
 INCLUDE "data/mapHeaders/victoryroad1.asm"
 INCLUDE "scripts/victoryroad1.asm"
 INCLUDE "data/mapObjects/victoryroad1.asm"
-VictoryRoad1Blocks:
-INCBIN "maps/victoryroad1.blk"
+VictoryRoad1Blocks: INCBIN "maps/victoryroad1.blk"
 
 INCLUDE "engine/evolution.asm"
 
@@ -1499,60 +1437,50 @@ SetPartyMonTypes::
 INCLUDE "engine/hidden_object_functions17.asm"
 
 SECTION "bank18",ROMX,BANK[$18]
-ViridianForestBlocks:
-INCBIN "maps/viridianforest.blk"
-UndergroundPathNSBlocks:
-INCBIN "maps/undergroundpathns.blk"
-UndergroundPathWEBlocks:
-INCBIN "maps/undergroundpathwe.blk"
+ViridianForestBlocks: INCBIN "maps/viridianforest.blk"
+UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk"
+UndergroundPathWEBlocks: INCBIN "maps/undergroundpathwe.blk"
 	dr $60258,$603c0
 
 SSAnne9Blocks:
-SSAnne10Blocks:
-INCBIN "maps/ssanne9.blk"
+SSAnne10Blocks: INCBIN "maps/ssanne9.blk"
 
 INCLUDE "data/mapHeaders/pokemontower1.asm"
 INCLUDE "scripts/pokemontower1.asm"
 INCLUDE "data/mapObjects/pokemontower1.asm"
-PokemonTower1Blocks:
-INCBIN "maps/pokemontower1.blk"
+PokemonTower1Blocks: INCBIN "maps/pokemontower1.blk"
 
 INCLUDE "data/mapHeaders/pokemontower2.asm"
 INCLUDE "scripts/pokemontower2.asm"
 INCLUDE "data/mapObjects/pokemontower2.asm"
-PokemonTower2Blocks:
-INCBIN "maps/pokemontower2.blk"
+PokemonTower2Blocks: INCBIN "maps/pokemontower2.blk"
 
 INCLUDE "data/mapHeaders/pokemontower3.asm"
 INCLUDE "scripts/pokemontower3.asm"
 INCLUDE "data/mapObjects/pokemontower3.asm"
-PokemonTower3Blocks:
-INCBIN "maps/pokemontower3.blk"
+PokemonTower3Blocks: INCBIN "maps/pokemontower3.blk"
 
 INCLUDE "data/mapHeaders/pokemontower4.asm"
 INCLUDE "scripts/pokemontower4.asm"
 INCLUDE "data/mapObjects/pokemontower4.asm"
-PokemonTower4Blocks:
-INCBIN "maps/pokemontower4.blk"
+PokemonTower4Blocks: INCBIN "maps/pokemontower4.blk"
 
 INCLUDE "data/mapHeaders/pokemontower5.asm"
 INCLUDE "scripts/pokemontower5.asm"
 INCLUDE "data/mapObjects/pokemontower5.asm"
-PokemonTower5Blocks:
-INCBIN "maps/pokemontower5.blk"
+PokemonTower5Blocks: INCBIN "maps/pokemontower5.blk"
 
 INCLUDE "data/mapHeaders/pokemontower6.asm"
 INCLUDE "scripts/pokemontower6.asm"
 INCLUDE "data/mapObjects/pokemontower6.asm"
-PokemonTower6Blocks:
-INCBIN "maps/pokemontower6.blk"
-	dr $60cde,$60ce8
+PokemonTower6Blocks: INCBIN "maps/pokemontower6.blk"
+
+INCBIN "maps/unusedblocks60cef.blk"
 
 INCLUDE "data/mapHeaders/pokemontower7.asm"
 INCLUDE "scripts/pokemontower7.asm"
 INCLUDE "data/mapObjects/pokemontower7.asm"
-PokemonTower7Blocks:
-INCBIN "maps/pokemontower7.blk"
+PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk"
 	dr $60ff2,$610ed
 
 INCLUDE "data/mapHeaders/viridianforest.asm"
@@ -1562,44 +1490,37 @@ INCLUDE "data/mapObjects/viridianforest.asm"
 INCLUDE "data/mapHeaders/ssanne1.asm"
 INCLUDE "scripts/ssanne1.asm"
 INCLUDE "data/mapObjects/ssanne1.asm"
-SSAnne1Blocks:
-INCBIN "maps/ssanne1.blk"
+SSAnne1Blocks: INCBIN "maps/ssanne1.blk"
 
 INCLUDE "data/mapHeaders/ssanne2.asm"
 INCLUDE "scripts/ssanne2.asm"
 INCLUDE "data/mapObjects/ssanne2.asm"
-SSAnne2Blocks:
-INCBIN "maps/ssanne2.blk"
+SSAnne2Blocks: INCBIN "maps/ssanne2.blk"
 
 INCLUDE "data/mapHeaders/ssanne4.asm"
 INCLUDE "scripts/ssanne4.asm"
 INCLUDE "data/mapObjects/ssanne4.asm"
-SSAnne4Blocks:
-INCBIN "maps/ssanne4.blk"
+SSAnne4Blocks: INCBIN "maps/ssanne4.blk"
 
 INCLUDE "data/mapHeaders/ssanne5.asm"
 INCLUDE "scripts/ssanne5.asm"
 INCLUDE "data/mapObjects/ssanne5.asm"
-SSAnne5Blocks:
-INCBIN "maps/ssanne5.blk"
+SSAnne5Blocks: INCBIN "maps/ssanne5.blk"
 
 INCLUDE "data/mapHeaders/ssanne6.asm"
 INCLUDE "scripts/ssanne6.asm"
 INCLUDE "data/mapObjects/ssanne6.asm"
-SSAnne6Blocks:
-INCBIN "maps/ssanne6.blk"
+SSAnne6Blocks: INCBIN "maps/ssanne6.blk"
 
 INCLUDE "data/mapHeaders/ssanne7.asm"
 INCLUDE "scripts/ssanne7.asm"
 INCLUDE "data/mapObjects/ssanne7.asm"
-SSAnne7Blocks:
-INCBIN "maps/ssanne7.blk"
+SSAnne7Blocks: INCBIN "maps/ssanne7.blk"
 
 INCLUDE "data/mapHeaders/ssanne8.asm"
 INCLUDE "scripts/ssanne8.asm"
 INCLUDE "data/mapObjects/ssanne8.asm"
-SSAnne8Blocks:
-INCBIN "maps/ssanne8.blk"
+SSAnne8Blocks: INCBIN "maps/ssanne8.blk"
 
 INCLUDE "data/mapHeaders/ssanne9.asm"
 INCLUDE "scripts/ssanne9.asm"
@@ -1667,8 +1588,7 @@ SECTION "bank1D",ROMX,BANK[$1D]
 
 	dr $74000,$74010
 
-PewterMartBlocks:
-INCBIN "maps/pewtermart.blk"
+PewterMartBlocks: INCBIN "maps/pewtermart.blk"
 	dr $74020,$7405c
 
 INCLUDE "engine/items/itemfinder.asm"
@@ -1677,8 +1597,7 @@ INCLUDE "scripts/ceruleancity2.asm"
 INCLUDE "data/mapHeaders/viridiangym.asm"
 INCLUDE "scripts/viridiangym.asm"
 INCLUDE "data/mapObjects/viridiangym.asm"
-ViridianGymBlocks:
-INCBIN "maps/viridiangym.blk"
+ViridianGymBlocks: INCBIN "maps/viridiangym.blk"
 
 INCLUDE "data/mapHeaders/pewtermart.asm"
 INCLUDE "scripts/pewtermart.asm"
@@ -1692,8 +1611,7 @@ INCLUDE "engine/menu/vending_machine.asm"
 INCLUDE "data/mapHeaders/gary.asm"
 INCLUDE "scripts/gary.asm"
 INCLUDE "data/mapObjects/gary.asm"
-GaryBlocks:
-INCBIN "maps/gary.blk"
+GaryBlocks: INCBIN "maps/gary.blk"
 	dr $759ef,$75dfe
 	
 INCLUDE "engine/menu/league_pc.asm"