From f3d1e99421fd1a96b7f872f6e28e976af4c57dcc Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Wed, 19 Jan 2022 19:52:01 +0100
Subject: [PATCH] Fix Tower of Hera boss music bug

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

diff --git a/hooks.asm b/hooks.asm
index f0534dd..f0fa654 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1858,12 +1858,12 @@ NOP #8
 ;JSL.l OnLoadMap
 ;================================================================================
 org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA)
-LDA $7EF00F : BNE + : NOP
+JSL CheckHeraBossDefeated : BNE + : NOP
 LDX.b #$F1 : STX $012C
 +
 ;================================================================================
 org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA)
-LDA $7EF00F : BNE + : NOP
+JSL CheckHeraBossDefeated : BNE + : NOP
 STX $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
 +
 ;================================================================================
diff --git a/music.asm b/music.asm
index 7973a49..f418dde 100644
--- a/music.asm
+++ b/music.asm
@@ -283,3 +283,10 @@ Overworld_MosaicDarkWorldChecks:
 .done
     RTL
 ;--------------------------------------------------------------------------------
+
+;--------------------------------------------------------------------------------
+; Check if the boss in ToH has been defeated (16-bit accumulator)
+CheckHeraBossDefeated:
+    LDA $7EF00F : AND #$00FF
+    RTL
+;--------------------------------------------------------------------------------