From c12898c9e0fddca17561a1be543cd0a73e8ed977 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 10 Aug 2024 13:58:02 -0400 Subject: [PATCH] remove sword shield from farore sequence --- Sprites/NPCs/farore.asm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Sprites/NPCs/farore.asm b/Sprites/NPCs/farore.asm index b07ee84..7047368 100644 --- a/Sprites/NPCs/farore.asm +++ b/Sprites/NPCs/farore.asm @@ -85,7 +85,7 @@ Sprite_Farore_Main: dw MoveUpTowardsFarore dw MoveLeftTowardsFarore dw WaitAndMessage - dw FaroreGiveSwordAndShield + dw Farore_ProceedWithCutscene dw FaroreFollowPlayer dw MakuArea_FaroreFollowPlayer dw MakuArea_FaroreWaitForKydrog @@ -166,16 +166,11 @@ Sprite_Farore_Main: } ; 04 - FaroreGiveSwordAndShield: + Farore_ProceedWithCutscene: { - ; Give Link the Sword and shield LDA.w SprTimerA, X : BNE ++ - - LDY.b #$00 : STZ $02E9 - JSL Link_ReceiveItem - - %GotoAction(5) - ++ + %GotoAction(5) + ++ RTS }