aboutsummaryrefslogtreecommitdiffstats
path: root/home/audio.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 18:56:44 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 18:56:44 -0400
commit2b7961759b3786725b95ee8f4a0b6e556091db7a (patch)
tree6287d4bb7bad7d012f804dc18856341a09fc015b /home/audio.asm
parentMerge branch 'master' of https://github.com/iimarckus/pokered (diff)
downloadpokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz
pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz
pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip
Fixes.
Diffstat (limited to 'home/audio.asm')
-rw-r--r--home/audio.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/home/audio.asm b/home/audio.asm
index 52f29b9b..21f8bb2c 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -24,7 +24,7 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118)
cp $2
jr z, .surfing
call Func_21c8
- jr c, .asm_21ac
+ jr c, .walking
ld a, $d2 ; MUSIC_BIKE_RIDING
jr .next
@@ -206,7 +206,7 @@ PlaySound:: ; 2238 (0:2238)
ld [wMusicHeaderPointer], a
.noFadeOut
xor a
- ld [wc0ee], a
+ ld [wNewSoundID], a
call Func_22ec
jr .done
.fadeOut