diff options
| author | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-11-04 00:06:44 -0600 |
| commit | 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch) | |
| tree | dde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /home/audio.asm | |
| parent | 53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff) | |
Sync with pokered
Diffstat (limited to 'home/audio.asm')
| -rw-r--r-- | home/audio.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/audio.asm b/home/audio.asm index fa7020ee..bf2537a7 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -93,7 +93,7 @@ UpdateMusicCTimes:: .loop push bc push hl - callba Audio1_UpdateMusic + farcall Audio1_UpdateMusic pop hl pop bc dec c @@ -144,11 +144,11 @@ Func_2223:: ld [wChannelSoundIDs + Ch6], a ld [wChannelSoundIDs + Ch7], a ld [wChannelSoundIDs + Ch8], a - ld [rNR10], a + ldh [rNR10], a ret StopAllMusic:: - ld a, $FF + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a ; plays music specified by a. If value is $ff, music is stopped PlaySound:: @@ -200,7 +200,7 @@ PlaySound:: ret GetNextMusicByte:: - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, [wAudioROMBank] call BankswitchCommon @@ -256,7 +256,7 @@ StopAllAudio:: ret DetermineAudioFunction:: - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, [wAudioROMBank] call BankswitchCommon |