Reimplemented part of the TF Cutscene for new item code

2024-04-26 07:24:54 -05:00
parent ad5eafec61
commit b76d440958
2 changed files with 12 additions and 3 deletions
--- 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
 }

--- 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