minimum vcancel

nstbayless · Jul 28, 2024 · 5ffb4a5 · 5ffb4a5
1 parent 670ba41
commit 5ffb4a5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/_common.asm b/_common.asm
@@ -0,0 +1,2 @@
+VSP_CONTROL_ZERO_VSPEED=$1C
+MINIMUM_VSP_CANCEL=$0E
diff --git a/_custom_jump.asm b/_custom_jump.asm
@@ -97,6 +97,10 @@ check_vcancel:
         BNE __vcancel_rts
         LDA vspint ; already moving downward?
         BPL __vcancel_rts
+        lda vsp_control
+        cmp #MINIMUM_VSP_CANCEL
+        bcc __vcancel_rts
+        
         
         LDA #VSP_CONTROL_ZERO_VSPEED
         STA vsp_control

diff --git a/patch-jp.asm b/patch-jp.asm
@@ -4,8 +4,7 @@ include "pre.asm"
 
 include "ram-jp.asm"
 include "offsets-jp.asm"
-
-VSP_CONTROL_ZERO_VSPEED=$1C
+include "_common.asm"
 
 MACRO BANKSWAP bank
     lda #bank

diff --git a/patch-us.asm b/patch-us.asm
@@ -4,8 +4,7 @@ include "pre.asm"
 
 include "ram-us.asm"
 include "offsets-us.asm"
-
-VSP_CONTROL_ZERO_VSPEED=$1C
+include "_common.asm"
 
 MACRO BANKSWAP bank
     ; unclear why we | $80, but everyone else is doing it...
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		VSP_CONTROL_ZERO_VSPEED=$1C
		MINIMUM_VSP_CANCEL=$0E