summaryrefslogtreecommitdiff
path: root/maps/blockdata_1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/blockdata_1.asm')
-rw-r--r--maps/blockdata_1.asm231
1 files changed, 77 insertions, 154 deletions
diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm
index 83bb76b96..0595a5ca6 100644
--- a/maps/blockdata_1.asm
+++ b/maps/blockdata_1.asm
@@ -1,76 +1,58 @@
-Route32_BlockData: ; 0xa8000
+Route32_BlockData:
INCBIN "maps/Route32.blk"
-; 0xa81c2
-Route40_BlockData: ; 0xa81c2
+Route40_BlockData:
INCBIN "maps/Route40.blk"
-; 0xa8276
-Route36_BlockData: ; 0xa8276
+Route36_BlockData:
INCBIN "maps/Route36.blk"
-; 0xa8384
-Route44_BlockData: ; 0xa8384
+Route44_BlockData:
INCBIN "maps/Route44.blk"
-; 0xa8492
-Route28_BlockData: ; 0xa8492
+Route28_BlockData:
INCBIN "maps/Route28.blk"
-; 0xa8546
-BetaHerosHouse_BlockData: ; 0xa8546
+BetaHerosHouse_BlockData:
INCBIN "maps/BetaHerosHouse.blk"
-; 0xa8552
-CeladonCity_BlockData: ; 0xa8552
+CeladonCity_BlockData:
INCBIN "maps/CeladonCity.blk"
-; 0xa86ba
-SaffronCity_BlockData: ; 0xa86ba
+SaffronCity_BlockData:
INCBIN "maps/SaffronCity.blk"
-; 0xa8822
-Route2_BlockData: ; 0xa8822
+Route2_BlockData:
INCBIN "maps/Route2.blk"
-; 0xa8930
-ElmsHouse_BlockData: ; 0xa8930
+ElmsHouse_BlockData:
INCBIN "maps/ElmsHouse.blk"
-; 0xa8940
-BetaSproutTower1_BlockData: ; 0xa8940
+BetaSproutTower1_BlockData:
INCBIN "maps/BetaSproutTower1.blk"
-; 0xa899a
-Route11_BlockData: ; 0xa899a
+Route11_BlockData:
INCBIN "maps/Route11.blk"
-; 0xa8a4e
-BetaSproutTower5_BlockData: ; 0xa8a4e
+BetaSproutTower5_BlockData:
INCBIN "maps/BetaSproutTower5.blk"
-; 0xa8aa8
-Route15_BlockData: ; 0xa8aa8
+Route15_BlockData:
INCBIN "maps/Route15.blk"
-; 0xa8b5c
-BetaSproutTower9_BlockData: ; 0xa8b5c
+BetaSproutTower9_BlockData:
INCBIN "maps/BetaSproutTower9.blk"
-; 0xa8b80
-Route19_BlockData: ; 0xa8b80
+Route19_BlockData:
INCBIN "maps/Route19.blk"
-; 0xa8c34
-BetaBlackthornCity_BlockData: ; 0xa8c34
+BetaBlackthornCity_BlockData:
INCBIN "maps/BetaBlackthornCity.blk"
-; 0xa8d9c
-Route10South_BlockData: ; 0xa8d9c
+Route10South_BlockData:
INCBIN "maps/Route10South.blk"
-; 0xa8df6
-CinnabarPokeCenter2FBeta_BlockData: ; 0xa8df6
+CinnabarPokeCenter2FBeta_BlockData:
CeruleanPokeCenter2FBeta_BlockData:
Route10PokeCenter2FBeta_BlockData:
VermilionPokeCenter2FBeta_BlockData:
@@ -82,117 +64,89 @@ CeladonPokeCenter2FBeta_BlockData:
ViridianPokeCenter2FBeta_BlockData:
SaffronPokeCenter2FBeta_BlockData:
INCBIN "maps/CinnabarPokeCenter2FBeta.blk"
-; 0xa8e16
-Route41_BlockData: ; 0xa8e16
+Route41_BlockData:
INCBIN "maps/Route41.blk"
-; 0xa90b9
-Route33_BlockData: ; 0xa90b9
+Route33_BlockData:
INCBIN "maps/Route33.blk"
-; 0xa9113
-Route45_BlockData: ; 0xa9113
+Route45_BlockData:
INCBIN "maps/Route45.blk"
-; 0xa92d5
-Route29_BlockData: ; 0xa92d5
+Route29_BlockData:
INCBIN "maps/Route29.blk"
-; 0xa93e3
-Route37_BlockData: ; 0xa93e3
+Route37_BlockData:
INCBIN "maps/Route37.blk"
-; 0xa943d
-LavenderTown_BlockData: ; 0xa943d
+LavenderTown_BlockData:
INCBIN "maps/LavenderTown.blk"
-; 0xa9497
-PalletTown_BlockData: ; 0xa9497
+PalletTown_BlockData:
INCBIN "maps/PalletTown.blk"
-; 0xa94f1
-Route25_BlockData: ; 0xa94f1
+Route25_BlockData:
INCBIN "maps/Route25.blk"
-; 0xa95ff
-Route24_BlockData: ; 0xa95ff
+Route24_BlockData:
INCBIN "maps/Route24.blk"
-; 0xa9659
-BetaVioletCity_BlockData: ; 0xa9659
+BetaVioletCity_BlockData:
INCBIN "maps/BetaVioletCity.blk"
-; 0xa97c1
-Route3_BlockData: ; 0xa97c1
+Route3_BlockData:
INCBIN "maps/Route3.blk"
-; 0xa98cf
-PewterCity_BlockData: ; 0xa98cf
+PewterCity_BlockData:
INCBIN "maps/PewterCity.blk"
-; 0xa9a37
-BetaIlexForest_BlockData: ; 0xa9a37
+BetaIlexForest_BlockData:
INCBIN "maps/BetaIlexForest.blk"
-; 0xa9b9f
-BetaSproutTower2_BlockData: ; 0xa9b9f
+BetaSproutTower2_BlockData:
INCBIN "maps/BetaSproutTower2.blk"
-; 0xa9bf9
-Route12_BlockData: ; 0xa9bf9
+Route12_BlockData:
INCBIN "maps/Route12.blk"
-; 0xa9d07
-BetaGoldenrodCity_BlockData: ; 0xa9d07
+BetaGoldenrodCity_BlockData:
INCBIN "maps/BetaGoldenrodCity.blk"
-; 0xa9e6f
-Route20_BlockData: ; 0xa9e6f
+Route20_BlockData:
INCBIN "maps/Route20.blk"
-; 0xa9f7d
-BetaSproutTower6_BlockData: ; 0xa9f7d
+BetaSproutTower6_BlockData:
INCBIN "maps/BetaSproutTower6.blk"
-; 0xa9fd7
-BetaPokecenterMainHouse_BlockData: ; 0xa9fd7
+BetaPokecenterMainHouse_BlockData:
INCBIN "maps/BetaPokecenterMainHouse.blk"
-; 0xa9ff7
-Route30_BlockData: ; 0xa9ff7
+Route30_BlockData:
INCBIN "maps/Route30.blk"
-; 0xaa105
-Route26_BlockData: ; 0xaa105
+Route26_BlockData:
INCBIN "maps/Route26.blk"
-; 0xaa321
-Route42_BlockData: ; 0xaa321
+Route42_BlockData:
INCBIN "maps/Route42.blk"
-; 0xaa42f
-Route34_BlockData: ; 0xaa42f
+Route34_BlockData:
INCBIN "maps/Route34.blk"
-; 0xaa53d
-Route46_BlockData: ; 0xaa53d
+Route46_BlockData:
INCBIN "maps/Route46.blk"
-; 0xaa5f1
-FuchsiaCity_BlockData: ; 0xaa5f1
+FuchsiaCity_BlockData:
INCBIN "maps/FuchsiaCity.blk"
-; 0xaa759
-Route38_BlockData: ; 0xaa759
+Route38_BlockData:
INCBIN "maps/Route38.blk"
-; 0xaa80d
-BetaCianwoodCity_BlockData: ; 0xaa80d
+BetaCianwoodCity_BlockData:
INCBIN "maps/BetaCianwoodCity.blk"
-; 0xaa867
-OlivineVoltorbHouse_BlockData: ; 0xaa867
+OlivineVoltorbHouse_BlockData:
OlivineHouseBeta_BlockData:
OlivinePunishmentSpeechHouse_BlockData:
OlivineGoodRodHouse_BlockData:
@@ -243,9 +197,8 @@ GuideGentsHouse_BlockData:
CherrygroveEvolutionSpeechHouse_BlockData:
Route30BerrySpeechHouse_BlockData:
INCBIN "maps/OlivineVoltorbHouse.blk"
-; 0xaa877
-SafariZoneFuchsiaGateBeta_BlockData: ; 0xaa877
+SafariZoneFuchsiaGateBeta_BlockData:
Route19FuchsiaGate_BlockData:
Route43MahoganyGate_BlockData:
Route43Gate_BlockData:
@@ -258,81 +211,62 @@ Route2Gate_BlockData:
Route2946Gate_BlockData:
Route5SaffronCityGate_BlockData:
INCBIN "maps/SafariZoneFuchsiaGateBeta.blk"
-; 0xaa88b
-BetaTeakCity_BlockData: ; 0xaa88b
+BetaTeakCity_BlockData:
INCBIN "maps/BetaTeakCity.blk"
-; 0xaa9f3
-BetaCherrygroveCity_BlockData: ; 0xaa9f3
+BetaCherrygroveCity_BlockData:
INCBIN "maps/BetaCherrygroveCity.blk"
-; 0xaaa4d
-CinnabarIsland_BlockData: ; 0xaaa4d
+CinnabarIsland_BlockData:
INCBIN "maps/CinnabarIsland.blk"
-; 0xaaaa7
-Route4_BlockData: ; 0xaaaa7
+Route4_BlockData:
INCBIN "maps/Route4.blk"
-; 0xaab5b
-Route8_BlockData: ; 0xaab5b
+Route8_BlockData:
INCBIN "maps/Route8.blk"
-; 0xaac0f
-BetaSproutTower3_BlockData: ; 0xaac0f
+BetaSproutTower3_BlockData:
INCBIN "maps/BetaSproutTower3.blk"
-; 0xaac69
-ViridianCity_BlockData: ; 0xaac69
+ViridianCity_BlockData:
INCBIN "maps/ViridianCity.blk"
-; 0xaadd1
-Route13_BlockData: ; 0xaadd1
+Route13_BlockData:
INCBIN "maps/Route13.blk"
-; 0xaaedf
-Route21_BlockData: ; 0xaaedf
+Route21_BlockData:
INCBIN "maps/Route21.blk"
-; 0xaaf93
-BetaSproutTower7_BlockData: ; 0xaaf93
+BetaSproutTower7_BlockData:
INCBIN "maps/BetaSproutTower7.blk"
-; 0xaafed
-Route17_BlockData: ; 0xaafed
+Route17_BlockData:
INCBIN "maps/Route17.blk"
-; 0xab1af
-BetaMahoganyTown_BlockData: ; 0xab1af
+BetaMahoganyTown_BlockData:
INCBIN "maps/BetaMahoganyTown.blk"
-; 0xab209
-Route31_BlockData: ; 0xab209
+Route31_BlockData:
INCBIN "maps/Route31.blk"
-; 0xab2bd
-Route27_BlockData: ; 0xab2bd
+Route27_BlockData:
INCBIN "maps/Route27.blk"
-; 0xab425
-Route35_BlockData: ; 0xab425
+Route35_BlockData:
INCBIN "maps/Route35.blk"
-; 0xab4d9
-Route43_BlockData: ; 0xab4d9
+Route43_BlockData:
INCBIN "maps/Route43.blk"
-; 0xab5e7
-Route39_BlockData: ; 0xab5e7
+Route39_BlockData:
INCBIN "maps/Route39.blk"
-; 0xab69b
-KrissHouse1F_BlockData: ; 0xab69b
+KrissHouse1F_BlockData:
INCBIN "maps/KrissHouse1F.blk"
-; 0xab6af
-Route38EcruteakGate_BlockData: ; 0xab6af
+Route38EcruteakGate_BlockData:
Route42EcruteakGate_BlockData:
Route32RuinsofAlphGate_BlockData:
IlexForestAzaleaGate_BlockData:
@@ -343,44 +277,33 @@ Route7SaffronGate_BlockData:
Route1718Gate_BlockData:
Route31VioletGate_BlockData:
INCBIN "maps/Route38EcruteakGate.blk"
-; 0xab6c3
-BetaAzaleaTown_BlockData: ; 0xab6c3
+BetaAzaleaTown_BlockData:
INCBIN "maps/BetaAzaleaTown.blk"
-; 0xab82b
-VermilionCity_BlockData: ; 0xab82b
+VermilionCity_BlockData:
INCBIN "maps/VermilionCity.blk"
-; 0xab993
-BetaOlivineCity_BlockData: ; 0xab993
+BetaOlivineCity_BlockData:
INCBIN "maps/BetaOlivineCity.blk"
-; 0xabafb
-BetaNewBarkTown_BlockData: ; 0xabafb
+BetaNewBarkTown_BlockData:
INCBIN "maps/BetaNewBarkTown.blk"
-; 0xabb55
-ElmsLab_BlockData: ; 0xabb55
+ElmsLab_BlockData:
INCBIN "maps/ElmsLab.blk"
-; 0xabb73
-CeruleanCity_BlockData: ; 0xabb73
+CeruleanCity_BlockData:
INCBIN "maps/CeruleanCity.blk"
-; 0xabcdb
-Route1_BlockData: ; 0xabcdb
+Route1_BlockData:
INCBIN "maps/Route1.blk"
-; 0xabd8f
-Route5_BlockData: ; 0xabd8f
+Route5_BlockData:
INCBIN "maps/Route5.blk"
-; 0xabde9
-Route9_BlockData: ; 0xabde9
+Route9_BlockData:
INCBIN "maps/Route9.blk"
-; 0xabef7
-Route22_BlockData: ; 0xabef7
+Route22_BlockData:
INCBIN "maps/Route22.blk"
-; 0xabfab