ref: 091e55bfa64456d8d02f353f290e5806444e1684
parent: 2955e28a42e5bc90363f9466a4ba9d2c2ad33454
author: yenatch <[email protected]>
date: Fri Jul 18 04:26:22 EDT 2014
Add labels for maps that reuse blockdata.
--- a/maps/blockdata_1.asm
+++ b/maps/blockdata_1.asm
@@ -71,6 +71,16 @@
; 0xa8df6
CinnabarPokeCenter2FBeta_BlockData: ; 0xa8df6
+CeruleanPokeCenter2FBeta_BlockData:
+Route10PokeCenter2FBeta_BlockData:
+VermilionPokeCenter2FBeta_BlockData:
+PewterPokeCEnter2FBeta_BlockData:
+FuchsiaPokeCenter2FBeta_BlockData:
+LavenderPokeCenter2FBeta_BlockData:
+PokeCenter2F_BlockData:
+CeladonPokeCenter2FBeta_BlockData:
+ViridianPokeCenter2FBeta_BlockData:
+SaffronPokeCenter2FBeta_BlockData:
INCBIN "maps/CinnabarPokeCenter2FBeta.blk"
; 0xa8e16
@@ -183,10 +193,70 @@
; 0xaa867
OlivineVoltorbHouse_BlockData: ; 0xaa867
+OlivineHouseBeta_BlockData:
+OlivinePunishmentSpeechHouse_BlockData:
+OlivineGoodRodHouse_BlockData:
+Route39Farmhouse_BlockData:
+MahoganyRedGyaradosSpeechHouse_BlockData:
+BlackthornDragonSpeechHouse_BlockData:
+BlackthornDodrioTradeHouse_BlockData:
+MoveDeletersHouse_BlockData:
+CeruleanGymBadgeSpeechHouse_BlockData:
+CeruleanPoliceStation_BlockData:
+CeruleanTradeSpeechHouse_BlockData:
+BillsHouse_BlockData:
+CharcoalKiln_BlockData:
+LakeofRageHiddenPowerHouse_BlockData:
+LakeofRageMagikarpHouse_BlockData:
+GoldenrodHappinessRater_BlockData:
+GoldenrodBillsHouse_BlockData:
+GoldenrodPPSpeechHouse_BlockData:
+GoldenrodNameRatersHouse_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/OlivineVoltorbHouse.blk"
; 0xaa877
SafariZoneFuchsiaGateBeta_BlockData: ; 0xaa877
+Route19FuchsiaGate_BlockData:
+Route43MahoganyGate_BlockData:
+Route43Gate_BlockData:
+Route35Goldenrodgate_BlockData:
+Route36RuinsofAlphgate_BlockData:
+Route34IlexForestGate_BlockData:
+Route6SaffronGate_BlockData:
+Route40BattleTowerGate_BlockData:
+Route2Gate_BlockData:
+Route2946Gate_BlockData:
+Route5SaffronCityGate_BlockData:
INCBIN "maps/SafariZoneFuchsiaGateBeta.blk"
; 0xaa88b
@@ -263,6 +333,15 @@
; 0xab6af
Route38EcruteakGate_BlockData: ; 0xab6af
+Route42EcruteakGate_BlockData:
+Route32RuinsofAlphGate_BlockData:
+IlexForestAzaleaGate_BlockData:
+Route15FuchsiaGate_BlockData:
+Route8SaffronGate_BlockData:
+Route16Gate_BlockData:
+Route7SaffronGate_BlockData:
+Route1718Gate_BlockData:
+Route31VioletGate_BlockData:
INCBIN "maps/Route38EcruteakGate.blk"
; 0xab6c3
--- a/maps/blockdata_2.asm
+++ b/maps/blockdata_2.asm
@@ -7,6 +7,18 @@
; 0xac10e
OlivineMart_BlockData: ; 0xac10e
+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/OlivineMart.blk"
; 0xac126
@@ -19,6 +31,26 @@
; 0xac2e8
OlivinePokeCenter1F_BlockData: ; 0xac2e8
+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/OlivinePokeCenter1F.blk"
; 0xac2fc
@@ -51,30 +83,37 @@
; 0xac3b4
GoldenrodDeptStore1F_BlockData: ; 0xac3b4
+CeladonDeptStore1F_BlockData:
INCBIN "maps/GoldenrodDeptStore1F.blk"
; 0xac3d4
GoldenrodDeptStore2F_BlockData: ; 0xac3d4
+CeladonDeptStore2F_BlockData:
INCBIN "maps/GoldenrodDeptStore2F.blk"
; 0xac3f4
GoldenrodDeptStore3F_BlockData: ; 0xac3f4
+CeladonDeptStore3F_BlockData:
INCBIN "maps/GoldenrodDeptStore3F.blk"
; 0xac414
GoldenrodDeptStore4F_BlockData: ; 0xac414
+CeladonDeptStore4F_BlockData:
INCBIN "maps/GoldenrodDeptStore4F.blk"
; 0xac434
GoldenrodDeptStore5F_BlockData: ; 0xac434
+CeladonDeptStore5F_BlockData:
INCBIN "maps/GoldenrodDeptStore5F.blk"
; 0xac454
GoldenrodDeptStore6F_BlockData: ; 0xac454
+CeladonDeptStore6F_BlockData:
INCBIN "maps/GoldenrodDeptStore6F.blk"
; 0xac474
GoldenrodDeptStoreElevator_BlockData: ; 0xac474
+CeladonDeptStoreElevator_BlockData:
INCBIN "maps/GoldenrodDeptStoreElevator.blk"
; 0xac478
@@ -111,10 +150,14 @@
; 0xac53b
TradeCenter_BlockData: ; 0xac53b
+TimeCapsule_BlockData:
INCBIN "maps/TradeCenter.blk"
; 0xac54f
EcruteakLugiaSpeechHouse_BlockData: ; 0xac54f
+EcruteakItemfinderHouse_BlockData:
+VioletNicknameSpeechHouse_BlockData:
+VioletOnixTradeHouse_BlockData:
INCBIN "maps/EcruteakLugiaSpeechHouse.blk"
; 0xac55f
@@ -135,10 +178,12 @@
; 0xac7d5
NationalPark_BlockData: ; 0xac7d5
+NationalParkBugContest_BlockData:
INCBIN "maps/NationalPark.blk"
; 0xac9f1
Route6UndergroundEntrance_BlockData: ; 0xac9f1
+Route5UndergroundEntrance_BlockData:
INCBIN "maps/Route6UndergroundEntrance.blk"
; 0xaca01
@@ -167,6 +212,9 @@
; 0xacbdf
RuinsofAlphHoOhChamber_BlockData: ; 0xacbdf
+RuinsofAlphKabutoChamber_BlockData:
+RuinsofAlphOmanyteChamber_BlockData:
+RuinsofAlphAerodactylChamber_BlockData:
INCBIN "maps/RuinsofAlphHoOhChamber.blk"
; 0xacbf3
@@ -447,6 +495,7 @@
; 0xaf885
MahoganyMart1F_BlockData: ; 0xaf885
+MountMoonGiftShop_BlockData:
INCBIN "maps/MahoganyMart1F.blk"
; 0xaf895
--- a/maps/blockdata_3.asm
+++ b/maps/blockdata_3.asm
@@ -83,6 +83,7 @@
; 0xb094d
OlivineCafe_BlockData: ; 0xb094d
+SafariZoneMainOffice_BlockData:
INCBIN "maps/OlivineCafe.blk"
; 0xb095d
@@ -111,6 +112,7 @@
; 0xb0acc
PokemonFanClub_BlockData: ; 0xb0acc
+SafariZoneWardensHome_BlockData:
INCBIN "maps/PokemonFanClub.blk"
; 0xb0ae0
@@ -215,6 +217,7 @@
; 0xb10fb
OlivinePortPassage_BlockData: ; 0xb10fb
+VermilionPortPassage_BlockData:
INCBIN "maps/OlivinePortPassage.blk"
; 0xb1155
@@ -283,6 +286,9 @@
; 0xb1773
RuinsofAlphHoOhItemRoom_BlockData: ; 0xb1773
+RuinsofAlphKabutoItemRoom_BlockData:
+RuinsofAlphOmanyteItemRoom_BlockData:
+RuinsofAlphAerodactylItemRoom_BlockData:
INCBIN "maps/RuinsofAlphHoOhItemRoom.blk"
; 0xb1787