From 186f9aa33a25c8fd88b8e6e48f509655e8f99cb2 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 1 Aug 2023 10:26:32 -0400
Subject: [PATCH] Disable player input during cutscenes

---
 Sprites/Kydrog/kydrog.asm |  1 +
 Sprites/farore.asm        | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Sprites/Kydrog/kydrog.asm b/Sprites/Kydrog/kydrog.asm
index d91ec72..33f3fef 100644
--- a/Sprites/Kydrog/kydrog.asm
+++ b/Sprites/Kydrog/kydrog.asm
@@ -97,6 +97,7 @@ Sprite_Kydrog_Main:
   Kydrog_AttractPlayer:
   {
     LDA.w SprTimerA, X : BNE +
+    LDA #$00 : STA $7EF303
     %ShowUnconditionalMessage($21)
     %GotoAction(2)
   +
diff --git a/Sprites/farore.asm b/Sprites/farore.asm
index 4c28dcf..f53d585 100644
--- a/Sprites/farore.asm
+++ b/Sprites/farore.asm
@@ -3,6 +3,23 @@
 ;
 ;==============================================================================
 
+InCutScene = $7EF303
+
+org $0083F8
+LDA InCutScene : BEQ .notInCutscene
+    STZ $F0
+    STZ $F2
+    STZ $F4
+    STZ $F6
+    STZ $F8
+    STZ $FA ; kill all input
+
+.notInCutscene
+
+RTS
+
+warnpc $00841E
+
 incsrc sprite_macros.asm
 incsrc sprite_functions_hooks.asm
 
@@ -111,6 +128,7 @@ Sprite_Farore_Main:
   ; 00
   IntroStart:
   {
+    LDA #$01 : STA InCutScene
     LDA $B6 : CMP.b #$01 : BEQ .maku_area
               CMP.b #$02 : BEQ .waiting
     
@@ -173,6 +191,7 @@ Sprite_Farore_Main:
     LDA.w SprTimerA, X : BNE +
 
     STZ $2F
+    LDA #$00 : STA InCutScene
     %ShowUnconditionalMessage($0E) ; "I am Farore, the Oracle of Secrets."
     
     %GotoAction(4)
@@ -197,6 +216,7 @@ Sprite_Farore_Main:
   ; 05
   FaroreFollowPlayer:
   {
+    LDA #$01 : STA InCutScene
     LDA WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
     LDA.b #$08 : STA.b $49 ; Auto-movement north
     %PlayAnimation(3, 4, 8)
@@ -239,7 +259,6 @@ Sprite_Farore_Main:
   {
     %PlayAnimation(5, 5, 8)
 
-
     RTS
   }