From 71916fb3200442e56b8b338538ea091f72c70480 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 12 May 2023 20:37:33 -0500
Subject: [PATCH] Fixed Hera boss music playing after boss defeated

---
 hooks.asm | 2 +-
 music.asm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hooks.asm b/hooks.asm
index 438cdb4..1e112b2 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2338,7 +2338,7 @@ JSL.l HeartPieceSpawnDelayFix
 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
 BCS $18 ; reinsert the near branch that appears midway through what we overrode
-NOP #22
+BRA + : NOP #20 : +
 ;--------------------------------------------------------------------------------
 org $06C0B0 ; <- 340B0 - sprite prep
 JSL.l HeartPieceSpritePrep
diff --git a/music.asm b/music.asm
index a7b6e9b..71adc06 100644
--- a/music.asm
+++ b/music.asm
@@ -210,6 +210,6 @@ Underworld_DoorDown_Entry:
 ;
 ; A=16bit XY=8bit
 CheckHeraBossDefeated:
-LDA RoomDataWRAM[$08].high : AND.w #$00FF : BEQ +
+LDA RoomDataWRAM[$07].high : AND.w #$00FF : BEQ +
     SEC : RTL
 + CLC : RTL