Skip to content

Implement "Enable Stage Collision Debug View" HMM code in a safer way #1541

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Implement "Enable Stage Collision Debug View" HMM code in a safer way #1541

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
3 changes: 0 additions & 3 deletions UnleashedRecomp/app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ PPC_FUNC(sub_822C1130)
if (Config::EnableObjectCollisionDebugView)
*SWA::SGlobals::ms_IsObjectCollisionRender = true;

if (Config::EnableStageCollisionDebugView)
*SWA::SGlobals::ms_IsCollisionRender = true;

__imp__sub_822C1130(ctx, base);
}

11 changes: 11 additions & 0 deletions UnleashedRecomp/patches/misc_patches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,14 @@ PPC_FUNC(sub_824EE620)

ctx.r3.u32 = PersistentStorageManager::ShouldDisplayDLCMessage(true);
}

bool StageCollisionDebugViewMidAsmHook(PPCRegister& r27)
{
if (Config::EnableStageCollisionDebugView)
{
r27.u32 = true;
return true;
}

return false;
}
6 changes: 6 additions & 0 deletions UnleashedRecompLib/config/SWA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,3 +1141,9 @@ registers = ["r3"]
name = "EndingTextPositionMidAsmHook"
address = 0x82580168
registers = ["r31", "f13"]

[[midasm_hook]]
name = "StageCollisionDebugViewMidAsmHook"
address = 0x825648F8
registers = ["r27"]
jump_address_on_true = 0x825648FC
Loading