diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-09 16:18:29 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-09 16:18:29 -0400 |
| commit | fadac928bccb9be1010e73df3253021312f5a2fb (patch) | |
| tree | 4c53e6ae86a8d69f520850af005a21c0d6c5ea8e /home | |
| parent | d266f788b4ba251c5a41f47745c941d81e5d7d88 (diff) | |
Clean up music bank references
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 16 | ||||
| -rw-r--r-- | home/init.asm | 2 | ||||
| -rw-r--r-- | home/vblank.asm | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/home/audio.asm b/home/audio.asm index 724b8c5f..fa62cc8a 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -30,7 +30,7 @@ asm_2324:: ; 2324 (0:2324) ld b, a ld a, d and a - ld a, Bank(Func_7d8ea) + ld a, BANK(Music_BikeRiding) jr nz, .asm_233e ld [wc0ef], a .asm_233e @@ -56,19 +56,19 @@ asm_2324:: ; 2324 (0:2324) Func_235f:: ; 235f (0:235f) ld a, [wc0ef] ld b, a - cp $2 + cp BANK(Music2_UpdateMusic) jr nz, .checkForBank08 .bank02 - ld hl, Func_9103 + ld hl, Music2_UpdateMusic jr .asm_2378 .checkForBank08 - cp $8 + cp BANK(Music8_UpdateMusic) jr nz, .bank1F .bank08 - ld hl, Func_21879 + ld hl, Music8_UpdateMusic jr .asm_2378 .bank1F - ld hl, Func_7d177 + ld hl, Music1f_UpdateMusic .asm_2378 ld c, $6 .asm_237a @@ -147,14 +147,14 @@ PlaySound:: ; 23b1 (0:23b1) ld a, [wc0ef] ld [H_LOADEDROMBANK], a ld [$2000], a - cp $2 + cp BANK(Func_9876) jr nz, .checkForBank08 .bank02 ld a, b call Func_9876 jr .asm_240b .checkForBank08 - cp $8 + cp BANK(Func_22035) jr nz, .bank1F .bank08 ld a, b diff --git a/home/init.asm b/home/init.asm index 939e81b5..ef5b5bb9 100644 --- a/home/init.asm +++ b/home/init.asm @@ -128,7 +128,7 @@ ClearVram: StopAllSounds:: - ld a, Bank(Func_9876) + ld a, BANK(Music2_UpdateMusic) ld [wc0ef], a ld [wc0f0], a xor a diff --git a/home/vblank.asm b/home/vblank.asm index ec82eb7d..15f91437 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -56,20 +56,20 @@ VBlank:: ld [H_LOADEDROMBANK], a ld [MBC3RomBank], a - cp BANK(Func_9103) + cp BANK(Music2_UpdateMusic) jr nz, .notbank2 .bank2 - call Func_9103 + call Music2_UpdateMusic jr .afterMusic .notbank2 - cp 8 + cp BANK(Music8_UpdateMusic) jr nz, .bank1F .bank8 call Func_2136e - call Func_21879 + call Music8_UpdateMusic jr .afterMusic .bank1F - call Func_7d177 + call Music1f_UpdateMusic .afterMusic callba Func_18dee ; keep track of time played |