alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Fix for Hera boss music fadeout when falling

Browse Source
This commit is contained in:
codemann8
2023-10-10 01:26:30 -05:00
parent edad66a5a8
commit 70badade72
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hooks.asm
View File

@@ -1967,6 +1967,9 @@ NOP #8
org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A) org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A)
JSL CheckHeraBossDefeated : NOP JSL CheckHeraBossDefeated : NOP
;================================================================================ ;================================================================================
org $028D6E
JSL FallingMusicFadeOut : BRA + : NOP #2 : +
;================================================================================
org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A) org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A)
JSL CheckHeraBossDefeated : NOP JSL CheckHeraBossDefeated : NOP
;================================================================================ ;================================================================================

7
music.asm
View File

@@ -213,3 +213,10 @@ CheckHeraBossDefeated:
LDA RoomDataWRAM[$07].high : AND.w #$00FF : BEQ + LDA RoomDataWRAM[$07].high : AND.w #$00FF : BEQ +
SEC : RTL SEC : RTL
+ CLC : 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