mirror
/
jak-project
mirror of https://github.com/open-goal/jak-project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[jak2] Fix Fortress Crash by Patching Mips2C Function (#3963) 

Fixes #3151 by applying the same fix as #2686 to another Mips2C
function.

Tested by mashing Jak's body into the bad collision walls for 30 minutes
without a single crash.
This commit is contained in:
massimilianodelliubaldini 2025-06-19 23:33:15 -04:00 committed by GitHub
parent 5ad176507b
commit d352856927
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
game/mips2c/jak2_functions/collide_hash.cpp
View File

@ -1066,9 +1066,11 @@ u64 execute(void* ctxt) {
c->ppach(a3, r0, a3); // ppach a3, r0, a3
c->lqc2(vf11, 272, a2); // lqc2 vf11, 272(a2)
c->dsll(a3, a3, 16); // dsll a3, a3, 16
c->vftoi0(DEST::xyzw, vf3, vf3); // vftoi0.xyzw vf3, vf3
// patch vftoi0 calls because there's more bogus collide fragments
c->vftoi0_sat(DEST::xyzw, vf3, vf3); // vftoi0.xyzw vf3, vf3
bc = c->sgpr64(a3) != 0; // bne a3, r0, L63
c->vftoi0(DEST::xyzw, vf4, vf4); // vftoi0.xyzw vf4, vf4
c->vftoi0_sat(DEST::xyzw, vf4, vf4); // vftoi0.xyzw vf4, vf4
if (bc) {goto block_22;} // branch non-likely
// nop // sll r0, r0, 0