summaryrefslogtreecommitdiff
path: root/common.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-14 18:13:22 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-14 18:13:22 -0600
commit76080c39787ccd0511bd38c937e45b971e056413 (patch)
tree9e92ed98c3658ff57bd66df6457f927e40787c83 /common.asm
parentcb30ae5b83d661ac3e778713c32c63440fd6d910 (diff)
clean up FuchsiaPokecenterTexts
hg-commit-id: ca749beb802f
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm11
1 files changed, 7 insertions, 4 deletions
diff --git a/common.asm b/common.asm
index cb94c1dd..b90aeeb9 100644
--- a/common.asm
+++ b/common.asm
@@ -36478,7 +36478,7 @@ FuchsiaHouse1Object: ; 0x75031 (size=38)
FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
db $06 ; tileset
db $04, $07 ; dimensions (y, x)
- dw FuchsiaPokecenterBlocks, $5069, FuchsiaPokecenterScript ; blocks, texts, scripts
+ dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTexts, FuchsiaPokecenterScript ; blocks, texts, scripts
db $00 ; connections
dw FuchsiaPokecenterObject ; objects
@@ -36488,10 +36488,13 @@ FuchsiaPokecenterScript: ; 0x75063
jp $3c3c
; 0x75069
-INCBIN "baserom.gbc",$75069,$9
+FuchsiaPokecenterTexts:
+ dw FuchsiaPokecenterText1, FuchsiaPokecenterText2, FuchsiaPokecenterText3, FuchsiaPokecenterText4
-FuchsiaPokecenterText2:
-FuchsiaPokecenterText1: ; 0x75071 or 0x75072
+FuchsiaPokecenterText1: ; 0x75071
+ db $ff
+
+FuchsiaPokecenterText2: ; 0x75072
TX_FAR _FuchsiaPokecenterText1
db $50