diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-11 02:49:08 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-11 02:55:01 -0400 |
| commit | 946a213f09db39243c883ad677a22de738977836 (patch) | |
| tree | d91d86afc81cd9265e47df9929539c1c15274303 | |
| parent | 66ef18384779629d3653892c0cfa821ced6ad3c5 (diff) | |
fix labels for SoundRestart and UpdateSound
| -rw-r--r-- | audio/engine.asm | 7 | ||||
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/vblank.asm | 28 | ||||
| -rw-r--r-- | main.asm | 18 |
4 files changed, 28 insertions, 29 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index d1f3376a9..ea48825d4 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -3,12 +3,11 @@ ; Interfaces are in bank 0. ; Notable functions: -; UpdateSound (called during VBlank) ; FadeMusic ; PlayStereoSFX ; PlayCry -SoundRestart: ; e8000 +_SoundRestart: ; e8000 ; restart sound operation ; clear all relevant hardware registers & wram push hl @@ -65,7 +64,7 @@ MusicFadeRestart: ; e803d push af ld a, [MusicFadeIDLo] push af - call SoundRestart + call _SoundRestart pop af ld [MusicFadeIDLo], a pop af @@ -85,7 +84,7 @@ MusicOff: ; e8057 ret ; e805c -UpdateSound: ; e805c +_UpdateSound: ; e805c ; called once per frame ; no use updating audio if it's not playing ld a, [MusicPlaying] diff --git a/home/init.asm b/home/init.asm index ead75975c..46ff1de4b 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,6 +1,6 @@ Reset: ; 150 di - call CleanSoundRestart + call SoundRestart xor a ld [$ffde], a call ClearPalettes @@ -170,7 +170,7 @@ Init: ; 17d ld a, $30 call Predef - call CleanSoundRestart + call SoundRestart xor a ld [CurMusic], a jp GameInit diff --git a/home/vblank.asm b/home/vblank.asm index 71114964e..f9e68785d 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -167,9 +167,9 @@ VBlank0: ; 2b1 call Joypad ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ld a, [$ff8a] rst Bankswitch ; restore bank @@ -189,9 +189,9 @@ VBlank2: ; 325 ld [$ff8a], a ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] @@ -265,9 +265,9 @@ VBlank1: ; 337 ei ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -369,9 +369,9 @@ VBlank3: ; 396 ei ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -434,9 +434,9 @@ VBlank4: ; 3df call AskSerial ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -486,9 +486,9 @@ VBlank5: ; 400 ei ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -531,9 +531,9 @@ VBlank6: ; 436 ld [VBlankOccurred], a ; update sound - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) rst Bankswitch ; bankswitch - call UpdateSound + call _UpdateSound ; restore bank ld a, [$ff8a] rst Bankswitch @@ -2985,7 +2985,7 @@ Function3b3c: ; 3b3c ; 3b4e -CleanSoundRestart: ; 3b4e +SoundRestart: ; 3b4e push hl push de @@ -2994,11 +2994,11 @@ CleanSoundRestart: ; 3b4e ld a, [hROMBank] push af - ld a, BANK(SoundRestart) + ld a, BANK(_SoundRestart) ld [hROMBank], a ld [MBC3RomBank], a - call SoundRestart + call _SoundRestart pop af ld [hROMBank], a @@ -3012,7 +3012,7 @@ CleanSoundRestart: ; 3b4e ; 3b6a -CleanUpdateSound: ; 3b6a +UpdateSound: ; 3b6a push hl push de @@ -3021,11 +3021,11 @@ CleanUpdateSound: ; 3b6a ld a, [hROMBank] push af - ld a, BANK(UpdateSound) + ld a, BANK(_UpdateSound) ld [hROMBank], a ld [MBC3RomBank], a - call UpdateSound + call _UpdateSound pop af ld [hROMBank], a @@ -3065,7 +3065,7 @@ PlayMusic: ; 3b97 ld a, [hROMBank] push af - ld a, BANK(_PlayMusic) ; and BANK(SoundRestart) + ld a, BANK(_PlayMusic) ; and BANK(_SoundRestart) ld [hROMBank], a ld [MBC3RomBank], a @@ -3077,7 +3077,7 @@ PlayMusic: ; 3b97 jr .end .nomusic - call SoundRestart + call _SoundRestart .end pop af @@ -3316,7 +3316,7 @@ Function3cb4: ; 3cb4 and a ret z dec a - call CleanUpdateSound + call UpdateSound jr .asm_3cb4 ; 3cbc |