Skip to content

Shadow Restoration Patches #147

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
hyperbx merged 3 commits into from
Sep 7, 2025
Merged

Shadow Restoration Patches #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06dfaee
RestoreChaosSpearFlips
IsaacMarovitz Sep 6, 2025
c9224ff
RestoreChaosBoostJump
IsaacMarovitz Sep 6, 2025
752bf1d
Merge branch 'main' into chaos-spear-flips
hyperbx Sep 7, 2025
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
14 changes: 14 additions & 0 deletions MarathonRecomp/patches/player_patches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,20 @@ bool ControllableSpinkick()
return Config::ControllableSpinkick;
}

bool RestoreChaosSpearFlips()
{
return Config::RestoreChaosSpearFlips;
}

void RestoreChaosBoostJump(PPCRegister& r10, PPCRegister& r11)
{
if (!Config::RestoreChaosBoostJump)
return;

r10.u32 = 1;
r11.u32 = 2;
}

bool RestoreChainJumpFlips1(PPCRegister& f3, PPCRegister& r1)
{
if (Config::RestoreChainJumpFlips)
Expand Down
2 changes: 2 additions & 0 deletions MarathonRecomp/user/config_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, FixPowerUpJingleDuration, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, UseOfficialTitleOnTitleBar, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, DisableLowResolutionFontOnCustomUI, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreContextualHUDColours, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreChaosSpearFlips, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreChaosBoostJump, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, RestoreChainJumpFlips, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, DisableEdgeGrabLeftover, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, TailsGauge, false);
Expand Down
10 changes: 10 additions & 0 deletions MarathonRecompLib/config/Marathon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,16 @@ name = "NOP"
address = 0x8258E600
jump_address = 0x8258E604

[[midasm_hook]]
name = "RestoreChaosSpearFlips"
address = 0x821A6730
jump_address_on_true = 0x821A6734

[[midasm_hook]]
name = "RestoreChaosBoostJump"
address = 0x821A6988
registers = ["r10", "r11"]

[[midasm_hook]]
name = "RestoreChainJumpFlips1"
address = 0x82199650
Expand Down
Loading