From 2995889157adf2557e606d5adf9c140b8115ac7f Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Thu, 10 Oct 2019 13:45:24 -0700
Subject: [PATCH] Use boss flag instead of pendant/crystal flag for Hera boss
 music

Customizer allows the player to start with the pendant/crystal assigned to Hera, which breaks boss music, so use the boss defeated flag instead
---
 hooks.asm             |  4 ++--
 pendantcrystalhud.asm | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/hooks.asm b/hooks.asm
index e43fcdf..0731804 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1710,12 +1710,12 @@ NOP #8
 ;JSL.l OnLoadMap
 ;================================================================================
 org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA)
-JSL.l CheckHeraObject : BNE + : NOP
+LDA $7EF00F : BNE + : NOP
 LDX.b #$F1 : STX $012C
 +
 ;================================================================================
 org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA)
-JSL.l CheckHeraObject : BNE + : NOP
+LDA $7EF00F : BNE + : NOP
 STX $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
 +
 ;================================================================================
diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index e6b2cbe..0dfa71e 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -139,16 +139,6 @@ RTL
 		LDA.b #03 ; light world - pendants
 RTL
 ;================================================================================
-CheckHeraObject:
-	LDA CrystalPendantFlags_2_hera : AND.w #$00FF : BNE .crystal
-	
-	.pendant
-	LDA $7EF374 : AND.l CrystalPendantFlags_hera : AND.w #$00FF
-RTL
-	.crystal
-	LDA $7EF37A : AND.l CrystalPendantFlags_hera : AND.w #$00FF
-RTL
-;================================================================================
 ;GetPendantCrystalWorld:
 ;	PHB : PHK : PLB
 ;	PHX