diff options
Diffstat (limited to 'home/audio.asm')
| -rw-r--r-- | home/audio.asm | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/home/audio.asm b/home/audio.asm index f71aa3d0..cb6f0988 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -1,4 +1,4 @@ -PlayDefaultMusic:: ; 216b (0:216b) +PlayDefaultMusic:: call WaitForSoundToFinish xor a ld c, a @@ -6,7 +6,7 @@ PlayDefaultMusic:: ; 216b (0:216b) ld [wLastMusicSoundID], a jr PlayDefaultMusicCommon -PlayDefaultMusicFadeOutCurrent:: ; 2176 (0:2176) +PlayDefaultMusicFadeOutCurrent:: ; Fade out the current music and then play the default music. ld c, 10 ld d, 0 @@ -17,7 +17,8 @@ PlayDefaultMusicFadeOutCurrent:: ; 2176 (0:2176) ld [wLastMusicSoundID], a ld c, 8 ld d, c -PlayDefaultMusicCommon:: ; 2118 (0:2118) + +PlayDefaultMusicCommon:: ld a, [wWalkBikeSurfState] and a jr z, .walking @@ -35,7 +36,7 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118) ld b, a ld a, d and a ; should current music be faded out first? - ld a, $1f ; BANK(Music_BikeRiding) + ld a, BANK(Music_BikeRiding) jr nz, .next2 ; Only change the audio ROM bank if the current music isn't going to be faded @@ -67,7 +68,7 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118) ld [wNewSoundID], a jp PlaySound -CheckForNoBikingMusicMap:: ; 21c8 (0:21c8) +CheckForNoBikingMusicMap:: ; probably used to not change music upon getting on bike ld a, [wCurMap] cp ROUTE_23 @@ -86,20 +87,20 @@ CheckForNoBikingMusicMap:: ; 21c8 (0:21c8) scf ret -UpdateMusic6Times:: ; 21e3 (0:21e3) - ld c, $6 +UpdateMusic6Times:: + ld c, 6 UpdateMusicCTimes:: .loop push bc push hl - callba Audio1_UpdateMusic ; 2:509d + callba Audio1_UpdateMusic pop hl pop bc dec c jr nz, .loop ret -CompareMapMusicBankWithCurrentBank:: ; 21f5 (0:21f5) +CompareMapMusicBankWithCurrentBank:: ; Compares the map music's audio ROM bank with the current audio ROM bank ; and updates the audio ROM bank variables. ; Returns whether the banks are different in carry. @@ -126,7 +127,7 @@ CompareMapMusicBankWithCurrentBank:: ; 21f5 (0:21f5) scf ret -PlayMusic:: ; 2211 (0:2211) +PlayMusic:: ld b, a ld [wNewSoundID], a xor a @@ -137,7 +138,7 @@ PlayMusic:: ; 2211 (0:2211) ld a, b jr PlaySound -Func_2223:: ; 2223 (0:2223) +Func_2223:: xor a ld [wChannelSoundIDs + CH4], a ld [wChannelSoundIDs + CH5], a @@ -146,11 +147,11 @@ Func_2223:: ; 2223 (0:2223) ld [rNR10], a ret -StopAllMusic:: ; 2233 (0:2233) +StopAllMusic:: ld a, $FF ld [wNewSoundID], a ; plays music specified by a. If value is $ff, music is stopped -PlaySound:: ; 2238 (0:2238) +PlaySound:: push hl push de push bc @@ -165,16 +166,17 @@ PlaySound:: ; 2238 (0:2238) ld [wChannelSoundIDs + CH7], a .next ld a, [wAudioFadeOutControl] - and a + and a ; has a fade-out length been specified? jr z, .noFadeOut ld a, [wNewSoundID] - and a - jr z, .done + and a ; is the new sound ID 0? + jr z, .done ; if so, do nothing xor a ld [wNewSoundID], a ld a, [wLastMusicSoundID] - cp $ff - jr nz, .fadeOut + cp $ff ; has the music been stopped? + jr nz, .fadeOut ; if not, fade out the current music +; If it has been stopped, start playing the new music immediately. xor a ld [wAudioFadeOutControl], a .noFadeOut @@ -197,7 +199,7 @@ PlaySound:: ; 2238 (0:2238) pop hl ret -GetNextMusicByte:: ; 2288 (0:2288) +GetNextMusicByte:: ld a, [H_LOADEDROMBANK] push af ld a, [wAudioROMBank] @@ -223,7 +225,7 @@ GetNextMusicByte:: ; 2288 (0:2288) ld a, e ret -InitMusicVariables:: ; 22aa (0:22aa) +InitMusicVariables:: push hl push de push bc @@ -233,7 +235,7 @@ InitMusicVariables:: ; 22aa (0:22aa) pop hl ret -InitSFXVariables:: ; 22c0 (0:22c0) +InitSFXVariables:: push hl push de push bc @@ -243,7 +245,7 @@ InitSFXVariables:: ; 22c0 (0:22c0) pop hl ret -StopAllAudio:: ; 22d6 (0:22d6) +StopAllAudio:: push hl push de push bc @@ -253,7 +255,7 @@ StopAllAudio:: ; 22d6 (0:22d6) pop hl ret -DetermineAudioFunction:: ; 22ec (0:22ec) +DetermineAudioFunction:: ld a, [H_LOADEDROMBANK] push af ld a, [wAudioROMBank] |