From 144817fe90d78fd4d95f1ff17c355bf4c05a53e9 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 29 Jun 2023 19:28:49 -0500
Subject: [PATCH] Fixed issue where Aga Door flag prevented TF Cutscene

---
 elder.asm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/elder.asm b/elder.asm
index 4ab0111..43b6a1e 100644
--- a/elder.asm
+++ b/elder.asm
@@ -121,6 +121,9 @@ pushpc
     org $0589B1
     MasterSword_ConditionalHandleReceipt_DoReceipt:
 
+    org $0588DF
+    JSL MasterSword_CheckIfPulled : PLX : NOP #2
+    db $90 ; BCC instead of BEQ
     org $05890E
     JSL MasterSword_ConditionalActivateCutscene
     org $05895F
@@ -134,6 +137,12 @@ pushpc
     JSL MasterSword_ConditionalHandleReceipt : NOP #2
 pullpc
 
+MasterSword_CheckIfPulled:
+    CPX.b #$80 : BEQ +
+        - CLC : RTL ; not on pedestal screen, continue with cutscene
+    + LDA.l $7EF280,X : AND.b #$40 ; what we wrote over
+    BEQ - : SEC : RTL
+
 MasterSword_ConditionalActivateCutscene:
     LDA.w $0D90,X : BNE .specialCutscene
         JML Sprite_CheckDamageToPlayerSameLayerLong ; what we wrote over