npc_gnd finished, movie_player almost done (#2818)

* movie_player mostly done * d_a_npc_gnd done * fix fshop debug match
2026-06-25 08:02:04 -04:00 · 2025-11-18 01:34:34 -08:00
parent 317d362c95
commit b3a3287475
11 changed files with 2019 additions and 1795 deletions
@@ -6,8 +6,6 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep

 #include "d/actor/d_a_npc_gnd.h"
-#include "dol2asm.h"
-

 /* 809BE5BC-809BE5C4 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
@@ -60,12 +58,11 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
 };

 /* 809BE640-809BE644 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Gnd_c */
-SECTION_DATA char* daNpc_Gnd_c::mCutNameList = "";
+char* daNpc_Gnd_c::mCutNameList[1] = {""};

 /* 809BE644-809BE650 0000A8 000C+00 2/2 0/0 0/0 .data            mCutList__11daNpc_Gnd_c */
 daNpc_Gnd_c::cutFunc daNpc_Gnd_c::mCutList[1] = {NULL};

-/* ############################################################################################## */
 /* 809BE4A0-809BE52C 000000 008C+00 6/6 0/0 0/0 .rodata          m__17daNpc_Gnd_Param_c */
 const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = {
    280.0f,
@@ -138,8 +135,8 @@ int daNpc_Gnd_c::create() {
    mType = getType();
    mFlowNodeNo = getFlowNodeNo();
    mTwilight = false;
-    int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
-    if (rv == cPhs_COMPLEATE_e) {
+    int phase_state = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
+    if (phase_state == cPhs_COMPLEATE_e) {
        if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0)) {
            return cPhs_ERROR_e;
        }
@@ -183,7 +180,7 @@ int daNpc_Gnd_c::create() {
        mCreating = 0;
    }

-    return rv;
+    return phase_state;
 }

 /* 809BB9D4-809BBC70 0004B4 029C+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Gnd_cFv */
@@ -256,7 +253,7 @@ int daNpc_Gnd_c::Draw() {
 /* 809BBF44-809BBF64 000A24 0020+00 1/1 0/0 0/0 .text
 * createHeapCallBack__11daNpc_Gnd_cFP10fopAc_ac_c              */
 int daNpc_Gnd_c::createHeapCallBack(fopAc_ac_c* i_this) {
-    return static_cast<daNpc_Gnd_c*>(i_this)->CreateHeap();
+    return ((daNpc_Gnd_c*)i_this)->CreateHeap();
 }

 /* 809BBF64-809BBFBC 000A44 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Gnd_cFP8J3DJointi
@@ -264,8 +261,8 @@ int daNpc_Gnd_c::createHeapCallBack(fopAc_ac_c* i_this) {
 int daNpc_Gnd_c::ctrlJointCallBack(J3DJoint* i_joint, int arg1) {
    if (arg1 == 0) {
        J3DModel* model = j3dSys.getModel();
-        daNpc_Gnd_c* i_this = reinterpret_cast<daNpc_Gnd_c*>(model->getUserArea());
-        if (i_this != 0) {
+        daNpc_Gnd_c* i_this = (daNpc_Gnd_c*)model->getUserArea();
+        if (i_this != NULL) {
            i_this->ctrlJoint(i_joint, model);
        }
    }
@@ -275,11 +272,11 @@ int daNpc_Gnd_c::ctrlJointCallBack(J3DJoint* i_joint, int arg1) {

 /* 809BBFBC-809BBFDC 000A9C 0020+00 1/1 0/0 0/0 .text            getType__11daNpc_Gnd_cFv */
 u8 daNpc_Gnd_c::getType() {
-    switch ((u8)fopAcM_GetParam(this)) {
-        case 0:
-            return TYPE_0;
-        default:
-            return TYPE_1;
+    switch (fopAcM_GetParam(this) & 0xFF) {
+    case 0:
+        return TYPE_0;
+    default:
+        return TYPE_1;
    }
 }

@@ -299,18 +296,18 @@ int daNpc_Gnd_c::isDelete() {
    }

    switch (mType) {
-        case TYPE_0:
-            return 0;
-        default: {
-            return 1;
-        }
+    case TYPE_0:
+        return 0;
+    default:
+        return 1;
    }
 }

 /* 809BC028-809BC168 000B08 0140+00 1/1 0/0 0/0 .text            reset__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::reset() {
    initialize();
-    memset(&field_0xF84, 0, (u8*)&field_0xF9C - (u8*)&field_0xF84);
+    memset(&mNextAction, 0, (u8*)&field_0xF9C - (u8*)&mNextAction);
+
    for (int idx = 0; idx < 2; ++idx) {
        if (mpMatAnm[idx] != NULL) {
            mpMatAnm[idx]->initialize();
@@ -331,95 +328,209 @@ void daNpc_Gnd_c::afterJntAnm(int param_1) {
    }
 }

-/* ############################################################################################## */
-/* 809BE554-809BE558 0000B4 0004+00 3/3 0/0 0/0 .rodata          @4552 */
-SECTION_RODATA static f32 const lit_4552 = -1.0f;
-COMPILER_STRIP_GATE(0x809BE554, &lit_4552);
-
 /* 809BC1F4-809BC328 000CD4 0134+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_Gnd_cFv */
 BOOL daNpc_Gnd_c::ctrlBtk() {
-    // NONMATCHING
-    return false; // Placeholder
+    if (mpMatAnm[0] != NULL && mpMatAnm[1] != NULL) {
+        if (field_0xe29 != 0 && mBtkAnm.getBtkAnm()) {
+            mpMatAnm[0]->setNowOffsetX(-1.0f * (0.2f * cM_ssin(mJntAnm.getEyeAngleY())));
+            mpMatAnm[0]->setNowOffsetY(0.2f * cM_ssin(mJntAnm.getEyeAngleX()));
+            mpMatAnm[1]->setNowOffsetX(0.2f * cM_ssin(mJntAnm.getEyeAngleY()));
+            mpMatAnm[1]->setNowOffsetY(0.2f * cM_ssin(mJntAnm.getEyeAngleX()));
+
+            if (field_0xe2a != 0) {
+                mpMatAnm[0]->setMorfFrm(field_0xe2a);
+                mpMatAnm[1]->setMorfFrm(field_0xe2a);
+                field_0xe2a = 0;
+            }
+
+            mpMatAnm[0]->onEyeMoveFlag();
+            mpMatAnm[1]->onEyeMoveFlag();
+            return 1;
+        }
+
+        if (field_0xe2a != 0) {
+            mpMatAnm[0]->setMorfFrm(field_0xe2a);
+            mpMatAnm[1]->setMorfFrm(field_0xe2a);
+            field_0xe2a = 0;
+        }
+
+        mpMatAnm[0]->offEyeMoveFlag();
+        mpMatAnm[1]->offEyeMoveFlag();
+    }
+
+    return 0;
 }

 /* 809BC328-809BC448 000E08 0120+00 1/0 0/0 0/0 .text            setParam__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::setParam() {
-    // NONMATCHING
+    u32 attn_flags = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
+
+    selectAction();
+    srchActors();
+
+    s16 talk_distance = mpHIO->m.common.talk_distance;
+    s16 talk_angle = mpHIO->m.common.talk_angle;
+    s16 attention_distance = mpHIO->m.common.attention_distance;
+    s16 attention_angle = mpHIO->m.common.attention_angle;
+
+    attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(attention_distance, attention_angle);
+    attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e];
+    attention_info.distances[fopAc_attn_SPEAK_e] = daNpcT_getDistTableIdx(talk_distance, talk_angle);
+    attention_info.flags = attn_flags;
+
+    scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale);
+    mCcStts.SetWeight(mpHIO->m.common.weight);
+    mCylH = mpHIO->m.common.height;
+    mWallR = mpHIO->m.common.width;
+    mAttnFovY = mpHIO->m.common.fov;
+    mAcchCir.SetWallR(mWallR);
+    mAcchCir.SetWallH(mpHIO->m.common.knee_length);
+    mRealShadowSize = mpHIO->m.common.real_shadow_size;
+    gravity = mpHIO->m.common.gravity;
+    mExpressionMorfFrame = mpHIO->m.common.expression_morf_frame;
+    mMorfFrames = mpHIO->m.common.morf_frame;
+
+    mAcch.SetGrndNone();
+    mAcch.SetWallNone();
+    gravity = 0.0f;
 }

 /* 809BC448-809BC4A8 000F28 0060+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Gnd_cFv
 */
 void daNpc_Gnd_c::setAfterTalkMotion() {
-    // NONMATCHING
+    mFaceMotionSeqMngr.getNo();
+    mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
 }

 /* 809BC4A8-809BC4AC 000F88 0004+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Gnd_cFv */
-void daNpc_Gnd_c::srchActors() {
-    /* empty function */
-}
+void daNpc_Gnd_c::srchActors() {}

 /* 809BC4AC-809BC5AC 000F8C 0100+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Gnd_cFv */
 BOOL daNpc_Gnd_c::evtTalk() {
-    // NONMATCHING
-    return false; // Placeholder
+    if (chkAction(&daNpc_Gnd_c::talk)) {
+        (this->*mAction)(NULL);
+    } else {
+        mPreItemNo = 0;
+        if (dComIfGp_event_chkTalkXY()) {
+            if (!dComIfGp_evmng_ChkPresentEnd()) {
+                return TRUE;
+            }
+            mEvtNo = 1;
+            evtChange();
+            return TRUE;
+        } else {
+            setAction(&daNpc_Gnd_c::talk);
+        }
+    }
+
+    return TRUE;
 }

 /* 809BC5AC-809BC674 00108C 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Gnd_cFv */
 BOOL daNpc_Gnd_c::evtCutProc() {
-    // NONMATCHING
-    return false; // Placeholder
+    BOOL rt = FALSE;
+
+    s32 staffId = dComIfGp_getEventManager().getMyStaffId("Gnd", this, -1);
+    if (staffId != -1) {
+        mStaffId = staffId;
+        int actIdx = dComIfGp_getEventManager().getMyActIdx(mStaffId, mCutNameList, 1, FALSE, FALSE);
+        if ((this->*mCutList[actIdx])(mStaffId)) {
+            dComIfGp_getEventManager().cutEnd(mStaffId);
+        }
+
+        rt = TRUE;
+    }
+
+    return rt;
 }

 /* 809BC674-809BC760 001154 00EC+00 1/0 0/0 0/0 .text            action__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::action() {
-    // NONMATCHING
+    if (mStagger.checkRebirth()) {
+        mStagger.initialize();
+        mMode = MODE_INIT;
+    }
+
+    if (mNextAction) {
+        if (mAction == mNextAction) {
+            (this->*mAction)(NULL);
+        } else {
+            setAction(mNextAction);
+        }
+    }
 }

 /* 809BC760-809BC7D8 001240 0078+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::beforeMove() {
-    // NONMATCHING
+    if (checkHide() || mNoDraw) {
+        attention_info.flags = 0;
+    }
 }

-/* ############################################################################################## */
-/* 809BE558-809BE55C 0000B8 0004+00 0/1 0/0 0/0 .rodata          @4723 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4723 = 10.0f;
-COMPILER_STRIP_GATE(0x809BE558, &lit_4723);
-#pragma pop
-
-/* 809BE55C-809BE560 0000BC 0004+00 0/1 0/0 0/0 .rodata          @4724 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4724 = 30.0f;
-COMPILER_STRIP_GATE(0x809BE55C, &lit_4724);
-#pragma pop
-
-/* 809BE560-809BE568 0000C0 0004+04 0/1 0/0 0/0 .rodata          @4725 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u32 const lit_4725[1 + 1 /* padding */] = {
-    0x38C90FDB,
-    /* padding */
-    0x00000000,
-};
-COMPILER_STRIP_GATE(0x809BE560, &lit_4725);
-#pragma pop
-
-/* 809BE568-809BE570 0000C8 0008+00 1/3 0/0 0/0 .rodata          @4727 */
-SECTION_RODATA static u8 const lit_4727[8] = {
-    0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x809BE568, &lit_4727);
-
 /* 809BC7D8-809BCA14 0012B8 023C+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::setAttnPos() {
-    // NONMATCHING
+    cXyz cStack_3c(10.0f, 30.0f, 0.0f);
+    cXyz cStack_48(10.0f, 0.0f, 0.0f);
+
+    mStagger.calc(FALSE);
+    f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y));
+
+    mJntAnm.setParam(this, mpMorf[0]->getModel(), &cStack_3c, getBackboneJointNo(),
+                     getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min,
+                     mpHIO->m.common.body_angleX_max, mpHIO->m.common.body_angleY_min,
+                     mpHIO->m.common.body_angleY_max, mpHIO->m.common.head_angleX_min,
+                     mpHIO->m.common.head_angleX_max, mpHIO->m.common.head_angleY_min,
+                     mpHIO->m.common.head_angleY_max, mpHIO->m.common.neck_rotation_ratio, rad,
+                     &cStack_48);
+
+    mJntAnm.calcJntRad(0.2f, 1.0f, rad);
+    setMtx();
+
+    mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo()));
+    mDoMtx_stack_c::multVec(&cStack_3c, &eyePos);
+
+    mJntAnm.setEyeAngleX(eyePos, 1.0f, 0);
+    mJntAnm.setEyeAngleY(eyePos, mCurAngle.y, FALSE, 1.0f, 0);
+
+    attention_info.position = current.pos;
+    attention_info.position.y += mpHIO->m.common.attention_offset;
 }

 /* 809BCA14-809BCB48 0014F4 0134+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::setCollision() {
-    // NONMATCHING
+    cXyz pos;
+    u32 tgType = 0xD8FBFDFF;
+    u32 tgSPrm = 0x1F;
+
+    if (!mHide) {
+        if (dComIfGp_event_runCheck()) {
+            tgType = 0;
+            tgSPrm = 0;
+        } else {
+            if (mTwilight) {
+                tgType = 0;
+                tgSPrm = 0;
+            } else if (mStagger.checkStagger()) {
+                tgType = 0;
+                tgSPrm = 0;
+            }
+        }
+
+        f32 cylH = mCylH;
+        f32 wallR = mWallR;
+        pos = current.pos;
+        mCyl1.SetCoSPrm(0x79);
+        mCyl1.SetTgType(tgType);
+        mCyl1.SetTgSPrm(tgSPrm);
+        mCyl1.OnTgNoHitMark();
+        mCyl1.SetH(cylH);
+        mCyl1.SetR(wallR);
+        mCyl1.SetC(pos);
+        dComIfG_Ccsp()->Set(&mCyl1);
+    }
+
+    mCyl1.ClrCoHit();
+    mCyl1.ClrTgHit();
 }

 /* 809BCB48-809BCB50 001628 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Gnd_cFv */
@@ -429,55 +540,186 @@ int daNpc_Gnd_c::drawDbgInfo() {

 /* 809BCB50-809BCCE8 001630 0198+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Gnd_cFiifi */
 bool daNpc_Gnd_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int param_3) {
-    // NONMATCHING
-    return false; // Placeholder
+    static struct {
+        int _0;
+        int _4;
+    } brkAnmData[] = {
+        {0x11, 1},
+    };
+
+    static struct {
+        int _0;
+        int _4;
+    } bpkAnmData[] = {
+        {0x0E, 1},
+    };
+    
+    J3DAnmTevRegKey* brk = NULL;
+    J3DAnmColor* bpk = NULL;
+
+    if (brkAnmData[param_0]._0 != -1) {
+        brk = getTevRegKeyAnmP(l_resNameList[brkAnmData[param_0]._4], brkAnmData[param_0]._0);
+    }
+
+    if (brk != NULL) {
+        if (mBrkAnm.getBrkAnm() == brk) {
+            mAnmFlags |= 0x100;
+        } else if (setBrkAnm(brk, mpMorf[0]->getModel()->getModelData(), 1.0f, param_1)) {
+            mAnmFlags |= 0x104;
+        }
+    }
+
+    if (brk == NULL && brkAnmData[param_0]._0 != -1) {
+        return 0;
+    }
+
+    if (bpkAnmData[param_0]._0 != -1) {
+        bpk = getColorAnmP(l_resNameList[bpkAnmData[param_0]._4], bpkAnmData[param_0]._0);
+    }
+
+    if (bpk != NULL) {
+        if (mBpkAnm.getBpkAnm() == bpk) {
+            mAnmFlags |= 0x200;
+        } else if (setBpkAnm(bpk, mpMorf[0]->getModel()->getModelData(), 1.0f, param_1)) {
+            mAnmFlags |= 0x208;
+        }
+    }
+
+    if (bpk == NULL && bpkAnmData[param_0]._0 != -1) {
+        return 0;
+    }
+
+    return 1;
 }

 /* 809BCCE8-809BCD30 0017C8 0048+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Gnd_cFv */
-void daNpc_Gnd_c::selectAction() {
-    // NONMATCHING
+int daNpc_Gnd_c::selectAction() {
+    mNextAction = NULL;
+    mNextAction = &daNpc_Gnd_c::wait;
+    return 1;
 }

 /* 809BCD30-809BCD5C 001810 002C+00 1/1 0/0 0/0 .text
 * chkAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i            */
-void daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*param_0)(void*)) {
-    // NONMATCHING
+int daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*i_action)(void*)) {
+    return mAction == i_action;
 }

 /* 809BCD5C-809BCE04 00183C 00A8+00 2/2 0/0 0/0 .text
 * setAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i            */
-void daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*param_0)(void*)) {
-    // NONMATCHING
+int daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*i_action)(void*)) {
+    mMode = MODE_EXIT;
+    if (mAction != NULL) {
+        (this->*(mAction))(NULL);
+    }
+
+    mMode = MODE_ENTER;
+    mAction = i_action;
+    if (mAction != NULL) {
+        (this->*(mAction))(NULL);
+    }
+
+    return 1;
 }

 /* 809BCE04-809BD050 0018E4 024C+00 1/0 0/0 0/0 .text            wait__11daNpc_Gnd_cFPv */
-void daNpc_Gnd_c::wait(void* param_0) {
-    // NONMATCHING
+int daNpc_Gnd_c::wait(void* param_0) {
+    switch (mMode) {
+    case MODE_ENTER:
+    case MODE_INIT:
+        if (!mStagger.checkStagger()) {
+            mFaceMotionSeqMngr.setNo(0, -1.0f, FALSE, 0);
+            mMotionSeqMngr.setNo(0, -1.0f, FALSE, 0);
+            mMode = MODE_RUN;
+        }
+    case MODE_RUN:
+        if (!mStagger.checkStagger()) {
+            if (mPlayerActorMngr.getActorP()) {
+                mJntAnm.lookNone(0);
+                if (chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) {
+                    mJntAnm.lookPlayer(0);
+                }
+                if (!srchPlayerActor() && home.angle.y == mCurAngle.y) {
+                    mMode = MODE_INIT;
+                }
+            } else {
+                mJntAnm.lookNone(0);
+                if (home.angle.y != mCurAngle.y) {
+                    if (field_0xe34 == 0) {
+                        setAngle(home.angle.y);
+                        mMode = MODE_INIT;
+                    } else if (step(home.angle.y, -1, -1, 15, 0)) {
+                        mMode = MODE_INIT;
+                    }
+                    attention_info.flags = 0;
+                } else {
+                    srchPlayerActor();
+                }
+            }
+        }
+        break;
+    case MODE_EXIT:
+        break;
+    }
+
+    return 1;
 }

 /* 809BD050-809BD248 001B30 01F8+00 2/0 0/0 0/0 .text            talk__11daNpc_Gnd_cFPv */
-void daNpc_Gnd_c::talk(void* param_0) {
-    // NONMATCHING
+int daNpc_Gnd_c::talk(void* param_0) {
+    switch (mMode) {
+    case MODE_ENTER:
+    case MODE_INIT:
+        if (!mStagger.checkStagger()) {
+            initTalk(mFlowNodeNo, NULL);
+            if (checkStep()) {
+                mStepMode = 0;
+            }
+            mMode = MODE_RUN;
+        }
+    case MODE_RUN:
+        if (!mStagger.checkStagger()) {
+            if (mTwilight || mCurAngle.y == fopAcM_searchPlayerAngleY(this)) {
+                if (talkProc(NULL, FALSE, NULL, FALSE)) {
+                    mPlayerActorMngr.entry(daPy_getPlayerActorClass());
+                    dComIfGp_event_reset();
+                    mMode = MODE_EXIT;
+                }
+                mJntAnm.lookPlayer(0);
+                if (mTwilight) {
+                    mJntAnm.lookNone(0);
+                }
+            } else {
+                mJntAnm.lookPlayer(0);
+                step(fopAcM_searchPlayerAngleY(this), -1, -1, 15, 0);
+            }
+        }
+        break;
+    case MODE_EXIT:
+        break;
+    }
+
+    return 0;
 }

 /* 809BD248-809BD268 001D28 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Create__FPv */
 static int daNpc_Gnd_Create(void* i_this) {
-    return static_cast<daNpc_Gnd_c*>(i_this)->create();
+    return ((daNpc_Gnd_c*)i_this)->create();
 }

 /* 809BD268-809BD288 001D48 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Delete__FPv */
 static int daNpc_Gnd_Delete(void* i_this) {
-    return static_cast<daNpc_Gnd_c*>(i_this)->Delete();
+    return ((daNpc_Gnd_c*)i_this)->Delete();
 }

 /* 809BD288-809BD2A8 001D68 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Execute__FPv */
 static int daNpc_Gnd_Execute(void* i_this) {
-    return static_cast<daNpc_Gnd_c*>(i_this)->Execute();
+    return ((daNpc_Gnd_c*)i_this)->Execute();
 }

 /* 809BD2A8-809BD2C8 001D88 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Draw__FPv */
 static int daNpc_Gnd_Draw(void* i_this) {
-    return static_cast<daNpc_Gnd_c*>(i_this)->Draw();
+    return ((daNpc_Gnd_c*)i_this)->Draw();
 }

 /* 809BD2C8-809BD2D0 001DA8 0008+00 1/0 0/0 0/0 .text            daNpc_Gnd_IsDelete__FPv */
@@ -485,73 +727,6 @@ static int daNpc_Gnd_IsDelete(void* i_this) {
    return 1;
 }

-/* ############################################################################################## */
-/* 809BE570-809BE578 0000D0 0008+00 0/1 0/0 0/0 .rodata          @4785 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_4785[8] = {
-    0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x809BE570, &lit_4785);
-#pragma pop
-
-/* 809BE578-809BE580 0000D8 0008+00 0/1 0/0 0/0 .rodata          @4786 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_4786[8] = {
-    0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x809BE578, &lit_4786);
-#pragma pop
-
-/* 809BE580-809BE588 0000E0 0008+00 0/1 0/0 0/0 .rodata          @4787 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_4787[8] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x809BE580, &lit_4787);
-#pragma pop
-
-extern "C" void talk__11daNpc_Gnd_cFPv();
-/* 809BE650-809BE65C -00001 000C+00 1/1 0/0 0/0 .data            @4607 */
-SECTION_DATA static void* lit_4607[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)talk__11daNpc_Gnd_cFPv,
-};
-
-/* 809BE65C-809BE668 -00001 000C+00 1/1 0/0 0/0 .data            @4617 */
-SECTION_DATA static void* lit_4617[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)talk__11daNpc_Gnd_cFPv,
-};
-
-/* 809BE668-809BE670 0000CC 0008+00 0/1 0/0 0/0 .data            brkAnmData$4830 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 brkAnmData[8] = {
-    0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x01,
-};
-#pragma pop
-
-/* 809BE670-809BE678 0000D4 0008+00 0/1 0/0 0/0 .data            bpkAnmData$4831 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 bpkAnmData[8] = {
-    0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x01,
-};
-#pragma pop
-
-extern "C" void wait__11daNpc_Gnd_cFPv();
-/* 809BE678-809BE684 -00001 000C+00 1/1 0/0 0/0 .data            @4881 */
-SECTION_DATA static void* lit_4881[3] = {
-    (void*)NULL,
-    (void*)0xFFFFFFFF,
-    (void*)wait__11daNpc_Gnd_cFPv,
-};
-
 /* 809BE684-809BE6A4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Gnd_MethodTable */
 static actor_method_class daNpc_Gnd_MethodTable = {
    (process_method_func)daNpc_Gnd_Create,
@@ -1857,8 +1857,8 @@ static void demo_camera_shop(npc_henna_class* i_this) {
                i_this->field_0x7b9 = 1;
                for (s32 i = 0; i < 100; i++) {
                    koro = &fshop->field_0x4008->mKoro2[i];
-                    if ((koro->field_0x34 >= 2 && koro->field_0x34 <= 5) ||
-                        (koro->field_0x34 >= 8 && koro->field_0x34 <= 11))
+                    if ((koro->part_id >= 2 && koro->part_id <= 5) ||
+                        (koro->part_id >= 8 && koro->part_id <= 11))
                    {
                        fshop->field_0x4008->mKoro2[i].field_0x60 = 1;
                    }