From f6eb25a7eda3e8358aa95f4a51e85060d54fc201 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 7 Jul 2024 19:15:42 -0400
Subject: [PATCH] disallow input while deku spin before hover

---
 Masks/all_masks.asm     | 7 +++++++
 Masks/deku_mask.asm     | 8 +++++---
 Masks/mask_routines.asm | 6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Masks/all_masks.asm b/Masks/all_masks.asm
index 29924c7..62ec36e 100644
--- a/Masks/all_masks.asm
+++ b/Masks/all_masks.asm
@@ -15,6 +15,13 @@
 !LinkGraphics = $BC
 !ZoraDiving = $0AAB
 
+; If set, deku is hovering and can drop bombs
+DekuFloating   = $70
+
+; If set, on deku platform and can hover
+; Unset, will shoot deku bubble instead
+DekuHover      = $71
+
 ; =========================================================
 
 AddTransformationCloud = $09912C
diff --git a/Masks/deku_mask.asm b/Masks/deku_mask.asm
index 34beb16..3387b07 100644
--- a/Masks/deku_mask.asm
+++ b/Masks/deku_mask.asm
@@ -129,15 +129,17 @@ LinkState_UsingQuake:
       LDA.b #$01 : STA.w $0324
       LDA.b #$12 : STA LinkZ
       LDA.b #$FF : STA FallTimer
-      LDA.b #$01 : STA $70
+      LDA.b #$01 : STA DekuFloating
       ; -------------------------------------------------
 
   .exit
   RTS
 
   .special
-  DEC $5C 
-  JSL DekuLink_HoverBasedOnInput
+  LDA.b DekuFloating : BEQ +
+    DEC $5C 
+    JSL DekuLink_HoverBasedOnInput
+  +
   RTS
 }
 
diff --git a/Masks/mask_routines.asm b/Masks/mask_routines.asm
index 2667a47..d05f51f 100644
--- a/Masks/mask_routines.asm
+++ b/Masks/mask_routines.asm
@@ -330,7 +330,7 @@ Link_TransformMask:
 DekuLink_SpinOrRecoil:
 {
   TAY
-  LDA $70 : BEQ .spin
+  LDA DekuFloating : BEQ .spin
     TYA
     LDY.b #$05 ; Recoil
     JML $0DA435 ; JML $0DA40B
@@ -362,7 +362,7 @@ PrepareQuakeSpell:
   LDA.b #$28 : STA.w $0362 : STA.w $0363 
   STZ.w $0364 ; Clear Z-coordinate for the jump
 
-  STZ $70 ; Clear bomb drop check flag 
+  STZ.w DekuFloating ; Clear the hover flag
 
   RTL
 }
@@ -466,7 +466,7 @@ DekuLink_HoverBasedOnInput:
   
   LDA $5C : BEQ .auto_cancel
 
-  LDA $70 : BEQ .no_bomb_drop
+  LDA DekuFloating : BEQ .no_bomb_drop
     LDA $F0 : AND #%01000000 : BEQ .no_bomb_drop
       LDY.b #$01 : LDA.b #$07 ; ANCILLA 07
       JSL $09811F ; AncillaAdd_Bomb