From 0c032c7d06e6c7adac407c3c213ad8acd3a6d94e Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Sat, 28 Sep 2019 18:12:52 -0700
Subject: [PATCH] Fix post-Aga1 Kakariko music

---
 hooks.asm |  8 ++++++++
 music.asm | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hooks.asm b/hooks.asm
index be5b455..15ee71d 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2255,6 +2255,14 @@ JML.l PreOverworld_LoadProperties_ChooseMusic
 org $028389  ; <- Bank02.asm:763
 PreOverworld_LoadProperties_SetSong:
 ;--------------------------------------------------------------------------------
+; Remove Aga1 check for Kakariko music, always play track 7
+org $02A992 ; (BCS $A999)
+NOP #2
+org $02A9B0 ; (BCS $A9B7)
+NOP #2
+org $02C1C8 ; (BCS $C1CC)
+NOP #2
+;--------------------------------------------------------------------------------
 org $05CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
 JSL PsychoSolder_MusicCheck
 NOP #1
diff --git a/music.asm b/music.asm
index 1bf8203..3c080fe 100644
--- a/music.asm
+++ b/music.asm
@@ -22,9 +22,9 @@ PreOverworld_LoadProperties_ChooseMusic:
     LDX.b #$07 ; Default village theme
 
     ; Check what phase we're in
-    LDA $7EF3C5 : CMP.b #$03 : !BLT +
-        LDX.b #$02 ; Default light world theme (phase >=3)
-    +
+    ;LDA $7EF3C5 : CMP.b #$03 : !BLT +
+    ;    LDX.b #$02 ; Default light world theme (phase >=3)
+    ;+
 
     ; Check if we're entering the village
     LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks
@@ -184,9 +184,9 @@ BirdTravel_LoadTargetAreaMusic:
     LDX.b #$07 ; Default village theme
 
     ; Check what phase we're in
-    LDA $7EF3C5 : CMP.b #$03 : !BLT +
-        LDX.b #$02 ; Default light world theme (phase >=3)
-    +
+    ;LDA $7EF3C5 : CMP.b #$03 : !BLT +
+    ;    LDX.b #$02 ; Default light world theme (phase >=3)
+    ;+
 
     ; Check if we're entering the village
     LDA $8A : CMP.b #$18 : BEQ .endOfLightWorldChecks