diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-03 14:42:46 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-03 14:42:46 -0400 |
| commit | b7ed43bd568045f265fc96abee480ff8bb8e2177 (patch) | |
| tree | 2fbfc9ff6bdd61ffc64ec0d94ee264a414f61f48 /home/audio.asm | |
| parent | 6de043f87d500014c7cc9c85a203f387a9cd4c7a (diff) | |
Make pokeyellow build correctly.
Diffstat (limited to 'home/audio.asm')
| -rw-r--r-- | home/audio.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/home/audio.asm b/home/audio.asm index 21f8bb2c..051fa0a1 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -86,7 +86,7 @@ Func_21c8:: ; 21c8 (0:21c8) scf ret -Func_21e3:: ; 21e5 (0:21e5) +Func_21e3:: ; 21e3 (0:21e3) ld c,$6 .loop push bc @@ -166,16 +166,16 @@ PlayMusic:: ; 2211 (0:2211) Func_2223:: ; 2223 (0:2223) xor a - ld [wc02a],a - ld [wc02b],a - ld [wc02c],a - ld [wc02d],a + ld [wChannelSoundIDs + CH4],a + ld [wChannelSoundIDs + CH5],a + ld [wChannelSoundIDs + CH6],a + ld [wChannelSoundIDs + CH7],a ld [rNR10],a ret StopAllMusic:: ; 2233 (0:2233) ld a,$FF - ld [wc0ee],a + ld [wNewSoundID],a ; plays music specified by a. If value is $ff, music is stopped PlaySound:: ; 2238 (0:2238) push hl @@ -186,10 +186,10 @@ PlaySound:: ; 2238 (0:2238) and a jr z, .next xor a - ld [wc02a], a - ld [wc02b], a - ld [wc02c], a - ld [wc02d], a + ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + CH5], a + ld [wChannelSoundIDs + CH6], a + ld [wChannelSoundIDs + CH7], a .next ld a, [wAudioFadeOutControl] and a @@ -203,7 +203,7 @@ PlaySound:: ; 2238 (0:2238) cp $ff jr nz, .fadeOut xor a - ld [wMusicHeaderPointer], a + ld [wAudioFadeOutControl], a .noFadeOut xor a ld [wNewSoundID], a |