From 53a10802779531e9fe2af647d9b2fce7b5e29bc6 Mon Sep 17 00:00:00 2001
From: nstbayless <nstbayless@gmail.com>
Date: Fri, 26 Jul 2024 11:01:13 -0700
Subject: [PATCH] unified jp/us hacks

---
 _improved_controls.asm | 109 ++++++++++++++++++++++++++++++++++++
 offsets-jp.asm         |   3 +-
 offsets-us.asm         |   2 +-
 out-jp.ips             | Bin 304 -> 358 bytes
 patch-jp.asm           |  99 +++------------------------------
 patch-us.asm           | 122 ++---------------------------------------
 test_protocol.txt      |   1 +
 7 files changed, 126 insertions(+), 210 deletions(-)
 create mode 100644 _improved_controls.asm

diff --git a/_improved_controls.asm b/_improved_controls.asm
new file mode 100644
index 0000000..9d9a8a8
--- /dev/null
+++ b/_improved_controls.asm
@@ -0,0 +1,109 @@
+; --------------------------------------------------------------------
+BANK $E
+BASE $8000
+
+include "_hooks.asm"
+
+; custom code
+FROM empty_bank_e
+
+stair_jumping:
+    ; pressed jump button?
+    LDA joypad_pressed
+    AND #$80 ; (pressed jump)
+    
+    BEQ __recover_step
+    
+    ; perform jump
+    LDA #$06 ; begin jump
+    STA simon_state
+    
+    ; double-return
+    ; (quit out of stair logic as well)
+    PLA
+    PLA
+    RTS
+    
+__recover_step:
+    ; here we perform the detour logic to resume a standard tick
+    ; however, we must do different logic depending on state/call site
+
+    LDA simon_state
+    CMP #$14 ; stair walk
+    BEQ __recover_stair_walk
+__recover_stair_idle:
+    LDA joypad_down
+    AND #$40
+    RTS
+__recover_stair_walk:
+    JMP stair_walk_resume
+
+crouch_direction:
+    LDA joypad_down
+    LSR A
+    BCC +
+    LDX #$00
+    STX facing
++
+    LSR A
+    BCC +
+    LDX #$01
+    STX facing
++
+    ; resolve detour: trampoline
+    JMP crouch_resolve
+  
+custom_knockback:
+    BANKSWAP CUSTOM_JUMP_BANK
+custom_knockback_bankswap_loc:
+    rts
+    
+custom_jump_then_standard_jump:
+    ; push return address (-1)
+    LDA #>standard_jump
+    PHA
+    LDA #<standard_jump-1
+    PHA
+custom_jump_jsr:
+    BANKSWAP CUSTOM_JUMP_BANK
+custom_jump_bankswap_loc:
+    rts
+
+jumping_attack:
+    JSR custom_jump_jsr
+    JMP attack_resolve ; .. not necessarily air-attacking?
+    
+LIMIT $C000
+
+; --------------------------------------------------------------------
+BANK CUSTOM_JUMP_BANK
+BASE $8000
+
+FROM empty_bank_jump
+    include "_custom_jump.asm"
+    include "_custom_knockback.asm"
+end_bank_0_core:
+    
+FROM custom_knockback_bankswap_loc-5
+ATLEAST end_bank_0_core
+custom_knockback_bankswap_loc_pre:
+    BANKSWAP PLAYER_UPDATE_BANK
+    
+    ; (bankswap)
+    EXACT custom_knockback_bankswap_loc
+    
+    jsr _custom_knockback
+    jmp custom_knockback_bankswap_loc_pre
+end_custom_knockback_bankswap_tramp
+    
+FROM custom_jump_bankswap_loc-5
+ATLEAST end_custom_knockback_bankswap_tramp
+custom_jump_bankswap_loc_pre:
+    BANKSWAP PLAYER_UPDATE_BANK
+    
+    ; (bankswap)
+    EXACT custom_jump_bankswap_loc
+    
+    jsr _custom_jump
+    jmp custom_jump_bankswap_loc_pre
+end_custom_jump_bankswap_tramp:
\ No newline at end of file
diff --git a/offsets-jp.asm b/offsets-jp.asm
index b426623..d0b8b34 100644
--- a/offsets-jp.asm
+++ b/offsets-jp.asm
@@ -14,6 +14,7 @@ stair_walk_resume=$9A43
 sypha_jumptable=$9C19
 alucard_jumptable=$A59B
 empty_bank_e=$BF39
+empty_bank_jump=$BED0 ; actually can go a bit earlier
 setAndSaveLowerBank=$E2D0
 PLAYER_UPDATE_BANK=$E
-CUSTOM_JUMP_BANK=$E
\ No newline at end of file
+CUSTOM_JUMP_BANK=$1
\ No newline at end of file
diff --git a/offsets-us.asm b/offsets-us.asm
index 83ffdf2..43cc5cb 100644
--- a/offsets-us.asm
+++ b/offsets-us.asm
@@ -14,7 +14,7 @@ stair_walk_resume=$9A2D
 sypha_jumptable=$9C02
 alucard_jumptable=$A5B4
 empty_bank_e=$BFAB
-empty_bank_0=$BED0 ; we actually can go a bit earlier
+empty_bank_jump=$BED0 ; we actually can go a bit earlier
 setAndSaveLowerBank=$E2E6
 PLAYER_UPDATE_BANK=$E
 CUSTOM_JUMP_BANK=$0
\ No newline at end of file
diff --git a/out-jp.ips b/out-jp.ips
index cfd0a6d655c73c1d52665fead7300a2d6c4b7370..101a5e65b24018547ae8261f8c371d3cebb343f8 100644
GIT binary patch
delta 195
zcmdnM^o&U=z%j(xgQ4yLL)qE}_77}po7q1wCah%W<z$`MZ#?m-vV+6^l`_3ISa)_V
zTgkEJ6H5X^eKiC3N<M`Pj}(OW`(*EDsBeeyFYNOv-_P9a!NB_Jl|uG@=E;2wOobCg
zoz=qjGtb<@z@lKe{}uDB-3-h?2J;+4pyYn$rJKRjeoqFki6`XrwY(;<E@J3g!2+Tg
gfwT`#%SuL|WeF>%d#o(;fUp(H_xmiK?&|Lb0DoIbeE<Le

delta 143
zcmaFHw1G)9z%j(xgSpv*f%VlZg$4VWC-*Th*-hNwY<_t^^UN&_EDFv0Uop?x&A<#~
zFwZdrO73S~x*1IE_heYVl5y@QmX*^zR+f1vWKLH|o<32^m`%ZDzt7_7lO-ADCi*F9
qoZY`truPQx&dy~kIo5n)Nm#1oHGy>zL*EJ(5X}greRx`2{oMfJyfttD

diff --git a/patch-jp.asm b/patch-jp.asm
index 68f619b..f51e517 100644
--- a/patch-jp.asm
+++ b/patch-jp.asm
@@ -7,102 +7,17 @@ include "offsets-jp.asm"
 
 VSP_CONTROL_ZERO_VSPEED=$1C
 
-; --------------------------------------------------------------------
-BANK $E
-BASE $8000
-
-FROM $81FE
-getting_hit:
-
-FROM $8307
-knockback_step:
-
-FROM $8AC6
-standard_state_0:
-
-
-FROM $952D
-standard_idle:
-
-FROM $9624
-standard_begin_jump:
-
-FROM $9667
-standard_walk:
-
-include "_hooks.asm"
-
-; custom code
-FROM empty_bank_e
-    LDA #$01
-    STA hspint,X
-custom_jump_then_standard_jump:
-    ; push return address (-1)
-    LDA #>standard_jump
-    PHA
-    LDA #<standard_jump-1
-    PHA
-custom_jump_jsr:
-    include "_custom_jump.asm"
+MACRO BANKSWAP bank
+    lda #bank
+    jsr setAndSaveLowerBank
+ENDM
 
-jumping_attack:
-    JSR custom_jump_jsr
-    JMP attack_resolve ; .. not necessarily air-attacking?
-
-stair_jumping:
-    ; pressed jump button?
-    LDA joypad_pressed
-    AND #$80 ; (pressed jump)
-    
-    BEQ __recover_step
-    
-    ; perform jump
-    LDA #$06 ; begin jump
-    STA simon_state
-    
-    ; double-return
-    ; (quit out of stair logic as well)
-    PLA
-    PLA
-    RTS
-    
-__recover_step:
-    ; here we perform the detour logic to resume a standard tick
-    ; however, we must do different logic depending on state/call site
-
-    LDA simon_state
-    CMP #$14 ; stair walk
-    BEQ __recover_stair_walk
-__recover_stair_idle:
-    LDA joypad_down
-    AND #$40
-    RTS
-__recover_stair_walk:
-    JMP stair_walk_resume
-
-custom_knockback:
-    include "_custom_knockback.asm"
-
-crouch_direction:
-    LDA joypad_down
-    LSR A
-    BCC +
-    LDX #$00
-    STX facing
-+
-    LSR A
-    BCC +
-    LDX #$01
-    STX facing
-+
-    ; (detour trampoline continue)
-    JMP crouch_resolve
-    
-LIMIT $C000
+include "_improved_controls.asm"
     
 ; --------------------------------------------------------------------
 BANK $F
 BASE $C000
 
 ; jump by table
-FROM $E814
\ No newline at end of file
+FROM $E814
+jump_by_table:
\ No newline at end of file
diff --git a/patch-us.asm b/patch-us.asm
index 2d45331..e04a04e 100644
--- a/patch-us.asm
+++ b/patch-us.asm
@@ -7,124 +7,14 @@ include "offsets-us.asm"
 
 VSP_CONTROL_ZERO_VSPEED=$1C
 
-; --------------------------------------------------------------------
-BANK $E
-BASE $8000
-
-include "_hooks.asm"
-
-; custom code
-FROM empty_bank_e
-
-stair_jumping:
-    ; pressed jump button?
-    LDA joypad_pressed
-    AND #$80 ; (pressed jump)
-    
-    BEQ __recover_step
-    
-    ; perform jump
-    LDA #$06 ; begin jump
-    STA simon_state
-    
-    ; double-return
-    ; (quit out of stair logic as well)
-    PLA
-    PLA
-    RTS
-    
-__recover_step:
-    ; here we perform the detour logic to resume a standard tick
-    ; however, we must do different logic depending on state/call site
-
-    LDA simon_state
-    CMP #$14 ; stair walk
-    BEQ __recover_stair_walk
-__recover_stair_idle:
-    LDA joypad_down
-    AND #$40
-    RTS
-__recover_stair_walk:
-    JMP stair_walk_resume
-
-crouch_direction:
-    LDA joypad_down
-    LSR A
-    BCC +
-    LDX #$00
-    STX facing
-+
-    LSR A
-    BCC +
-    LDX #$01
-    STX facing
-+
-    ; resolve detour: trampoline
-    JMP crouch_resolve
-  
-custom_knockback:
-    lda #((CUSTOM_JUMP_BANK << 1) | $80)
+MACRO BANKSWAP bank
+    ; unclear why we | $80, but everyone else is doing it...
+    lda #((bank << 1) | $80)
     jsr setAndSaveLowerBank
-custom_knockback_bankswap_loc:
-    rts
-    
-custom_jump_then_standard_jump:
-    ; push return address (-1)
-    LDA #>standard_jump
-    PHA
-    LDA #<standard_jump-1
-    PHA
-custom_jump_jsr:
-    ; not sure why we | #$80 but it seems everything else does
-    lda #((CUSTOM_JUMP_BANK << 1) | $80)
-    jsr setAndSaveLowerBank
-custom_jump_bankswap_loc:
-    rts
+ENDM
 
-jumping_attack:
-    JSR custom_jump_jsr
-    JMP attack_resolve ; .. not necessarily air-attacking?
-    
-LIMIT $C000
-
-; --------------------------------------------------------------------
-BANK $0
-BASE $8000
-
-FROM empty_bank_0
-    include "_custom_jump.asm"
-    include "_custom_knockback.asm"
-end_bank_0_core:
-    
-FROM custom_knockback_bankswap_loc-5
-ATLEAST end_bank_0_core
-custom_knockback_bankswap_loc_pre:
-    lda #((PLAYER_UPDATE_BANK << 1) | $80)
-    jsr setAndSaveLowerBank
-    
-    ; (bankswap)
-    EXACT custom_knockback_bankswap_loc
-    
-    jsr _custom_knockback
-    jmp custom_knockback_bankswap_loc_pre
-end_custom_knockback_bankswap_tramp
-    
-FROM custom_jump_bankswap_loc-5
-ATLEAST end_custom_knockback_bankswap_tramp
-custom_jump_bankswap_loc_pre:
-    lda #((PLAYER_UPDATE_BANK << 1) | $80)
-    jsr setAndSaveLowerBank
-    
-    ; (bankswap)
-    EXACT custom_jump_bankswap_loc
-    
-    jsr _custom_jump
-    jmp custom_jump_bankswap_loc_pre
-end_custom_jump_bankswap_tramp:
+include "_improved_controls.asm"
     
 ; --------------------------------------------------------------------
 BANK $F
-BASE $C000
-
-; jump by table
-FROM $E814
\ No newline at end of file
+BASE $C000
\ No newline at end of file
diff --git a/test_protocol.txt b/test_protocol.txt
index 9625a93..de1beb9 100644
--- a/test_protocol.txt
+++ b/test_protocol.txt
@@ -6,6 +6,7 @@ for us and jp versions:
             - falling off a cliff results in jumping instead (retain control)
             - knockback is forgiving, directional input restored after a moment
             - it's possible to die from enemy damage
+            - can jump off stairs
             - (vcancel only) it's possible let go of the jump button in order to stop rising.
 
     - (use passwords for these, and only test the vcancel rom):