From 84992d010ff291eb322ff8c449bccd6adfdd0e5e Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Sun, 5 Nov 2023 08:39:13 -0600
Subject: [PATCH] Fix for playing correct track after Agas and GT cutscene

---
 bugfixes.asm | 6 +++---
 inverted.asm | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bugfixes.asm b/bugfixes.asm
index 32764e2..c8adb66 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -90,11 +90,11 @@ FixAga2Bunny:
     ++
 	JSL DecideIfBunny : BNE +
 		JSR MakeBunny
-		LDA.b #$04 : STA.w $012C ; play bunny music
-		BRA .done
 	+
-	LDA.b #$09 : STA.w $012C ; what we wrote over
 	.done
+	PHX
+		JSL Overworld_DetermineMusic : STX !REG_MUSIC_CONTROL_REQUEST
+	PLX
 RTL
 ;--------------------------------------------------------------------------------
 
diff --git a/inverted.asm b/inverted.asm
index e7b4019..dec7e99 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -151,7 +151,9 @@ GanonTowerAnimation:
         STZ $011B
         STZ $011C
         STZ $011D
-		LDA.b #$02 : STA $012C
+		PHX
+			JSL Overworld_DetermineMusic : STX !REG_MUSIC_CONTROL_REQUEST
+		PLX
         LDA.b #$09 : STA $012D
 		RTL
 	.done