diff options
author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-10 17:01:45 -0400 |
---|---|---|
committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-10 17:01:45 -0400 |
commit | d59aff582f2e2cfddb5d1972505931d031f170c8 (patch) | |
tree | 901d4b94b5d9dba5d47c8dd435518d4e1a378f61 | |
parent | 91fcccaf11c4fd9aa3811a6331268a853b951beb (diff) |
Finish working on remaining audio function.
-rw-r--r-- | home/audio.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/home/audio.asm b/home/audio.asm index 910d3532..c157e692 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -257,7 +257,7 @@ Func_22d6:: ; 22d6 (0:22d6) pop hl ret -Func_22ec:: ; 22dc (0:22ec) +Func_22ec:: ; 22ec (0:22ec) ; incomplete ld a,[H_LOADEDROMBANK] push af @@ -268,32 +268,25 @@ Func_22ec:: ; 22dc (0:22ec) .bank02 ld a, b call Func_984e - jr .asm_240b + jr .done .checkForBank08 cp BANK(Func_218bb) - jr nz, .bank1F + jr nz, .checkForBank1F .bank08 ld a, b call Func_22035 - jr .asm_240b -.bank1F + jr .done +.checkForBank1F + cp BANK(Func_7d10d) + jr nz, .unknownBank ld a, b - call Func_7d8ea -.asm_240b - ld a, [$ffb9] - ld [H_LOADEDROMBANK], a - ld [$2000], a - jr .asm_2425 -.asm_2414 - ld a, b - ld [wcfca], a - ld a, [wMusicHeaderPointer] - ld [wcfc8], a - ld [wcfc9], a - ld a, b - ld [wMusicHeaderPointer], a -.asm_2425 - pop bc - pop de - pop hl + call Func_7d10d + jr .done +.bank20 + ld a,b + call Func_82bd4 +.done + pop af + call BankswitchCommon ret + |