diff --git a/hooks.asm b/hooks.asm index 0c72759..8279aca 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1967,6 +1967,9 @@ NOP #8 org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A) JSL CheckHeraBossDefeated : NOP ;================================================================================ +org $028D6E +JSL FallingMusicFadeOut : BRA + : NOP #2 : + +;================================================================================ org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A) JSL CheckHeraBossDefeated : NOP ;================================================================================ diff --git a/music.asm b/music.asm index 71adc06..f53a848 100644 --- a/music.asm +++ b/music.asm @@ -213,3 +213,10 @@ CheckHeraBossDefeated: LDA RoomDataWRAM[$07].high : AND.w #$00FF : BEQ + SEC : RTL + CLC : RTL + +FallingMusicFadeOut: + CMP.w #$0017 ; what we wrote over + BNE .return + LDA.w $0130 : AND.w #$00FF : CMP.b #$15 ; if boss music is playing, then fade out +.return + RTL