Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions MarathonRecomp/patches/player_patches.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,16 @@ bool ControllableTeleportDash()
{
return Config::ControllableTeleportDash;
}

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

bool ControllableBoundAttack2(PPCCRRegister& cmp)
{
if (Config::ControllableBoundAttack)
return !cmp.eq;

return cmp.eq;
}
1 change: 1 addition & 0 deletions MarathonRecomp/user/config_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,6 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, PlayerDebugMode, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForMachSpeed, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, MidairControlForSnowboards, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, ControllableTeleportDash, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, ControllableBoundAttack, false);

CONFIG_DEFINE("Update", time_t, LastChecked, 0);
17 changes: 17 additions & 0 deletions MarathonRecompLib/config/Marathon.toml
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,20 @@ jump_address_on_true = 0x82512C9C
name = "ControllableTeleportDash"
address = 0x8221C49C
jump_address_on_true = 0x8221C4A0

[[midasm_hook]]
name = "ControllableBoundAttack"
address = 0x82217EE0
jump_address_on_true = 0x82217EE4

[[midasm_hook]]
name = "ControllableBoundAttack"
address = 0x82217F1C
jump_address_on_true = 0x82217F20

[[midasm_hook]]
name = "ControllableBoundAttack2"
address = 0x82217DC8
registers = ["cr6"]
jump_address_on_true = 0x82217DD8
jump_address_on_false = 0x82217DCC
Loading