From 115873f5cb5d79ccc44cc595ba3f69c7739c88a4 Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Sun, 23 Sep 2018 00:23:01 -0400
Subject: [PATCH] Fix double flute song

---
 flute.asm | 7 +++++++
 hooks.asm | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/flute.asm b/flute.asm
index 9315cce..b9ce68d 100644
--- a/flute.asm
+++ b/flute.asm
@@ -91,8 +91,15 @@ FreeDuckCheck:
     LDA.b #$37
     
     JSL AddWeathervaneExplosion
+	BRA .skipSong
 	.done
     SEP #$20
 	LDA.b #$80 : STA $03F0 ; thing we wrote over, load flute timer
+	LDA.b #$13
+RTL
+	.skipSong
+	SEP #$20
+	LDA.b #$80 : STA $03F0 ; thing we wrote over, load flute timer
+	LDA.b #$00
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/hooks.asm b/hooks.asm
index 809fbb8..4496b20 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1966,7 +1966,10 @@ JSL.l Overworld_LoadNewTiles
 NOP #$02
 ;================================================================================
 org $07A3E2 ;<- 3A3E2 Bank07.asm:5764 (LDA.b #$80 : STA $03F0)
-JSL.l FreeDuckCheck : NOP
+JSL.l FreeDuckCheck : BEQ +
+	NOP
+	skip 3 ; a JSR we need to keep
++
 ;================================================================================
 org $07A9AC ; <- 3A9AC - Bank07.asm:6628 (LDA $0C : ORA $0E : STA $00 : AND.b #$0C : BEQ BRANCH_BETA)
 JML.l MirrorBonk