diff options
| author | Max Roncace <me@caseif.net> | 2025-08-25 18:33:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-25 15:33:44 -0700 |
| commit | b309e0cf57ba36f0c3e01a205f7e097ae46f389b (patch) | |
| tree | 9737d7a7210b909edf0875d262b5e75399c1ede4 /src/d/actor/d_a_midna.cpp | |
| parent | 19c8b6995ee3d774f78c4421cba833ec2cea77b4 (diff) | |
Miscellaneous improvements (#2603)
Diffstat (limited to 'src/d/actor/d_a_midna.cpp')
| -rw-r--r-- | src/d/actor/d_a_midna.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 421220f185..39d2352db4 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -1781,6 +1781,8 @@ void daMidna_c::setBckAnime(J3DAnmTransform* i_bck, int i_attr, f32 i_morf) { /* 804C103C-804C287C 004E9C 1840+00 2/2 0/0 0/0 .text setAnm__9daMidna_cFv */ // NONMATCHING regalloc void daMidna_c::setAnm() { + BOOL bVar1, bVar2, bVar3; + offStateFlg0((daMidna_FLG0)(FLG0_NO_HAIR_SCALE | FLG0_UNK_200000)); if (setDemoAnm()) { @@ -1789,14 +1791,13 @@ void daMidna_c::setAnm() { daAlink_c* link = daAlink_getAlinkActorClass(); - BOOL bVar1; if (dComIfGp_event_runCheck() || checkEndResetStateFlg0(ERFLG0_NO_SERVICE_WAIT)) { bVar1 = TRUE; } else { bVar1 = FALSE; } - BOOL bVar2 = FALSE; - BOOL bVar3 = TRUE; + bVar2 = FALSE; + bVar3 = TRUE; bool tired = checkMidnaTired(); daMidna_ANM anm; @@ -2073,7 +2074,7 @@ void daMidna_c::setAnm() { } else if (anm == ANM_S_RETURN) { current.pos.x += 90.0f * cM_ssin(shape_angle.y); current.pos.z += 90.0f * cM_scos(shape_angle.y); - shape_angle.y += 0x8000; + shape_angle.y += (s16)0x8000; field_0x85a = shape_angle.y; current.angle.y = shape_angle.y; mpMorf->getOldTransInfo()[JNT_BACKBONE1].mTranslate.z += 90.0f; @@ -2134,8 +2135,7 @@ void daMidna_c::setAnm() { || (checkSetAnime(0, ANM_SWAITC) && fabsf(speedF) > 0.1f)) { offStateFlg0(FLG0_UNK_1); - u16 res_id = m_anmDataTable[anm].mResID; - J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(res_id); + J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(m_anmDataTable[anm].mResID); setBckAnime(bck, J3DFrameCtrl::EMode_LOOP, 5.0f); setUpperAnime(mBckHeap[0].getIdx(), 0xffff); } else if (checkSetAnime(0, ANM_SWAITB) && mUpperBck.checkFrame(95.0f) @@ -2143,8 +2143,7 @@ void daMidna_c::setAnm() { { anm = ANM_SWAITC; setUpperAnimeAndSe(ANM_SWAITC); - u16 res_id = m_anmDataTable[anm].mResID; - J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(res_id); + J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(m_anmDataTable[anm].mResID); setBckAnime(bck, J3DFrameCtrl::EMode_NONE, 0.0f); } } else if (daPy_py_c::checkNowWolf() && !bVar1 |