From b76d440958d6d7978ec06d30325cd0ebc95c2df8 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 26 Apr 2024 07:24:54 -0500
Subject: [PATCH] Reimplemented part of the TF Cutscene for new item code

---
 multiworld.asm |  5 ++++-
 newitems.asm   | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/multiworld.asm b/multiworld.asm
index f113106..985a0df 100644
--- a/multiworld.asm
+++ b/multiworld.asm
@@ -240,7 +240,10 @@ Multiworld_MasterSword_GrantToPlayer:
 	LDA.l PedestalSword_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLP : PLA
 
-	JSL Link_ReceiveItem ; thing we wrote over
+	CPY.b #$6A : BEQ +
+		JSL Link_ReceiveItem ; thing we wrote over
+		RTL
+	+ JSL ActivateGoal
 RTL
 }
 
diff --git a/newitems.asm b/newitems.asm
index b1039bf..06c3297 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -470,7 +470,10 @@ ItemBehavior:
         RTS
 
         .triforce
-        JSL ActivateGoal
+        LDA.b OverworldIndex : CMP.b #$80 : BNE +
+        LDA.b LinkPosX+1 : BNE +
+                JSL ActivateGoal
+        +
         RTS
 
         .goal_item
@@ -479,7 +482,10 @@ ItemBehavior:
         LDA.l GoalCounter : INC : STA.l GoalCounter
         CMP.w GoalItemRequirement : BCC +
         LDA.l TurnInGoalItems : AND.w #$00FF : BNE +
-                JSL ActivateGoal
+                SEP #$20 ; set 8-bit accumulator
+                LDA.b OverworldIndex : CMP.b #$80 : BNE +
+                LDA.b LinkPosX+1 : BNE +
+                        JSL ActivateGoal
         +
         SEP #$20 ; set 8-bit accumulator
         RTS