From d40c4ded9dd4161a745eb0bd33022a8b194db24a Mon Sep 17 00:00:00 2001
From: nstbayless <nstbayless@gmail.com>
Date: Tue, 30 Jul 2024 09:21:28 -0700
Subject: [PATCH] fixed grant knockback glitch (us)

---
 _custom_knockback.asm |   7 +++----
 out-jp.ips            | Bin 443 -> 440 bytes
 out-us.ips            | Bin 443 -> 440 bytes
 pkg_readme.md         |   9 +++++++--
 ram-jp.asm            |   8 +++++++-
 ram-us.asm            |   8 +++++++-
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/_custom_knockback.asm b/_custom_knockback.asm
index f4a87b5..7aaa86f 100644
--- a/_custom_knockback.asm
+++ b/_custom_knockback.asm
@@ -8,11 +8,10 @@ _custom_knockback:
     
     LDA #8 ; jumping
     STA simon_state
-    LDA $49
-    BEQ custom_knockback_moving_upward
-    LDA $48
-    CMP #$02
+    LDA current_player
+    cmp #$02 ; grant
     BNE custom_knockback_moving_upward
+grant_version:
     LDA #$38
     STA vsp_control
     LDA #$16
diff --git a/out-jp.ips b/out-jp.ips
index 38d7c4530d6c4e0c5e478df773c527c3eefc7d0d..5416f679f7feb5ef2478ecd1060d661820254fe5 100644
GIT binary patch
delta 52
zcmV-40L%Zo1GobUP(f5fNC1A|0LYOFn;s^uAO$cPsR)f_1+7j6$pX*~sW^?;1*sN|
K00c~uk;e7Of)d04

delta 55
zcmV-70LcHi1G@tXP(f5fNC1A|0LzgIn;|K!AO$cSsR)f_1*J*w6QxMW0?-YqIE~l^
NsTPd@1Wc8Y!}SvJ6s`aO

diff --git a/out-us.ips b/out-us.ips
index fd2d764eaa85b6a40b78e8749da24ac63be86816..533c8c6cae521b23015224c540395bf64b05d7a2 100644
GIT binary patch
delta 52
zcmV-40L%Zo1GobUP(f5fNB}<I0LYOFn;s^uAO$cPsR)f_1+7j6$pX*~sW^?;1*sN|
K00c~uk;e7ELK1`k

delta 55
zcmV-70LcHi1G@tXP(f5fNB}<I0LzgIn;|K!AO$cSsR)f_1*J*w6QxMW0?-YqIE~l^
NsTPd@1Wc8Y!}SO86m9?j

diff --git a/pkg_readme.md b/pkg_readme.md
index ed5152b..99c02cf 100644
--- a/pkg_readme.md
+++ b/pkg_readme.md
@@ -10,13 +10,15 @@ Source code and build instructions available [here](https://github.com/nstbayles
 
 Some of these are optional, and depend on the specific patch.
 
-- Enables all characters to control their x-velocity in mid-air while jumping (including while jump attacking); Grant’s jumping controls remain unchanged. 
-- (Optional) When releasing the jump button, one immediately starts falling again; this allows the player to make smaller hops if desired. (Does not apply to Grant.)
+- Enables all characters to control their x-velocity in mid-air while jumping (including while jump attacking)
+- (Optional) When releasing the jump button, one immediately starts falling again; this allows the player to make smaller hops if desired.
     - apply `vcancel` hack for this (Recommended).
 - After being knocked back, the player regains control after a split second and can angle their fall.
 - When walking off an edge, the player retains control instead of dropping straight down.
 - All characters can jump off of stairs at any point in the climb (however, it is still impossible to land on stairs, so be careful jumping from long flights of stairs over pits)
 
+Note that Grant's controls remain mostly unaltered.
+
 ## Compatability
 
 This hack is comaptible with both the US and JP versions of *Castlevania III*. Additionally, it is compatible with the following hacks:
@@ -49,8 +51,11 @@ Tools:
     `fceux` and `asm6f`
     
 Special thanks:
+    Theou Aegis
     revility
     OmegaJP
+    vinheim3
+    
 
 ## ROM information
 
diff --git a/ram-jp.asm b/ram-jp.asm
index 0865235..2b198a9 100644
--- a/ram-jp.asm
+++ b/ram-jp.asm
@@ -136,6 +136,9 @@ BASE $0008:
 BASE $0048
     partner:
     
+BASE $0049
+    partner_swap:
+    
 BASE $780
     cutscene_timer:
     
@@ -143,4 +146,7 @@ BASE $783
     cutscene_input:
     
 BASE $007B:
-    time_lo:
\ No newline at end of file
+    time_lo:
+    
+BASE $054E:
+    current_player:
\ No newline at end of file
diff --git a/ram-us.asm b/ram-us.asm
index 48aa012..ecea795 100644
--- a/ram-us.asm
+++ b/ram-us.asm
@@ -9,6 +9,9 @@ BASE $0028:
 
 BASE $003A
     partner:
+    
+BASE $003B
+    partner_swap:
 
 BASE $0565:
     simon_state:
@@ -57,4 +60,7 @@ BASE $783
     cutscene_input:
     
 BASE $05C1:
-    simon_fall_objphase:
\ No newline at end of file
+    simon_fall_objphase:
+    
+BASE $054E:
+    current_player:
\ No newline at end of file