summaryrefslogtreecommitdiff
path: root/scripts/pewterpokecenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/pewterpokecenter.asm')
-rwxr-xr-xscripts/pewterpokecenter.asm9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm
index 584878eb..46d4d509 100755
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/pewterpokecenter.asm
@@ -27,7 +27,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
call DelayFrames
ld hl, JigglypuffFacingDirections
ld de, wJigglypuffFacingDirections
- ld bc, 4
+ ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
call CopyData
ld a, [wSpriteStateData1 + 3 * $10 + $2]
@@ -50,7 +50,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
push hl
ld hl, wJigglypuffFacingDirections
ld de, wJigglypuffFacingDirections - 1
- ld bc, 4
+ ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
call CopyData
ld a, [wJigglypuffFacingDirections - 1]
ld [wJigglypuffFacingDirections + 3], a
@@ -59,9 +59,9 @@ PewterPokecenterText3: ; 5c59b (17:459b)
ld c, 24
call DelayFrames
- ld a, [wc026]
+ ld a, [wChannelSoundIDs]
ld b, a
- ld a, [wc027]
+ ld a, [wChannelSoundIDs + CH1]
or b
jr nz, .loop
@@ -79,6 +79,7 @@ JigglypuffFacingDirections: ; 5c608 (17:4608)
db $30 | SPRITE_FACING_LEFT
db $30 | SPRITE_FACING_UP
db $30 | SPRITE_FACING_RIGHT
+JigglypuffFacingDirectionsEnd:
PewterPokecenterText4: ; 5c60c (17:460c)
db $f6