disallow input while deku spin before hover

This commit is contained in:
scawful
2024-07-07 19:15:42 -04:00
parent 91f6a178b5
commit f6eb25a7ed
3 changed files with 15 additions and 6 deletions

View File

@@ -15,6 +15,13 @@
!LinkGraphics = $BC !LinkGraphics = $BC
!ZoraDiving = $0AAB !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 AddTransformationCloud = $09912C

View File

@@ -129,15 +129,17 @@ LinkState_UsingQuake:
LDA.b #$01 : STA.w $0324 LDA.b #$01 : STA.w $0324
LDA.b #$12 : STA LinkZ LDA.b #$12 : STA LinkZ
LDA.b #$FF : STA FallTimer LDA.b #$FF : STA FallTimer
LDA.b #$01 : STA $70 LDA.b #$01 : STA DekuFloating
; ------------------------------------------------- ; -------------------------------------------------
.exit .exit
RTS RTS
.special .special
DEC $5C LDA.b DekuFloating : BEQ +
JSL DekuLink_HoverBasedOnInput DEC $5C
JSL DekuLink_HoverBasedOnInput
+
RTS RTS
} }

View File

@@ -330,7 +330,7 @@ Link_TransformMask:
DekuLink_SpinOrRecoil: DekuLink_SpinOrRecoil:
{ {
TAY TAY
LDA $70 : BEQ .spin LDA DekuFloating : BEQ .spin
TYA TYA
LDY.b #$05 ; Recoil LDY.b #$05 ; Recoil
JML $0DA435 ; JML $0DA40B JML $0DA435 ; JML $0DA40B
@@ -362,7 +362,7 @@ PrepareQuakeSpell:
LDA.b #$28 : STA.w $0362 : STA.w $0363 LDA.b #$28 : STA.w $0362 : STA.w $0363
STZ.w $0364 ; Clear Z-coordinate for the jump STZ.w $0364 ; Clear Z-coordinate for the jump
STZ $70 ; Clear bomb drop check flag STZ.w DekuFloating ; Clear the hover flag
RTL RTL
} }
@@ -466,7 +466,7 @@ DekuLink_HoverBasedOnInput:
LDA $5C : BEQ .auto_cancel 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 LDA $F0 : AND #%01000000 : BEQ .no_bomb_drop
LDY.b #$01 : LDA.b #$07 ; ANCILLA 07 LDY.b #$01 : LDA.b #$07 ; ANCILLA 07
JSL $09811F ; AncillaAdd_Bomb JSL $09811F ; AncillaAdd_Bomb