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

Fixed Hera boss music playing after boss defeated

Browse Source 
# Conflicts:
#	music.asm
This commit is contained in:
codemann8
2023-05-12 20:37:33 -05:00
committed by aerinon
parent 1c0b7b5320
commit 8d0585ec33
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks.asm
View File

@@ -2318,7 +2318,7 @@ JSL.l DrawHeartPieceGFX
org $05F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination org $05F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination
JSL.l HeartPieceGet JSL.l HeartPieceGet
BCS $18 ; reinsert the near branch that appears midway through what we overrode BCS $18 ; reinsert the near branch that appears midway through what we overrode
NOP #22 BRA + : NOP #20 : +
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $06C0B0 ; <- 340B0 - sprite prep org $06C0B0 ; <- 340B0 - sprite prep
JSL.l HeartPieceSpritePrep JSL.l HeartPieceSpritePrep

6
music.asm
View File

@@ -306,6 +306,6 @@ Underworld_DoorDown_Entry:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Check if the boss in ToH has been defeated (16-bit accumulator) ; Check if the boss in ToH has been defeated (16-bit accumulator)
CheckHeraBossDefeated: CheckHeraBossDefeated:
LDA RoomDataWRAM[$08].high : AND #$00FF LDA RoomDataWRAM[$07].high : AND.w #$00FF : BEQ +
RTL SEC : RTL
;-------------------------------------------------------------------------------- + CLC : RTL