summaryrefslogtreecommitdiff
path: root/data/maps/blocks.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-23 01:03:47 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-23 01:03:47 -0500
commitfc61d58dc45e1a205ab63cdb7a8df62450383bf9 (patch)
treeec98e2e399988436023ce237d3b68efabdf8e433 /data/maps/blocks.asm
parent14cb5a3cb097d808e839d677d54a66f176b2e0b7 (diff)
Rename some more maps
The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
Diffstat (limited to 'data/maps/blocks.asm')
-rw-r--r--data/maps/blocks.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 764ab0a70..1b3eda585 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -165,7 +165,7 @@ CharcoalKiln_Blocks:
LakeOfRageHiddenPowerHouse_Blocks:
LakeOfRageMagikarpHouse_Blocks:
GoldenrodHappinessRater_Blocks:
-GoldenrodBillsHouse_Blocks:
+BillsFamilysHouse_Blocks:
GoldenrodPPSpeechHouse_Blocks:
GoldenrodNameRater_Blocks:
VermilionFishingSpeechHouse_Blocks:
@@ -174,7 +174,7 @@ VermilionDiglettsCaveSpeechHouse_Blocks:
BluesHouse_Blocks:
PewterNidoranSpeechHouse_Blocks:
PewterSnoozeSpeechHouse_Blocks:
-FuchsiaBillSpeechHouse_Blocks:
+BillsBrothersHouse_Blocks:
LavenderSpeechHouse_Blocks:
LavenderNameRater_Blocks:
Route12SuperRodHouse_Blocks:
@@ -190,7 +190,7 @@ ViridianNicknameSpeechHouse_Blocks:
Route2NuggetSpeechHouse_Blocks:
PlayersNeighborsHouse_Blocks:
Route26HealSpeechHouse_Blocks:
-Route26DayofWeekSiblingsHouse_Blocks:
+DayOfWeekSiblingsHouse_Blocks:
Route27SandstormHouse_Blocks:
MrPsychicsHouse_Blocks:
Route5CleanseTagSpeechHouse_Blocks:
@@ -1022,8 +1022,8 @@ BattleTower1F_Blocks:
BattleTowerBattleRoom_Blocks:
INCBIN "maps/BattleTowerBattleRoom.blk"
-GoldenrodPokeComCenter2FMobile_Blocks:
- INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk"
+PokecomCenterAdminRoomMobile_Blocks:
+ INCBIN "maps/PokecomCenterAdminRoomMobile.blk"
MobileTradeRoomMobile_Blocks:
INCBIN "maps/MobileTradeRoomMobile.blk"