Skip to content

Fix XButtonHoming patch leaking state into other parameters #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blueskythlikesclouds merged 1 commit into from
Mar 2, 2025
Merged

Fix XButtonHoming patch leaking state into other parameters #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions UnleashedRecomp/patches/player_patches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,11 @@ void PostUnleashMidAsmHook(PPCRegister& r30)
g_isUnleashCancelled = false;
}

void SetXButtonHomingMidAsmHook(PPCRegister& r30)
void SetXButtonHomingMidAsmHook(PPCRegister& r1)
{
r30.u32 = !Config::HomingAttackOnJump;
auto pXButtonHoming = (bool*)(g_memory.base + r1.u32 + 0x63);

*pXButtonHoming = !Config::HomingAttackOnJump;
}

// SWA::Player::CEvilSonicContext
Expand Down
4 changes: 2 additions & 2 deletions UnleashedRecompLib/config/SWA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ return_on_false = true

[[midasm_hook]]
name = "SetXButtonHomingMidAsmHook"
address = 0x8237AC88
registers = ["r30"]
address = 0x8237AC90
registers = ["r1"]

# Down force HFR fix
[[midasm_hook]]
Expand Down