fix: YA Hera Boss music fix

This commit is contained in:
Randall Rupper
2023-11-15 14:56:37 -07:00
parent 79bdace3b3
commit 52325979a7
3 changed files with 11 additions and 1 deletions

View File

@@ -1723,6 +1723,9 @@ JSL CheckHeraBossDefeated : BNE + : NOP
LDX.b #$F1 : STX.w MusicControlRequest
+
;================================================================================
org $828D6E
JSL FallingMusicFadeOut : BRA + : NOP #2 : +
;================================================================================
org $829090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA)
JSL CheckHeraBossDefeated : BNE + : NOP
STX.w MusicControlRequest ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS

View File

@@ -378,7 +378,7 @@ SpiralStairsPreCheck:
SpiralStairsPostCheck:
LDA.l DRMode : BEQ + ; if door rando enabled
LDA.b $A2 : CMP.w #$0007 : BNE .done
LDX.b #$16 : STX.w MusicControlRequest
LDA.l Music_Hera : TAX : STX.w MusicControlRequest
BRA .done
+ LDA.b RoomIndex
CMP.w #$000C : BNE +

View File

@@ -285,4 +285,11 @@ 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.w #$0015 ; if boss music is playing, then fade out
.return
RTL
;--------------------------------------------------------------------------------