summaryrefslogtreecommitdiff
path: root/scripts/route22.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-10 00:00:12 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-10 00:00:12 -0500
commit66bc517605860c9f716a176ed467d34097985895 (patch)
tree4c126cbb3bbdb2b0a236375c2140e7a6c25260a6 /scripts/route22.asm
parent8a6d46f3d9ba4fb6939eb9ea9949f47aa8608d4a (diff)
parent2b018159997e3b580efd114ff4e3548a0de3cbc5 (diff)
Merge branch 'master' of https://github.com/YamaArashi/pokered
Diffstat (limited to 'scripts/route22.asm')
-rwxr-xr-xscripts/route22.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/route22.asm b/scripts/route22.asm
index 041f75e6..f6f6778e 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -89,7 +89,7 @@ Route22Script0: ; 50f00 (14:4f00)
and a
jr z, .asm_50f4e
ld a, $ff
- ld [wc0ee], a
+ ld [wNewSoundID], a
call PlaySound
.asm_50f4e
ld c, BANK(Music_MeetRival)
@@ -168,7 +168,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
- ld [wc0ee], a
+ ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
ld a, [wcf0d]
@@ -242,11 +242,11 @@ Route22Script_5104e: ; 5104e (14:504e)
and a
jr z, .skipYVisibilityTesta
ld a, $ff
- ld [wc0ee], a
+ ld [wNewSoundID], a
call PlaySound
.skipYVisibilityTesta
ld a, $ff
- ld [wc0ee], a
+ ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateTempo
ld a, $2
@@ -327,7 +327,7 @@ Route22Script5: ; 510df (14:50df)
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $ff
- ld [wc0ee], a
+ ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStartAndTempo
ld a, [wcf0d]