summaryrefslogtreecommitdiff
path: root/common.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-14 20:26:00 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-14 20:26:00 -0600
commit74b8e8169fc7df8c001fe3771851ba89accc54cd (patch)
tree352aedc69584bbe5345b925c1da0946997034a67 /common.asm
parentc16a1b6125f4b82dfb9b0a9df1e3f534fac3bcf0 (diff)
fix CeruleanPokecenterTexts
hg-commit-id: 51ac47654d4a
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm13
1 files changed, 8 insertions, 5 deletions
diff --git a/common.asm b/common.asm
index d8dbf82e..ccc5b57a 100644
--- a/common.asm
+++ b/common.asm
@@ -31388,7 +31388,7 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
db $06 ; tileset
db $04, $07 ; dimensions (y, x)
- dw CeruleanPokecenterBlocks, $464b, CeruleanPokecenterScript ; blocks, texts, scripts
+ dw CeruleanPokecenterBlocks, CeruleanPokecenterTexts, CeruleanPokecenterScript ; blocks, texts, scripts
db $00 ; connections
dw CeruleanPokecenterObject ; objects
@@ -31398,13 +31398,16 @@ CeruleanPokecenterScript: ; 0x5c645
jp $3c3c
; 0x5c64b
-INCBIN "baserom.gbc",$5c64b,$8
+CeruleanPokecenterTexts:
+ dw CeruleanPokecenterText1, CeruleanPokecenterText2, CeruleanPokecenterText3, CeruleanPokecenterText4
CeruleanPokecenterText4:
- db $f6, $ff
+ db $f6
+
+CeruleanPokecenterText1: ; 0x5c654
+ db $ff
-CeruleanPokecenterText2:
-CeruleanPokecenterText1: ; 0x5c655
+CeruleanPokecenterText2: ; 0x5c655
TX_FAR _CeruleanPokecenterText1
db $50