diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-23 18:23:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-23 15:23:44 -0800 |
| commit | 8d53f6dd591abb21e9474a5ad85ee19eb58f2e50 (patch) | |
| tree | fa0119425e15c8be3f7833b6b4379b8eb50412cc /src/d/actor/d_a_alink.cpp | |
| parent | eaf980174f97ca1ee08df8c93a4459fba9527bad (diff) | |
Fix more nonmatchings (#2850)
* Fix GetPolyIndex and GetBgIndex, fixing a couple regallocs
* Match daNpcCd2_c::checkFearSituation and daNpcCd2_c::getAnmP
* Match daAlink_c::jointControll
* Clean up float class checks
* Move float constants to global.h
Diffstat (limited to 'src/d/actor/d_a_alink.cpp')
| -rw-r--r-- | src/d/actor/d_a_alink.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 276c467de8..816f6fc908 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -1923,19 +1923,17 @@ void daAlink_c::setMatrixWorldAxisRot(MtxP param_0, s16 param_1, s16 param_2, s1 } /* 8009DD90-8009E7B8 0986D0 0A28+00 2/2 0/0 0/0 .text jointControll__9daAlink_cFi */ -// NONMATCHING - 0x20 bytes missing from stack at 0x58 (release)/0x60 (debug) int daAlink_c::jointControll(int param_0) { csXyz sp18(0, 0, 0); int var_r27 = 0; - mDoExt_MtxCalcOldFrame* temp = field_0x2060; - J3DTransformInfo* temp_r3 = temp->getOldFrameTransInfo(param_0); - J3DTransformInfo sp80 = *temp_r3; + J3DTransformInfo sp80; + J3DTransformInfo sp60 = *field_0x2060->getOldFrameTransInfo(param_0); Quaternion sp50; Quaternion sp40; Quaternion sp30; - Quaternion sp20 = *temp->getOldFrameQuaternion(param_0); + Quaternion sp20 = *field_0x2060->getOldFrameQuaternion(param_0); csXyz sp10(0, 1, 2); @@ -2114,7 +2112,7 @@ int daAlink_c::jointControll(int param_0) { spC = field_0x2060->getOldFrameQuaternion(param_0); } - mDoMtx_stack_c::transS(sp80.mTranslate.x, sp80.mTranslate.y, sp80.mTranslate.z); + mDoMtx_stack_c::transS(sp60.mTranslate.x, sp60.mTranslate.y, sp60.mTranslate.z); mDoMtx_stack_c::quatM(&sp20); mDoMtx_stack_c::inverse(); cMtx_concat(temp_r26, mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); |
