diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-25 12:24:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 21:24:14 +0100 |
| commit | 612f26c132280da43ecfa5fa8c8cc32966f06eb6 (patch) | |
| tree | ac20d071712cf830ec526222c98d340d90721f77 /src/d/a/d_a_alink.cpp | |
| parent | 6f4d068f1d7c5a9f25f1920e64e5b10dc29aea07 (diff) | |
d_kankyo_wether / d_eye_hl (#178)
* d_eye_hl / d_kankyo_wether wip
* more d_kankyo_wether + format
* remove asm
* some d_kankyo wip
* fix dccs vtable
* some m_Do_graphic / d_meter2_draw work
Diffstat (limited to 'src/d/a/d_a_alink.cpp')
| -rw-r--r-- | src/d/a/d_a_alink.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 8c397548c8..3ede1b76e1 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -3324,7 +3324,6 @@ extern "C" u8 BaseY__4cXyz[12]; extern "C" u8 BaseZ__4cXyz[12]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_whiteColor; extern "C" u16 m_branchId__7dDemo_c[1 + 3 /* padding */]; extern "C" extern u8 data_80450B38[4]; extern "C" f32 mGroundY__11fopAcM_gc_c; @@ -3582,10 +3581,10 @@ void daAlink_c::setMatrixWorldAxisRot(MtxP param_0, s16 param_1, s16 param_2, s1 mDoMtx_stack_c::YrotM(-mCollisionRot.y); concatMagneBootInvMtx(); mDoMtx_stack_c::transM(-tmp.x, -tmp.y, -tmp.z); - PSMTXConcat(*mDoMtx_stack_c::get(), param_0, *mDoMtx_stack_c::get()); - PSMTXCopy(*mDoMtx_stack_c::get(), param_0); + PSMTXConcat(mDoMtx_stack_c::get(), param_0, mDoMtx_stack_c::get()); + PSMTXCopy(mDoMtx_stack_c::get(), param_0); if (param_4 != 0) { - PSMTXCopy(*mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + PSMTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); } } |