mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-03 10:09:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Regalloc/debug/misc fixes (#2794)

Browse Source 
* Fix "0" asserts

* More debug and regalloc fixes

* Fix PTMF syntax for compatibility with other compilers

* Fix some fakematches, link more TUs for J/P
This commit is contained in:
LagoLunatic
2025-11-10 21:25:00 -05:00
committed by GitHub
parent a02f72d8f3
commit 23a1c94063
87 changed files with 314 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_wrestler.cpp
+33 -30
View File
@@ -1621,7 +1621,7 @@ inline bool daNpcWrestler_c::wait(void* param_1) {
}
default: {
JUT_PANIC(2769, "0")
JUT_ASSERT(2769, FALSE);
break;
}
}
@@ -1772,7 +1772,7 @@ inline bool daNpcWrestler_c::talk(void* param_1) {
}
default: {
JUT_PANIC(2858, "0");
JUT_ASSERT(2858, FALSE);
}
}
@@ -1815,7 +1815,7 @@ inline bool daNpcWrestler_c::demo(void* param_1) {
}
default: {
JUT_PANIC(2912, "0");
JUT_ASSERT(2912, FALSE);
break;
}
}
@@ -1876,7 +1876,7 @@ inline bool daNpcWrestler_c::gotoArena(void* param_1) {
}
default: {
JUT_PANIC(2969, "0");
JUT_ASSERT(2969, FALSE);
break;
}
}
@@ -1887,7 +1887,7 @@ inline bool daNpcWrestler_c::gotoArena(void* param_1) {
}
default: {
JUT_PANIC(2974, "0");
JUT_ASSERT(2974, FALSE);
break;
}
}
@@ -1944,7 +1944,7 @@ inline bool daNpcWrestler_c::gotoLiving(void* param_1) {
}
default: {
JUT_PANIC(3032, "0");
JUT_ASSERT(3032, FALSE);
break;
}
}
@@ -1955,7 +1955,7 @@ inline bool daNpcWrestler_c::gotoLiving(void* param_1) {
}
default: {
JUT_PANIC(3037, "0");
JUT_ASSERT(3037, FALSE);
break;
}
}
@@ -2119,7 +2119,7 @@ bool daNpcWrestler_c::sumouReady(void* param_1) {
break;
default:
JUT_PANIC(3181, "0");
JUT_ASSERT(3181, FALSE);
break;
}
@@ -2371,7 +2371,7 @@ inline bool daNpcWrestler_c::sumouPunchHit(void* param_1) {
}
default: {
JUT_PANIC(3411, "0");
JUT_ASSERT(3411, FALSE);
break;
}
}
@@ -2552,7 +2552,7 @@ inline bool daNpcWrestler_c::sumouPunchMiss(void* param_1) {
}
default: {
JUT_PANIC(3579, "0");
JUT_ASSERT(3579, FALSE);
}
}
@@ -2670,8 +2670,7 @@ bool daNpcWrestler_c::sumouPunchDraw(void* param_1) {
/* 80B3606C-80B36908 006ECC 089C+00 5/0 0/0 0/0 .text sumouTackleHit__15daNpcWrestler_cFPv */
bool daNpcWrestler_c::sumouTackleHit(void* param_1) {
// NONMATCHING - regalloc
daPy_py_c* player = daPy_getPlayerActorClass();
daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
int jointNo = mType == 0 ? 0 : 0;
cXyz sp2c;
@@ -3028,7 +3027,7 @@ inline bool daNpcWrestler_c::sumouSideStep(void* param_1) {
}
default: {
JUT_PANIC(4008, "0");
JUT_ASSERT(4008, FALSE);
break;
}
}
@@ -3154,7 +3153,7 @@ inline bool daNpcWrestler_c::sumouPunchChaseShock(void* param_1) {
break;
default:
JUT_PANIC(4149, "0");
JUT_ASSERT(4149, FALSE);
}
return true;
@@ -3237,7 +3236,6 @@ bool daNpcWrestler_c::sumouTackleStagger(void* param_1) {
daPy_py_c* player = daPy_getPlayerActorClass();
int jointNo = mType == 0 ? 0x1A : 0x18;
int jointNo2 = mType == 0 ? 0x1E : 0x1B;
cXyz sp58;
f32 fVar1, fVar2;
switch (field_0xe96) {
@@ -3249,8 +3247,9 @@ bool daNpcWrestler_c::sumouTackleStagger(void* param_1) {
field_0xe96 = 2;
break;
case 2:
case 2: {
correctGraspPosAngle(true);
cXyz sp58;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo));
mDoMtx_stack_c::multVecZero(&sp58);
sp58.y = current.pos.y;
@@ -3282,10 +3281,14 @@ bool daNpcWrestler_c::sumouTackleStagger(void* param_1) {
setAction(&daNpcWrestler_c::sumouTackleStaggerRelease);
}
break;
}
case 3:
player->setSumouForceGraspCancel();
break;
default:
JUT_ASSERT(4311, FALSE);
break;
}
return true;
@@ -3382,7 +3385,7 @@ inline bool daNpcWrestler_c::sumouTacklePush(void* param_1) {
break;
default: {
JUT_PANIC(4435, "0");
JUT_ASSERT(4435, FALSE);
break;
}
}
@@ -3718,7 +3721,7 @@ inline bool daNpcWrestler_c::demoSumouReady(void* param_1) {
break;
default:
JUT_PANIC(4821, "0");
JUT_ASSERT(4821, FALSE);
break;
}
@@ -3732,7 +3735,7 @@ inline bool daNpcWrestler_c::demoSumouReady(void* param_1) {
break;
default:
JUT_PANIC(4828, "0");
JUT_ASSERT(4828, FALSE);
break;
}
@@ -4218,7 +4221,7 @@ bool daNpcWrestler_c::demoSumouLose2(void* param_1) {
}
default:
JUT_PANIC(5347, "0");
JUT_ASSERT(5347, FALSE);
break;
}
@@ -4232,7 +4235,7 @@ bool daNpcWrestler_c::demoSumouLose2(void* param_1) {
break;
default:
JUT_PANIC(5355, "0");
JUT_ASSERT(5355, FALSE);
}
return true;
@@ -4339,7 +4342,7 @@ inline bool daNpcWrestler_c::demoSumouUnilateralWin(void* param_1) {
}
default:
JUT_PANIC(5478, "0");
JUT_ASSERT(5478, FALSE);
break;
}
@@ -4353,7 +4356,7 @@ inline bool daNpcWrestler_c::demoSumouUnilateralWin(void* param_1) {
break;
default:
JUT_PANIC(5486, "0");
JUT_ASSERT(5486, FALSE);
break;
}
@@ -4429,7 +4432,7 @@ inline bool daNpcWrestler_c::demoTalkAfterLose(void* param_1) {
break;
default:
JUT_PANIC(5571, "0");
JUT_ASSERT(5571, FALSE);
break;
}
break;
@@ -4440,7 +4443,7 @@ inline bool daNpcWrestler_c::demoTalkAfterLose(void* param_1) {
break;
default:
JUT_PANIC(5579, "0");
JUT_ASSERT(5579, FALSE);
break;
}
@@ -4482,7 +4485,7 @@ inline BOOL daNpcWrestler_c::EvCut_grDSEntry(int i_cutIndex) {
break;
default:
JUT_PANIC(5622, "0");
JUT_ASSERT(5622, FALSE);
break;
}
}
@@ -4554,7 +4557,7 @@ inline BOOL daNpcWrestler_c::EvCut_grDSEntry(int i_cutIndex) {
}
default: {
JUT_PANIC(5688, "0");
JUT_ASSERT(5688, FALSE);
break;
}
}
@@ -4576,7 +4579,7 @@ inline BOOL daNpcWrestler_c::EvCut_grDSEntry2(int i_cutIndex) {
break;
default:
JUT_PANIC(5715, "0");
JUT_ASSERT(5715, FALSE);
break;
}
}
@@ -4594,7 +4597,7 @@ inline BOOL daNpcWrestler_c::EvCut_grDSEntry2(int i_cutIndex) {
return TRUE;
default:
JUT_PANIC(5735, "0");
JUT_ASSERT(5735, FALSE);
break;
}