From e3d0b94122116ae1cd8188078ad6e710eb54a26c Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:43:25 -0500 Subject: [PATCH] d_a_npc work (#2306) --- include/d/actor/d_a_npc.h | 414 ++-- include/d/actor/d_a_npc_bou.h | 18 +- include/d/actor/d_a_npc_hanjo.h | 6 +- include/d/actor/d_a_npc_hoz.h | 8 +- include/d/actor/d_a_npc_kolin.h | 16 +- include/d/actor/d_a_obj_sekizoa.h | 6 +- include/d/d_attention.h | 4 +- include/d/d_com_inf_game.h | 2 +- include/d/d_stage.h | 2 +- src/d/actor/d_a_npc.cpp | 2757 ++++++++++++++------------ src/d/actor/d_a_npc_bans.cpp | 15 - src/d/actor/d_a_npc_besu.cpp | 15 - src/d/actor/d_a_npc_bou.cpp | 23 +- src/d/actor/d_a_npc_clerka.cpp | 20 - src/d/actor/d_a_npc_clerkb.cpp | 20 - src/d/actor/d_a_npc_clerkt.cpp | 20 - src/d/actor/d_a_npc_doc.cpp | 5 - src/d/actor/d_a_npc_fairy.cpp | 10 - src/d/actor/d_a_npc_fairy_seirei.cpp | 45 - src/d/actor/d_a_npc_gnd.cpp | 20 - src/d/actor/d_a_npc_grm.cpp | 20 - src/d/actor/d_a_npc_grmc.cpp | 20 - src/d/actor/d_a_npc_hanjo.cpp | 358 ++-- src/d/actor/d_a_npc_hoz.cpp | 28 +- src/d/actor/d_a_npc_jagar.cpp | 5 - src/d/actor/d_a_npc_kakashi.cpp | 40 - src/d/actor/d_a_npc_kkri.cpp | 20 - src/d/actor/d_a_npc_knj.cpp | 50 - src/d/actor/d_a_npc_kolin.cpp | 11 +- src/d/actor/d_a_npc_kolinb.cpp | 20 - src/d/actor/d_a_npc_kyury.cpp | 15 - src/d/actor/d_a_npc_len.cpp | 5 - src/d/actor/d_a_npc_lud.cpp | 15 - src/d/actor/d_a_npc_maro.cpp | 5 - src/d/actor/d_a_npc_midp.cpp | 20 - src/d/actor/d_a_npc_moi.cpp | 5 - src/d/actor/d_a_npc_pachi_besu.cpp | 10 - src/d/actor/d_a_npc_pachi_maro.cpp | 10 - src/d/actor/d_a_npc_pachi_taro.cpp | 15 - src/d/actor/d_a_npc_pouya.cpp | 15 - src/d/actor/d_a_npc_raca.cpp | 10 - src/d/actor/d_a_npc_saru.cpp | 15 - src/d/actor/d_a_npc_seib.cpp | 49 - src/d/actor/d_a_npc_seic.cpp | 50 - src/d/actor/d_a_npc_seid.cpp | 50 - src/d/actor/d_a_npc_seira.cpp | 15 - src/d/actor/d_a_npc_seira2.cpp | 20 - src/d/actor/d_a_npc_seirei.cpp | 45 - src/d/actor/d_a_npc_shaman.cpp | 15 - src/d/actor/d_a_npc_sola.cpp | 25 - src/d/actor/d_a_npc_taro.cpp | 5 - src/d/actor/d_a_npc_tkj.cpp | 25 - src/d/actor/d_a_npc_toby.cpp | 5 - src/d/actor/d_a_npc_uri.cpp | 5 - src/d/actor/d_a_npc_yamid.cpp | 20 - src/d/actor/d_a_npc_yamis.cpp | 20 - src/d/actor/d_a_npc_yamit.cpp | 20 - src/d/actor/d_a_npc_yelia.cpp | 15 - src/d/actor/d_a_npc_ykm.cpp | 10 - src/d/actor/d_a_npc_zanb.cpp | 15 - src/d/actor/d_a_npc_zant.cpp | 35 - src/d/actor/d_a_npc_zelR.cpp | 25 - src/d/actor/d_a_npc_zelRo.cpp | 20 - src/d/actor/d_a_npc_zelda.cpp | 15 - src/d/actor/d_a_obj_sekizoa.cpp | 20 - src/d/actor/d_a_peru.cpp | 25 - src/d/actor/d_a_tag_chgrestart.cpp | 5 +- src/d/actor/d_a_talk.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 6 +- src/d/actor/d_a_vrbox.cpp | 2 +- src/d/actor/d_a_vrbox2.cpp | 2 +- src/d/actor/d_flower.inc | 4 +- src/d/actor/d_grass.inc | 2 +- src/d/d_camera.cpp | 10 +- src/d/d_com_inf_game.cpp | 12 +- src/d/d_envse.cpp | 2 +- src/d/d_event.cpp | 26 +- src/d/d_event_data.cpp | 2 +- src/d/d_event_manager.cpp | 4 +- src/d/d_kankyo.cpp | 28 +- src/d/d_kankyo_rain.cpp | 4 +- src/d/d_kankyo_wether.cpp | 6 +- src/d/d_meter_map.cpp | 4 +- src/d/d_msg_flow.cpp | 8 +- src/d/d_path.cpp | 14 +- src/d/d_s_room.cpp | 8 +- src/d/d_shop_system.cpp | 89 +- src/d/d_stage.cpp | 8 +- src/f_op/f_op_actor.cpp | 4 +- 89 files changed, 2026 insertions(+), 2913 deletions(-) diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index 2abe7e6e109..cea1ddea720 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -25,7 +25,7 @@ struct dPnt : public dStage_dPnt_c {}; class daNpcT_ActorMngr_c { private: - /* 0x0 */ u32 mActorID; + /* 0x0 */ fpc_ProcID mActorID; public: /* 801456D4 */ void initialize(); @@ -42,25 +42,31 @@ class daNpcT_MatAnm_c : public J3DMaterialAnm { private: /* 0x0F4 */ mutable f32 field_0xF4; /* 0x0F8 */ mutable f32 field_0xF8; - /* 0x0FC */ f32 mTranslationX; - /* 0x100 */ f32 mTranslationY; - /* 0x104 */ u8 field_0x104; - /* 0x105 */ u8 field_0x105; + /* 0x0FC */ f32 mNowOffsetX; + /* 0x100 */ f32 mNowOffsetY; + /* 0x104 */ u8 mEyeMoveFlg; + /* 0x105 */ u8 mMorfFrm; public: daNpcT_MatAnm_c() { initialize(); } /* 80145764 */ void initialize(); + /* 8014D24C */ virtual ~daNpcT_MatAnm_c() {} /* 80145788 */ virtual void calc(J3DMaterial*) const; - /* 8014D24C */ ~daNpcT_MatAnm_c(); + + void setNowOffsetX(f32 i_value) { mNowOffsetX = i_value; } + void setNowOffsetY(f32 i_value) { mNowOffsetY = i_value; } + void onEyeMoveFlg() { mEyeMoveFlg = 1; } + void offEyeMoveFlg() { mEyeMoveFlg = 0; } + void setMorfFrm(u8 i_value) { mMorfFrm = i_value; } }; class daNpcT_MotionSeqMngr_c { public: class sequenceStepData_c { public: - s16 field_0x0; - s8 field_0x2; - s8 field_0x3; + /* 0x0 */ s16 mAnmIdx; + /* 0x2 */ s8 mMorf; + /* 0x3 */ s8 mLoopCount; }; // Size: 0x4? /* 80145898 */ void initialize(); @@ -68,32 +74,35 @@ class daNpcT_MotionSeqMngr_c { /* 80145A24 */ s32 checkEndSequence(); daNpcT_MotionSeqMngr_c(sequenceStepData_c const* param_1,int param_2) : - mpSeqData(param_1), field_0x4(param_2) { + mpSeqData(param_1), mStepNum(param_2) { initialize(); } - bool checkEntryNewMotion() { return mStepNo == 0 && field_0x14 == -1; } + bool checkEntryNewMotion() { return mStepNo == 0 && mPrevStepNo == -1; } int getNo() { return mNo; } + int getOffset() { return mOffset; } int getStepNo() { return mStepNo; } - void setNo(int param_1, f32 param_2, int param_3, int param_4) { - int newNo = param_4 + param_1; - if (param_1 >= 0 && (param_3 != 0 || newNo != mNo)) { - int offset = mOffset; - initialize(); - mOffset = offset; - mNo = newNo; - field_0x18 = param_2; + void setNo(int i_index, f32 i_morf, BOOL i_reset, int i_offset) { + if (i_index >= 0) { + int newNo = i_index + i_offset; + if (i_reset || newNo != mNo) { + int offset = mOffset; + initialize(); + mOffset = offset; + mNo = newNo; + mInitialMorf = i_morf; + } } } private: /* 0x00 */ sequenceStepData_c const* mpSeqData; - /* 0x04 */ int field_0x4; + /* 0x04 */ int mStepNum; /* 0x08 */ int mNo; /* 0x0C */ int mOffset; /* 0x10 */ int mStepNo; - /* 0x14 */ int field_0x14; - /* 0x18 */ f32 field_0x18; + /* 0x14 */ int mPrevStepNo; + /* 0x18 */ f32 mInitialMorf; /* 0x1C */ bool mEndSequence; public: @@ -103,25 +112,25 @@ class daNpcT_MotionSeqMngr_c { class daNpcT_JntAnm_c { private: /* 0x000 */ daNpcT_ActorMngr_c mActrMngr; - /* 0x008 */ cXyz field_0x8; - /* 0x014 */ cXyz field_0x14; - /* 0x020 */ cXyz* field_0x20; + /* 0x008 */ cXyz mPos; + /* 0x014 */ cXyz mAttnPos; + /* 0x020 */ cXyz* mAttnPosP; /* 0x024 */ cXyz field_0x24; - /* 0x030 */ cXyz field_0x30[3]; + /* 0x030 */ cXyz mJntPos[3]; /* 0x054 */ cXyz field_0x54[3]; - /* 0x078 */ cXyz field_0x78[3]; - /* 0x09C */ cXyz field_0x9c[3]; + /* 0x078 */ cXyz mMinRad[3]; + /* 0x09C */ cXyz mMaxRad[3]; /* 0x0C0 */ cXyz mRad[3]; /* 0x0E4 */ cXyz field_0xe4[3]; - /* 0x108 */ cXyz field_0x108; - /* 0x114 */ cXyz field_0x114; + /* 0x108 */ cXyz mEyePos; + /* 0x114 */ cXyz mHeadPos; /* 0x120 */ cXyz field_0x120; /* 0x12C */ csXyz mEyeAngle; /* 0x132 */ csXyz field_0x132; /* 0x138 */ int mMode; - /* 0x13C */ u8 field_0x13c[4]; - /* 0x140 */ int field_0x140; - /* 0x144 */ u8 field_0x144[4]; + /* 0x13C */ int field_0x13c; + /* 0x140 */ int mBaseTimer; + /* 0x144 */ int mTimer; /* 0x148 */ f32 field_0x148; /* 0x14C */ f32 field_0x14c; /* 0x150 */ csXyz field_0x150; @@ -135,11 +144,12 @@ class daNpcT_JntAnm_c { f32, f32, f32, f32, f32, f32, cXyz*); /* 80147858 */ void calc(f32); /* 80147C38 */ void calcJntRad(f32, f32, f32); + void setEyeAngleX(cXyz param_1, f32 param_2, s16 param_3) { cXyz cStack_50; s16 sVar3 = 0; - if (field_0x20 != NULL) { - cStack_50 = *field_0x20 - param_1; + if (mAttnPosP != NULL) { + cStack_50 = *mAttnPosP - param_1; sVar3 = -cM_atan2s(cStack_50.y, cStack_50.absXZ()); sVar3 += param_3; } @@ -151,8 +161,8 @@ class daNpcT_JntAnm_c { void setEyeAngleY(cXyz param_1, s16 param_2, int param_3, f32 param_4, s16 param_5) { cXyz cStack_50; s16 sVar3 = 0; - if (field_0x20 != NULL) { - cStack_50 = *field_0x20 - param_1; + if (mAttnPosP != NULL) { + cStack_50 = *mAttnPosP - param_1; sVar3 = cM_atan2s(cStack_50.x, cStack_50.z); sVar3 -= param_2; s16 diff = field_0x150.y - param_2; @@ -166,6 +176,47 @@ class daNpcT_JntAnm_c { sVar3 * (1.0f / param_4); } + s16 getEyeAngleX() { return mEyeAngle.x; } + s16 getEyeAngleY() { return mEyeAngle.y; } + + f32 getJntRadX(int param_0) { + f32 ret = field_0xe4[2].x; + if (param_0 == 0) { + ret += field_0xe4[0].x * (1.0f - field_0x148); + } else if (param_0 == 1) { + ret += field_0xe4[0].x * field_0x148; + } + return ret; + } + + f32 getJntRadY(int param_0) { + f32 ret = field_0xe4[2].y; + if (param_0 == 0) { + ret += field_0xe4[0].y * (1.0f - field_0x148); + } else if (param_0 == 1) { + ret += field_0xe4[0].y * field_0x148; + } + return ret; + } + + s16 getJntRadX2S(int param_0) { + return cM_rad2s(getJntRadX(param_0)); + } + + s16 getJntRadY2S(int param_0) { + return cM_rad2s(getJntRadY(param_0)); + } + + void clrRad() { + for (int i = 0; i < 3; i++) { + mRad[i].setall(0.0f); + } + } + + int getTime() { + return cLib_getRndValue(mBaseTimer / 2, mBaseTimer); + } + daNpcT_JntAnm_c() { initialize(); } @@ -177,7 +228,7 @@ class daNpcT_JntAnm_c { int setMode(int mode, int param_2) { if (mode >= 0 && (param_2 != 0 || mode != mMode)) { mActrMngr.remove(); - field_0x20 = NULL; + mAttnPosP = NULL; field_0x14c = 0.0f; mDirectFlag = 0; mMode = mode; @@ -221,7 +272,7 @@ class daNpcT_JntAnm_c { class daNpcT_DmgStagger_c { public: /* 80147DCC */ void setParam(fopAc_ac_c*, fopAc_ac_c*, s16); - /* 80147E3C */ void calc(int); + /* 80147E3C */ void calc(BOOL); void initialize() { for (int i = 0; i < 2; i++) { @@ -253,21 +304,37 @@ struct daNpcT_evtData_c { }; struct daNpcT_faceMotionAnmData_c { - u32 field_0x0[6]; - u32 field_0x18; + /* 0x00 */ int mBckFileIdx; + /* 0x04 */ int mBckAttr; + /* 0x08 */ int mBckArcIdx; + /* 0x0C */ int mBtpFileIdx; + /* 0x10 */ int mBtpAttr; + /* 0x14 */ int mBtpArcIdx; + /* 0x18 */ BOOL field_0x18; }; -struct daNpcT_pntData_c {}; +struct daNpcT_pntData_c { + /* 0x0 */ int field_0x0; + /* 0x4 */ int field_0x4; +}; struct daNpcT_motionAnmData_c { - u32 field_0x0[6]; - u32 field_0x18; + /* 0x00 */ int mBckFileIdx; + /* 0x04 */ int mBckAttr; + /* 0x08 */ int mBckArcIdx; + /* 0x0C */ int mBtkFileIdx; + /* 0x10 */ int mBtkAttr; + /* 0x14 */ int mBtkArcIdx; + /* 0x18 */ s16 field_0x18; + /* 0x1A */ s16 field_0x1a; }; class daNpcT_Hermite_c { public: /* 0x00 */ f32 field_0x00; - /* 0x04 */ cXyz mPosition; + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0c; /* 0x10 */ f32 field_0x10; /* 8014CBAC */ virtual ~daNpcT_Hermite_c() {} @@ -277,9 +344,9 @@ class daNpcT_Hermite_c { field_0x00 = param_1; f32 sqr = param_1 * param_1; f32 cubed = param_1 * sqr; - mPosition.x = 1.0f + (2.0f * cubed - 3.0f * sqr); - mPosition.y = 4.0f * cubed + 3.0f * sqr; - mPosition.z = param_1 + (cubed - 2.0f * sqr); + field_0x04 = 1.0f + (2.0f * cubed - 3.0f * sqr); + field_0x08 = -2.0f * cubed + 3.0f * sqr; + field_0x0c = param_1 + (cubed - 2.0f * sqr); field_0x10 = cubed - sqr; } }; @@ -332,23 +399,23 @@ class mDoExt_McaMorfSO; class daNpcT_c : public fopAc_ac_c { public: - /* 0x568 */ daNpcT_faceMotionAnmData_c const* field_0x568; - /* 0x56C */ daNpcT_motionAnmData_c const* field_0x56c; - /* 0x570 */ daNpcT_evtData_c const* field_0x570; - /* 0x574 */ char** field_0x574; + /* 0x568 */ daNpcT_faceMotionAnmData_c const* mpFaceMotionAnmData; + /* 0x56C */ daNpcT_motionAnmData_c const* mpMotionAnmData; + /* 0x570 */ daNpcT_evtData_c const* mpEvtData; + /* 0x574 */ char** mpArcNames; /* 0x578 */ mDoExt_McaMorfSO* mpMorf[2]; - /* 0x580 */ Z2Creature field_0x580; + /* 0x580 */ Z2Creature mSound; /* 0x610 */ mDoExt_bckAnm mBckAnm; /* 0x62C */ mDoExt_btpAnm mBtpAnm; /* 0x644 */ mDoExt_btkAnm mBtkAnm; /* 0x65C */ mDoExt_brkAnm mBrkAnm; /* 0x674 */ mDoExt_bpkAnm mBpkAnm; - /* 0x68C */ dBgS_ObjAcch field_0x68c; - /* 0x864 */ dCcD_Stts field_0x864; + /* 0x68C */ dBgS_ObjAcch mAcch; + /* 0x864 */ dCcD_Stts mCcStts; /* 0x8A0 */ dBgS_AcchCir field_0x8a0; - /* 0x8E0 */ request_of_phase_process_class field_0x8e0[10]; - /* 0x930 */ cBgS_GndChk field_0x930; - /* 0x96C */ daNpcT_MatAnm_c* field_0x96c; + /* 0x8E0 */ request_of_phase_process_class mPhase[10]; + /* 0x930 */ cBgS_GndChk mGndChk; + /* 0x96C */ daNpcT_MatAnm_c* mpMatAnm; /* 0x970 */ u8 field_0x970[4]; /* 0x974 */ dMsgFlow_c mFlow; /* 0x9C0 */ dPaPoT_c field_0x9c0; @@ -357,75 +424,79 @@ class daNpcT_c : public fopAc_ac_c { /* 0xA80 */ f32 field_0xa80; /* 0xA84 */ f32 field_0xa84; /* 0xA88 */ u8 field_0xa88; - /* 0xA89 */ u8 field_0xa89; + /* 0xA89 */ bool mTwilight; /* 0xA8C */ dBgS_GndChk field_0xa8c; - /* 0xAE0 */ dBgS_LinChk field_0xae0; - /* 0xB50 */ daNpcT_MotionSeqMngr_c field_0xb50; - /* 0xB74 */ daNpcT_MotionSeqMngr_c field_0xb74; - /* 0xB98 */ daNpcT_ActorMngr_c field_0xb98; + /* 0xAE0 */ dBgS_LinChk mLinChk; + /* 0xB50 */ daNpcT_MotionSeqMngr_c mFaceMotionSeqMngr; + /* 0xB74 */ daNpcT_MotionSeqMngr_c mMotionSeqMngr; + /* 0xB98 */ daNpcT_ActorMngr_c mPlayerActorMngr; /* 0xBA0 */ daNpcT_ActorMngr_c field_0xba0; - /* 0xBA8 */ daNpcT_JntAnm_c field_0xba8; + /* 0xBA8 */ daNpcT_JntAnm_c mJntAnm; /* 0xD08 */ daNpcT_DmgStagger_c field_0xd08; - /* 0xD24 */ cXyz field_0xd24; - /* 0xD30 */ cXyz field_0xd30; - /* 0xD3C */ cXyz field_0xd3c; - /* 0xD48 */ cXyz field_0xd48; - /* 0xD54 */ cXyz field_0xd54; - /* 0xD60 */ cXyz field_0xd60; + /* 0xD24 */ cXyz mFootLPos; + /* 0xD30 */ cXyz mFootRPos; + /* 0xD3C */ cXyz mFootLOffset; + /* 0xD48 */ cXyz mFootROffset; + /* 0xD54 */ cXyz mOldFootLOffset; + /* 0xD60 */ cXyz mOldFootROffset; /* 0xD6C */ cXyz field_0xd6c; - /* 0xD78 */ csXyz field_0xd78; + /* 0xD78 */ csXyz mCurAngle; /* 0xD7E */ csXyz field_0xd7e; /* 0xD84 */ csXyz field_0xd84; /* 0xD8A */ csXyz field_0xd8a; - /* 0xD90 */ u32 field_0xd90; - /* 0xD94 */ u32 field_0xd94; - /* 0xD98 */ u32 field_0xd98; + /* 0xD90 */ fpc_ProcID mItemId; + /* 0xD94 */ u32 mShadowKey; + /* 0xD98 */ u32 mAnmFlags; /* 0xD9C */ u32 mMsgId; - /* 0xDA0 */ u8 field_0xda0[8]; - /* 0xDA8 */ u32 field_0xda8; + /* 0xDA0 */ u32 mHitodamaPrtclKey[2]; + /* 0xDA8 */ u32 mPolSound; /* 0xDAC */ int field_0xdac; /* 0xDB0 */ int mCutType; /* 0xDB4 */ int field_0xdb4; - /* 0xDB8 */ int field_0xdb8; - /* 0xDBC */ int mTimer; - /* 0xDC0 */ int field_0xdc0; + /* 0xDB8 */ int mDamageTimerStart; + /* 0xDBC */ int mDamageTimer; + /* 0xDC0 */ int mBtpPauseTimer; /* 0xDC4 */ int field_0xdc4; /* 0xDC8 */ s16 field_0xdc8; - /* 0xDCA */ s16 field_0xdca; - /* 0xDCC */ u8 field_0xdcc[10]; - /* 0xDD4 */ s16 field_0xdd4; - /* 0xDD8 */ s16 mStepNo; - /* 0xDDA */ s16 field_0xdda; - /* 0xDDC */ f32 field_0xddc; + /* 0xDCA */ s16 mGroundAngle; + /* 0xDCC */ u8 field_0xdcc[2]; + /* 0xDCE */ s16 mFootLPolyAngle; + /* 0xDD0 */ u8 field_0xdd0[2]; + /* 0xDD2 */ s16 mFootRPolyAngle; + /* 0xDD4 */ s16 mStartAngle; + /* 0xDD6 */ s16 mTargetAngle; + /* 0xDD8 */ s16 mStepMode; + /* 0xDDA */ s16 mTurnAmount; + /* 0xDDC */ f32 mTurnCount; /* 0xDE0 */ f32 field_0xde0; /* 0xDE4 */ f32 field_0xde4; /* 0xDE8 */ f32 field_0xde8; /* 0xDEC */ f32 field_0xdec; /* 0xDF0 */ f32 field_0xdf0; - /* 0xDF4 */ f32 field_0xdf4; + /* 0xDF4 */ f32 mGroundH; /* 0xDF8 */ f32 field_0xdf8; /* 0xDFC */ f32 field_0xdfc; /* 0xE00 */ cXyz field_0xe00; /* 0xE0C */ cXyz field_0xe0c; /* 0xE18 */ s16 field_0xe18; /* 0xE1A */ s16 field_0xe1a; - /* 0xE1C */ s16 field_0xe1c; - /* 0xE1E */ u16 field_0xe1e; - /* 0xE20 */ u16 field_0xe20; + /* 0xE1C */ s16 mEvtId; + /* 0xE1E */ u16 mMorfLoops; + /* 0xE20 */ u16 mBckLoops; /* 0xE22 */ u16 field_0xe22; - /* 0xE24 */ s8 field_0xe24; + /* 0xE24 */ s8 mReverb; /* 0xE25 */ u8 field_0xe25; - /* 0xE26 */ u8 field_0xe26; - /* 0xE27 */ u8 field_0xe27; - /* 0xE28 */ u8 field_0xe28; + /* 0xE26 */ bool field_0xe26; + /* 0xE27 */ u8 mFootLOnGround; + /* 0xE28 */ u8 mFootROnGround; /* 0xE29 */ u8 field_0xe29; /* 0xE2A */ u8 field_0xe2a; - /* 0xE2B */ u8 field_0xe2b; + /* 0xE2B */ bool mNoDraw; /* 0xE2C */ u8 field_0xe2c; /* 0xE2D */ u8 field_0xe2d; /* 0xE2E */ u8 field_0xe2e[2]; - /* 0xE30 */ u16 field_0xe30; - /* 0xE32 */ u8 field_0xe32; + /* 0xE30 */ u16 mEvtNo; + /* 0xE32 */ bool mSpeakEvent; /* 0xE33 */ u8 field_0xe33; /* 0xE34 */ u8 field_0xe34; /* 0xE35 */ u8 field_0xe35; @@ -435,32 +506,32 @@ class daNpcT_c : public fopAc_ac_c { /* 0xE3C vtable */ public: - daNpcT_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, + daNpcT_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, - daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, daNpcT_evtData_c const* param_7, - char** param_8) : - field_0x568(param_1), - field_0x56c(param_2), - field_0x570(param_7), - field_0x574(param_8), - field_0xb50(param_3, param_4), - field_0xb74(param_5, param_6) { + daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, daNpcT_evtData_c const* i_evtData, + char** i_arcNames) : + mpFaceMotionAnmData(i_faceMotionAnmData), + mpMotionAnmData(i_motionAnmData), + mpEvtData(i_evtData), + mpArcNames(i_arcNames), + mFaceMotionSeqMngr(param_3, param_4), + mMotionSeqMngr(param_5, param_6) { initialize(); } /* 80147FA4 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - /* 80147FD4 */ static int srchActor(void*, void*); + /* 80147FD4 */ static void* srchActor(void*, void*); /* 80148058 */ J3DAnmTransform* getTrnsfrmAnmP(char const*, int); /* 80148094 */ J3DAnmTransformKey* getTrnsfrmKeyAnmP(char const*, int); /* 801480D0 */ J3DAnmTexPattern* getTexPtrnAnmP(char const*, int); /* 8014810C */ J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char const*, int); /* 80148148 */ J3DAnmTevRegKey* getTevRegKeyAnmP(char const*, int); /* 80148184 */ J3DAnmColor* getColorAnmP(char const*, int); - /* 801481C0 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); + /* 801481C0 */ int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); /* 80148204 */ int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 801482F8 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - /* 80148338 */ void setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); - /* 80148378 */ void setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int); - /* 801483B8 */ void setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int); + /* 801482F8 */ int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); + /* 80148338 */ int setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); + /* 80148378 */ int setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int); + /* 801483B8 */ int setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int); /* 801483F8 */ int loadRes(s8 const*, char const**); /* 801484AC */ void deleteRes(s8 const*, char const**); /* 8014852C */ int execute(); @@ -484,63 +555,63 @@ class daNpcT_c : public fopAc_ac_c { /* 8014ABD0 */ BOOL chkActorInSight(fopAc_ac_c*, f32, s16); /* 8014ACF0 */ BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16); /* 8014ADA0 */ BOOL chkPointInArea(cXyz, cXyz, cXyz, s16); - /* 8014AE1C */ void chkFindActor(fopAc_ac_c*, int, s16); - /* 8014B024 */ void chkWolfAction(); - /* 8014B0C8 */ void chkFindWolf(s16, int, int, f32, f32, f32, f32, int); + /* 8014AE1C */ BOOL chkFindActor(fopAc_ac_c*, BOOL, s16); + /* 8014B024 */ BOOL chkWolfAction(); + /* 8014B0C8 */ BOOL chkFindWolf(s16, int, int, f32, f32, f32, f32, BOOL); /* 8014B338 */ BOOL srchPlayerActor(); - /* 8014B3EC */ void getAttnPos(fopAc_ac_c*); - /* 8014B4A4 */ void turn(s16, int, int); - /* 8014B648 */ int step(s16, int, int, int, int); - /* 8014B808 */ void calcSpeedAndAngle(cXyz, int, s16, s16); - /* 8014BB00 */ void getActorDistance(fopAc_ac_c*, int, int); - /* 8014BBF0 */ int initTalk(int, fopAc_ac_c**); - /* 8014BC78 */ int talkProc(int*, int, fopAc_ac_c**, int); + /* 8014B3EC */ cXyz getAttnPos(fopAc_ac_c*); + /* 8014B4A4 */ BOOL turn(s16, int, int); + /* 8014B648 */ BOOL step(s16, int, int, int, int); + /* 8014B808 */ void calcSpeedAndAngle(cXyz, BOOL, s16, s16); + /* 8014BB00 */ int getActorDistance(fopAc_ac_c*, int, int); + /* 8014BBF0 */ BOOL initTalk(int, fopAc_ac_c**); + /* 8014BC78 */ BOOL talkProc(int*, BOOL, fopAc_ac_c**, BOOL); /* 8014BE2C */ fopAc_ac_c* getNearestActorP(s16); /* 8014BEE4 */ fopAc_ac_c* getEvtAreaTagP(int, int); /* 8014BFB0 */ fopAc_ac_c* getShopItemTagP(); /* 8014C030 */ void setHitodamaPrtcl(); - /* 8014CD20 */ virtual ~daNpcT_c(); - /* 801490D4 */ virtual void ctrlBtk(); + /* 8014CD20 */ virtual ~daNpcT_c() {} + /* 801490D4 */ virtual BOOL ctrlBtk(); /* 8014CC14 */ virtual void ctrlSubFaceMotion(int) {} - /* 8014CC40 */ virtual int checkChangeJoint(int); - /* 8014CC38 */ virtual int checkRemoveJoint(int); - /* 8014CC5C */ virtual s32 getBackboneJointNo(); - /* 8014CC54 */ virtual s32 getNeckJointNo(); - /* 8014CC4C */ virtual s32 getHeadJointNo(); - /* 8014CC90 */ virtual s32 getFootLJointNo(); - /* 8014CC88 */ virtual s32 getFootRJointNo(); - /* 8014D0A8 */ virtual int getEyeballLMaterialNo() { return 0; } - /* 8014D0B0 */ virtual bool getEyeballRMaterialNo() { return 0; } + /* 8014CC40 */ virtual BOOL checkChangeJoint(int) { return FALSE; } + /* 8014CC38 */ virtual BOOL checkRemoveJoint(int) { return FALSE; } + /* 8014CC5C */ virtual s32 getBackboneJointNo() { return -1; } + /* 8014CC54 */ virtual s32 getNeckJointNo() { return -1; } + /* 8014CC4C */ virtual s32 getHeadJointNo() { return -1; } + /* 8014CC90 */ virtual s32 getFootLJointNo() { return -1; } + /* 8014CC88 */ virtual s32 getFootRJointNo() { return -1; } + /* 8014D0A8 */ virtual s32 getEyeballLMaterialNo() { return 0; } + /* 8014D0B0 */ virtual s32 getEyeballRMaterialNo() { return 0; } /* 8014D0B8 */ virtual s32 getEyeballMaterialNo() { return 0; } - /* 8014951C */ virtual void ctrlJoint(J3DJoint*, J3DModel*); - /* 8014CC48 */ virtual void afterJntAnm(int); - /* 8014CC24 */ virtual void setParam(); - /* 8014CC80 */ virtual bool checkChangeEvt(); - /* 8014CC78 */ virtual bool evtTalk(); - /* 8014CC70 */ virtual bool evtEndProc() { return true; } - /* 8014CC68 */ virtual bool evtCutProc(); - /* 8014CC64 */ virtual void setAfterTalkMotion(); - /* 8014997C */ virtual int evtProc(); - /* 8014CC20 */ virtual void action(); - /* 8014CC1C */ virtual void beforeMove(); - /* 8014CC18 */ virtual void afterMoved(); - /* 8014CC10 */ virtual void setAttnPos(); + /* 8014951C */ virtual int ctrlJoint(J3DJoint*, J3DModel*); + /* 8014CC48 */ virtual void afterJntAnm(int) {} + /* 8014CC24 */ virtual void setParam() {} + /* 8014CC80 */ virtual BOOL checkChangeEvt() { return FALSE; } + /* 8014CC78 */ virtual BOOL evtTalk() { return TRUE; } + /* 8014CC70 */ virtual BOOL evtEndProc() { return TRUE; } + /* 8014CC68 */ virtual BOOL evtCutProc() { return FALSE; } + /* 8014CC64 */ virtual void setAfterTalkMotion() {} + /* 8014997C */ virtual BOOL evtProc(); + /* 8014CC20 */ virtual void action() {} + /* 8014CC1C */ virtual void beforeMove() {} + /* 8014CC18 */ virtual void afterMoved() {} + /* 8014CC10 */ virtual void setAttnPos() {} /* 80149BB4 */ virtual void setFootPos(); - /* 8014CC0C */ virtual void setCollision(); + /* 8014CC0C */ virtual void setCollision() {} /* 80149D7C */ virtual void setFootPrtcl(cXyz*, f32, f32); /* 8014A05C */ virtual bool checkCullDraw(); /* 8014A064 */ virtual void twilight(); - /* 8014CC98 */ virtual bool chkXYItems() { return false; } + /* 8014CC98 */ virtual BOOL chkXYItems() { return FALSE; } /* 8014A0B0 */ virtual void evtOrder(); /* 8014CBF4 */ virtual void decTmr() { - if (mTimer != 0) { - mTimer--; + if (mDamageTimer != 0) { + mDamageTimer--; } } /* 8014A324 */ virtual void clrParam(); - /* 8014CC30 */ virtual int drawDbgInfo(); - /* 8014CC28 */ virtual void drawOtherMdl(); + /* 8014CC30 */ virtual int drawDbgInfo() { return 0; } + /* 8014CC28 */ virtual void drawOtherMdl() {} /* 8014CC2C */ virtual void drawGhost() {} /* 8014CCA0 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int) { return true; } /* 8014CCE0 */ virtual bool afterSetMotionAnm(int, int, f32, int) { return true; } @@ -552,20 +623,21 @@ class daNpcT_c : public fopAc_ac_c { /* 8014CCE8 */ virtual void changeBtk(int*, int*) {} /* 8014A628 */ virtual bool setMotionAnm(int, f32, int); - bool checkHide() { return field_0xe25 || (!dComIfGs_wolfeye_effect_check() && field_0xa89); } - s16 checkStep() { return mStepNo == 1; } + bool checkHide() { return field_0xe25 || (!dComIfGs_wolfeye_effect_check() && mTwilight); } + s16 checkStep() { return mStepMode == 1; } void setCommander(fopAc_ac_c* param_0) { field_0xba0.entry(param_0); } + void setCutType(int i_cutType) { mCutType = i_cutType; } void initialize() { - memset(&field_0xd24, 0, (u8*)&field_0xe38 - (u8*)&field_0xd24); - field_0xb50.initialize(); - field_0xb74.initialize(); - field_0xb98.initialize(); + memset(&mFootLPos, 0, (u8*)&field_0xe38 - (u8*)&mFootLPos); + mFaceMotionSeqMngr.initialize(); + mMotionSeqMngr.initialize(); + mPlayerActorMngr.initialize(); field_0xba0.initialize(); - field_0xba8.initialize(); + mJntAnm.initialize(); field_0xd08.initialize(); - field_0xd90 = 0xffffffff; - field_0xe26 = 1; + mItemId = fpcM_ERROR_PROCESS_ID_e; + field_0xe26 = true; field_0xe1a = cM_rndF(65536.0f); field_0xde0 = 0.2f; field_0xde4 = 0.2f; @@ -577,12 +649,30 @@ class daNpcT_c : public fopAc_ac_c { static fopAc_ac_c* mFindActorPtrs[50]; static s16 mSrchName; static s32 mFindCount; + + enum AnmFlags { + ANM_PAUSE_MORF = 0x1, + ANM_PAUSE_BTK = 0x2, + ANM_PAUSE_BRK = 0x4, + ANM_PAUSE_BPK = 0x8, + ANM_PAUSE_BCK = 0x10, + ANM_PAUSE_BTP = 0x20, + ANM_PLAY_MORF = 0x40, + ANM_PLAY_BTK = 0x80, + ANM_PLAY_BRK = 0x100, + ANM_PLAY_BPK = 0x200, + ANM_PLAY_BCK = 0x400, + ANM_PLAY_BTP = 0x800, + ANM_FLAG_1000 = 0x1000, + ANM_PAUSE_TIMER_BTP = 0x2000, + ANM_FLAG_4000 = 0x4000, + }; }; STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40); BOOL daNpcT_chkEvtBit(u32 i_idx); -BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4); +BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, BOOL param_4); u8 daNpcT_getDistTableIdx(int param_0, int param_1); BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_ActorP); void daNpcT_offTmpBit(u32 i_idx); @@ -756,7 +846,7 @@ class daBaseNpc_moveBgActor_c : public daBaseNpc_c { class daNpcF_ActorMngr_c { private: - /* 0x0 */ u32 mActorID; + /* 0x0 */ fpc_ProcID mActorID; public: daNpcF_ActorMngr_c() { initialize(); } diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h index ee383764b51..e6469b2cb76 100644 --- a/include/d/actor/d_a_npc_bou.h +++ b/include/d/actor/d_a_npc_bou.h @@ -54,10 +54,10 @@ class daNpc_Bou_c : public daNpcT_c { /* 809727B4 */ virtual s32 getEyeballMaterialNo(); /* 8096DD44 */ virtual void afterJntAnm(int); /* 8096DDC8 */ virtual void setParam(); - /* 8096DF9C */ virtual bool checkChangeEvt(); - /* 8096E27C */ virtual bool evtTalk(); - /* 8096E31C */ virtual bool evtEndProc(); - /* 8096E324 */ virtual bool evtCutProc(); + /* 8096DF9C */ virtual BOOL checkChangeEvt(); + /* 8096E27C */ virtual BOOL evtTalk(); + /* 8096E31C */ virtual BOOL evtEndProc(); + /* 8096E324 */ virtual BOOL evtCutProc(); /* 8096E0EC */ virtual void setAfterTalkMotion(); /* 8096E3EC */ virtual void action(); /* 8096E7E0 */ virtual void beforeMove(); @@ -71,15 +71,15 @@ class daNpc_Bou_c : public daNpcT_c { BOOL speakTo() { if (field_0xf80 == 4) { - if (current.pos.absXZ(daPy_getPlayerActorClass()->current.pos) < 1100.0f && strlen(field_0x570[5].eventName) != 0) { - u32 len = strlen(field_0x574[field_0x570[5].num]); + if (current.pos.absXZ(daPy_getPlayerActorClass()->current.pos) < 1100.0f && strlen(mpEvtData[5].eventName) != 0) { + u32 len = strlen(mpArcNames[mpEvtData[5].num]); if (len != 0) { - eventInfo.setArchiveName(field_0x574[field_0x570[5].num]); + eventInfo.setArchiveName(mpArcNames[mpEvtData[5].num]); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); } - field_0xe1c = dComIfGp_getEventManager().getEventIdx(this, field_0x570[5].eventName, 0xFF); - fopAcM_orderOtherEventId(this, field_0xe1c, 0xFF, 0xFFFF, 4, 1); + mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[5].eventName, 0xFF); + fopAcM_orderOtherEventId(this, mEvtId, 0xFF, 0xFFFF, 4, 1); return 1; } } diff --git a/include/d/actor/d_a_npc_hanjo.h b/include/d/actor/d_a_npc_hanjo.h index d5546da996f..913dfdd6394 100644 --- a/include/d/actor/d_a_npc_hanjo.h +++ b/include/d/actor/d_a_npc_hanjo.h @@ -121,11 +121,11 @@ class daNpc_Hanjo_c : public daNpcT_c { /* 809F9D9C */ void reset(); /* 809F9FCC */ void afterJntAnm(int); /* 809FA050 */ void setParam(); - /* 809FA1C4 */ bool checkChangeEvt(); + /* 809FA1C4 */ BOOL checkChangeEvt(); /* 809FA3B8 */ void setAfterTalkMotion(); /* 809FA45C */ void srchActors(); - /* 809FA55C */ bool evtTalk(); - /* 809FA5FC */ bool evtCutProc(); + /* 809FA55C */ BOOL evtTalk(); + /* 809FA5FC */ BOOL evtCutProc(); /* 809FA6C4 */ void action(); /* 809FA88C */ void beforeMove(); /* 809FAABC */ void afterMoved(); diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index f34fbe37170..302964e79ee 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -38,10 +38,10 @@ class daNpc_Hoz_c : public daNpcT_c { /* 80A021DC */ void setParam(); /* 80A0236C */ void setAfterTalkMotion(); /* 80A02370 */ void srchActors(); - /* 80A02374 */ bool checkChangeEvt(); - /* 80A023EC */ bool evtTalk(); - /* 80A024D0 */ bool evtEndProc(); - /* 80A0260C */ bool evtCutProc(); + /* 80A02374 */ BOOL checkChangeEvt(); + /* 80A023EC */ BOOL evtTalk(); + /* 80A024D0 */ BOOL evtEndProc(); + /* 80A0260C */ BOOL evtCutProc(); /* 80A026D4 */ int evtProc(); /* 80A02918 */ void action(); /* 80A029A0 */ void beforeMove(); diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index a721455eefd..13361bd6d3e 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -61,9 +61,9 @@ class daNpc_Kolin_c : public daNpcT_c { /* 8055A498 */ virtual s32 getEyeballMaterialNo(); /* 80554EBC */ virtual void afterJntAnm(int); /* 80554F48 */ virtual void setParam(); - /* 80555118 */ virtual bool checkChangeEvt(); - /* 80555448 */ virtual bool evtTalk(); - /* 805554E8 */ virtual bool evtCutProc(); + /* 80555118 */ virtual BOOL checkChangeEvt(); + /* 80555448 */ virtual BOOL evtTalk(); + /* 805554E8 */ virtual BOOL evtCutProc(); /* 8055523C */ virtual void setAfterTalkMotion(); /* 805555B0 */ virtual void action(); /* 8055574C */ virtual void beforeMove(); @@ -86,15 +86,15 @@ class daNpc_Kolin_c : public daNpcT_c { var_r29 = 2; } - if (strlen(field_0x570[var_r29].eventName) != 0) { - u32 len = strlen(field_0x574[field_0x570[var_r29].num]); + if (strlen(mpEvtData[var_r29].eventName) != 0) { + u32 len = strlen(mpArcNames[mpEvtData[var_r29].num]); if (len != 0) { - eventInfo.setArchiveName(field_0x574[field_0x570[var_r29].num]); + eventInfo.setArchiveName(mpArcNames[mpEvtData[var_r29].num]); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); } - field_0xe1c = dComIfGp_getEventManager().getEventIdx(this, field_0x570[var_r29].eventName, 0xFF); - fopAcM_orderOtherEventId(this, field_0xe1c, 0xFF, 0xFFFF, 4, 1); + mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[var_r29].eventName, 0xFF); + fopAcM_orderOtherEventId(this, mEvtId, 0xFF, 0xFFFF, 4, 1); return 1; } } diff --git a/include/d/actor/d_a_obj_sekizoa.h b/include/d/actor/d_a_obj_sekizoa.h index c7f2b02d8a4..1ccd6e53861 100644 --- a/include/d/actor/d_a_obj_sekizoa.h +++ b/include/d/actor/d_a_obj_sekizoa.h @@ -58,9 +58,9 @@ class daObj_Sekizoa_c : public daNpcT_c { /* 80CD5B74 */ s32 getHeadJointNo(); /* 80CCF358 */ void afterJntAnm(int); /* 80CCF3E4 */ void setParam(); - /* 80CCF6BC */ bool checkChangeEvt(); - /* 80CCF9A8 */ bool evtTalk(); - /* 80CCFAA8 */ bool evtCutProc(); + /* 80CCF6BC */ BOOL checkChangeEvt(); + /* 80CCF9A8 */ BOOL evtTalk(); + /* 80CCFAA8 */ BOOL evtCutProc(); /* 80CCF704 */ void setAfterTalkMotion(); /* 80CCFBA0 */ void action(); /* 80CCFD08 */ void beforeMove(); diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 56898d10157..085ecc43148 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -216,7 +216,7 @@ class dAttention_c { /* 8016E424 */ void LockEdge(); /* 80182994 */ void GetCheckObjectCount(); /* 80182AD0 */ void keepLock(int); - /* 8014B010 */ static dist_entry& getDistTable(int); + /* 8014B010 */ static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; } fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); } fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); } @@ -253,8 +253,6 @@ class dAttention_c { mPadNo = i_padNo; } - static dist_entry& i_getDistTable(int i_no) { return dist_table[i_no]; } - static type_tbl_entry loc_type_tbl[3]; static type_tbl_entry act_type_tbl[5]; static dist_entry dist_table[234]; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 392c2623eb6..534ed8ed11d 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3258,7 +3258,7 @@ inline void dComIfGp_roomControl_init() { g_dComIfG_gameInfo.play.getRoomControl()->init(); } -inline dStage_roomStatus_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) { +inline dStage_roomDt_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) { return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no); } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 0d5c81196fc..4cac69dfa19 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -804,7 +804,7 @@ class dStage_roomControl_c { void init(void); static int getZoneNo(int i_roomNo) { return mStatus[i_roomNo].getZoneNo(); } /* 80024338 */ void initZone(); - /* 80024384 */ dStage_roomStatus_c* getStatusRoomDt(int); + /* 80024384 */ dStage_roomDt_c* getStatusRoomDt(int); /* 800243B0 */ static JKRExpHeap* getMemoryBlock(int); /* 800243E8 */ static void setStayNo(int); /* 80024424 */ static void setNextStayNo(int); diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 7db452cbe7b..c94d9d17177 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -5,609 +5,22 @@ #include "d/actor/d_a_npc.h" #include "SSystem/SComponent/c_math.h" +#include "d/d_k_wmark.h" #include "d/d_msg_object.h" #include "dol2asm.h" +#include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_lib.h" #include "d/actor/d_a_npc_tk.h" #include "d/actor/d_a_tag_evtarea.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -// -// Forward References: -// - -extern "C" void initialize__18daNpcT_ActorMngr_cFv(); -extern "C" void entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c(); -extern "C" void remove__18daNpcT_ActorMngr_cFv(); -extern "C" void getActorP__18daNpcT_ActorMngr_cFv(); -extern "C" void initialize__15daNpcT_MatAnm_cFv(); -extern "C" void calc__15daNpcT_MatAnm_cCFP11J3DMaterial(); -extern "C" void initialize__22daNpcT_MotionSeqMngr_cFv(); -extern "C" void play__22daNpcT_MotionSeqMngr_cFUsPiPf(); -extern "C" void checkEndSequence__22daNpcT_MotionSeqMngr_cFv(); -extern "C" static void daNpcT_addIdx__FiiRUsi(); -extern "C" static void daNpcT_subIdx__FiiRUsi(); -extern "C" static void daNpcT_incIdx__FiRUsii(); -extern "C" static void daNpcT_decIdx__FiRUsii(); -extern "C" void hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz(); -extern "C" void initialize__13daNpcT_Path_cFv(); -extern "C" void setPathInfo__13daNpcT_Path_cFUcScUc(); -extern "C" void setNextPathInfo__13daNpcT_Path_cFScUc(); -extern "C" void reverse__13daNpcT_Path_cFv(); -extern "C" void setNextIdx__13daNpcT_Path_cFi(); -extern "C" void getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi(); -extern "C" void getDstPosH__13daNpcT_Path_cF4cXyzP4cXyzii(); -extern "C" void chkPassed1__13daNpcT_Path_cF4cXyzi(); -extern "C" void chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii(); -extern "C" static void daNpcT_chkPassed__F4cXyzP4dPntUsUsiiP4cXyzPiPi(); -extern "C" void initialize__15daNpcT_JntAnm_cFv(); -extern "C" void setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz(); -extern "C" void calc__15daNpcT_JntAnm_cFf(); -extern "C" void calcJntRad__15daNpcT_JntAnm_cFfff(); -extern "C" void setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs(); -extern "C" void calc__19daNpcT_DmgStagger_cFi(); -extern "C" void tgHitCallBack__8daNpcT_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); -extern "C" void srchActor__8daNpcT_cFPvPv(); -extern "C" void getTrnsfrmAnmP__8daNpcT_cFPCci(); -extern "C" void getTrnsfrmKeyAnmP__8daNpcT_cFPCci(); -extern "C" void getTexPtrnAnmP__8daNpcT_cFPCci(); -extern "C" void getTexSRTKeyAnmP__8daNpcT_cFPCci(); -extern "C" void getTevRegKeyAnmP__8daNpcT_cFPCci(); -extern "C" void getColorAnmP__8daNpcT_cFPCci(); -extern "C" void setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib(); -extern "C" void setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii(); -extern "C" void setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi(); -extern "C" void setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi(); -extern "C" void setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi(); -extern "C" void setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi(); -extern "C" void loadRes__8daNpcT_cFPCScPPCc(); -extern "C" void deleteRes__8daNpcT_cFPCScPPCc(); -extern "C" void execute__8daNpcT_cFv(); -extern "C" void draw__8daNpcT_cFiifP11_GXColorS10fiii(); -extern "C" void setEnvTevColor__8daNpcT_cFv(); -extern "C" void setRoomNo__8daNpcT_cFv(); -extern "C" void checkEndAnm__8daNpcT_cFf(); -extern "C" void checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf(); -extern "C" void playAllAnm__8daNpcT_cFv(); -extern "C" void ctrlBtk__8daNpcT_cFv(); -extern "C" void setMtx__8daNpcT_cFv(); -extern "C" void ctrlFaceMotion__8daNpcT_cFv(); -extern "C" void ctrlMotion__8daNpcT_cFv(); -extern "C" void ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci(); -extern "C" void ctrlJoint__8daNpcT_cFP8J3DJointP8J3DModel(); -extern "C" void evtProc__8daNpcT_cFv(); -extern "C" void setFootPos__8daNpcT_cFv(); -extern "C" void setFootPrtcl__8daNpcT_cFP4cXyzff(); -extern "C" bool checkCullDraw__8daNpcT_cFv(); -extern "C" void twilight__8daNpcT_cFv(); -extern "C" void evtOrder__8daNpcT_cFv(); -extern "C" void evtChange__8daNpcT_cFv(); -extern "C" void clrParam__8daNpcT_cFv(); -extern "C" void setFaceMotionAnm__8daNpcT_cFib(); -extern "C" void setMotionAnm__8daNpcT_cFifi(); -extern "C" void setPos__8daNpcT_cF4cXyz(); -extern "C" void setAngle__8daNpcT_cF5csXyz(); -extern "C" void setAngle__8daNpcT_cFs(); -extern "C" void hitChk__8daNpcT_cFP12dCcD_GObjInfUl(); -extern "C" void setDamage__8daNpcT_cFiii(); -extern "C" void chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs(); -extern "C" void chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs(); -extern "C" void chkPointInArea__8daNpcT_cF4cXyz4cXyz4cXyzs(); -extern "C" void chkFindActor__8daNpcT_cFP10fopAc_ac_cis(); -extern "C" void getDistTable__12dAttention_cFi(); -extern "C" void chkWolfAction__8daNpcT_cFv(); -extern "C" void chkFindWolf__8daNpcT_cFsiiffffi(); -extern "C" void srchPlayerActor__8daNpcT_cFv(); -extern "C" void getAttnPos__8daNpcT_cFP10fopAc_ac_c(); -extern "C" void turn__8daNpcT_cFsii(); -extern "C" void step__8daNpcT_cFsiiii(); -extern "C" void calcSpeedAndAngle__8daNpcT_cF4cXyziss(); -extern "C" void getActorDistance__8daNpcT_cFP10fopAc_ac_cii(); -extern "C" void initTalk__8daNpcT_cFiPP10fopAc_ac_c(); -extern "C" void talkProc__8daNpcT_cFPiiPP10fopAc_ac_ci(); -extern "C" void getNearestActorP__8daNpcT_cFs(); -extern "C" void getEvtAreaTagP__8daNpcT_cFii(); -extern "C" void getShopItemTagP__8daNpcT_cFv(); -extern "C" void setHitodamaPrtcl__8daNpcT_cFv(); -extern "C" void daNpcT_chkActorInScreen__FP10fopAc_ac_cfffffffi(); -extern "C" void daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi(); -extern "C" void daNpcT_getPlayerInfoFromPlayerList__FiiP4cXyzP5csXyz(); -extern "C" void daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c(); -extern "C" void daNpcT_judgeRace__FP5dPathPP10fopAc_ac_cP16daNpcT_pntData_ciPi(); -extern "C" void daNpcT_getDistTableIdx__Fii(); -extern "C" void daNpcT_onEvtBit__FUl(); -extern "C" void daNpcT_offEvtBit__FUl(); -extern "C" void daNpcT_chkEvtBit__FUl(); -extern "C" void daNpcT_onTmpBit__FUl(); -extern "C" void daNpcT_offTmpBit__FUl(); -extern "C" void daNpcT_chkTmpBit__FUl(); -extern "C" void __dt__16daNpcT_Hermite_cFv(); -extern "C" void decTmr__8daNpcT_cFv(); -extern "C" void setCollision__8daNpcT_cFv(); -extern "C" void setAttnPos__8daNpcT_cFv(); -extern "C" void ctrlSubFaceMotion__8daNpcT_cFi(); -extern "C" void afterMoved__8daNpcT_cFv(); -extern "C" void beforeMove__8daNpcT_cFv(); -extern "C" void action__8daNpcT_cFv(); -extern "C" void setParam__8daNpcT_cFv(); -extern "C" void drawOtherMdl__8daNpcT_cFv(); -extern "C" void drawGhost__8daNpcT_cFv(); -extern "C" bool drawDbgInfo__8daNpcT_cFv(); -extern "C" bool checkRemoveJoint__8daNpcT_cFi(); -extern "C" bool checkChangeJoint__8daNpcT_cFi(); -extern "C" void afterJntAnm__8daNpcT_cFi(); -extern "C" s32 getHeadJointNo__8daNpcT_cFv(); -extern "C" s32 getNeckJointNo__8daNpcT_cFv(); -extern "C" s32 getBackboneJointNo__8daNpcT_cFv(); -extern "C" void setAfterTalkMotion__8daNpcT_cFv(); -extern "C" bool evtCutProc__8daNpcT_cFv(); -extern "C" bool evtEndProc__8daNpcT_cFv(); -extern "C" bool evtTalk__8daNpcT_cFv(); -extern "C" bool checkChangeEvt__8daNpcT_cFv(); -extern "C" s32 getFootRJointNo__8daNpcT_cFv(); -extern "C" s32 getFootLJointNo__8daNpcT_cFv(); -extern "C" bool chkXYItems__8daNpcT_cFv(); -extern "C" bool afterSetFaceMotionAnm__8daNpcT_cFiifi(); -extern "C" void changeBtp__8daNpcT_cFPiPi(); -extern "C" void changeBck__8daNpcT_cFPiPi(); -extern "C" void getFaceMotionAnm__8daNpcT_cF26daNpcT_faceMotionAnmData_c(); -extern "C" bool afterSetMotionAnm__8daNpcT_cFiifi(); -extern "C" void changeBtk__8daNpcT_cFPiPi(); -extern "C" void changeAnm__8daNpcT_cFPiPi(); -extern "C" void getMotionAnm__8daNpcT_cF22daNpcT_motionAnmData_c(); -extern "C" void __dt__8daNpcT_cFv(); -extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv(); -extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv(); -extern "C" bool getEyeballMaterialNo__8daNpcT_cFv(); -extern "C" void __dt__22daNpcT_MotionSeqMngr_cFv(); -extern "C" void __dt__18daNpcT_ActorMngr_cFv(); -extern "C" void __dt__15daNpcT_JntAnm_cFv(); -extern "C" void __dt__15daNpcT_MatAnm_cFv(); -extern "C" s16 func_8014D32C(s16*); -extern "C" int func_8014D348(int*); -extern "C" int func_8014D364(int, int); -extern "C" void __sinit_d_a_npc_cpp(); -extern "C" static void daBaseNpc_addIdx__FiiPUsi(); -extern "C" static void daBaseNpc_subIdx__FiiPUsi(); -extern "C" static void daBaseNpc_incIdx__FiPUsii(); -extern "C" static void daBaseNpc_decIdx__FiPUsii(); -extern "C" static void daNpcBase_BBasis__FiiiPi(); -extern "C" void __ct__18daBaseNpc_acMngr_cFv(); -extern "C" void entry__18daBaseNpc_acMngr_cFP10fopAc_ac_c(); -extern "C" void getActor__18daBaseNpc_acMngr_cFv(); -extern "C" void calc__18daBaseNpc_matAnm_cCFP11J3DMaterial(); -extern "C" void __ct__16daBaseNpc_path_cFv(); -extern "C" void isPath__16daBaseNpc_path_cFv(); -extern "C" void setPathInfo__16daBaseNpc_path_cFUcScSc(); -extern "C" void reverseDir__16daBaseNpc_path_cFv(); -extern "C" void chkPnt__16daBaseNpc_path_cF4cXyz(); -extern "C" void setNextPnt__16daBaseNpc_path_cFv(); -extern "C" void getIdx__16daBaseNpc_path_cFv(); -extern "C" void setIdx__16daBaseNpc_path_cFUs(); -extern "C" void getPntPos__16daBaseNpc_path_cFUs(); -extern "C" void limitter__18daBaseNpc_lookat_cFsPsss(); -extern "C" void calc__18daBaseNpc_lookat_cFP10fopAc_ac_cPA4_fs(); -extern "C" void setMaxJntLmt__18daBaseNpc_lookat_cF5csXyzi(); -extern "C" void setMinJntLmt__18daBaseNpc_lookat_cF5csXyzi(); -extern "C" void setJntPos__18daBaseNpc_lookat_cF4cXyzi(); -extern "C" void setAttnPos__18daBaseNpc_lookat_cFP4cXyz(); -extern "C" void getRot__18daBaseNpc_lookat_cFi(); -extern "C" void __ct__11daBaseNpc_cFv(); -extern "C" void __dt__11daBaseNpc_cFv(); -extern "C" void execute__11daBaseNpc_cFv(); -extern "C" void draw__11daBaseNpc_cFf(); -extern "C" bool getResName__11daBaseNpc_cFv(); -extern "C" void getTrnsfrmKeyAnmP__11daBaseNpc_cFPci(); -extern "C" void setMcaMorfAnm__11daBaseNpc_cFP18J3DAnmTransformKeyffiii(); -extern "C" void setBckAnm__11daBaseNpc_cFP15J3DAnmTransformfiiib(); -extern "C" void getTexPtrnAnmP__11daBaseNpc_cFPci(); -extern "C" void setBtpAnm__11daBaseNpc_cFP16J3DAnmTexPatternP12J3DModelDatafi(); -extern "C" void attnSttsOn__11daBaseNpc_cFii(); -extern "C" void setParam__11daBaseNpc_cFv(); -extern "C" void orderEvent__11daBaseNpc_cFiPc(); -extern "C" void mainProc__11daBaseNpc_cFv(); -extern "C" void setEnvTevColor__11daBaseNpc_cFv(); -extern "C" void setRoomNo__11daBaseNpc_cFv(); -extern "C" bool btkCtrl__11daBaseNpc_cFv(); -extern "C" void checkEndAnm__11daBaseNpc_cFf(); -extern "C" void checkEndAnm__11daBaseNpc_cFP12J3DFrameCtrl(); -extern "C" void allAnmPlay__11daBaseNpc_cFv(); -extern "C" void adjustShapeAngle__11daBaseNpc_cFv(); -extern "C" void setMtx__11daBaseNpc_cFi(); -extern "C" void setCollisions__11daBaseNpc_cFv(); -extern "C" void setAttnPos__11daBaseNpc_cFv(); -extern "C" void drawOtherMdls__11daBaseNpc_cFv(); -extern "C" bool dbgDraw__11daBaseNpc_cFv(); -extern "C" void __ct__23daBaseNpc_moveBgActor_cFv(); -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv(); -extern "C" void -MoveBGCreate__23daBaseNpc_moveBgActor_cFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUl(); -extern "C" void MoveBGDelete__23daBaseNpc_moveBgActor_cFv(); -extern "C" void MoveBGExecute__23daBaseNpc_moveBgActor_cFv(); -extern "C" static void daBaseNpc_PntVsLineSegmentLengthSquare2D__FffffffPfPfPf(); -extern "C" static void daBaseNpc_putNurbs__FP4dPntiiP4dPnti(); -extern "C" static void daBaseNpc_chkPnt__F4cXyzP4dPntUsUsii(); -extern "C" static void daBaseNpc_getGroundAngle__FP13cBgS_PolyInfos(); -extern "C" void __dt__18daBaseNpc_lookat_cFv(); -extern "C" bool CreateHeap__23daBaseNpc_moveBgActor_cFv(); -extern "C" bool Create__23daBaseNpc_moveBgActor_cFv(); -extern "C" bool Delete__23daBaseNpc_moveBgActor_cFv(); -extern "C" bool Execute__23daBaseNpc_moveBgActor_cFPPA3_A4_f(); -extern "C" bool Draw__23daBaseNpc_moveBgActor_cFv(); -extern "C" bool IsDelete__23daBaseNpc_moveBgActor_cFv(); -extern "C" bool ToFore__23daBaseNpc_moveBgActor_cFv(); -extern "C" bool ToBack__23daBaseNpc_moveBgActor_cFv(); -extern "C" void __dt__16daBaseNpc_path_cFv(); -extern "C" void __dt__18daBaseNpc_matAnm_cFv(); -extern "C" void __dt__18daBaseNpc_acMngr_cFv(); -extern "C" static void daNpcF_addIdx__FiiRUsi(); -extern "C" static void daNpcF_subIdx__FiiRUsi(); -extern "C" static void daNpcF_incIdx__FiRUsii(); -extern "C" static void daNpcF_decIdx__FiRUsii(); -extern "C" void initialize__18daNpcF_ActorMngr_cFv(); -extern "C" void entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c(); -extern "C" void entry__18daNpcF_ActorMngr_cFUi(); -extern "C" void remove__18daNpcF_ActorMngr_cFv(); -extern "C" void getActorP__18daNpcF_ActorMngr_cFv(); -extern "C" void initialize__15daNpcF_MatAnm_cFv(); -extern "C" void calc__15daNpcF_MatAnm_cCFP11J3DMaterial(); -extern "C" void initialize__16daNpcF_SPCurve_cFP5dPathi(); -extern "C" void initialize__13daNpcF_Path_cFv(); -extern "C" void setPathInfo__13daNpcF_Path_cFUcScUc(); -extern "C" void chkPassed__13daNpcF_Path_cF4cXyz(); -extern "C" void chkPassedDst__13daNpcF_Path_cF4cXyz(); -extern "C" void reverse__13daNpcF_Path_cFv(); -extern "C" void setNextIdx__13daNpcF_Path_cFv(); -extern "C" void getNextIdx__13daNpcF_Path_cFv(); -extern "C" void getBeforeIdx__13daNpcF_Path_cFv(); -extern "C" void getBeforePos__13daNpcF_Path_cFR4cXyz(); -extern "C" void getNextPos__13daNpcF_Path_cFR4cXyz(); -extern "C" void getDstPos__13daNpcF_Path_cF4cXyzR4cXyz(); -extern "C" void setNextIdxDst__13daNpcF_Path_cF4cXyz(); -extern "C" void initialize__15daNpcF_Lookat_cFv(); -extern "C" void setParam__15daNpcF_Lookat_cFffffffffffffsP4cXyz(); -extern "C" void calc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fPP5csXyziii(); -extern "C" void adjustMoveDisAngle__15daNpcF_Lookat_cFRssss(); -extern "C" void initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi(); -extern "C" void update__15daNpcF_Lookat_cFP4cXyzP5csXyzPf(); -extern "C" void calcMoveDisAngle__15daNpcF_Lookat_cFiP4cXyzP5csXyz4cXyzii(); -extern "C" void setRotAngle__15daNpcF_Lookat_cFv(); -extern "C" void clrRotAngle__15daNpcF_Lookat_cFv(); -extern "C" void execute__8daNpcF_cFv(); -extern "C" void draw__8daNpcF_cFiifP11_GXColorS10i(); -extern "C" void tgHitCallBack__8daNpcF_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); -extern "C" void srchAttnActor1__8daNpcF_cFPvPv(); -extern "C" void srchActor__8daNpcF_cFPvPv(); -extern "C" void setMtx__8daNpcF_cFv(); -extern "C" void setMtx2__8daNpcF_cFv(); -extern "C" void initialize__8daNpcF_cFv(); -extern "C" void getTrnsfrmKeyAnmP__8daNpcF_cFPci(); -extern "C" void getTexPtrnAnmP__8daNpcF_cFPci(); -extern "C" void getTexSRTKeyAnmP__8daNpcF_cFPci(); -extern "C" void getTevRegKeyAnmP__8daNpcF_cFPci(); -extern "C" void setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii(); -extern "C" void setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib(); -extern "C" void setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi(); -extern "C" void setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi(); -extern "C" void setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi(); -extern "C" void setEnvTevColor__8daNpcF_cFv(); -extern "C" void setRoomNo__8daNpcF_cFv(); -extern "C" void chkEndAnm__8daNpcF_cFf(); -extern "C" void chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf(); -extern "C" void playAllAnm__8daNpcF_cFv(); -extern "C" void playExpressionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData(); -extern "C" void playMotionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData(); -extern "C" void setLookatMtx__8daNpcF_cFiPif(); -extern "C" void hitChk2__8daNpcF_cFP8dCcD_Cylii(); -extern "C" void setDamage__8daNpcF_cFiii(); -extern "C" void ctrlMsgAnm__8daNpcF_cFRiRiP10fopAc_ac_ci(); -extern "C" void orderEvent__8daNpcF_cFiPcUsUsUcUs(); -extern "C" void changeEvent__8daNpcF_cFPcPcUsUs(); -extern "C" void chkActorInSight__8daNpcF_cFP10fopAc_ac_cf(); -extern "C" void chkActorInArea__8daNpcF_cFP10fopAc_ac_c4cXyz4cXyzs(); -extern "C" void chkActorInAttnArea__8daNpcF_cFP10fopAc_ac_cP10fopAc_ac_ci(); -extern "C" void initTalk__8daNpcF_cFiPP10fopAc_ac_c(); -extern "C" void talkProc__8daNpcF_cFPiiPP10fopAc_ac_c(); -extern "C" void turn__8daNpcF_cFsfi(); -extern "C" void step__8daNpcF_cFsiii(); -extern "C" void setAngle__8daNpcF_cFs(); -extern "C" void getDistTableIdx__8daNpcF_cFii(); -extern "C" void getEvtAreaTagP__8daNpcF_cFii(); -extern "C" void getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii(); -extern "C" void chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs(); -extern "C" void chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs(); -extern "C" void chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs(); -extern "C" void getAttentionPos__8daNpcF_cFP10fopAc_ac_c(); -extern "C" void chkFindPlayer2__8daNpcF_cFis(); -extern "C" void setHitodamaPrtcl__8daNpcF_cFv(); -extern "C" void daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf(); -extern "C" static bool daNpcF_putNurbs__FP4dPntiiP4dPnti(); -extern "C" void daNpcF_chkPassed__F4cXyzP4dPntUsUsii(); -extern "C" void daNpcF_getGroundAngle__FP13cBgS_PolyInfos(); -extern "C" void daNpcF_chkEvtBit__FUl(); -extern "C" void daNpcF_onEvtBit__FUl(); -extern "C" void daNpcF_chkTmpBit__FUl(); -extern "C" void daNpcF_onTmpBit__FUl(); -extern "C" void daNpcF_offTmpBit__FUl(); -extern "C" void daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz(); -extern "C" void daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c(); -extern "C" void daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs(); -extern "C" void daNpcF_getDistTableIdx__Fii(); -extern "C" void daNpcF_clearMessageTmpBit__Fv(); -extern "C" void __dt__20daNpcF_MoveBgActor_cFv(); -extern "C" void setCollisions__8daNpcF_cFv(); -extern "C" void setAttnPos__8daNpcF_cFv(); -extern "C" void adjustShapeAngle__8daNpcF_cFv(); -extern "C" bool main__8daNpcF_cFv(); -extern "C" void setParam__8daNpcF_cFv(); -extern "C" void drawOtherMdls__8daNpcF_cFv(); -extern "C" bool drawDbgInfo__8daNpcF_cFv(); -extern "C" bool ctrlBtk__8daNpcF_cFv(); -extern "C" bool setExpressionAnm__8daNpcF_cFib(); -extern "C" void setMotionAnm__8daNpcF_cFif(); -extern "C" void setMotion__8daNpcF_cFifi(); -extern "C" void setExpression__8daNpcF_cFif(); -extern "C" void __dt__8daNpcF_cFv(); -extern "C" void __dt__18daNpcF_ActorMngr_cFv(); -extern "C" bool CreateHeap__20daNpcF_MoveBgActor_cFv(); -extern "C" bool Create__20daNpcF_MoveBgActor_cFv(); -extern "C" bool Delete__20daNpcF_MoveBgActor_cFv(); -extern "C" bool Execute__20daNpcF_MoveBgActor_cFPPA3_A4_f(); -extern "C" bool Draw__20daNpcF_MoveBgActor_cFv(); -extern "C" bool IsDelete__20daNpcF_MoveBgActor_cFv(); -extern "C" bool ToFore__20daNpcF_MoveBgActor_cFv(); -extern "C" bool ToBack__20daNpcF_MoveBgActor_cFv(); -extern "C" bool setExpressionBtp__8daNpcF_cFi(); -extern "C" void __dt__15daNpcF_MatAnm_cFv(); -extern "C" void __dt__23daBaseNpc_moveBgActor_cFv(); -extern "C" u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" u8 const mCcDObj__11daBaseNpc_c[48]; -extern "C" u8 const mCcDObjInfo__8daNpcF_c[48]; -extern "C" extern char const* const d_a_d_a_npc__stringBase0; -extern "C" u8 mCcDCyl__8daNpcT_c[68]; -extern "C" u8 mCcDSph__8daNpcT_c[64]; -extern "C" u8 mCcDCyl__11daBaseNpc_c[68]; -extern "C" u8 mCcDSph__11daBaseNpc_c[64]; -extern "C" u8 mCcDCyl__8daNpcF_c[68]; -extern "C" u8 mCcDSph__8daNpcF_c[64]; -extern "C" u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" u8 mFindActorPList__8daNpcF_c[400]; -extern "C" u8 mSrchName__8daNpcT_c[2 + 2 /* padding */]; -extern "C" u8 mFindCount__8daNpcT_c[4]; -extern "C" u8 m_name__23daBaseNpc_moveBgActor_c[4]; -extern "C" u8 m_dzb_id__23daBaseNpc_moveBgActor_c[4]; -extern "C" u8 m_set_func__23daBaseNpc_moveBgActor_c[4]; -extern "C" u8 mFindCount__8daNpcF_c[4]; -extern "C" u8 mSrchActorName__8daNpcF_c[2 + 2 /* padding */]; -extern "C" extern u8 data_80450FF8[8]; -static asm s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, - int param_5); +static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, + int param_5); static u16 daNpcF_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4); -// -// External References: -// - -extern "C" void __dt__4cXyzFv(); -extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_XrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void XYZrotS__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void XYZrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(); -extern "C" void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss(); -extern "C" void entry__13mDoExt_btpAnmFP16J3DMaterialTables(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); -extern "C" void entryJoint__13mDoExt_bckAnmFP12J3DModelDataUsf(); -extern "C" void setMorf__13mDoExt_morf_cFf(); -extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void entryDL__16mDoExt_McaMorfSOFv(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" void mDoLib_project__FP3VecP3Vec(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__5csXyzFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs(); -extern "C" void fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -extern "C" void fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos(); -extern "C" void fopAcM_getPolygonAngle__FPC8cM3dGPlas(); -extern "C" void fopKyM_create__FsiP4cXyzP4cXyzPFPv_i(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj(); -extern "C" void -dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(); -extern "C" void dComIfGs_wolfeye_effect_check__Fv(); -extern "C" void onEventBit__11dSv_event_cFUs(); -extern "C" void offEventBit__11dSv_event_cFUs(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void __dt__15J3DTevKColorAnmFv(); -extern "C" void __dt__14J3DTevColorAnmFv(); -extern "C" void __dt__11J3DTexNoAnmFv(); -extern "C" void __dt__12J3DTexMtxAnmFv(); -extern "C" void __dt__14J3DMatColorAnmFv(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void reset__14dEvt_control_cFPv(); -extern "C" void convPId__14dEvt_control_cFUi(); -extern "C" void setPtT__14dEvt_control_cFPv(); -extern "C" void setPtI_Id__14dEvt_control_cFUi(); -extern "C" void setObjectArchive__16dEvent_manager_cFPc(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getRunEventName__16dEvent_manager_cFv(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void getActionBtnB__12dAttention_cFv(); -extern "C" void LockonTarget__12dAttention_cFl(); -extern "C" void ActionTarget__12dAttention_cFl(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void ChkPolySafe__4cBgSFRC13cBgS_PolyInfo(); -extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void __ct__5csXyzFv(); -extern "C" void getAttentionOffsetY__9daPy_py_cFv(); -extern "C" void checkNowWolfEyeUp__9daPy_py_cFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_pol_sound_get__FPC13cBgS_PolyInfo(); -extern "C" void dKy_darkworld_check__Fv(); -extern "C" void getActor__12dMsgObject_cFv(); -extern "C" void offMsgSendControl__12dMsgObject_cFv(); -extern "C" void isMsgSendControl__12dMsgObject_cFv(); -extern "C" void isMouthCheck__12dMsgObject_cFv(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void __dt__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -extern "C" void checkEventRender__10dMsgFlow_cFPiPiPiPi(); -extern "C" void getMsgNo__10dMsgFlow_cFv(); -extern "C" void getMsg__10dMsgFlow_cFv(); -extern "C" void __pl__4cXyzCFRC3Vec(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void normalize__4cXyzFv(); -extern "C" void isZero__4cXyzCFv(); -extern "C" void __apl__5csXyzFR5csXyz(); -extern "C" void cM_rad2s__Ff(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rnd__Fv(); -extern "C" void cM_rndF__Ff(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void cBgW_CheckBGround__Ff(); -extern "C" void cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void cLib_chaseS__FPsss(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz(); -extern "C" void __ct__7cSAngleFRC7cSAngle(); -extern "C" void __ct__7cSAngleFs(); -extern "C" void Inv__7cSAngleCFv(); -extern "C" void __mi__7cSAngleCFs(); -extern "C" void __ct__7cSGlobeFRC4cXyz(); -extern "C" void __ct__10Z2CreatureFv(); -extern "C" void __dt__10Z2CreatureFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void calc__14J3DMaterialAnmCFP11J3DMaterial(); -extern "C" void removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor(); -extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); -extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void __register_global_object(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void _savegpr_16(); -extern "C" void _savegpr_18(); -extern "C" void _savegpr_19(); -extern "C" void _savegpr_20(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_16(); -extern "C" void _restgpr_18(); -extern "C" void _restgpr_19(); -extern "C" void _restgpr_20(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__12dBgS_AcchCir[3]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__10dCcD_GStts[3]; -extern "C" extern void* __vt__10cCcD_GStts[3]; -extern "C" extern void* __vt__12dBgS_ObjAcch[9]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern dScnKy_env_light_c g_env_light; -extern "C" u8 mCurrentMtx__6J3DSys[48]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; - -// -// Declarations: -// - /* 801456D4-801456E0 140014 000C+00 1/1 0/0 159/159 .text initialize__18daNpcT_ActorMngr_cFv */ void daNpcT_ActorMngr_c::initialize() { - mActorID = -1; + mActorID = fpcM_ERROR_PROCESS_ID_e; } /* 801456E0-801456FC 140020 001C+00 1/1 0/0 160/160 .text @@ -619,7 +32,7 @@ void daNpcT_ActorMngr_c::entry(fopAc_ac_c* actor) { /* 801456FC-80145708 14003C 000C+00 1/1 0/0 382/382 .text remove__18daNpcT_ActorMngr_cFv */ void daNpcT_ActorMngr_c::remove() { - mActorID = -1; + mActorID = fpcM_ERROR_PROCESS_ID_e; } /* 80145708-80145764 140048 005C+00 2/2 1/1 233/233 .text getActorP__18daNpcT_ActorMngr_cFv */ @@ -636,14 +49,12 @@ fopAc_ac_c* daNpcT_ActorMngr_c::getActorP() { /* 80145764-80145788 1400A4 0024+00 0/0 0/0 103/103 .text initialize__15daNpcT_MatAnm_cFv */ void daNpcT_MatAnm_c::initialize() { - f32 value = 0.0f; - - field_0xF4 = value; - field_0xF8 = value; - mTranslationX = value; - mTranslationY = value; - field_0x104 = 0; - field_0x105 = 0; + field_0xF4 = 0.0f; + field_0xF8 = 0.0f; + mNowOffsetX = 0.0f; + mNowOffsetY = 0.0f; + mEyeMoveFlg = 0; + mMorfFrm = 0; } /* 80145788-80145898 1400C8 0110+00 1/0 0/0 0/0 .text calc__15daNpcT_MatAnm_cCFP11J3DMaterial */ @@ -655,13 +66,13 @@ void daNpcT_MatAnm_c::calc(J3DMaterial* param_0) const { J3DTexMtxInfo* curr_mtx_info = ¶m_0->getTexGenBlock()->getTexMtx(i)->getTexMtxInfo(); - if (field_0x104 != 0) { - curr_mtx_info->mSRT.mTranslationX = mTranslationX; - curr_mtx_info->mSRT.mTranslationY = mTranslationY; + if (mEyeMoveFlg != 0) { + curr_mtx_info->mSRT.mTranslationX = mNowOffsetX; + curr_mtx_info->mSRT.mTranslationY = mNowOffsetY; } - if (field_0x105 != 0) { - f32 tmp8 = 1.0f / (field_0x105 + 1); + if (mMorfFrm != 0) { + f32 tmp8 = 1.0f / (mMorfFrm + 1); curr_mtx_info->mSRT.mTranslationX = field_0xF4 * (1.0f - tmp8) + curr_mtx_info->mSRT.mTranslationX * tmp8; @@ -681,34 +92,34 @@ void daNpcT_MotionSeqMngr_c::initialize() { mNo = 0; mOffset = 0; mStepNo = 0; - field_0x14 = -1; - field_0x18 = -1.0f; + mPrevStepNo = -1; + mInitialMorf = -1.0f; mEndSequence = false; } /* 801458C0-80145A24 140200 0164+00 2/2 0/0 2/2 .text play__22daNpcT_MotionSeqMngr_cFUsPiPf */ -int daNpcT_MotionSeqMngr_c::play(u16 param_0, int* param_1, f32* param_2) { +int daNpcT_MotionSeqMngr_c::play(u16 i_loopNo, int* o_anmIdx, f32* o_morf) { int ret = 0; - if (field_0x14 == mStepNo && mStepNo < field_0x4) { - if ((&mpSeqData[mNo * field_0x4])[mStepNo].field_0x0 != -1) { - s8 tmp = (&mpSeqData[mNo * field_0x4])[mStepNo].field_0x3; - - if (tmp > 0 && tmp <= param_0) { + if (mPrevStepNo == mStepNo && mStepNo < mStepNum) { + if ((&mpSeqData[mNo * mStepNum])[mStepNo].mAnmIdx != -1) { + if ((&mpSeqData[mNo * mStepNum])[mStepNo].mLoopCount > 0 + && (&mpSeqData[mNo * mStepNum])[mStepNo].mLoopCount <= i_loopNo) + { mStepNo++; - } else if (tmp == 0 && param_0 != 0) { + } else if ((&mpSeqData[mNo * mStepNum])[mStepNo].mLoopCount == 0 && i_loopNo != 0) { mEndSequence = true; } } } - if (field_0x14 != mStepNo && mStepNo < field_0x4) { - if ((&mpSeqData[mNo * field_0x4])[mStepNo].field_0x0 != -1) { - *param_1 = (&mpSeqData[mNo * field_0x4])[mStepNo].field_0x0; - *param_2 = (&mpSeqData[mNo * field_0x4])[mStepNo].field_0x2; + if (mPrevStepNo != mStepNo && mStepNo < mStepNum) { + if ((&mpSeqData[mNo * mStepNum])[mStepNo].mAnmIdx != -1) { + *o_anmIdx = (&mpSeqData[mNo * mStepNum])[mStepNo].mAnmIdx; + *o_morf = (&mpSeqData[mNo * mStepNum])[mStepNo].mMorf; - if (field_0x14 == -1 && -1.0f < field_0x18) { - *param_2 = field_0x18; + if (mPrevStepNo == -1 && -1.0f < mInitialMorf) { + *o_morf = mInitialMorf; } ret = 1; } else { @@ -716,7 +127,7 @@ int daNpcT_MotionSeqMngr_c::play(u16 param_0, int* param_1, f32* param_2) { } } - field_0x14 = mStepNo; + mPrevStepNo = mStepNo; return ret; } @@ -781,27 +192,26 @@ static int daNpcT_decIdx(int i_num, u16& i_idx, int i_closed, int i_direction) { * hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz */ void daNpcT_Path_c::hermite(cXyz& param_0, cXyz& param_1, cXyz& param_2, cXyz& param_3, daNpcT_Hermite_c& param_4, cXyz& param_5) { - param_5.x = param_0.x * param_4.mPosition.x + param_2.x * param_4.mPosition.y + - param_1.x * param_4.mPosition.z + param_3.x * param_4.field_0x10; + param_5.x = param_0.x * param_4.field_0x04 + param_2.x * param_4.field_0x08 + + param_1.x * param_4.field_0x0c + param_3.x * param_4.field_0x10; - param_5.y = param_0.y * param_4.mPosition.x + param_2.y * param_4.mPosition.y + - param_1.y * param_4.mPosition.z + param_3.y * param_4.field_0x10; + param_5.y = param_0.y * param_4.field_0x04 + param_2.y * param_4.field_0x08 + + param_1.y * param_4.field_0x0c + param_3.y * param_4.field_0x10; - param_5.z = param_0.z * param_4.mPosition.x + param_2.z * param_4.mPosition.y + - param_1.z * param_4.mPosition.z + param_3.z * param_4.field_0x10; + param_5.z = param_0.z * param_4.field_0x04 + param_2.z * param_4.field_0x08 + + param_1.z * param_4.field_0x0c + param_3.z * param_4.field_0x10; } /* 80145C40-80145C74 140580 0034+00 0/0 0/0 44/44 .text initialize__13daNpcT_Path_cFv */ void daNpcT_Path_c::initialize() { mpRoomPath = 0; - f32 value = 0.0f; - mPosition.x = value; - mPosition.y = value; - mPosition.z = value; - field_0x10 = value; - field_0x14 = value; - field_0x18 = value; + mPosition.x = 0.0f; + mPosition.y = 0.0f; + mPosition.z = 0.0f; + field_0x10 = 0.0f; + field_0x14 = 0.0f; + field_0x18 = 0.0f; mIdx = 0; mDirection = 0; @@ -985,112 +395,6 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803B36B4-803B36D8 -00001 0024+00 1/2 0/0 0/0 .data @5258 */ -SECTION_DATA static void* lit_5258[9] = { - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x3E8), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x3F4), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x428), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x47C), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x4A4), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x4F0), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x52C), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x568), - (void*)(((char*)setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz) + - 0x568), -}; - -/* 803B36D8-803B371C 0107F8 0044+00 0/0 0/0 54/54 .data mCcDCyl__8daNpcT_c */ -dCcD_SrcCyl daNpcT_c::mCcDCyl = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl -}; - -/* 803B371C-803B375C 01083C 0040+00 0/0 0/0 3/3 .data mCcDSph__8daNpcT_c */ -dCcD_SrcSph daNpcT_c::mCcDSph = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 0.0f} // mSph - } // mSphAttr -}; - -/* 803B375C-803B37A0 01087C 0044+00 0/0 0/0 1/1 .data mCcDCyl__11daBaseNpc_c */ -dCcD_SrcCyl daBaseNpc_c::mCcDCyl = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl -}; - -/* 803B37A0-803B37E0 0108C0 0040+00 0/0 0/0 1/1 .data mCcDSph__11daBaseNpc_c */ -dCcD_SrcSph daBaseNpc_c::mCcDSph = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 0.0f} // mSph - } // mSphAttr -}; - -/* 803B37E0-803B3824 010900 0044+00 0/0 0/0 36/36 .data mCcDCyl__8daNpcF_c */ -dCcD_SrcCyl daNpcF_c::mCcDCyl = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl -}; - -/* 803B3824-803B3864 010944 0040+00 0/0 0/0 2/2 .data mCcDSph__8daNpcF_c */ -dCcD_SrcSph daNpcF_c::mCcDSph = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 0.0f} // mSph - } // mSphAttr -}; - /* 801464D8-8014698C 140E18 04B4+00 1/1 0/0 0/0 .text chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii */ // NONMATCHING int daNpcT_Path_c::chkPassed2(cXyz param_1, cXyz* param_2, int param_3, int param_4) { @@ -1167,62 +471,384 @@ int daNpcT_Path_c::chkPassed2(cXyz param_1, cXyz* param_2, int param_3, int para /* 8014698C-80146C98 1412CC 030C+00 1/1 0/0 0/0 .text * daNpcT_chkPassed__F4cXyzP4dPntUsUsiiP4cXyzPiPi */ -static void daNpcT_chkPassed(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, - int param_5, cXyz* param_6, int* param_7, int* param_8) { - // NONMATCHING +static BOOL daNpcT_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, int i_closed, + int param_5, cXyz* o_proj, int* o_prevIdx, int* o_nextIdx) { + u16 prev_idx = i_idx; + u16 next_idx = i_idx; + daNpcT_incIdx(i_num, next_idx, i_closed, 0); + daNpcT_decIdx(i_num, prev_idx, i_closed, 0); + + cXyz prev_pnt(i_points[prev_idx].m_position.x, i_points[prev_idx].m_position.y, + i_points[prev_idx].m_position.z); + cXyz next_pnt(i_points[next_idx].m_position.x, i_points[next_idx].m_position.y, + i_points[next_idx].m_position.z); + cXyz cur_pnt(i_points[i_idx].m_position.x, i_points[i_idx].m_position.y, + i_points[i_idx].m_position.z); + + cXyz vec(0.0f, 0.0f, 2.0f); + + s16 angle; + if (prev_idx < i_idx && i_idx < next_idx) { + angle = cM_atan2s(next_pnt.x - prev_pnt.x, next_pnt.z - prev_pnt.z); + } else if (prev_idx < i_idx) { + angle = cM_atan2s(cur_pnt.x - prev_pnt.x, cur_pnt.z - prev_pnt.z); + } else if (i_idx < next_idx) { + angle = cM_atan2s(next_pnt.x - cur_pnt.x, next_pnt.z - cur_pnt.z); + } + + mDoMtx_stack_c::transS(next_pnt); + mDoMtx_stack_c::YrotM(angle); + mDoMtx_stack_c::multVec(&vec, &next_pnt); + mDoMtx_stack_c::transS(prev_pnt); + mDoMtx_stack_c::YrotM(angle + 0x8000); + mDoMtx_stack_c::multVec(&vec, &prev_pnt); + + f32 len, proj1_x, proj1_z, proj2_x, proj2_z; + cM3d_Len2dSqPntAndSegLine(i_pos.x, i_pos.z, prev_pnt.x, prev_pnt.z, next_pnt.x, next_pnt.z, + &proj1_x, &proj1_z, &len); + if (cM3d_IsZero(len)) { + return FALSE; + } + + cM3d_Len2dSqPntAndSegLine(cur_pnt.x, cur_pnt.z, prev_pnt.x, prev_pnt.z, next_pnt.x, next_pnt.z, + &proj2_x, &proj2_z, &len); + + s16 angle1; + if (param_5) { + angle1 = cM_atan2s(prev_pnt.x - next_pnt.x, prev_pnt.z - next_pnt.z); + } else { + angle1 = cM_atan2s(next_pnt.x - prev_pnt.x, next_pnt.z - prev_pnt.z); + } + s16 angle2 = cM_atan2s(proj2_x - proj1_x, proj2_z - proj1_z); + s16 angle_diff = angle1 - angle2; + + if (o_proj != NULL) { + o_proj->set(proj1_x, 0.0f, proj1_z); + } + if (o_prevIdx != NULL) { + *o_prevIdx = prev_idx; + } + if (o_nextIdx != NULL) { + *o_nextIdx = next_idx; + } + + return (u16)abs(angle_diff) > 0x4000; +} + +static f32 dummy_literal() { + cXyz vec; + return vec.abs(); } /* 80146C98-80146CD8 1415D8 0040+00 0/0 0/0 121/121 .text initialize__15daNpcT_JntAnm_cFv */ void daNpcT_JntAnm_c::initialize() { mActrMngr.initialize(); - memset(&field_0x14, 0, (u32)&field_0x158 - (u32)&field_0x14); + memset(&mAttnPos, 0, (u32)&field_0x158 - (u32)&mAttnPos); } -/* ############################################################################################## */ -/* 80453408-80453410 001A08 0008+00 8/8 0/0 0/0 .sdata2 @4723 */ -SECTION_SDATA2 static f64 lit_4723 = 0.5; +/* 80146CD8-80147858 141618 0B80+00 1/0 0/0 52/52 .text + * setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz */ +void daNpcT_JntAnm_c::setParam(fopAc_ac_c* i_actor, J3DModel* i_model, cXyz* i_eyeOffset_p, + int i_backboneJointNo, int i_neckJointNo, int i_headJointNo, + f32 i_bodyUpAngle, f32 i_bodyDownAngle, f32 i_bodyLeftAngle, + f32 i_bodyRightAngle, f32 i_headUpAngle, f32 i_headDownAngle, + f32 i_headLeftAngle, f32 i_headRightAngle, f32 param_14, + f32 param_15, cXyz* param_16) { + cXyz vec1, vec2, vec3; + csXyz angle; + mPos = i_actor->current.pos; + + if (i_headJointNo >= 0) { + mDoMtx_stack_c::copy(i_model->getAnmMtx(i_headJointNo)); + mDoMtx_stack_c::multVecZero(&mJntPos[0]); + mHeadPos.setall(0.0f); + mDoMtx_stack_c::multVec(&mHeadPos, &mHeadPos); + mEyePos.set(i_eyeOffset_p->x, i_eyeOffset_p->y, i_eyeOffset_p->z); + mDoMtx_stack_c::multVec(&mEyePos, &mEyePos); + field_0x150.x = cLib_targetAngleX(&mJntPos[0], &mEyePos); + field_0x150.y = cLib_targetAngleY(&mJntPos[0], &mEyePos); + } else { + field_0x150.y = 0; + } -/* 80453410-80453418 001A10 0008+00 8/8 0/0 0/0 .sdata2 @4724 */ -SECTION_SDATA2 static f64 lit_4724 = 3.0; + if (i_neckJointNo >= 0) { + mDoMtx_stack_c::copy(i_model->getAnmMtx(i_neckJointNo)); + mDoMtx_stack_c::multVecZero(&mJntPos[1]); + } -/* 80453418-80453420 001A18 0008+00 8/8 0/0 0/0 .sdata2 @4725 */ -SECTION_SDATA2 static u8 lit_4725[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; + if (i_backboneJointNo >= 0) { + mDoMtx_stack_c::copy(i_model->getAnmMtx(i_backboneJointNo)); + mDoMtx_stack_c::multVecZero(&mJntPos[2]); + } -/* 80453420-80453424 001A20 0004+00 5/5 0/0 0/0 .sdata2 @5239 */ -SECTION_SDATA2 static f32 lit_5239 = 182.04444885253906f; + mMinRad[2].x = cM_s2rad(cM_deg2s(-i_bodyDownAngle)); + mMaxRad[2].x = cM_s2rad(cM_deg2s(-i_bodyUpAngle)); + mMinRad[2].y = cM_s2rad(cM_deg2s(i_bodyLeftAngle)); + mMaxRad[2].y = cM_s2rad(cM_deg2s(i_bodyRightAngle)); + mMinRad[1].setall(0.0f); + mMaxRad[1].setall(0.0f); + mMinRad[0].x = cM_s2rad(cM_deg2s(-i_headDownAngle)); + mMaxRad[0].x = cM_s2rad(cM_deg2s(-i_headUpAngle)); + mMinRad[0].y = cM_s2rad(cM_deg2s(i_headLeftAngle)); + mMaxRad[0].y = cM_s2rad(cM_deg2s(i_headRightAngle)); + mAttnPos.setall(0.0f); -/* 80453424-80453428 001A24 0004+00 2/2 0/0 0/0 .sdata2 @5240 */ -SECTION_SDATA2 static f32 lit_5240 = 9.58738019107841e-05f; + switch (mMode) { + case 0: + mAttnPosP = NULL; + break; -/* 80453428-8045342C 001A28 0004+00 2/2 0/0 0/0 .sdata2 @5241 */ -SECTION_SDATA2 static f32 lit_5241 = 1000.0f; + case 1: + mAttnPosP = &daPy_getPlayerActorClass()->attention_info.position; + mAttnPos = *mAttnPosP; + break; -/* 80146CD8-80147858 141618 0B80+00 1/0 0/0 52/52 .text - * setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz */ -void daNpcT_JntAnm_c::setParam(fopAc_ac_c* param_0, J3DModel* param_1, cXyz* param_2, - int param_3, int param_4, int param_5, f32 param_6, f32 param_7, - f32 param_8, f32 param_9, f32 param_10, f32 param_11, - f32 param_12, f32 param_13, f32 param_14, f32 param_15, - cXyz* param_16) { - // NONMATCHING + case 2: { + fopAc_ac_c* actor = mActrMngr.getActorP(); + if (actor != NULL) { + mAttnPosP = &actor->attention_info.position; + mAttnPos = *mAttnPosP; + mAttnPos.y += field_0x14c; + } else { + mAttnPosP = NULL; + } + break; + } + + case 3: + if (mAttnPosP != NULL) { + mAttnPos = *mAttnPosP; + } + break; + + case 4: { + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + if (camera != NULL) { + mAttnPosP = fopCamM_GetEye_p(camera); + mAttnPos = *mAttnPosP; + } + break; + } + + case 5: + if (mAttnPosP != NULL) { + mMinRad[2].y = 0.0f; + mMaxRad[2].y = 0.0f; + mMinRad[0].y = 0.0f; + mMaxRad[0].y = 0.0f; + mAttnPos = *mAttnPosP; + } + break; + + case 6: + if (mAttnPosP != NULL) { + mMinRad[2].y = 0.0f; + mMaxRad[2].y = 0.0f; + mMinRad[0].x = 0.0f; + mMaxRad[0].x = 0.0f; + mAttnPos = *mAttnPosP; + } + break; + + case 7: + case 8: { + if (cLib_calcTimer(&mTimer) == 0) { + field_0x13c ^= 1; + mTimer = getTime(); + } + int angle_y_offset; + if (field_0x13c != 0) { + angle_y_offset = cM_deg2s(-110.0f); + } else { + angle_y_offset = cM_deg2s(110.0f); + } + angle.y = angle_y_offset; + angle.y += static_cast(i_actor)->mCurAngle.y; + vec3.set(0.0f, mJntPos[0].y, 1000.0f); + if (mMode == 8) { + vec3.y = i_actor->current.pos.y; + } + mDoMtx_stack_c::YrotS(angle.y); + mDoMtx_stack_c::multVec(&vec3, &mAttnPos); + mAttnPos += i_actor->current.pos; + mAttnPosP = &mAttnPos; + break; + } + + default: + mAttnPosP = NULL; + break; + } + + field_0x120 = mAttnPos; + + Mtx mtx; + MTXCopy(i_model->getBaseTRMtx(), mtx); + mtx[0][3] = 0.0f; + mtx[1][3] = 0.0f; + mtx[2][3] = 0.0f; + mDoMtx_stack_c::copy(mtx); + mDoMtx_stack_c::inverse(); + + vec3 = field_0x120 - i_actor->current.pos; + mDoMtx_stack_c::multVec(&vec3, &vec3); + field_0x120 = vec3 + i_actor->current.pos; + + for (int i = 0; i < 3; i++) { + vec3 = mJntPos[i] - i_actor->current.pos; + mDoMtx_stack_c::multVec(&vec3, &vec3); + mJntPos[i] = vec3 + i_actor->current.pos; + } + + vec3 = mHeadPos - i_actor->current.pos; + mDoMtx_stack_c::multVec(&vec3, &vec3); + mHeadPos = vec3 + i_actor->current.pos; + + vec3 = mEyePos - i_actor->current.pos; + mDoMtx_stack_c::multVec(&vec3, &vec3); + mEyePos = vec3 + i_actor->current.pos; + + vec3 = field_0x120 - i_actor->current.pos; + mDoMtx_stack_c::YrotS(-cM_rad2s(param_15)); + mDoMtx_stack_c::multVec(&vec3, &vec3); + field_0x120 = vec3 + i_actor->current.pos; + + mEyePos = mEyePos - mHeadPos; + mHeadPos = mHeadPos - mJntPos[0]; + + for (int i = 0; i < 3; i++) { + field_0x54[i] = mJntPos[i]; + } + + for (int i = 2; i >= 0; i--) { + angle.set(getJntRadX2S(i), getJntRadY2S(i), 0); + mDoMtx_stack_c::ZXYrotS(angle); + mDoMtx_stack_c::inverse(); + if (i != 0) { + vec3 = field_0x54[i - 1] - field_0x54[i]; + mDoMtx_stack_c::multVec(&vec3, &vec3); + mJntPos[i - 1] = mJntPos[i] + vec3; + } else { + mDoMtx_stack_c::multVec(&mEyePos, &vec1); + mDoMtx_stack_c::multVec(&mHeadPos, &vec2); + } + } + + for (int i = 0; i < 3; i++) { + field_0x54[i] = mJntPos[i]; + } + + mJntPos[0] += vec2; + field_0x24 = mJntPos[0] + vec1; + + field_0x148 = param_14; } /* 80147858-80147C38 142198 03E0+00 1/1 0/0 0/0 .text calc__15daNpcT_JntAnm_cFf */ +// NONMATCHING float loads out of order void daNpcT_JntAnm_c::calc(f32 param_0) { - // NONMATCHING -} + cXyz vec1, vec2; + cXyz vec3 = field_0x24; + s16 angle = cLib_targetAngleY(&mPos, &field_0x120); + vec1.set(0.0f, 0.0f, 1000.0f); + mDoMtx_stack_c::YrotS(angle); + mDoMtx_stack_c::multVec(&vec1, &vec1); + vec1 += mPos; -/* ############################################################################################## */ -/* 8045342C-80453430 001A2C 0004+00 1/1 0/0 0/0 .sdata2 @5410 */ -SECTION_SDATA2 static f32 lit_5410 = 3.1415927410125732f; + for (int i = 0; i < 3; i++) { + if (i != 1) { + s16 angle1 = cLib_targetAngleY(&mJntPos[i], &vec1); + s16 angle2 = cLib_targetAngleY(&mJntPos[i], &vec3); + mRad[i].y = cM_s2rad((s16)(angle1 - angle2)); + if (mMaxRad[i].y < mRad[i].y) { + mRad[i].y = mMaxRad[i].y; + } + if (mRad[i].y < mMinRad[i].y) { + mRad[i].y = mMinRad[i].y; + } + } else { + mRad[i].y = 0.0f; + } + + switch (i) { + case 0: + mDoMtx_stack_c::YrotS(cM_rad2s(mRad[i].y * (1.0f - field_0x148))); + break; + case 1: + mDoMtx_stack_c::YrotS(cM_rad2s(mRad[0].y * field_0x148)); + break; + default: + mDoMtx_stack_c::YrotS(cM_rad2s(mRad[i].y)); + break; + } + + vec2 = vec3 - mJntPos[i]; + mDoMtx_stack_c::multVec(&vec2, &vec3); + vec3 += mJntPos[i]; + } + + vec3 = field_0x24; + mJntPos[0].y = field_0x24.y; + + for (int i = 0; i < 3; i++) { + if (i != 1) { + s16 angle1 = -cLib_targetAngleX(&mJntPos[i], &field_0x120); + s16 angle2 = -cLib_targetAngleX(&mJntPos[i], &field_0x24); + mRad[i].x = cM_s2rad((s16)(angle1 - angle2)); + if (mMaxRad[i].x < mRad[i].x) { + mRad[i].x = mMaxRad[i].x; + } + if (mRad[i].x < mMinRad[i].x) { + mRad[i].x = mMinRad[i].x; + } + } else { + mRad[i].x = 0.0f; + } + + switch (i) { + case 0: + mDoMtx_stack_c::XrotS(cM_rad2s(mRad[i].x * (1.0f - field_0x148))); + break; + case 1: + mDoMtx_stack_c::XrotS(cM_rad2s(mRad[0].x * field_0x148)); + break; + default: + mDoMtx_stack_c::XrotS(cM_rad2s(mRad[i].x)); + } + + vec2 = vec3 - mJntPos[i]; + mDoMtx_stack_c::multVec(&vec2, &vec3); + vec3 += mJntPos[i]; + } +} /* 80147C38-80147DCC 142578 0194+00 0/0 0/0 52/52 .text calcJntRad__15daNpcT_JntAnm_cFfff */ void daNpcT_JntAnm_c::calcJntRad(f32 param_0, f32 param_1, f32 param_2) { - // NONMATCHING + if (mMode == 0) { + clrRad(); + } else { + calc(param_2); + } + + for (int i = 0; i < 3; i++) { + if (param_0 < 1.0f && mDirectFlag == 0) { + cLib_addCalc2(&field_0xe4[i].x, mRad[i].x, param_0, 3.1415927f); + cLib_addCalc2(&field_0xe4[i].y, mRad[i].y, param_0, 3.1415927f); + cLib_addCalc2(&field_0xe4[i].z, mRad[i].z, param_0, 3.1415927f); + if (0.0f < param_2 && 0.0f < mRad[i].y && mRad[i].y - field_0xe4[i].y < 0.0f) { + field_0xe4[i].y = mRad[i].y; + } + if (param_2 < 0.0f && mRad[i].y < 0.0f && 0.0f < mRad[i].y - field_0xe4[i].y) { + field_0xe4[i].y = mRad[i].y; + } + } else { + field_0xe4[i].x = mRad[i].x; + field_0xe4[i].y = mRad[i].y; + field_0xe4[i].z = mRad[i].z; + } + } } /* 80147DCC-80147E3C 14270C 0070+00 0/0 0/0 28/28 .text @@ -1236,26 +862,133 @@ void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, s } } -/* ############################################################################################## */ -/* 80453438-8045343C 001A38 0004+00 1/1 0/0 0/0 .sdata2 @5459 */ -SECTION_SDATA2 static f32 lit_5459 = 1.0f / 10.0f; +/* 80147E3C-80147FA4 14277C 0168+00 0/0 0/0 47/47 .text calc__19daNpcT_DmgStagger_cFi */ +void daNpcT_DmgStagger_c::calc(BOOL param_0) { + cXyz vec1, vec2; + mDoMtx_stack_c::YrotS(field_0x16); + cLib_addCalc2(&field_0xc[1], 0.0f, 0.1f, 125.0f); + cLib_addCalc2(&field_0xc[0], 0.0f, 0.1f, 125.0f); + + for (int i = 0; i < 2; i++) { + vec1.set(0.0f, 0.0f, field_0xc[i] * cM_ssin(mStagger)); + mDoMtx_stack_c::multVec(&vec1, &vec2); + field_0x0[i].x = -vec2.z; + field_0x0[i].z = -vec2.x; + } + + if (mStagger != 0) { + cLib_chaseS(&mStagger, 0, 0x555); + if (mStagger == 0) { + if (param_0) { + mStagger = 1; + } else { + mRebirth = true; + } + } + } else { + mRebirth = false; + } +} + +/* 803B36D8-803B371C 0107F8 0044+00 0/0 0/0 54/54 .data mCcDCyl__8daNpcT_c */ +dCcD_SrcCyl daNpcT_c::mCcDCyl = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl +}; + +/* 803B371C-803B375C 01083C 0040+00 0/0 0/0 3/3 .data mCcDSph__8daNpcT_c */ +dCcD_SrcSph daNpcT_c::mCcDSph = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 0.0f} // mSph + } // mSphAttr +}; + +/* 803B375C-803B37A0 01087C 0044+00 0/0 0/0 1/1 .data mCcDCyl__11daBaseNpc_c */ +dCcD_SrcCyl daBaseNpc_c::mCcDCyl = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl +}; + +/* 803B37A0-803B37E0 0108C0 0040+00 0/0 0/0 1/1 .data mCcDSph__11daBaseNpc_c */ +dCcD_SrcSph daBaseNpc_c::mCcDSph = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 0.0f} // mSph + } // mSphAttr +}; -/* 8045343C-80453440 001A3C 0004+00 1/1 0/0 0/0 .sdata2 @5460 */ -SECTION_SDATA2 static f32 lit_5460 = 125.0f; +/* 803B37E0-803B3824 010900 0044+00 0/0 0/0 36/36 .data mCcDCyl__8daNpcF_c */ +dCcD_SrcCyl daNpcF_c::mCcDCyl = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl +}; -/* 80147E3C-80147FA4 14277C 0168+00 0/0 0/0 47/47 .text calc__19daNpcT_DmgStagger_cFi */ -void daNpcT_DmgStagger_c::calc(int param_0) { - // NONMATCHING -} +/* 803B3824-803B3864 010944 0040+00 0/0 0/0 2/2 .data mCcDSph__8daNpcF_c */ +dCcD_SrcSph daNpcF_c::mCcDSph = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 0.0f} // mSph + } // mSphAttr +}; /* 80147FA4-80147FD4 1428E4 0030+00 0/0 0/0 53/53 .text * tgHitCallBack__8daNpcT_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -void daNpcT_c::tgHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2, - dCcD_GObjInf* param_3) { - // NONMATCHING +void daNpcT_c::tgHitCallBack(fopAc_ac_c* i_actor1, dCcD_GObjInf* i_obj1, fopAc_ac_c* i_actor2, + dCcD_GObjInf* i_obj2) { + u8 cut_type = 0; + if (i_actor2 != NULL) { + if (fopAcM_GetProfName(i_actor2) == PROC_ALINK) { + cut_type = static_cast(i_actor2)->getCutType(); + } else { + cut_type = daPy_py_c::CUT_TYPE_NM_VERTICAL; + } + } + static_cast(i_actor1)->setCutType(cut_type); } -/* ############################################################################################## */ /* 80425708-804257D0 052428 00C8+00 4/4 0/0 40/40 .bss mFindActorPtrs__8daNpcT_c */ fopAc_ac_c* daNpcT_c::mFindActorPtrs[50]; @@ -1266,7 +999,7 @@ s16 daNpcT_c::mSrchName; s32 daNpcT_c::mFindCount; /* 80147FD4-80148058 142914 0084+00 3/3 0/0 2/2 .text srchActor__8daNpcT_cFPvPv */ -int daNpcT_c::srchActor(void* actor, void* param_1) { +void* daNpcT_c::srchActor(void* actor, void* param_1) { if (mFindCount < 50 && fopAcM_IsActor(actor) && actor != param_1) { if (mSrchName == fopAcM_GetName((fopAc_ac_c*)actor)) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)actor; @@ -1274,7 +1007,7 @@ int daNpcT_c::srchActor(void* actor, void* param_1) { } } - return 0; + return NULL; } /* 80148058-80148094 142998 003C+00 1/1 0/0 7/7 .text getTrnsfrmAnmP__8daNpcT_cFPCci */ @@ -1310,22 +1043,22 @@ J3DAnmColor* daNpcT_c::getColorAnmP(char const* arcName, int fileIdx) { /* 801481C0-80148204 142B00 0044+00 1/1 0/0 0/0 .text setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib */ -void daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF, int endF, +int daNpcT_c::setBckAnm(J3DAnmTransform* bck, f32 rate, int attr, int startF, int endF, bool modify) { - mBckAnm.init(bck, TRUE, attr, rate, startF, endF, modify); + return mBckAnm.init(bck, TRUE, attr, rate, startF, endF, modify); } /* 80148204-801482F8 142B44 00F4+00 1/1 0/0 1/1 .text * setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii */ -int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mode, int startF, +int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 rate, f32 morf, int mode, int startF, int endF) { f32 start = startF; f32 end = endF; - mpMorf[0]->setAnm(bck, mode, frame, morf, start, end); + mpMorf[0]->setAnm(bck, mode, morf, rate, start, end); if (mpMorf[1] != NULL) { - mpMorf[1]->setAnm(bck, mode, frame, morf, start, end); + mpMorf[1]->setAnm(bck, mode, morf, rate, start, end); } return 1; @@ -1334,29 +1067,26 @@ int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* bck, f32 morf, f32 frame, int mo /* 801482F8-80148338 142C38 0040+00 1/1 0/0 1/1 .text * setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi */ -void daNpcT_c::setBtpAnm(J3DAnmTexPattern* param_0, J3DModelData* modelData, f32 param_2, - int param_3) { - mBtpAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1); +int daNpcT_c::setBtpAnm(J3DAnmTexPattern* btp, J3DModelData* modelData, f32 rate, int attr) { + return mBtpAnm.init(modelData, btp, 1, attr, rate, 0, -1); } /* 80148338-80148378 142C78 0040+00 1/1 0/0 6/6 .text * setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi */ -void daNpcT_c::setBtkAnm(J3DAnmTextureSRTKey* param_0, J3DModelData* modelData, f32 param_2, - int param_3) { - mBtkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1); +int daNpcT_c::setBtkAnm(J3DAnmTextureSRTKey* btk, J3DModelData* modelData, f32 rate, int attr) { + return mBtkAnm.init(modelData, btk, 1, attr, rate, 0, -1); } /* 80148378-801483B8 142CB8 0040+00 0/0 0/0 9/9 .text * setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi */ -void daNpcT_c::setBrkAnm(J3DAnmTevRegKey* param_0, J3DModelData* modelData, f32 param_2, - int param_3) { - mBrkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1); +int daNpcT_c::setBrkAnm(J3DAnmTevRegKey* brk, J3DModelData* modelData, f32 rate, int attr) { + return mBrkAnm.init(modelData, brk, 1, attr, rate, 0, -1); } /* 801483B8-801483F8 142CF8 0040+00 0/0 0/0 2/2 .text * setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi */ -void daNpcT_c::setBpkAnm(J3DAnmColor* param_0, J3DModelData* modelData, f32 param_2, int param_3) { - mBpkAnm.init(modelData, param_0, 1, param_3, param_2, 0, -1); +int daNpcT_c::setBpkAnm(J3DAnmColor* bpk, J3DModelData* modelData, f32 rate, int attr) { + return mBpkAnm.init(modelData, bpk, 1, attr, rate, 0, -1); } /* 801483F8-801484AC 142D38 00B4+00 0/0 0/0 58/58 .text loadRes__8daNpcT_cFPCScPPCc */ @@ -1369,7 +1099,7 @@ int daNpcT_c::loadRes(s8 const* resNoList, char const** resNameList) { return cPhs_COMPLEATE_e; } - int phase_state = dComIfG_resLoad(&field_0x8e0[i], resNameList[resNoList[i]]); + int phase_state = dComIfG_resLoad(&mPhase[i], resNameList[resNoList[i]]); if (phase_state == cPhs_COMPLEATE_e) { resLoad_cnt++; } @@ -1385,14 +1115,10 @@ int daNpcT_c::loadRes(s8 const* resNoList, char const** resNameList) { /* 801484AC-8014852C 142DEC 0080+00 0/0 0/0 58/58 .text deleteRes__8daNpcT_cFPCScPPCc */ void daNpcT_c::deleteRes(s8 const* resNoList, char const** resNameList) { for (int i = 0; i < 10 && resNoList[i] != -1; i++) { - dComIfG_resDelete(&field_0x8e0[i], resNameList[resNoList[i]]); + dComIfG_resDelete(&mPhase[i], resNameList[resNoList[i]]); } } -/* ############################################################################################## */ -/* 80453440-80453444 001A40 0004+00 3/3 0/0 0/0 .sdata2 @5667 */ -SECTION_SDATA2 static f32 lit_5667 = -1000000000.0f; - /* 8014852C-8014886C 142E6C 0340+00 0/0 0/0 59/59 .text execute__8daNpcT_cFv */ int daNpcT_c::execute() { setParam(); @@ -1401,32 +1127,32 @@ int daNpcT_c::execute() { } beforeMove(); - fopAcM_posMoveF(this, field_0x864.GetCCMoveP()); - field_0x68c.CrrPos(dComIfG_Bgsp()); - field_0x930 = field_0x68c.m_gnd; - field_0xdca = fopAcM_getPolygonAngle(field_0x930, current.angle.y); - field_0xdf4 = field_0x68c.GetGroundH(); - if (FLOAT_LABEL(lit_5667) != field_0xdf4) { - field_0xda8 = dKy_pol_sound_get(&field_0x68c.m_gnd); - field_0xe24 = dComIfGp_getReverb(field_0x864.GetRoomId()); - - if (field_0x68c.ChkWaterHit() && field_0x68c.m_wtr.GetHeight() > field_0xdf4) { - field_0xda8 = dKy_pol_sound_get(&field_0x68c.m_wtr); + fopAcM_posMoveF(this, mCcStts.GetCCMoveP()); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + mGroundAngle = fopAcM_getPolygonAngle(mGndChk, current.angle.y); + mGroundH = mAcch.GetGroundH(); + if (mGroundH != -1.0e9f) { + mPolSound = dKy_pol_sound_get(&mAcch.m_gnd); + mReverb = dComIfGp_getReverb(mCcStts.GetRoomId()); + + if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > mGroundH) { + mPolSound = dKy_pol_sound_get(&mAcch.m_wtr); } } afterMoved(); - if (FLOAT_LABEL(lit_5667) != field_0xdf4) { + if (mGroundH != -1.0e9f) { setEnvTevColor(); setRoomNo(); } - if (field_0xb50.checkEntryNewMotion()) { + if (mFaceMotionSeqMngr.checkEntryNewMotion()) { ctrlFaceMotion(); ctrlSubFaceMotion(1); } - if (field_0xb74.checkEntryNewMotion()) { + if (mMotionSeqMngr.checkEntryNewMotion()) { ctrlMotion(); } @@ -1450,18 +1176,14 @@ int daNpcT_c::execute() { return 1; } -/* ############################################################################################## */ -/* 80453444-80453448 001A44 0004+00 3/3 0/0 0/0 .sdata2 @5794 */ -SECTION_SDATA2 static f32 lit_5794 = 20.0f; - /* 8014886C-80148C70 1431AC 0404+00 0/0 0/0 58/58 .text draw__8daNpcT_cFiifP11_GXColorS10fiii */ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_color, f32 param_4, - int i_drawGhost, int param_6, int param_7) { + int i_drawGhost, int i_noShadow, int i_simpleShadow) { J3DModel* model = mpMorf[0]->getModel(); J3DModelData* modelData = model->getModelData(); field_0xe34 = 1; - if (drawDbgInfo() || checkHide() || field_0xe2b) { + if (drawDbgInfo() || checkHide() || mNoDraw) { return 1; } @@ -1477,8 +1199,8 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo tevStr.TevColor.a = i_color->a; } - if (field_0xdb8 != 0 && mTimer != 0) { - f32 r = (f32)mTimer / (f32)field_0xdb8; + if (mDamageTimerStart != 0 && mDamageTimer != 0) { + f32 r = (f32)mDamageTimer / (f32)mDamageTimerStart; if (cM3d_IsZero(r) == false) { tevStr.TevColor.r = r * 20.0f; @@ -1487,19 +1209,19 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo tevStr.TevColor.g = 20; } - if (field_0xd98 & 0x800) { + if (mAnmFlags & ANM_PLAY_BTP) { mBtpAnm.entry(modelData); } - if (field_0xd98 & 0x80) { + if (mAnmFlags & ANM_PLAY_BTK) { mBtkAnm.entry(modelData); } - if (field_0xd98 & 0x100) { + if (mAnmFlags & ANM_PLAY_BRK) { mBrkAnm.entry(modelData); } - if (field_0xd98 & 0x200) { + if (mAnmFlags & ANM_PLAY_BPK) { mBpkAnm.entry(modelData); } @@ -1509,7 +1231,7 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo if (i_drawGhost) { drawGhost(); - } else if (field_0xa89 != 0) { + } else if (mTwilight != 0) { g_env_light.settingTevStruct(4, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(model, &tevStr); dComIfGd_setListDark(); @@ -1521,29 +1243,29 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo mpMorf[0]->entryDL(); } - if (field_0xd98 & 0x800) { + if (mAnmFlags & ANM_PLAY_BTP) { mBtpAnm.remove(modelData); } - if (field_0xd98 & 0x80) { + if (mAnmFlags & ANM_PLAY_BTK) { mBtkAnm.remove(modelData); } - if (field_0xd98 & 0x100) { + if (mAnmFlags & ANM_PLAY_BRK) { mBrkAnm.remove(modelData); } - if (field_0xd98 & 0x200) { + if (mAnmFlags & ANM_PLAY_BPK) { mBpkAnm.remove(modelData); } - if (param_6 == 0) { - if (param_7 == 0) { - field_0xd94 = dComIfGd_setShadow(field_0xd94, 1, model, ¤t.pos, param_2, param_4, - current.pos.y, field_0xdf4, field_0x930, &tevStr, 0, - 1.0f, dDlst_shadowControl_c::getSimpleTex()); + if (i_noShadow == 0) { + if (i_simpleShadow == 0) { + mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, ¤t.pos, param_2, param_4, + current.pos.y, mGroundH, mGndChk, &tevStr, 0, + 1.0f, dDlst_shadowControl_c::getSimpleTex()); } else { - dComIfGd_setSimpleShadow(¤t.pos, field_0xdf4, param_4, field_0x930, 0, 1.0f, + dComIfGd_setSimpleShadow(¤t.pos, mGroundH, param_4, mGndChk, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } } @@ -1555,27 +1277,27 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo /* 80148C70-80148CCC 1435B0 005C+00 1/1 0/0 58/58 .text setEnvTevColor__8daNpcT_cFv */ void daNpcT_c::setEnvTevColor() { - tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(field_0x930); - tevStr.room_no = dComIfG_Bgsp().GetRoomId(field_0x930); + tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk); + tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk); } /* 80148CCC-80148D10 14360C 0044+00 1/1 0/0 58/58 .text setRoomNo__8daNpcT_cFv */ void daNpcT_c::setRoomNo() { - int roomId = dComIfG_Bgsp().GetRoomId(field_0x930); + int roomId = dComIfG_Bgsp().GetRoomId(mGndChk); fopAcM_SetRoomNo(this, roomId); - field_0x864.SetRoomId(roomId); + mCcStts.SetRoomId(roomId); } /* 80148D10-80148DD0 143650 00C0+00 1/1 0/0 0/0 .text checkEndAnm__8daNpcT_cFf */ -int daNpcT_c::checkEndAnm(f32 param_0) { +int daNpcT_c::checkEndAnm(f32 i_speed) { switch (mpMorf[0]->getPlayMode()) { case 2: return mpMorf[0]->isLoop(); case 0: case 1: return mpMorf[0]->isStop() && cM3d_IsZero(mpMorf[0]->getPlaySpeed()) && - !cM3d_IsZero(param_0); + !cM3d_IsZero(i_speed); case 3: case 4: break; @@ -1586,13 +1308,13 @@ int daNpcT_c::checkEndAnm(f32 param_0) { /* 80148DD0-80148E4C 143710 007C+00 1/1 0/0 0/0 .text checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf */ -int daNpcT_c::checkEndAnm(J3DFrameCtrl* param_0, f32 param_1) { - switch (param_0->getAttribute()) { +int daNpcT_c::checkEndAnm(J3DFrameCtrl* i_anm, f32 i_speed) { + switch (i_anm->getAttribute()) { case 2: - return param_0->checkState(2); + return i_anm->checkState(2); case 0: case 1: - return (param_0->checkState(1) && param_0->getRate() == 0.0f) && param_1 != 0.0f; + return (i_anm->checkState(1) && i_anm->getRate() == 0.0f) && i_speed != 0.0f; case 3: break; } @@ -1603,55 +1325,55 @@ int daNpcT_c::checkEndAnm(J3DFrameCtrl* param_0, f32 param_1) { /* 80148E4C-801490D4 14378C 0288+00 1/1 0/0 0/0 .text playAllAnm__8daNpcT_cFv */ void daNpcT_c::playAllAnm() { - if (!(field_0xd98 & 0x4000)) { - if (field_0xd98 & 0x400) { + if (!(mAnmFlags & ANM_FLAG_4000)) { + if (mAnmFlags & ANM_PLAY_BCK) { f32 bck_speed = mBckAnm.getPlaySpeed(); - if (field_0xd98 & 0x10) { + if (mAnmFlags & ANM_PAUSE_BCK) { mBckAnm.setPlaySpeed(0.0f); } mBckAnm.play(); if (checkEndAnm(mBckAnm.getFrameCtrl(), bck_speed)) { - field_0xe20++; + mBckLoops++; } mBckAnm.setPlaySpeed(bck_speed); } - if (field_0xd98 & 0x800) { + if (mAnmFlags & ANM_PLAY_BTP) { f32 btp_speed = mBtpAnm.getPlaySpeed(); - if (field_0xd98 & 0x20) { + if (mAnmFlags & ANM_PAUSE_BTP) { mBtpAnm.setPlaySpeed(0.0f); - if (field_0xd98 & 0x2000) { - field_0xdc0 = func_8014D364(90, 90); + if (mAnmFlags & ANM_PAUSE_TIMER_BTP) { + mBtpPauseTimer = cLib_getRndValue(90, 90); } } - if (func_8014D348(&field_0xdc0) != 0) { + if (cLib_calcTimer(&mBtpPauseTimer) != 0) { mBtpAnm.setPlaySpeed(0.0f); } mBtpAnm.play(); - if (field_0xd98 & 0x2000) { + if (mAnmFlags & ANM_PAUSE_TIMER_BTP) { if (checkEndAnm(mBtpAnm.getFrameCtrl(), mBtpAnm.getPlaySpeed())) { - field_0xdc0 = func_8014D364(90, 90); + mBtpPauseTimer = cLib_getRndValue(90, 90); } } else { - field_0xdc0 = 0; + mBtpPauseTimer = 0; } mBtpAnm.setPlaySpeed(btp_speed); } } - if (field_0xd98 & 0x40) { + if (mAnmFlags & ANM_PLAY_MORF) { f32 morf_speed = mpMorf[0]->getPlaySpeed(); - if (field_0xd98 & 0x1) { + if (mAnmFlags & ANM_PAUSE_MORF) { mpMorf[0]->setPlaySpeed(0.0f); - mpMorf[0]->play(field_0xda8, field_0xe24); + mpMorf[0]->play(mPolSound, mReverb); mpMorf[0]->setPlaySpeed(morf_speed); if (mpMorf[1] != NULL) { @@ -1660,21 +1382,21 @@ void daNpcT_c::playAllAnm() { mpMorf[1]->setPlaySpeed(morf_speed); } } else { - mpMorf[0]->play(field_0xda8, field_0xe24); + mpMorf[0]->play(mPolSound, mReverb); if (mpMorf[1] != NULL) { mpMorf[1]->play(0, 0); } if (checkEndAnm(morf_speed)) { - field_0xe1e++; + mMorfLoops++; } } } - if (field_0xd98 & 0x80) { + if (mAnmFlags & ANM_PLAY_BTK) { f32 btk_speed = mBtkAnm.getPlaySpeed(); - if (field_0xd98 & 0x2) { + if (mAnmFlags & ANM_PAUSE_BTK) { mBtkAnm.setPlaySpeed(0.0f); } @@ -1683,9 +1405,9 @@ void daNpcT_c::playAllAnm() { mBtkAnm.setPlaySpeed(btk_speed); } - if (field_0xd98 & 0x100) { + if (mAnmFlags & ANM_PLAY_BRK) { f32 brk_speed = mBrkAnm.getPlaySpeed(); - if (field_0xd98 & 0x4) { + if (mAnmFlags & ANM_PAUSE_BRK) { mBrkAnm.setPlaySpeed(0.0f); } @@ -1693,9 +1415,9 @@ void daNpcT_c::playAllAnm() { mBrkAnm.setPlaySpeed(brk_speed); } - if (field_0xd98 & 0x200) { + if (mAnmFlags & ANM_PLAY_BPK) { f32 bpk_speed = mBpkAnm.getPlaySpeed(); - if (field_0xd98 & 0x8) { + if (mAnmFlags & ANM_PAUSE_BPK) { mBpkAnm.setPlaySpeed(0.0f); } @@ -1703,13 +1425,33 @@ void daNpcT_c::playAllAnm() { mBpkAnm.setPlaySpeed(bpk_speed); } - field_0xd98 &= ~0x403F; + mAnmFlags &= ~(ANM_PAUSE_MORF | ANM_PAUSE_BTK | ANM_PAUSE_BRK | ANM_PAUSE_BPK | ANM_PAUSE_BCK + | ANM_PAUSE_BTP | ANM_FLAG_4000); } /* 801490D4-80149190 143A14 00BC+00 1/0 1/0 55/0 .text ctrlBtk__8daNpcT_cFv */ -void daNpcT_c::ctrlBtk() { - // NONMATCHING +BOOL daNpcT_c::ctrlBtk() { + if (mpMatAnm != NULL) { + if (field_0xe29 != 0 && mBtkAnm.getBtkAnm() != NULL) { + mpMatAnm->setNowOffsetX(field_0xde4 * cM_ssin(mJntAnm.getEyeAngleY())); + mpMatAnm->setNowOffsetY(field_0xde0 * cM_ssin(mJntAnm.getEyeAngleX())); + if (field_0xe2a != 0) { + mpMatAnm->setMorfFrm(field_0xe2a); + field_0xe2a = 0; + } + mpMatAnm->onEyeMoveFlg(); + return TRUE; + } + + if (field_0xe2a != 0) { + mpMatAnm->setMorfFrm(field_0xe2a); + field_0xe2a = 0; + } + mpMatAnm->offEyeMoveFlg(); + } + + return FALSE; } /* 80149190-8014924C 143AD0 00BC+00 0/0 0/0 57/57 .text setMtx__8daNpcT_cFv */ @@ -1718,7 +1460,7 @@ void daNpcT_c::setMtx() { J3DModelData* modelData = model->getModelData(); mDoMtx_stack_c::transS(current.pos); - mDoMtx_stack_c::ZXYrotM(field_0xd78); + mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::scaleM(scale); model->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -1729,7 +1471,7 @@ void daNpcT_c::setMtx() { mpMorf[0]->offMorfNone(); } - if (field_0xd98 & 0x400) { + if (mAnmFlags & ANM_PLAY_BCK) { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); } @@ -1738,13 +1480,13 @@ void daNpcT_c::setMtx() { /* 8014924C-80149300 143B8C 00B4+00 1/1 0/0 0/0 .text ctrlFaceMotion__8daNpcT_cFv */ void daNpcT_c::ctrlFaceMotion() { - int l_int; - f32 l_float; + int anmIdx; + f32 morf; - if (field_0xb50.play(field_0xe20, &l_int, &l_float)) { - setFaceMotionAnm(l_int, true); + if (mFaceMotionSeqMngr.play(mBckLoops, &anmIdx, &morf)) { + setFaceMotionAnm(anmIdx, true); - if (l_float < 0.0f) { + if (morf < 0.0f) { mpMorf[0]->setMorf(field_0xa80); field_0xdfc = field_0xa80; @@ -1752,11 +1494,11 @@ void daNpcT_c::ctrlFaceMotion() { mpMorf[1]->setMorf(field_0xa80); } } else { - mpMorf[0]->setMorf(l_float); - field_0xdfc = l_float; + mpMorf[0]->setMorf(morf); + field_0xdfc = morf; if (mpMorf[1]) { - mpMorf[1]->setMorf(l_float); + mpMorf[1]->setMorf(morf); } } } @@ -1764,18 +1506,18 @@ void daNpcT_c::ctrlFaceMotion() { /* 80149300-801493B8 143C40 00B8+00 1/1 0/0 0/0 .text ctrlMotion__8daNpcT_cFv */ void daNpcT_c::ctrlMotion() { - int l_int; - int l_int2; - f32 l_float; + int anmIdx; + BOOL restart; + f32 morf; - if (field_0xb74.play(field_0xe1e, &l_int, &l_float)) { - l_int2 = 0; + if (mMotionSeqMngr.play(mMorfLoops, &anmIdx, &morf)) { + restart = FALSE; - if (l_float < 0.5f) { - l_int2 = 1; + if (morf < -1.0f) { + restart = TRUE; } - setMotionAnm(l_int, l_float < 0.0f ? field_0xa84 : l_float, l_int2); + setMotionAnm(anmIdx, morf < 0.0f ? field_0xa84 : morf, restart); field_0xdfc = 0.0f; @@ -1791,7 +1533,6 @@ void daNpcT_c::ctrlMotion() { } } - /* 801493B8-8014951C 143CF8 0164+00 1/1 0/0 2/2 .text ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci */ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int param_3) { *param_0 = -1; @@ -1815,15 +1556,15 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa } if (dMsgObject_c::isMouthCheck()) { - field_0xd98 &= ~0x4000; + mAnmFlags &= ~ANM_FLAG_4000; } else { - field_0xd98 |= 0x4000; + mAnmFlags |= ANM_FLAG_4000; } field_0xdb4 = 0x14; } else { - if (field_0xd98 & 0x4000) { - field_0xd98 &= ~0x4000; + if (mAnmFlags & ANM_FLAG_4000) { + mAnmFlags &= ~ANM_FLAG_4000; } mMsgId = -1; } @@ -1836,8 +1577,7 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa } if (param_3 == 0) { - // cLib_calcTimer - func_8014D348(&field_0xdb4); + cLib_calcTimer(&field_0xdb4); } return field_0xdb4; @@ -1845,31 +1585,208 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa /* 8014951C-8014997C 143E5C 0460+00 1/0 1/0 59/0 .text ctrlJoint__8daNpcT_cFP8J3DJointP8J3DModel */ -void daNpcT_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - // NONMATCHING -} +int daNpcT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { + int joint_no = i_joint->getJntNo(); + cXyz pos; + csXyz angle; + mDoMtx_stack_c::copy(i_model->getAnmMtx(joint_no)); + + if (joint_no == getBackboneJointNo() || joint_no == getNeckJointNo() + || joint_no == getHeadJointNo()) { + Mtx joint_mtx; + MTXCopy(mDoMtx_stack_c::get(), joint_mtx); + pos.set(joint_mtx[0][3], joint_mtx[1][3], joint_mtx[2][3]); + joint_mtx[0][3] = joint_mtx[1][3] = joint_mtx[2][3] = 0.0f; + + mDoMtx_stack_c::ZXYrotS(mCurAngle.x, mCurAngle.y + field_0xd8a.y, mCurAngle.z); + if (joint_no == getNeckJointNo()) { + angle.set(mJntAnm.getJntRadX2S(2), mJntAnm.getJntRadY2S(2), 0); + mDoMtx_stack_c::ZXYrotM(angle); + } + if (joint_no == getHeadJointNo()) { + angle.set(mJntAnm.getJntRadX2S(2), mJntAnm.getJntRadY2S(2), 0); + mDoMtx_stack_c::ZXYrotM(angle); + } -/* ############################################################################################## */ -/* 80392710-80392710 01ED70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80392710 = "DEFAULT_GETITEM"; -#pragma pop + mDoMtx_stack_c::inverse(); + Mtx inverse_mtx; + MTXCopy(mDoMtx_stack_c::get(), inverse_mtx); + + mDoMtx_stack_c::transS(pos); + mDoMtx_stack_c::ZXYrotM(mCurAngle.x, mCurAngle.y + field_0xd8a.y, mCurAngle.z); + if (joint_no == getBackboneJointNo()) { + angle.set(mJntAnm.getJntRadX2S(2), mJntAnm.getJntRadY2S(2), 0); + mDoMtx_stack_c::ZXYrotM(angle); + } + if (joint_no == getNeckJointNo()) { + angle.set(mJntAnm.getJntRadX2S(1), mJntAnm.getJntRadY2S(1), 0); + mDoMtx_stack_c::ZXYrotM(angle); + } + if (joint_no == getHeadJointNo()) { + angle.set(mJntAnm.getJntRadX2S(0), mJntAnm.getJntRadY2S(0), 0); + mDoMtx_stack_c::ZXYrotM(angle); + } + mDoMtx_stack_c::concat(inverse_mtx); + mDoMtx_stack_c::concat(joint_mtx); + } + + afterJntAnm(joint_no); + i_model->setAnmMtx(joint_no, mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + + if ((mAnmFlags & ANM_PLAY_BCK) && (checkChangeJoint(joint_no) || checkRemoveJoint(joint_no))) { + J3DAnmTransform* bck = mBckAnm.getBckAnm(); + mBckAnm.changeBckOnly(mpMorf[0]->getAnm()); + mpMorf[0]->changeAnm(bck); + } + + if (cM3d_IsZero(field_0xdfc) == false) { + if (checkChangeJoint(joint_no)) { + mpMorf[0]->offMorfNone(); + } else if (checkRemoveJoint(joint_no)) { + mpMorf[0]->onMorfNone(); + } + } + + return 1; +} /* 8014997C-80149BB4 1442BC 0238+00 1/0 1/0 58/0 .text evtProc__8daNpcT_cFv */ -int daNpcT_c::evtProc() { - // NONMATCHING +// NONMATCHING loads dComIfG_gameInfo twice +BOOL daNpcT_c::evtProc() { + BOOL ret = FALSE; + + if (dComIfGp_event_runCheck() != FALSE) { + if (eventInfo.checkCommandTalk()) { + if (!checkChangeEvt()) { + evtTalk(); + } + ret = TRUE; + } else if (eventInfo.i_checkCommandDemoAccrpt() + && dComIfGp_getEventManager().endCheck(mEvtId)) { + if (evtEndProc()) { + dComIfGp_event_reset(); + mEvtId = -1; + } + } else { + if (!strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") + && mItemId != fpcM_ERROR_PROCESS_ID_e) { + dComIfGp_event_setTalkPartner(NULL); + dComIfGp_event_setItemPartnerId(mItemId); + mItemId = fpcM_ERROR_PROCESS_ID_e; + } + ret = evtCutProc(); + } + + int tmp = field_0xdb4; + int face_motion, motion; + if (ctrlMsgAnm(&face_motion, &motion, this, field_0xe2d)) { + if (field_0xe26) { + mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, mFaceMotionSeqMngr.getOffset()); + mMotionSeqMngr.setNo(motion, -1.0f, FALSE, mMotionSeqMngr.getOffset()); + } + } else if (tmp != 0 && field_0xe26) { + setAfterTalkMotion(); + } + field_0xe26 = true; + + } else { + if (field_0xdac != -1) { + field_0xe22 = 1; + field_0xdac = -1; + } + field_0xdb4 = 0; + field_0xe26 = true; + } + + return ret; } /* 80149BB4-80149D7C 1444F4 01C8+00 1/0 1/0 60/0 .text setFootPos__8daNpcT_cFv */ void daNpcT_c::setFootPos() { - // NONMATCHING + if (getFootLJointNo() >= 0) { + mOldFootLOffset = mFootLOffset; + mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getFootLJointNo())); + mDoMtx_stack_c::multVecZero(&mFootLPos); + mFootLOffset = mFootLPos - current.pos; + } + + if (getFootRJointNo() >= 0) { + mOldFootROffset = mFootROffset; + mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getFootRJointNo())); + mDoMtx_stack_c::multVecZero(&mFootRPos); + mFootROffset = mFootRPos - current.pos; + } + + if (field_0xa88) { + mOldFootLOffset = mFootLOffset; + mOldFootROffset = mFootROffset; + } } /* 80149D7C-8014A05C 1446BC 02E0+00 1/0 1/0 60/0 .text setFootPrtcl__8daNpcT_cFP4cXyzff */ void daNpcT_c::setFootPrtcl(cXyz* param_0, f32 param_1, f32 param_2) { - // NONMATCHING + cXyz foot_l_pos = mFootLPos; + cXyz foot_r_pos = mFootRPos; + cXyz start, end; + u32 cross1; + u8 foot_l_att; + u32 cross2; + u8 foot_r_att; + + start = mFootLPos; + end = start; + end.y -= param_1; + mLinChk.Set(&start, &end, this); + cross1 = dComIfG_Bgsp().LineCross(&mLinChk); + if (cross1) { + foot_l_pos.y = mLinChk.i_GetCross().y; + mFootLPolyAngle = fopAcM_getPolygonAngle(mLinChk, mCurAngle.y); + foot_l_att = dComIfG_Bgsp().GetPolyAtt0(mLinChk); + } else { + mFootLPolyAngle = 0; + } + + start = mFootRPos; + end = start; + end.y -= param_1; + mLinChk.Set(&start, &end, this); + cross2 = dComIfG_Bgsp().LineCross(&mLinChk); + if (cross2) { + foot_r_pos.y = mLinChk.i_GetCross().y; + mFootRPolyAngle = fopAcM_getPolygonAngle(mLinChk, mCurAngle.y); + foot_r_att = dComIfG_Bgsp().GetPolyAtt0(mLinChk); + } else { + mFootRPolyAngle = 0; + } + + field_0x9c0.setEffectTwo(&tevStr, ¤t.pos, 0, 0, NULL, + mFootLOnGround == 0 && cross1 == 1 ? &foot_l_pos : NULL, + mFootROnGround == 0 && cross2 == 1 ? &foot_r_pos : NULL, + &mCurAngle, param_0, fopAcM_GetRoomNo(this), param_2, speedF); + + if (mFootLOnGround == 0 && cross1 == 1) { + switch (foot_l_att) { + case 3: + break; + case 0xd: + dkWmark_c::setFootMark(&foot_l_pos, mCurAngle.y, 3); + break; + } + } + if (mFootROnGround == 0 && cross2 == 1) { + switch (foot_r_att) { + case 3: + break; + case 0xd: + dkWmark_c::setFootMark(&foot_r_pos, mCurAngle.y, 3); + break; + } + } + + mFootLOnGround = cross1; + mFootROnGround = cross2; } /* 8014A05C-8014A064 14499C 0008+00 1/0 1/0 60/0 .text checkCullDraw__8daNpcT_cFv */ @@ -1879,9 +1796,9 @@ bool daNpcT_c::checkCullDraw() { /* 8014A064-8014A0B0 1449A4 004C+00 1/0 1/0 60/0 .text twilight__8daNpcT_cFv */ void daNpcT_c::twilight() { - if (field_0xa89 != 0) { + if (mTwilight) { attention_info.flags |= 0x400000; - field_0xe2b = 0; + mNoDraw = false; attention_info.flags |= 0x800000; setHitodamaPrtcl(); } @@ -1889,41 +1806,173 @@ void daNpcT_c::twilight() { /* 8014A0B0-8014A224 1449F0 0174+00 1/0 1/0 59/0 .text evtOrder__8daNpcT_cFv */ void daNpcT_c::evtOrder() { - // NONMATCHING + if (strlen(mpEvtData[mEvtNo].eventName) != 0) { + if (strlen(mpArcNames[mpEvtData[mEvtNo].num]) != 0) { + eventInfo.setArchiveName(mpArcNames[mpEvtData[mEvtNo].num]); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + } + mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[mEvtNo].eventName, 0xff); + fopAcM_orderOtherEventId(this, mEvtId, 0xff, 0xffff, 40, 1); + } else if ((!mTwilight || daPy_py_c::checkNowWolfEyeUp()) + && ((attention_info.flags & 8) || (attention_info.flags & 2))) + { + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); + if (chkXYItems()) { + eventInfo.i_onCondition(dEvtCnd_CANTALKITEM_e); + } + if (mSpeakEvent) { + fopAcM_orderSpeakEvent(this, 0, 0); + } + } } /* 8014A224-8014A324 144B64 0100+00 0/0 2/2 81/81 .text evtChange__8daNpcT_cFv */ void daNpcT_c::evtChange() { - // NONMATCHING + if (strlen(mpEvtData[mEvtNo].eventName) != 0) { + if (strlen(mpArcNames[mpEvtData[mEvtNo].num]) != 0) { + eventInfo.setArchiveName(mpArcNames[mpEvtData[mEvtNo].num]); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + } + mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[mEvtNo].eventName, 0xff); + dComIfGp_getEvent().reset(this); + fopAcM_orderChangeEventId(this, mEvtId, 1, 0xffff); + } } /* 8014A324-8014A388 144C64 0064+00 1/0 1/0 60/0 .text clrParam__8daNpcT_cFv */ void daNpcT_c::clrParam() { - field_0xd7e = field_0xd78; + field_0xd7e = mCurAngle; mCutType = 0; - memset(&field_0xe30, 0, (u32)&field_0xe38 - (u32)&field_0xe30); - field_0xba8.clrDirectFlag(); + memset(&mEvtNo, 0, (u32)&field_0xe38 - (u32)&mEvtNo); + mJntAnm.clrDirectFlag(); } /* 8014A388-8014A628 144CC8 02A0+00 1/1 0/0 57/57 .text setFaceMotionAnm__8daNpcT_cFib */ -bool daNpcT_c::setFaceMotionAnm(int param_0, bool param_1) { - // NONMATCHING +bool daNpcT_c::setFaceMotionAnm(int i_idx, bool i_modify) { + J3DAnmTransform* bck = NULL; + J3DAnmTexPattern* btp = NULL; + + mAnmFlags &= ~(ANM_PAUSE_BCK | ANM_PAUSE_BTP | ANM_PLAY_BCK | ANM_PLAY_BTP + | ANM_FLAG_1000 | ANM_PAUSE_TIMER_BTP | ANM_FLAG_4000); + + daNpcT_faceMotionAnmData_c anm_data = getFaceMotionAnm(mpFaceMotionAnmData[i_idx]); + + if (anm_data.mBckFileIdx != -1) { + int arc_idx = anm_data.mBckArcIdx; + int file_idx = anm_data.mBckFileIdx; + changeBck(&file_idx, &arc_idx); + bck = getTrnsfrmAnmP(mpArcNames[arc_idx], file_idx); + } + + if (bck != NULL) { + if (setBckAnm(bck, 1.0f, anm_data.mBckAttr, 0, -1, i_modify)) { + mAnmFlags |= ANM_PAUSE_BCK | ANM_PLAY_BCK; + mBckLoops = 0; + } else { + bck = NULL; + } + } + + if (bck == NULL && anm_data.mBckFileIdx != -1) { + return false; + } + + if (anm_data.mBtpFileIdx != -1) { + int arc_idx = anm_data.mBtpArcIdx; + int file_idx = anm_data.mBtpFileIdx; + changeBtp(&file_idx, &arc_idx); + btp = getTexPtrnAnmP(mpArcNames[arc_idx], file_idx); + } + + if (btp != NULL) { + if (btp == mBtpAnm.getBtpAnm() && anm_data.field_0x18) { + mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_TIMER_BTP; + } else if (setBtpAnm(btp, mpMorf[0]->getModel()->getModelData(), 1.0f, anm_data.mBtpAttr)) { + mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; + if (anm_data.field_0x18) { + mAnmFlags |= ANM_PAUSE_TIMER_BTP; + } + } else { + btp = NULL; + } + } + + if (btp == NULL && anm_data.mBtpFileIdx != -1) { + return false; + } + + return afterSetFaceMotionAnm(i_idx, anm_data.mBckAttr, 0.0f, anm_data.mBtpAttr); } /* 8014A628-8014A908 144F68 02E0+00 1/0 1/0 59/0 .text setMotionAnm__8daNpcT_cFifi */ -bool daNpcT_c::setMotionAnm(int param_0, f32 param_1, int param_2) { - // NONMATCHING -} +bool daNpcT_c::setMotionAnm(int i_idx, f32 i_morf, BOOL i_restart) { + J3DAnmTransformKey* bck = NULL; + J3DAnmTextureSRTKey* btk = NULL; + BOOL restarted = FALSE; + + mAnmFlags &= ~(ANM_PAUSE_MORF | ANM_PAUSE_BTK | ANM_PAUSE_BRK | ANM_PAUSE_BPK + | ANM_PLAY_MORF | ANM_PLAY_BTK | ANM_PLAY_BRK | ANM_PLAY_BPK); + + daNpcT_motionAnmData_c anm_data = getMotionAnm(mpMotionAnmData[i_idx]); + + if (anm_data.mBckFileIdx != -1) { + int arc_idx = anm_data.mBckArcIdx; + int file_idx = anm_data.mBckFileIdx; + changeAnm(&file_idx, &arc_idx); + bck = getTrnsfrmKeyAnmP(mpArcNames[arc_idx], file_idx); + } + + if (bck != NULL) { + if (i_restart && bck == mpMorf[0]->getAnm()) { + mAnmFlags |= ANM_PLAY_MORF; + mMorfLoops = 0; + restarted = TRUE; + } else if (setMcaMorfAnm(bck, 1.0f, i_morf, anm_data.mBckAttr, 0, -1)) { + mAnmFlags |= ANM_PAUSE_MORF | ANM_PLAY_MORF; + mMorfLoops = 0; + } else { + bck = NULL; + } + } -/* ############################################################################################## */ -/* 80453448-8045344C 001A48 0004+00 1/1 0/0 0/0 .sdata2 @6667 */ -SECTION_SDATA2 static f32 lit_6667 = 300.0f; + if (bck == NULL && anm_data.mBckFileIdx != -1) { + return false; + } + + field_0xe29 = 0; + field_0xe2a = 0; + + if (anm_data.mBtkFileIdx != -1) { + int arc_idx = anm_data.mBtkArcIdx; + int file_idx = anm_data.mBtkFileIdx; + changeBtk(&file_idx, &arc_idx); + field_0xe29 = anm_data.field_0x18; + field_0xe2a = anm_data.field_0x1a; + btk = getTexSRTKeyAnmP(mpArcNames[arc_idx], file_idx); + } + + if (btk != NULL) { + if (restarted) { + mAnmFlags |= ANM_PLAY_BTK; + } else if (setBtkAnm(btk, mpMorf[0]->getModel()->getModelData(), 1.0f, anm_data.mBtkAttr)) { + mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; + } else { + btk = NULL; + } + } + + if (btk == NULL && anm_data.mBtkFileIdx != -1) { + return false; + } + + return afterSetMotionAnm(i_idx, anm_data.mBckAttr, i_morf, anm_data.mBtkAttr); +} /* 8014A908-8014A99C 145248 0094+00 0/0 0/0 40/40 .text setPos__8daNpcT_cF4cXyz */ void daNpcT_c::setPos(cXyz i_pos) { i_pos.y += 300.0f; - field_0x930.SetPos(&i_pos); - i_pos.y = dComIfG_Bgsp().GroundCross(&field_0x930); + mGndChk.SetPos(&i_pos); + i_pos.y = dComIfG_Bgsp().GroundCross(&mGndChk); current.pos = i_pos; old.pos = current.pos; @@ -1933,8 +1982,8 @@ void daNpcT_c::setPos(cXyz i_pos) { void daNpcT_c::setAngle(csXyz i_angle) { current.angle = i_angle; shape_angle = current.angle; - field_0xd78 = current.angle; - field_0xd7e = field_0xd78; + mCurAngle = current.angle; + field_0xd7e = mCurAngle; old.angle = current.angle; } @@ -1942,8 +1991,8 @@ void daNpcT_c::setAngle(csXyz i_angle) { void daNpcT_c::setAngle(s16 i_angle) { current.angle.y = i_angle; shape_angle.y = current.angle.y; - field_0xd78.y = current.angle.y; - field_0xd7e.y = field_0xd78.y; + mCurAngle.y = current.angle.y; + field_0xd7e.y = mCurAngle.y; old.angle.y = current.angle.y; } @@ -1952,7 +2001,7 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) { dCcD_Stts* stts = (dCcD_Stts*)i_objInf->GetStts(); stts->Move(); - if (mTimer == 0) { + if (mDamageTimer == 0) { fopAc_ac_c* hitAc = i_objInf->GetTgHitAc(); if (hitAc != NULL) { @@ -1968,154 +2017,378 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) { } /* 8014AAD0-8014ABD0 145410 0100+00 0/0 0/0 27/27 .text setDamage__8daNpcT_cFiii */ -void daNpcT_c::setDamage(int param_0, int param_1, int param_2) { - // NONMATCHING -} +void daNpcT_c::setDamage(int param_0, int i_faceMotion, int i_motion) { + mDamageTimerStart = 8; + if (mCutType == daPy_py_c::CUT_TYPE_TURN_RIGHT || mCutType == daPy_py_c::CUT_TYPE_TURN_LEFT + || mCutType == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT + || mCutType == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) + { + mDamageTimerStart = 20; + } + mDamageTimer = mDamageTimerStart; -/* ############################################################################################## */ -/* 8045344C-80453450 001A4C 0004+00 7/7 0/0 0/0 .sdata2 @6775 */ -SECTION_SDATA2 static f32 lit_6775 = 180.0f; + if (i_faceMotion > -1) { + mFaceMotionSeqMngr.setNo(i_faceMotion, 0.0f, FALSE, mFaceMotionSeqMngr.getOffset()); + } + if (i_motion > -1) { + //! @bug The parameters to this function are passed in the wrong order + mMotionSeqMngr.setNo(i_motion, 0.0f, mMotionSeqMngr.getOffset(), FALSE); + } + + speed.setall(0.0f); + speedF = 0.0f; +} /* 8014ABD0-8014ACF0 145510 0120+00 2/2 0/0 53/53 .text chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs */ -BOOL daNpcT_c::chkActorInSight(fopAc_ac_c* param_0, f32 param_1, s16 param_2) { - // NONMATCHING +BOOL daNpcT_c::chkActorInSight(fopAc_ac_c* i_actor, f32 i_fovY, s16 i_angleY) { + if (cM3d_IsZero(i_fovY)) { + return FALSE; + } + + if (i_fovY < 180.0f) { + s16 fov_s = cM_deg2s(i_fovY); + cXyz attn_pos = getAttnPos(i_actor); + cSGlobe globe(attention_info.position - attn_pos); + cSAngle angle_diff = cSAngle(globe.U().Inv()) - i_angleY; + s16 angle_diff_s = angle_diff.Val(); + if (angle_diff_s < 0) { + angle_diff_s = -angle_diff_s; + } + return angle_diff_s <= fov_s; + } + + return TRUE; } /* 8014ACF0-8014ADA0 145630 00B0+00 2/2 0/0 12/12 .text chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs */ -BOOL daNpcT_c::chkPointInArea(cXyz param_0, cXyz param_1, f32 param_2, f32 param_3, f32 param_4, - s16 param_5) { - // NONMATCHING +BOOL daNpcT_c::chkPointInArea(cXyz i_pos, cXyz i_center, f32 i_boundXZ, f32 i_boundY1, + f32 i_boundY2, s16 i_angle) { + cXyz bounds, center; + f32 min_y = i_boundY2; + f32 max_y = i_boundY1; + if (i_boundY1 < i_boundY2) { + min_y = i_boundY1; + max_y = i_boundY2; + } + f32 range_y = fabsf(max_y - min_y); + bounds.set(i_boundXZ, range_y, i_boundXZ); + center = i_center; + center.y += min_y; + return chkPointInArea(i_pos, center, bounds, i_angle); } /* 8014ADA0-8014AE1C 1456E0 007C+00 1/1 0/0 1/1 .text chkPointInArea__8daNpcT_cF4cXyz4cXyz4cXyzs */ -BOOL daNpcT_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3) { - // NONMATCHING +BOOL daNpcT_c::chkPointInArea(cXyz i_pos, cXyz i_center, cXyz i_bounds, s16 i_angle) { + return daNpcT_chkPointInArea(i_pos, i_center, i_bounds, i_angle, TRUE); } -/* ############################################################################################## */ -/* 80453450-80453454 001A50 0004+00 2/2 0/0 0/0 .sdata2 @6904 */ -SECTION_SDATA2 static f32 lit_6904 = 30.0f; - -/* 80453454-80453458 001A54 0004+00 2/2 0/0 0/0 .sdata2 @6905 */ -SECTION_SDATA2 static f32 lit_6905 = 45.0f; +/* 8014AE1C-8014B010 14575C 01F4+00 1/1 0/0 0/0 .text chkFindActor__8daNpcT_cFP10fopAc_ac_cis */ +BOOL daNpcT_c::chkFindActor(fopAc_ac_c* i_actor, BOOL i_release, s16 i_angleY) { + cXyz attn_pos = getAttnPos(i_actor); + + int dist_index = i_release == FALSE ? attention_info.distances[fopAc_attn_SPEAK_e] + : attention_info.distances[fopAc_attn_TALK_e]; + + f32 dist_max = i_release == FALSE ? dComIfGp_getAttention().getDistTable(dist_index).mDistMax + : dComIfGp_getAttention().getDistTable(dist_index).mDistMaxRelease; + f32 lower_y = dComIfGp_getAttention().getDistTable(dist_index).mLowerY * -1.0f; + f32 upper_y = dComIfGp_getAttention().getDistTable(dist_index).mUpperY * -1.0f; + u32 angle_select = dComIfGp_getAttention().getDistTable(dist_index).mAngleSelect; + + f32 fov = 180.0f; + if (angle_select & 8) { + fov = 30.0f; + } else if (angle_select & 0x10) { + fov = 45.0f; + } else if (angle_select & 0x20) { + fov = 60.0f; + } else if (angle_select & 0x40) { + fov = 90.0f; + } else if (angle_select & 0x80) { + fov = 110.0f; + } else if (angle_select & 0x100) { + fov = 135.0f; + } + + if (chkPointInArea(attn_pos, attention_info.position, dist_max, lower_y, upper_y, 0) + && chkActorInSight(i_actor, fov, i_angleY)) + { + return TRUE; + } else { + return FALSE; + } +} -/* 80453458-8045345C 001A58 0004+00 2/2 0/0 0/0 .sdata2 @6906 */ -SECTION_SDATA2 static f32 lit_6906 = 60.0f; +/* 8014B024-8014B0C8 145964 00A4+00 1/1 0/0 0/0 .text chkWolfAction__8daNpcT_cFv */ +// NONMATCHING regswap +BOOL daNpcT_c::chkWolfAction() { + if (daPy_py_c::i_checkNowWolf()) { + bool ret = false; + if (!daPy_getPlayerActorClass()->checkWolfWait() + && !dComIfGp_checkPlayerStatus0(0, 0x8000000) + && !daPy_getPlayerActorClass()->checkWolfRSit()) + { + ret = true; + } -/* 8045345C-80453460 001A5C 0004+00 2/2 0/0 0/0 .sdata2 @6907 */ -SECTION_SDATA2 static f32 lit_6907 = 90.0f; + return ret; + } -/* 80453460-80453464 001A60 0004+00 2/2 0/0 0/0 .sdata2 @6908 */ -SECTION_SDATA2 static f32 lit_6908 = 110.0f; + return FALSE; +} -/* 80453464-80453468 001A64 0004+00 2/2 0/0 0/0 .sdata2 @6909 */ -SECTION_SDATA2 static f32 lit_6909 = 135.0f; +/* 8014B0C8-8014B338 145A08 0270+00 0/0 0/0 2/2 .text chkFindWolf__8daNpcT_cFsiiffffi */ +BOOL daNpcT_c::chkFindWolf(s16 i_angleY, int i_distIndex, int param_2, f32 i_boundXZ, f32 i_fovY, + f32 i_boundY1, f32 i_boundY2, BOOL param_7) { + cXyz attn_pos = getAttnPos(daPy_getPlayerActorClass()); -/* 8014AE1C-8014B010 14575C 01F4+00 1/1 0/0 0/0 .text chkFindActor__8daNpcT_cFP10fopAc_ac_cis */ -void daNpcT_c::chkFindActor(fopAc_ac_c* param_0, int param_1, s16 param_2) { - // NONMATCHING -} + if (daPy_py_c::i_checkNowWolf()) { + if (chkPointInArea(attn_pos, attention_info.position, i_boundXZ, i_boundY1, i_boundY2, 0) + && chkActorInSight(daPy_getPlayerActorClass(), i_fovY, i_angleY)) + { + return TRUE; + } -/* 8014B010-8014B024 145950 0014+00 5/5 1/1 0/0 .text getDistTable__12dAttention_cFi */ -dist_entry& dAttention_c::getDistTable(int param_0) { - // NONMATCHING -} + f32 dist_max = dComIfGp_getAttention().getDistTable(i_distIndex).mDistMax; + f32 upper_y = dComIfGp_getAttention().getDistTable(i_distIndex).mUpperY; + f32 lower_y = dComIfGp_getAttention().getDistTable(i_distIndex).mLowerY; + if (chkPointInArea(attn_pos, attention_info.position, dist_max, upper_y, lower_y, 0)) { + return TRUE; + } -/* 8014B024-8014B0C8 145964 00A4+00 1/1 0/0 0/0 .text chkWolfAction__8daNpcT_cFv */ -void daNpcT_c::chkWolfAction() { - // NONMATCHING -} + int dist_index = attention_info.distances[fopAc_attn_TALK_e]; + dist_max = dComIfGp_getAttention().getDistTable(dist_index).mDistMax; + upper_y = dComIfGp_getAttention().getDistTable(dist_index).mUpperY; + lower_y = dComIfGp_getAttention().getDistTable(dist_index).mLowerY; + if (chkPointInArea(attn_pos, attention_info.position, dist_max, upper_y, lower_y, 0) + && param_2 < 2 && param_7 && chkWolfAction()) + { + return TRUE; + } + } -/* 8014B0C8-8014B338 145A08 0270+00 0/0 0/0 2/2 .text chkFindWolf__8daNpcT_cFsiiffffi */ -void daNpcT_c::chkFindWolf(s16 param_0, int param_1, int param_2, f32 param_3, f32 param_4, - f32 param_5, f32 param_6, int param_7) { - // NONMATCHING + return FALSE; } /* 8014B338-8014B3EC 145C78 00B4+00 0/0 0/0 75/75 .text srchPlayerActor__8daNpcT_cFv */ BOOL daNpcT_c::srchPlayerActor() { - // NONMATCHING + if (mPlayerActorMngr.getActorP() != NULL) { + if (!chkFindActor(daPy_getPlayerActorClass(), TRUE, mCurAngle.y)) { + mPlayerActorMngr.remove(); + } + } else { + if (chkFindActor(daPy_getPlayerActorClass(), FALSE, mCurAngle.y)) { + mPlayerActorMngr.entry(daPy_getPlayerActorClass()); + } + } + return mPlayerActorMngr.getActorP() != NULL; } /* 8014B3EC-8014B4A4 145D2C 00B8+00 3/3 0/0 5/5 .text getAttnPos__8daNpcT_cFP10fopAc_ac_c */ -void daNpcT_c::getAttnPos(fopAc_ac_c* param_0) { - // NONMATCHING +cXyz daNpcT_c::getAttnPos(fopAc_ac_c* i_actor) { + cXyz attn_pos = i_actor->attention_info.position; + if (fopAcM_GetName(i_actor) == PROC_ALINK) { + attn_pos.y -= daPy_py_c::getAttentionOffsetY(); + if (daPy_py_c::i_checkNowWolf()) { + attn_pos = i_actor->current.pos; + attn_pos.y = i_actor->attention_info.position.y; + } + } + return attn_pos; } -/* ############################################################################################## */ -/* 80453468-8045346C 001A68 0004+00 4/4 0/0 0/0 .sdata2 @7089 */ -SECTION_SDATA2 static f32 lit_7089 = 0.0054931640625f; +/* 8014B4A4-8014B648 145DE4 01A4+00 1/1 0/0 1/1 .text turn__8daNpcT_cFsii */ +BOOL daNpcT_c::turn(s16 i_angle, int i_count, int i_direction) { + if (mTurnAmount == 0) { + mTurnCount = fabsf(cM_sht2d((s16)(i_angle - mStartAngle))); + mTurnCount = mTurnCount / 180.0f * i_count; + mTurnCount = (int)mTurnCount + 1; + if (mTurnCount < 8.0f) { + mTurnCount = 8.0f; + } + } + + int tmp1 = mStartAngle; + int tmp2 = i_angle; + if (i_direction == 0) { + i_direction = (s16)(tmp2 - tmp1) >= 0 ? 1 : -1; + } -/* 8045346C-80453470 001A6C 0004+00 4/4 0/0 0/0 .sdata2 @7090 */ -SECTION_SDATA2 static f32 lit_7090 = 8.0f; + int angle_diff = (u16)(i_angle - mStartAngle); + if (i_direction == -1) { + angle_diff = -(u16)(0xffff - angle_diff); + } -/* 80453470-80453474 001A70 0004+00 2/2 0/0 0/0 .sdata2 @7091 */ -SECTION_SDATA2 static f32 lit_7091 = 16384.0f; + s16 turn = angle_diff * cM_ssin(mTurnAmount); + mTurnAmount += (s16)(0x4000 / mTurnCount); -/* 8014B4A4-8014B648 145DE4 01A4+00 1/1 0/0 1/1 .text turn__8daNpcT_cFsii */ -void daNpcT_c::turn(s16 param_0, int param_1, int param_2) { - // NONMATCHING + if ((u16)mTurnAmount < 0x4000) { + mCurAngle.y = mStartAngle + turn; + } else { + mCurAngle.y = i_angle; + mTurnAmount = 0x4000; + } + + return i_angle == mCurAngle.y; } /* 8014B648-8014B808 145F88 01C0+00 0/0 0/0 177/177 .text step__8daNpcT_cFsiiii */ -int daNpcT_c::step(s16 param_0, int param_1, int param_2, int param_3, int param_4) { - // NONMATCHING -} +BOOL daNpcT_c::step(s16 i_angle, int i_faceMotion, int i_motion, int i_turnCount, + int i_turnDirection) { + if (mStepMode >= 2 && i_angle != mCurAngle.y) { + mStepMode = 0; + } -/* ############################################################################################## */ -/* 80453474-80453478 001A74 0004+00 1/1 0/0 0/0 .sdata2 @7222 */ -SECTION_SDATA2 static f32 lit_7222 = 17.0f / 20.0f; + if (mStepMode == 0) { + s16 angle_diff = i_angle - mCurAngle.y; + if (angle_diff == 0) { + mStepMode = 2; + } else { + mTargetAngle = i_angle; + mStartAngle = mCurAngle.y; + mTurnAmount = 0; + if ((int)fabsf(cM_sht2d(angle_diff)) > 64) { + mFaceMotionSeqMngr.setNo(i_faceMotion, -1.0f, TRUE, mFaceMotionSeqMngr.getOffset()); + mMotionSeqMngr.setNo(i_motion, -1.0f, TRUE, mMotionSeqMngr.getOffset()); + } + current.angle.y = mCurAngle.y; + shape_angle.y = current.angle.y; + mStepMode++; + } -/* 8014B808-8014BB00 146148 02F8+00 0/0 0/0 11/11 .text calcSpeedAndAngle__8daNpcT_cF4cXyziss */ -void daNpcT_c::calcSpeedAndAngle(cXyz param_0, int param_1, s16 param_2, s16 param_3) { - // NONMATCHING + } else if (mStepMode == 1) { + if (turn(mTargetAngle, i_turnCount, i_turnDirection)) { + current.angle.y = mCurAngle.y; + shape_angle.y = current.angle.y; + field_0xd7e.y = current.angle.y; + mStepMode++; + } else { + current.angle.y = mCurAngle.y; + shape_angle.y = current.angle.y; + } + } + + return mStepMode > 1; } -/* ############################################################################################## */ -/* 80453478-8045347C 001A78 0004+00 1/1 0/0 0/0 .sdata2 @7242 */ -SECTION_SDATA2 static f32 lit_7242 = 6.0f; +/* 8014B808-8014BB00 146148 02F8+00 0/0 0/0 11/11 .text calcSpeedAndAngle__8daNpcT_cF4cXyziss */ +void daNpcT_c::calcSpeedAndAngle(cXyz i_target, BOOL i_stop, s16 i_angleScale, s16 i_angleStep) { + if (i_stop) { + speedF = 0.0f; + return; + } + + current.angle.y = cLib_targetAngleY(¤t.pos, &i_target); + cLib_addCalcAngleS2(&shape_angle.y, current.angle.y, i_angleScale, i_angleStep); + mCurAngle.y = shape_angle.y; + + if (mFootLOffset.y < mFootROffset.y) { + speedF = (mFootLOffset - mOldFootLOffset).absXZ(); + } else { + speedF = (mFootROffset - mOldFootROffset).absXZ(); + } + + speedF *= cM_scos(mGroundAngle); + if (mGroundAngle < 0) { + speedF *= 0.85f; + } +} /* 8014BB00-8014BBF0 146440 00F0+00 0/0 0/0 2/2 .text getActorDistance__8daNpcT_cFP10fopAc_ac_cii */ -void daNpcT_c::getActorDistance(fopAc_ac_c* param_0, int param_1, int param_2) { - // NONMATCHING +int daNpcT_c::getActorDistance(fopAc_ac_c* i_actor, int i_distIndex1, int i_distIndex2) { + int ret = 0; + f32 dist1 = dComIfGp_getAttention().getDistTable(i_distIndex1).mDistMax; + f32 dist2 = dComIfGp_getAttention().getDistTable(i_distIndex2).mDistMax; + f32 actor_dist = fopAcM_searchActorDistanceXZ(this, i_actor); + + if (actor_dist < dist1) { + return 0; + } + + f32 diff = actor_dist - dist1; + dist2 -= dist1; + dist2 /= 6.0f; + for (int i = 0; i < 5; i++, ret++) { + if (diff < dist2 * (i + 1)) { + return ret; + } + } + + return ret; } /* 8014BBF0-8014BC78 146530 0088+00 0/0 1/1 180/180 .text initTalk__8daNpcT_cFiPP10fopAc_ac_c */ -int daNpcT_c::initTalk(int param_0, fopAc_ac_c** param_1) { - mFlow.init(this, param_0, 0, param_1); +BOOL daNpcT_c::initTalk(int i_flowID, fopAc_ac_c** param_1) { + mFlow.init(this, i_flowID, 0, param_1); field_0xdc8 = fopAcM_searchPlayerAngleY(this); if (checkStep()) { - mStepNo = 0; + mStepMode = 0; } - f32 tmp = 0.0f; - speedF = tmp; - speed.set(tmp, tmp, tmp); - return 1; + speedF = 0.0f; + speed.set(0.0f, 0.0f, 0.0f); + return TRUE; } /* 8014BC78-8014BE2C 1465B8 01B4+00 0/0 0/0 169/169 .text talkProc__8daNpcT_cFPiiPP10fopAc_ac_ci */ -int daNpcT_c::talkProc(int* param_0, int param_1, fopAc_ac_c** param_2, int param_3) { - // NONMATCHING -} +BOOL daNpcT_c::talkProc(int* param_0, BOOL param_1, fopAc_ac_c** param_2, BOOL param_3) { + BOOL ret = FALSE; -/* ############################################################################################## */ -/* 8045347C-80453480 001A7C 0004+00 2/2 0/0 0/0 .sdata2 @7337 */ -SECTION_SDATA2 static f32 lit_7337 = 1000000000.0f; + if (dMsgObject_isMsgSendControl()) { + if (param_1) { + dMsgObject_offMsgSendControl(); + } + } else if (mFlow.doFlow(this, param_2, 0)) { + ret = TRUE; + } else { + if (mFlow.getMsg() != NULL) { + switch (mFlow.getMsg()->mode) { + case 2: + case 6: + if (param_0 != NULL) { + for (int i = 0; param_0[i] > 0; i++) { + if (param_0[i] == mFlow.getMsgNo()) { + ret = TRUE; + break; + } + } + } + break; + case 17: + if (param_3) { + ret = TRUE; + } + break; + } + } + + int tmp1, face_motion, motion, tmp2; + if (mFlow.checkEventRender(&tmp1, &motion, &face_motion, &tmp2)) { + if (face_motion != mFaceMotionSeqMngr.getNo()) { + mFaceMotionSeqMngr.setNo(face_motion, -1.0f, FALSE, mFaceMotionSeqMngr.getOffset()); + } + if (motion != mMotionSeqMngr.getNo()) { + mMotionSeqMngr.setNo(motion, -1.0f, FALSE, mMotionSeqMngr.getOffset()); + } + } + } + + return ret; +} /* 8014BE2C-8014BEE4 14676C 00B8+00 0/0 0/0 25/25 .text getNearestActorP__8daNpcT_cFs */ -fopAc_ac_c* daNpcT_c::getNearestActorP(s16 param_0) { +fopAc_ac_c* daNpcT_c::getNearestActorP(s16 i_procName) { fopAc_ac_c* actor = NULL; f32 minDistance = 1000000000.0f; mFindCount = 0; - mSrchName = param_0; - fpcEx_Search((fpcLyIt_JudgeFunc)srchActor, this); + mSrchName = i_procName; + fpcM_Search(srchActor, this); for (s32 i = 0; i < mFindCount; i++) { f32 dist = fopAcM_searchActorDistance(this, mFindActorPtrs[i]); if (dist < minDistance) { @@ -2128,15 +2401,27 @@ fopAc_ac_c* daNpcT_c::getNearestActorP(s16 param_0) { /* 8014BEE4-8014BFB0 146824 00CC+00 0/0 0/0 12/12 .text getEvtAreaTagP__8daNpcT_cFii */ -fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int param_0, int param_1) { - // NONMATCHING +// NONMATCHING regswap +fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) { + mFindCount = 0; + mSrchName = PROC_TAG_EVTAREA; + fpcM_Search(srchActor, this); + + for (int i = 0; i < mFindCount; i++) { + daTag_EvtArea_c* evt_area = static_cast(mFindActorPtrs[i]); + if (evt_area->getType() == i_type && evt_area->getNo() == i_no) { + return mFindActorPtrs[i]; + } + } + + return NULL; } /* 8014BFB0-8014C030 1468F0 0080+00 0/0 0/0 5/5 .text getShopItemTagP__8daNpcT_cFv */ fopAc_ac_c* daNpcT_c::getShopItemTagP() { mFindCount = 0; - mSrchName = 0x127; - fpcM_Search((fopAcIt_JudgeFunc)srchActor, (void*)this); + mSrchName = PROC_TAG_SHOPITM; + fpcM_Search(srchActor, this); for (s32 i = 0; i < mFindCount; i++) { if ((fopAcM_GetParam(mFindActorPtrs[i]) & 0xf0000000) == 0xf0000000) { @@ -2147,29 +2432,32 @@ fopAc_ac_c* daNpcT_c::getShopItemTagP() { return NULL; } -/* ############################################################################################## */ -/* 80453480-80453484 001A80 0004+00 1/1 0/0 0/0 .sdata2 id$7388 */ -SECTION_SDATA2 static u8 id_7388[4] = { - 0x84, - 0x97, - 0x84, - 0x98, -}; - -/* 80453484-80453488 001A84 0004+00 2/2 0/0 0/0 .sdata2 @7442 */ -SECTION_SDATA2 static f32 lit_7442 = 4.0f; - /* 8014C030-8014C200 146970 01D0+00 1/1 0/0 0/0 .text setHitodamaPrtcl__8daNpcT_cFv */ void daNpcT_c::setHitodamaPrtcl() { - // NONMATCHING -} + static const u16 id[2] = {0x8497, 0x8498}; -/* ############################################################################################## */ -/* 80453488-8045348C 001A88 0004+00 1/1 0/0 0/0 .sdata2 @7550 */ -SECTION_SDATA2 static f32 lit_7550 = 608.0f; + cXyz pos; + field_0xe18 = (u16)(field_0xe1a * 2); + field_0xe00.x = cM_ssin(field_0xe1a) * 8.0f; + field_0xe00.y = cM_ssin(field_0xe18) * 4.0f; + field_0xe00.z = field_0xe00.x * -cM_ssin(shape_angle.y); + field_0xe00.x = field_0xe00.x * cM_scos(shape_angle.y); + field_0xe1a += 0x400; + pos.x = eyePos.x + field_0xe00.x + field_0xe0c.x; + pos.y = eyePos.y + field_0xe00.y + field_0xe0c.y; + pos.z = eyePos.z + field_0xe00.z + field_0xe0c.z; -/* 8045348C-80453490 001A8C 0004+00 1/1 0/0 0/0 .sdata2 @7551 */ -SECTION_SDATA2 static f32 lit_7551 = 448.0f; + for (int i = 0; i < 2; i++) { + mHitodamaPrtclKey[i] = dComIfGp_particle_set(mHitodamaPrtclKey[i], id[i], &pos, + &mCurAngle, NULL); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mHitodamaPrtclKey[i]); + if (emitter != NULL) { + u8 alpha = dComIfGs_wolfeye_effect_check() == FALSE ? 0xff : 0; + emitter->setGlobalTranslation(pos.x, pos.y, pos.z); + emitter->setGlobalAlpha(alpha); + } + } +} /* 8014C200-8014C384 146B40 0184+00 0/0 0/0 2/2 .text * daNpcT_chkActorInScreen__FP10fopAc_ac_cfffffffi */ @@ -2211,38 +2499,52 @@ bool daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32 /* 8014C384-8014C500 146CC4 017C+00 1/1 0/0 3/3 .text daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi */ -BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4) { - BOOL ret; +BOOL daNpcT_chkPointInArea(cXyz i_pos, cXyz i_center, cXyz i_bounds, s16 i_angle, + BOOL i_checkHeight) { cXyz l_pos; cXyz diff; - mDoMtx_stack_c::YrotS(-param_3); - mDoMtx_stack_c::transM(-param_1.x, -param_1.y, -param_1.z); - mDoMtx_stack_c::multVec(¶m_0, &l_pos); + mDoMtx_stack_c::YrotS(-i_angle); + mDoMtx_stack_c::transM(-i_center.x, -i_center.y, -i_center.z); + mDoMtx_stack_c::multVec(&i_pos, &l_pos); - f32 l_float1 = fabsf(param_2.x); - f32 l_float2 = fabsf(param_2.z); - f32 l_float3 = fabsf(l_pos.x); - f32 l_float4 = fabsf(l_pos.z); + f32 axis_x = fabsf(i_bounds.x); + f32 axis_z = fabsf(i_bounds.z); + f32 pos_x = fabsf(l_pos.x); + f32 pos_z = fabsf(l_pos.z); - if (param_4 != 0 && - (!(0.0f <= (diff = param_0 - param_1).y) || !(diff.y < param_2.y))) - { - ret = FALSE; + if (i_checkHeight) { + diff = i_pos - i_center; + if (!(0.0f <= diff.y && diff.y < i_bounds.y)) { + return FALSE; + } + } + + f32 tmp1 = (pos_x * pos_x) / (axis_x * axis_x); + f32 tmp2 = (pos_z * pos_z) / (axis_z * axis_z); + if (tmp1 + tmp2 <= 1.0f) { + return TRUE; } else { - f32 tmp1 = (l_float3 * l_float3) / (l_float1 * l_float1); - f32 tmp2 = (l_float4 * l_float4) / (l_float2 * l_float2); - tmp1 + tmp2 <= 1.0f ? ret = TRUE : ret = FALSE; + return FALSE; } - - return ret; } /* 8014C500-8014C5E0 146E40 00E0+00 0/0 0/0 29/29 .text * daNpcT_getPlayerInfoFromPlayerList__FiiP4cXyzP5csXyz */ -void daNpcT_getPlayerInfoFromPlayerList(int param_0, int param_1, cXyz* param_2, - csXyz* param_3) { - // NONMATCHING +BOOL daNpcT_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz* o_spawnPos, + csXyz* o_angle) { + BOOL ret = FALSE; + dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); + stage_actor_data_class* entry = room_dt->getPlayer()->mEntries; + for (int i = 0; i < room_dt->getPlayerNum(); entry++, i++) { + if (param_0 == (entry->mAngle.z & 0xff)) { + *o_spawnPos = entry->mSpawnPos; + *o_angle = entry->mAngle; + ret = TRUE; + break; + } + } + return ret; } /* 8014C5E0-8014C700 146F20 0120+00 0/0 0/0 5/5 .text daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c */ @@ -2275,9 +2577,81 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_ActorP) { /* 8014C700-8014CA18 147040 0318+00 0/0 0/0 2/2 .text * daNpcT_judgeRace__FP5dPathPP10fopAc_ac_cP16daNpcT_pntData_ciPi */ -void daNpcT_judgeRace(dPath* param_0, fopAc_ac_c** param_1, daNpcT_pntData_c* param_2, - int param_3, int* param_4) { - // NONMATCHING +int daNpcT_judgeRace(dPath* i_path, fopAc_ac_c** param_1, daNpcT_pntData_c* i_pntData, + int param_3, int* param_4) { + cXyz proj; + for (int i = 0; i < param_3; i++) { + proj.setall(0.0f); + int prev_idx = 0; + int next_idx = 0; + u16 idx = i_pntData[i].field_0x0; + if (i_pntData[i].field_0x0 < 0) { + idx = i_path->m_num; + } + while (idx < i_path->m_num) { + if (!daNpcT_chkPassed(param_1[i]->current.pos, (dPnt*)i_path->m_points, idx, + i_path->m_num, i_path->m_closed & 1, 0, + &proj, &prev_idx, &next_idx)) { + break; + } + if (daNpcT_incIdx(i_path->m_num, idx, i_path->m_closed & 1, 0)) { + idx = i_path->m_num; + } + } + if (idx != i_path->m_num) { + i_pntData[i].field_0x0 = idx; + } else { + i_pntData[i].field_0x0 = -1; + } + i_pntData[i].field_0x4 = prev_idx; + } + + if (param_4 != NULL) { + for (int i = 0; i < param_3; i++) { + int count = 0; + if (i_pntData[i].field_0x0 >= 0) { + for (int j = 0; j < param_3; j++) { + if (i == j) { + continue; + } + if (i_pntData[j].field_0x0 < 0) { + count++; + } else if (i_pntData[i].field_0x0 == i_pntData[j].field_0x0) { + f32 proj1_x, proj2_x, proj1_z, proj2_z, tmp; + if (cM3d_Len2dSqPntAndSegLine(param_1[i]->current.pos.x, + param_1[i]->current.pos.z, + i_path->m_points[i_pntData[i].field_0x4].m_position.x, + i_path->m_points[i_pntData[i].field_0x4].m_position.z, + i_path->m_points[i_pntData[i].field_0x0].m_position.x, + i_path->m_points[i_pntData[i].field_0x0].m_position.z, + &proj1_x, &proj1_z, &tmp) + && cM3d_Len2dSqPntAndSegLine(param_1[j]->current.pos.x, + param_1[j]->current.pos.z, + i_path->m_points[i_pntData[i].field_0x4].m_position.x, + i_path->m_points[i_pntData[i].field_0x4].m_position.z, + i_path->m_points[i_pntData[i].field_0x0].m_position.x, + i_path->m_points[i_pntData[i].field_0x0].m_position.z, + &proj2_x, &proj2_z, &tmp)) { + s16 angle1 = cM_atan2s( + i_path->m_points[i_pntData[i].field_0x0].m_position.x + - i_path->m_points[i_pntData[i].field_0x4].m_position.x, + i_path->m_points[i_pntData[i].field_0x0].m_position.z + - i_path->m_points[i_pntData[i].field_0x4].m_position.z); + s16 angle2 = cM_atan2s(proj2_x - proj1_x, proj2_z - proj1_z); + if ((u16)abs((s16)(angle1 - angle2)) < 0x4000) { + count++; + } + } + } else if (i_pntData[i].field_0x0 < i_pntData[j].field_0x0) { + count++; + } + } + param_4[i] = count; + } + } + } + + return 1; } /* 8014CA18-8014CA2C 147358 0014+00 0/0 0/0 61/61 .text daNpcT_getDistTableIdx__Fii */ @@ -2315,197 +2689,6 @@ BOOL daNpcT_chkTmpBit(u32 i_idx) { return dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[i_idx]); } -/* 8014CC0C-8014CC10 14754C 0004+00 1/0 1/0 0/0 .text setCollision__8daNpcT_cFv */ -void daNpcT_c::setCollision() { - /* empty function */ -} - -/* 8014CC10-8014CC14 147550 0004+00 1/0 1/0 0/0 .text setAttnPos__8daNpcT_cFv */ -void daNpcT_c::setAttnPos() { - /* empty function */ -} - -/* 8014CC14-8014CC18 147554 0004+00 1/0 1/0 0/0 .text ctrlSubFaceMotion__8daNpcT_cFi */ -//void daNpcT_c::ctrlSubFaceMotion(int param_0) { -void ctrlSubFaceMotion__8daNpcT_cFi() { - /* empty function */ -} - -/* 8014CC18-8014CC1C 147558 0004+00 1/0 1/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - -/* 8014CC1C-8014CC20 14755C 0004+00 1/0 1/0 0/0 .text beforeMove__8daNpcT_cFv */ -void daNpcT_c::beforeMove() { - /* empty function */ -} - -/* 8014CC20-8014CC24 147560 0004+00 1/0 1/0 0/0 .text action__8daNpcT_cFv */ -void daNpcT_c::action() { - /* empty function */ -} - -/* 8014CC24-8014CC28 147564 0004+00 1/0 1/0 0/0 .text setParam__8daNpcT_cFv */ -void daNpcT_c::setParam() { - /* empty function */ -} - -/* 8014CC28-8014CC2C 147568 0004+00 1/0 1/0 0/0 .text drawOtherMdl__8daNpcT_cFv */ -void daNpcT_c::drawOtherMdl() { - /* empty function */ -} - -/* 8014CC30-8014CC38 147570 0008+00 1/0 1/0 0/0 .text drawDbgInfo__8daNpcT_cFv */ -int daNpcT_c::drawDbgInfo() { - return false; -} - -/* 8014CC48-8014CC4C 147588 0004+00 1/0 1/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 8014CC4C-8014CC54 14758C 0008+00 1/0 1/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 8014CC54-8014CC5C 147594 0008+00 1/0 1/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 8014CC5C-8014CC64 14759C 0008+00 1/0 1/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 8014CC64-8014CC68 1475A4 0004+00 1/0 1/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 8014CC68-8014CC70 1475A8 0008+00 1/0 1/0 0/0 .text evtCutProc__8daNpcT_cFv */ -bool daNpcT_c::evtCutProc() { - return false; -} - -/* 8014CC70-8014CC78 1475B0 0008+00 1/0 1/0 0/0 .text evtEndProc__8daNpcT_cFv */ -// bool daNpcT_c::evtEndProc() { -extern "C" bool evtEndProc__8daNpcT_cFv() { - return true; -} - -/* 8014CC78-8014CC80 1475B8 0008+00 1/0 1/0 0/0 .text evtTalk__8daNpcT_cFv */ -bool daNpcT_c::evtTalk() { - return true; -} - -/* 8014CC80-8014CC88 1475C0 0008+00 1/0 1/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - -/* 8014CC88-8014CC90 1475C8 0008+00 1/0 1/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - -/* 8014CC90-8014CC98 1475D0 0008+00 1/0 1/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 8014CC98-8014CCA0 1475D8 0008+00 1/0 1/0 0/0 .text chkXYItems__8daNpcT_cFv */ -// bool daNpcT_c::chkXYItems() { -extern "C" bool chkXYItems__8daNpcT_cFv() { - return false; -} - -/* 8014CCA0-8014CCA8 1475E0 0008+00 1/0 1/0 0/0 .text afterSetFaceMotionAnm__8daNpcT_cFiifi */ -// bool daNpcT_c::afterSetFaceMotionAnm(int param_0, int param_1, f32 param_2, int param_3) { -extern "C" bool afterSetFaceMotionAnm__8daNpcT_cFiifi() { - return true; -} - -/* 8014CCE0-8014CCE8 147620 0008+00 1/0 1/0 0/0 .text afterSetMotionAnm__8daNpcT_cFiifi - */ -// bool daNpcT_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int param_3) { -extern "C" bool afterSetMotionAnm__8daNpcT_cFiifi() { - return true; -} - -/* 8014CD20-8014D0A8 147660 0388+00 1/0 1/1 0/0 .text __dt__8daNpcT_cFv */ -// daNpcT_c::~daNpcT_c() { -extern "C" void __dt__8daNpcT_cFv() { - // NONMATCHING -} - -/* 8014D0A8-8014D0B0 1479E8 0008+00 1/0 1/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv - */ -// bool daNpcT_c::getEyeballLMaterialNo() { -extern "C" bool getEyeballLMaterialNo__8daNpcT_cFv() { - return false; -} - -/* 8014D0B0-8014D0B8 1479F0 0008+00 1/0 1/0 0/0 .text getEyeballRMaterialNo__8daNpcT_cFv - */ -// bool daNpcT_c::getEyeballRMaterialNo() { -extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { - return false; -} - -/* 8014D0C0-8014D108 147A00 0048+00 1/0 0/0 0/0 .text __dt__22daNpcT_MotionSeqMngr_cFv */ -// daNpcT_MotionSeqMngr_c::~daNpcT_MotionSeqMngr_c() { -extern "C" void __dt__22daNpcT_MotionSeqMngr_cFv() { - // NONMATCHING -} - -/* 8014D108-8014D150 147A48 0048+00 1/0 0/0 0/0 .text __dt__18daNpcT_ActorMngr_cFv */ -// daNpcT_ActorMngr_c::~daNpcT_ActorMngr_c() { -extern "C" void __dt__18daNpcT_ActorMngr_cFv() { - // NONMATCHING -} - -/* 8014D150-8014D24C 147A90 00FC+00 1/0 0/0 0/0 .text __dt__15daNpcT_JntAnm_cFv */ -// daNpcT_JntAnm_c::~daNpcT_JntAnm_c() { -extern "C" void __dt__15daNpcT_JntAnm_cFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 803B3B6C-803B3B80 010C8C 0010+04 1/1 0/0 45/45 .data __vt__15daNpcT_MatAnm_c */ -SECTION_DATA extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daNpcT_MatAnm_cFv, - (void*)calc__15daNpcT_MatAnm_cCFP11J3DMaterial, - /* padding */ - NULL, -}; - -/* 8014D24C-8014D32C 147B8C 00E0+00 1/0 0/0 0/0 .text __dt__15daNpcT_MatAnm_cFv */ -daNpcT_MatAnm_c::~daNpcT_MatAnm_c() { - // NONMATCHING -} - -/* 8014D32C-8014D348 147C6C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPs */ -extern "C" s16 func_8014D32C(s16* param_0) { - // NONMATCHING -} - -/* 8014D348-8014D364 147C88 001C+00 7/7 2/2 0/0 .text cLib_calcTimer__FPi */ -extern "C" int func_8014D348(int*) { - // NONMATCHING -} - -/* 8014D364-8014D3D8 147CA4 0074+00 4/4 1/1 0/0 .text cLib_getRndValue__Fii */ -extern "C" int func_8014D364(int param_0, int param_1) { - // NONMATCHING -} - -/* ############################################################################################## */ /* 80392680-803926B0 01ECE0 0030+00 1/1 0/0 4/4 .rodata mCcDObjData__8daNpcT_c */ const dCcD_SrcGObjInf daNpcT_c::mCcDObjData = { {0, {{0, 0, 0}, {0, 0x00}, {0x79}}}, @@ -2514,15 +2697,6 @@ const dCcD_SrcGObjInf daNpcT_c::mCcDObjData = { {0}, }; -/* 8014D3D8-8014D538 147D18 0160+00 0/0 1/0 0/0 .text __sinit_d_a_npc_cpp */ -void __sinit_d_a_npc_cpp(){// NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8014D3D8, __sinit_d_a_npc_cpp); -#pragma pop - /** * From here to `__dt__18daBaseNpc_acMngr_cFv` is supposed to be d_a_npc2.cpp * according to the debug rom OSPanic reports @@ -3184,7 +3358,7 @@ static BOOL daNpcF_decIdx(int i_num, u16& i_idx, int i_isClosed, BOOL i_reverse) /* 801506B0-801506BC 14AFF0 000C+00 0/0 0/0 130/130 .text initialize__18daNpcF_ActorMngr_cFv */ void daNpcF_ActorMngr_c::initialize() { - mActorID = -1; + mActorID = fpcM_ERROR_PROCESS_ID_e; } /* 801506BC-801506D8 14AFFC 001C+00 1/1 0/0 130/130 .text @@ -3194,13 +3368,13 @@ void daNpcF_ActorMngr_c::entry(fopAc_ac_c* i_actor) { } /* 801506D8-801506E0 -00001 0008+00 0/0 0/0 0/0 .text entry__18daNpcF_ActorMngr_cFUi */ -void daNpcF_ActorMngr_c::entry(unsigned int i_actorID) { +void daNpcF_ActorMngr_c::entry(fpc_ProcID i_actorID) { mActorID = i_actorID; } /* 801506E0-801506EC 14B020 000C+00 2/2 0/0 55/55 .text remove__18daNpcF_ActorMngr_cFv */ void daNpcF_ActorMngr_c::remove() { - mActorID = -1; + mActorID = fpcM_ERROR_PROCESS_ID_e; } /* 801506EC-80150738 14B02C 004C+00 1/1 0/0 135/135 .text getActorP__18daNpcF_ActorMngr_cFv */ @@ -3217,12 +3391,10 @@ fopAc_ac_c* daNpcF_ActorMngr_c::getActorP() { /* 80150738-8015075C 14B078 0024+00 0/0 0/0 48/48 .text initialize__15daNpcF_MatAnm_cFv */ void daNpcF_MatAnm_c::initialize() { - f32 value = 0.0f; - - field_0xF4 = value; - field_0xF8 = value; - mNowOffsetX = value; - mNowOffsetY = value; + field_0xF4 = 0.0f; + field_0xF8 = 0.0f; + mNowOffsetX = 0.0f; + mNowOffsetY = 0.0f; mEyeMoveFlag = 0; field_0x105 = 0; } @@ -3287,10 +3459,9 @@ void daNpcF_Path_c::initialize() { mSPCurve.initialize(NULL, false); - f32 value = 0.0f; - mRange = value; - mPosDst = value; - field_0x10 = value; + mRange = 0.0f; + mPosDst = 0.0f; + field_0x10 = 0.0f; } /* 8015095C-80150A24 14B29C 00C8+00 0/0 0/0 12/12 .text setPathInfo__13daNpcF_Path_cFUcScUc */ @@ -4922,10 +5093,10 @@ void daNpcF_offTmpBit(u32 i_idx) { int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2, csXyz& param_3) { int rv = 0; - dStage_roomStatus_c* roomP = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); - stage_actor_data_class* entries = roomP->mRoomDt.getPlayer()->mEntries; + dStage_roomDt_c* roomP = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); + stage_actor_data_class* entries = roomP->getPlayer()->mEntries; - for (int i = 0; i < roomP->mRoomDt.getPlayerNum(); entries++, i++) { + for (int i = 0; i < roomP->getPlayerNum(); entries++, i++) { if (param_0 == (u8)entries->mAngle.z) { param_2 = entries->mSpawnPos; param_3 = entries->mAngle; diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 2fb987d3b6e..fd25531958c 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -1533,16 +1533,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80967910-80967918 005130 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80967918-80967920 005138 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80967920-80967928 005140 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1563,11 +1553,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80967938-8096793C 005158 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 8096793C-80967944 00515C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 1a24a076401..2b7dab6d129 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -2190,16 +2190,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 8053E2AC-8053E2B4 00754C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 8053E2B4-8053E2BC 007554 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 8053E2BC-8053E2C4 00755C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -2220,11 +2210,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 8053E2D4-8053E2D8 007574 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 8053E2D8-8053E2E0 007578 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 8acb2ab570b..94de5146b8a 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -1113,7 +1113,7 @@ void daNpc_Bou_c::setParam() { } /* 8096DF9C-8096E0EC 0010FC 0150+00 1/0 0/0 0/0 .text checkChangeEvt__11daNpc_Bou_cFv */ -bool daNpc_Bou_c::checkChangeEvt() { +BOOL daNpc_Bou_c::checkChangeEvt() { // NONMATCHING } @@ -1138,17 +1138,17 @@ void daNpc_Bou_c::srchActors() { } /* 8096E27C-8096E31C 0013DC 00A0+00 1/0 0/0 0/0 .text evtTalk__11daNpc_Bou_cFv */ -bool daNpc_Bou_c::evtTalk() { +BOOL daNpc_Bou_c::evtTalk() { // NONMATCHING } /* 8096E31C-8096E324 00147C 0008+00 1/0 0/0 0/0 .text evtEndProc__11daNpc_Bou_cFv */ -bool daNpc_Bou_c::evtEndProc() { +BOOL daNpc_Bou_c::evtEndProc() { return true; } /* 8096E324-8096E3EC 001484 00C8+00 1/0 0/0 0/0 .text evtCutProc__11daNpc_Bou_cFv */ -bool daNpc_Bou_c::evtCutProc() { +BOOL daNpc_Bou_c::evtCutProc() { // NONMATCHING } @@ -1548,16 +1548,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 809724C4-809724CC 005624 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 809724CC-809724D4 00562C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 809724D4-809724DC 005634 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1572,11 +1562,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 809724E4-809724E8 005644 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 809724E8-809724F0 005648 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index 326f51c08f5..98e9a818933 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -1171,16 +1171,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 8099546C-80995474 00302C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80995474-8099547C 003034 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 8099547C-80995484 00303C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1195,22 +1185,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 8099548C-80995494 00304C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80995494-8099549C 003054 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 8099549C-809954A0 00305C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 809954A0-809954A8 003060 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 08b1c036990..b5529b54351 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -1236,16 +1236,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80999528-80999530 0036E8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80999530-80999538 0036F0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80999538-80999540 0036F8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1260,22 +1250,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80999548-80999550 003708 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80999550-80999558 003710 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80999558-8099955C 003718 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 8099955C-80999564 00371C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index dc0a747b24a..fadfd4d7659 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -1126,16 +1126,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 8099CE5C-8099CE64 002DFC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 8099CE64-8099CE6C 002E04 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 8099CE6C-8099CE74 002E0C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1150,22 +1140,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 8099CE7C-8099CE84 002E1C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 8099CE84-8099CE8C 002E24 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 8099CE8C-8099CE90 002E2C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 8099CE90-8099CE98 002E30 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index d6411be4b40..9a6138e37a5 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -1331,11 +1331,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 809AA080-809AA084 0034E0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 809AA084-809AA09C 0034E4 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */ // void daNpcT_c::decTmr() { extern "C" void decTmr__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index 19307bf85e6..bcdabe805b3 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -2581,16 +2581,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 809B8DC8-809B8DD0 0073A8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 809B8DD0-809B8DD8 0073B0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 809B8DD8-809B8DE0 0073B8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index 3bcc427b9ec..31ce3341a3c 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -825,31 +825,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80541A78-80541A80 001BF8 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 80541A80-80541A88 001C00 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 80541A88-80541A90 001C08 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 80541A90-80541A98 001C10 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80541A98-80541AA0 001C18 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80541AA0-80541AA8 001C20 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -864,32 +839,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80541AB8-80541ABC 001C38 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80541ABC-80541AC4 001C3C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80541AC4-80541ACC 001C44 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80541ACC-80541AD0 001C4C 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 80541AD0-80541AD4 001C50 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80541AD4-80541ADC 001C54 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index bef34b49046..6b53c4a21d7 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -1046,32 +1046,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 809BE19C-809BE1A4 002C7C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 809BE1A4-809BE1AC 002C84 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - -/* 809BE1B4-809BE1BC 002C94 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 809BE1BC-809BE1C4 002C9C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 809BE1C4-809BE1C8 002CA4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 809BE1C8-809BE1D0 002CA8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 65e6d00af08..ea2c2c7fa83 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -1148,11 +1148,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 809D68C0-809D68C8 002940 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 809D68C8-809D69E4 002948 011C+00 1/1 0/0 0/0 .text setEyeAngleY__15daNpcT_JntAnm_cF4cXyzsifs */ // void daNpcT_JntAnm_c::setEyeAngleY(cXyz param_0, s16 param_1, int param_2, f32 param_3, // s16 param_4) { @@ -1200,16 +1195,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 809D6BF0-809D6BF8 002C70 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 809D6BF8-809D6C00 002C78 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 809D6C00-809D6C08 002C80 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1224,11 +1209,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 809D6C10-809D6C14 002C90 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 809D6C14-809D6C1C 002C94 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index eaee673db78..ca3d04e8d75 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -1183,16 +1183,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 809D9C1C-809D9C24 0028FC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 809D9C24-809D9C2C 002904 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 809D9C2C-809D9C34 00290C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1207,22 +1197,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 809D9C3C-809D9C44 00291C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 809D9C44-809D9C4C 002924 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 809D9C4C-809D9C50 00292C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 809D9C50-809D9C58 002930 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index fab3e419502..cb3a5256eb4 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -769,7 +769,7 @@ int daNpc_Hanjo_c::create() { l_motionSequenceData, 4, l_evtList, l_resNameList); mType = getType(); field_0xa7c = getFlowNodeNo(); - field_0xa89 = 0; + mTwilight = 0; int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList); if (rv == cPhs_COMPLEATE_e) { OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (uint)mType, @@ -785,28 +785,28 @@ int daNpc_Hanjo_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox2(this, modelData); - field_0x580.init(¤t.pos, &eyePos, 3, 1); - field_0x9c0.init(&field_0x68c, 60.0f, 0.0f); + mSound.init(¤t.pos, &eyePos, 3, 1); + field_0x9c0.init(&mAcch, 60.0f, 0.0f); reset(); - field_0x68c.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &field_0x8a0, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); - field_0x864.Init(daNpc_Hanjo_Param_c::m.field_0x10, 0, this); + mCcStts.Init(daNpc_Hanjo_Param_c::m.field_0x10, 0, this); mCyl1.Set(mCcDCyl); - mCyl1.SetStts(&field_0x864); + mCyl1.SetStts(&mCcStts); mCyl1.SetTgHitCallback(tgHitCallBack); mCyl2.Set(mCcDCyl); - mCyl2.SetStts(&field_0x864); - field_0x68c.CrrPos(dComIfG_Bgsp()); - field_0x930 = field_0x68c.m_gnd; - field_0xdf4 = field_0x68c.GetGroundH(); - if (field_0xdf4 != -1e9f) { + mCyl2.SetStts(&mCcStts); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + mGroundH = mAcch.GetGroundH(); + if (mGroundH != -1e9f) { setEnvTevColor(); setRoomNo(); } for (int i = 0; i < 4; i ++) { mStones[i].getSphP()->Set(*(dCcD_SrcSph*)&mStoneCcDSph); - mStones[i].getSphP()->SetStts(&field_0x864); + mStones[i].getSphP()->SetStts(&mCcStts); } field_0xa88 = 1; Execute(); @@ -832,7 +832,7 @@ int daNpc_Hanjo_c::CreateHeap() { if (modelData == NULL) { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &field_0x580, + mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -842,8 +842,8 @@ int daNpc_Hanjo_c::CreateHeap() { modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } model->setUserArea((u32)this); - field_0x96c = new daNpcT_MatAnm_c(); - if (field_0x96c == NULL) { + mpMatAnm = new daNpcT_MatAnm_c(); + if (mpMatAnm == NULL) { return 0; } switch (mType) { @@ -914,9 +914,9 @@ int daNpc_Hanjo_c::Execute() { /* 809F9B8C-809F9C20 000BEC 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Hanjo_cFv */ int daNpc_Hanjo_c::Draw() { - if (field_0x96c != NULL) { + if (mpMatAnm != NULL) { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); - modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(field_0x96c); + modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm); } return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0); } @@ -981,8 +981,8 @@ int daNpc_Hanjo_c::isDelete() { void daNpc_Hanjo_c::reset() { csXyz acStack_20; int iVar1 = (u8*)&field_0x1728 - (u8*)&field_0x16e0; - if (field_0x96c != NULL) { - field_0x96c->initialize(); + if (mpMatAnm != NULL) { + mpMatAnm->initialize(); } initialize(); for (int i = 0; i < 4; i++) { @@ -1058,7 +1058,7 @@ void daNpc_Hanjo_c::setParam() { attention_info.flags = 0xa; scale.set(daNpc_Hanjo_Param_c::m.field_0x08, daNpc_Hanjo_Param_c::m.field_0x08, daNpc_Hanjo_Param_c::m.field_0x08); - field_0x864.SetWeight(daNpc_Hanjo_Param_c::m.field_0x10); + mCcStts.SetWeight(daNpc_Hanjo_Param_c::m.field_0x10); field_0xdec = daNpc_Hanjo_Param_c::m.field_0x14; field_0xdf0 = daNpc_Hanjo_Param_c::m.field_0x1c; field_0xdf8 = daNpc_Hanjo_Param_c::m.field_0x50; @@ -1072,12 +1072,12 @@ void daNpc_Hanjo_c::setParam() { /* 809FA1C4-809FA3B8 001224 01F4+00 1/0 0/0 0/0 .text checkChangeEvt__13daNpc_Hanjo_cFv */ -bool daNpc_Hanjo_c::checkChangeEvt() { +BOOL daNpc_Hanjo_c::checkChangeEvt() { if (!chkAction(&daNpc_Hanjo_c::talk)) { field_0xe2e[0] = 0; if (dComIfGp_event_chkTalkXY()) { if (dComIfGp_evmng_ChkPresentEnd()) { - field_0xe30 = 1; + mEvtNo = 1; evtChange(); } return true; @@ -1110,7 +1110,7 @@ bool daNpc_Hanjo_c::checkChangeEvt() { } if (sVar3 != 0) { - field_0xe30 = sVar3; + mEvtNo = sVar3; evtChange(); return true; } @@ -1118,9 +1118,9 @@ bool daNpc_Hanjo_c::checkChangeEvt() { break; case TYPE_3: if (daNpcT_chkEvtBit(0x24d)) { - field_0xe30 = 3; + mEvtNo = 3; } else { - field_0xe30 = 2; + mEvtNo = 2; } evtChange(); return 1; @@ -1133,7 +1133,7 @@ bool daNpc_Hanjo_c::checkChangeEvt() { /* 809FA3B8-809FA45C 001418 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Hanjo_cFv */ void daNpc_Hanjo_c::setAfterTalkMotion() { int iVar2 = 7; - switch(field_0xb50.getNo()) { + switch(mFaceMotionSeqMngr.getNo()) { case 1: iVar2 = 5; break; @@ -1146,7 +1146,7 @@ void daNpc_Hanjo_c::setAfterTalkMotion() { iVar2 = 6; break; } - field_0xb50.setNo(iVar2, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0); } /* 809FA45C-809FA55C 0014BC 0100+00 1/1 0/0 0/0 .text srchActors__13daNpc_Hanjo_cFv */ @@ -1176,7 +1176,7 @@ void daNpc_Hanjo_c::srchActors() { } /* 809FA55C-809FA5FC 0015BC 00A0+00 1/0 0/0 0/0 .text evtTalk__13daNpc_Hanjo_cFv */ -bool daNpc_Hanjo_c::evtTalk() { +BOOL daNpc_Hanjo_c::evtTalk() { if (chkAction(&daNpc_Hanjo_c::talk)) { (this->*field_0x16ec)(NULL); } else { @@ -1186,7 +1186,7 @@ bool daNpc_Hanjo_c::evtTalk() { } /* 809FA5FC-809FA6C4 00165C 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpc_Hanjo_cFv */ -bool daNpc_Hanjo_c::evtCutProc() { +BOOL daNpc_Hanjo_c::evtCutProc() { int staffId = dComIfGp_getEventManager().getMyStaffId("Hanjo", this, -1); if (staffId != -1) { field_0xdac = staffId; @@ -1208,10 +1208,10 @@ void daNpc_Hanjo_c::action() { if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != PROC_NPC_TK || mType != TYPE_1)) { field_0xd08.setParam(this, - hitActor, field_0xd78.y); + hitActor, mCurAngle.y); setDamage(0, 7, 0); - field_0xdb8 = 0; - field_0xba8.lookNone(1); + mDamageTimerStart = 0; + mJntAnm.lookNone(1); } } if (field_0xd08.checkRebirth()) { @@ -1238,7 +1238,7 @@ void daNpc_Hanjo_c::beforeMove() { if (checkHide()) { fopAcM_OnStatus(this, 0x8000000); } - if (checkHide() || field_0xe2b != 0) { + if (checkHide() || mNoDraw != 0) { attention_info.flags = 0; } for (int i = 0; i < 4; i++) { @@ -1246,8 +1246,8 @@ void daNpc_Hanjo_c::beforeMove() { if (cM3d_IsZero(mStones[i].getSpeedF()) == false) { oldPos = mStones[i].getOld(); pos = mStones[i].getPos(); - field_0xae0.Set(&oldPos, &pos, this); - if (!dComIfG_Bgsp().LineCross(&field_0xae0)) { + mLinChk.Set(&oldPos, &pos, this); + if (!dComIfG_Bgsp().LineCross(&mLinChk)) { if (!mStones[i].getSphP()->ChkCoHit()) { continue; } @@ -1382,25 +1382,25 @@ void daNpc_Hanjo_c::setAttnPos() { cXyz cStack_38(-10.0f, 10.0f, 0.0f); cXyz cStack_44; field_0xd08.calc(0); - f32 dVar8 = cM_s2rad(field_0xd78.y - field_0xd7e.y); + f32 dVar8 = cM_s2rad(mCurAngle.y - field_0xd7e.y); J3DModel* model = mpMorf[0]->getModel(); - field_0xba8.setParam(this, model, &cStack_38, getBackboneJointNo(), getNeckJointNo(), + mJntAnm.setParam(this, model, &cStack_38, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(), daNpc_Hanjo_Param_c::m.field_0x24, daNpc_Hanjo_Param_c::m.field_0x20, daNpc_Hanjo_Param_c::m.field_0x2c, daNpc_Hanjo_Param_c::m.field_0x28, daNpc_Hanjo_Param_c::m.field_0x34, daNpc_Hanjo_Param_c::m.field_0x30, daNpc_Hanjo_Param_c::m.field_0x3c, daNpc_Hanjo_Param_c::m.field_0x38, daNpc_Hanjo_Param_c::m.field_0x40, dVar8, NULL); - field_0xba8.calcJntRad(0.2f, 1.0f, dVar8); + mJntAnm.calcJntRad(0.2f, 1.0f, dVar8); setMtx(); mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo())); mDoMtx_stack_c::multVec(&cStack_38, &eyePos); - field_0xba8.setEyeAngleX(eyePos, 1.0f, 0); - field_0xba8.setEyeAngleY(eyePos, field_0xd78.y, 1, 1.0f, 0); + mJntAnm.setEyeAngleX(eyePos, 1.0f, 0); + mJntAnm.setEyeAngleY(eyePos, mCurAngle.y, 1, 1.0f, 0); cStack_38.set(0.0f, 0.0f, 20.0f); cStack_38.y = daNpc_Hanjo_Param_c::m.field_0x00; if (field_0x1721 != 0) { cStack_38.set(0.0f, 170.0f, -10.0f); - } else if (field_0xb74.getNo() == 2) { + } else if (mMotionSeqMngr.getNo() == 2) { cStack_38.set(0.0f, 170.0f, -20.0f); } if (1.0f <= mpMorf[0]->getMorfRatio()) { @@ -1410,7 +1410,7 @@ void daNpc_Hanjo_c::setAttnPos() { cStack_44 *= 1.0f - mpMorf[0]->getMorfRatio(); cStack_38 = cStack_38 + cStack_44; } - mDoMtx_stack_c::YrotS(field_0xd78.y); + mDoMtx_stack_c::YrotS(mCurAngle.y); mDoMtx_stack_c::multVec(&cStack_38, &cStack_38); attention_info.position = current.pos + cStack_38; static cXyz prtclScl(1.0f, 1.0f, 1.0f); @@ -1426,7 +1426,7 @@ void daNpc_Hanjo_c::setCollision() { if (field_0xe25 == 0) { u32 tgType = 0xd8fbfdff; u32 tgSPrm = 0x1f; - if (field_0xa89 != 0) { + if (mTwilight != 0) { tgType = 0; tgSPrm = 0; } else { @@ -1442,7 +1442,7 @@ void daNpc_Hanjo_c::setCollision() { cStack_4c.set(0.0f, 0.0f, 0.0f); f32 cylHeight = field_0xdec; f32 cylRadius = field_0xdf0; - mDoMtx_stack_c::YrotS(field_0xd78.y); + mDoMtx_stack_c::YrotS(mCurAngle.y); mDoMtx_stack_c::multVec(&cStack_4c, &cStack_4c); cStack_4c += current.pos; mCyl1.SetH(cylHeight); @@ -1581,13 +1581,13 @@ int daNpc_Hanjo_c::setAction(int (daNpc_Hanjo_c::*action)(void*)) { /* 809FB7A0-809FB90C 002800 016C+00 2/2 0/0 0/0 .text initShoot__13daNpc_Hanjo_cFi */ void daNpc_Hanjo_c::initShoot(int param_1) { if (param_1 != 0) { - field_0xb50.setNo( 7, -1.0f, 0, 0); - field_0xb74.setNo( 16, 0.0f, 1, 0); - field_0xba8.lookNone(1); + mFaceMotionSeqMngr.setNo( 7, -1.0f, 0, 0); + mMotionSeqMngr.setNo( 16, 0.0f, 1, 0); + mJntAnm.lookNone(1); } else { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(15, -1.0f, 0, 0); - field_0xba8.lookNone(0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(15, -1.0f, 0, 0); + mJntAnm.lookNone(0); } } @@ -1596,8 +1596,8 @@ int daNpc_Hanjo_c::shoot(int param_1) { csXyz cStack_60; f32 dVar13 = daNpc_Hanjo_Param_c::m.field_0x98; s16 sVar9 = cM_deg2s(daNpc_Hanjo_Param_c::m.field_0x9c); - if (field_0xb74.getNo() == 16 || field_0xb74.getNo() == 15) { - switch(field_0xb74.getStepNo()) { + if (mMotionSeqMngr.getNo() == 16 || mMotionSeqMngr.getNo() == 15) { + switch(mMotionSeqMngr.getStepNo()) { case 0: dVar13 = mpMorf[0]->getFrame(); if (36.0f < dVar13 && field_0x170c == -1) { @@ -1641,8 +1641,8 @@ int daNpc_Hanjo_c::shoot(int param_1) { /* 809FBB94-809FBC3C 002BF4 00A8+00 2/2 0/0 0/0 .text initDive__13daNpc_Hanjo_cFv */ void daNpc_Hanjo_c::initDive() { - field_0xb50.setNo(6, -1.0f, 0, 0); - field_0xb74.setNo(18, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(6, -1.0f, 0, 0); + mMotionSeqMngr.setNo(18, -1.0f, 0, 0); speed.y = daNpc_Hanjo_Param_c::m.field_0x8c; field_0x1721 = 1; } @@ -1655,7 +1655,7 @@ void daNpc_Hanjo_c::dive() { cLib_chaseF(&speedF, 0.0f, 0.1f); } else { if (field_0x1720 == 0) { - field_0x580.startCreatureSound(Z2SE_CM_BODYFALL_WATER_M, 0, 0xffffffff); + mSound.startCreatureSound(Z2SE_CM_BODYFALL_WATER_M, 0, 0xffffffff); speedF *= 0.5f; field_0x1720 = 1; } else if (field_0x171f == 0) { @@ -1669,9 +1669,9 @@ void daNpc_Hanjo_c::dive() { if (0.0f < speed.y && local_34 < current.pos.y + daNpc_Hanjo_Param_c::m.field_0xa8) { field_0x171f = 1; - if (field_0xb74.getNo() == 18) { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(19, -1.0f, 0, 0); + if (mMotionSeqMngr.getNo() == 18) { + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(19, -1.0f, 0, 0); } field_0x171c = 0; speed.y = 0; @@ -1697,14 +1697,14 @@ void daNpc_Hanjo_c::dive() { gravity = 0; } } - if (field_0xb74.getNo() == 18) { + if (mMotionSeqMngr.getNo() == 18) { if (field_0x1720 != 0 && field_0x171f == 0 && 0.0f < speed.y) { - if (local_34 - current.pos.y < 260.0f && field_0xb74.getNo() == 18) { + if (local_34 - current.pos.y < 260.0f && mMotionSeqMngr.getNo() == 18) { if (cM3d_IsZero(mpMorf[0]->getPlaySpeed())) { mpMorf[0]->setPlaySpeed(1.0f); } } - } else if ((field_0xb74.getNo() == 18) && mpMorf[0]->checkFrame(18.0f)) { + } else if ((mMotionSeqMngr.getNo() == 18) && mpMorf[0]->checkFrame(18.0f)) { mpMorf[0]->setPlaySpeed(0.0f); } } @@ -1715,23 +1715,23 @@ int daNpc_Hanjo_c::lookround(s16 param_1) { if (field_0x171e != 0) { cLib_addCalcAngleS2(¤t.angle.y, param_1, 4, 0x800); shape_angle.y = current.angle.y; - field_0xd78.y = shape_angle.y; - if (field_0xb74.getNo() != 14) { - field_0xb74.setNo(14, -1.0f, 0, 0); + mCurAngle.y = shape_angle.y; + if (mMotionSeqMngr.getNo() != 14) { + mMotionSeqMngr.setNo(14, -1.0f, 0, 0); } else { - if (field_0xb74.checkEndSequence()) { - s16 angleDiff = param_1 - field_0xd78.y; + if (mMotionSeqMngr.checkEndSequence()) { + s16 angleDiff = param_1 - mCurAngle.y; s16 absDiff = abs(angleDiff); if (absDiff <= cM_deg2s(4.0f)) { - field_0xb74.setNo(0, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); field_0x171e = 0; } else { - field_0xb74.setNo(14, 0.0f, 1, 0); + mMotionSeqMngr.setNo(14, 0.0f, 1, 0); } } } } else { - s16 angleDiff = param_1 - field_0xd78.y; + s16 angleDiff = param_1 - mCurAngle.y; s16 absDiff = abs(angleDiff); if (absDiff > cM_deg2s(90.0f)) { field_0x171e = 1; @@ -1786,7 +1786,7 @@ int daNpc_Hanjo_c::cutConversationAboutSaru(int staffIdx) { case 0: field_0xdc8 = fopAcM_searchPlayerAngleY(this); if (checkStep()) { - mStepNo = 0; + mStepMode = 0; } break; case 1: @@ -1798,8 +1798,8 @@ int daNpc_Hanjo_c::cutConversationAboutSaru(int staffIdx) { rv = 1; break; case 1: - field_0xba8.lookPlayer(0); - if (field_0xdc8 != field_0xd78.y) { + mJntAnm.lookPlayer(0); + if (field_0xdc8 != mCurAngle.y) { step(field_0xdc8, 7, 14, 15, 0); } else { rv = 1; @@ -1831,16 +1831,16 @@ int daNpc_Hanjo_c::cutConversation(int param_1) { if (dComIfGp_getEventManager().getIsAddvance(param_1)) { switch(iVar9) { case 0: - field_0xb74.setNo(0, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); initTalk(field_0xa7c, NULL); - field_0xb98.entry(daPy_getPlayerActorClass()); + mPlayerActorMngr.entry(daPy_getPlayerActorClass()); break; case 1: case 2: case 3: if (iVar9 == 2) { initTalk(field_0xa7c, NULL); - field_0xb98.entry(daPy_getPlayerActorClass()); + mPlayerActorMngr.entry(daPy_getPlayerActorClass()); } if (iVar6 == 1) { fopAc_ac_c* actor_p =field_0x10c8[0].getActorP(); @@ -1853,26 +1853,26 @@ int daNpc_Hanjo_c::cutConversation(int param_1) { int local_38[2] = {-1, -1}; switch(iVar9) { case 0: - field_0xba8.lookPlayer(0); - if (field_0xdc8 == field_0xd78.y) { + mJntAnm.lookPlayer(0); + if (field_0xdc8 == mCurAngle.y) { rv = 1; } else if (step(field_0xdc8, 7, 0xe, 0xf, 0)) { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(0, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } break; case 1: case 2: case 3: - field_0xba8.lookPlayer(0); + mJntAnm.lookPlayer(0); if (iVar9 == 2) { - field_0xba8.lookNone(0); + mJntAnm.lookNone(0); } - if ((iVar9 == 3 && field_0xdc8 != field_0xd78.y) && + if ((iVar9 == 3 && field_0xdc8 != mCurAngle.y) && step(field_0xdc8, -1, -1, 15, 0)) { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(0, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } local_38[0] = iVar7; if (talkProc(local_38, 0, NULL, 0)) { @@ -1922,12 +1922,12 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) { field_0xdc4 = 0; break; case 3: - field_0xb50.setNo(6, -1.0f, 0, + mFaceMotionSeqMngr.setNo(6, -1.0f, 0, 0); - field_0xb74.setNo(17, -1.0f, + mMotionSeqMngr.setNo(17, -1.0f, 0, 0); field_0xdc4 = 1; - field_0x580.startCreatureVoice(Z2SE_M077_HANJO_05, -1); + mSound.startCreatureVoice(Z2SE_M077_HANJO_05, -1); break; case 4: field_0x1724 = 0; @@ -1979,14 +1979,14 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) { } break; case 3: - field_0xba8.lookNone(0); + mJntAnm.lookNone(0); if (field_0x10e8.getDstPosH(current.pos, &cStack_6c, field_0x10e8.mpRoomPath->m_num, 4)) { rv = 1; } else { cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &cStack_6c), 4, 0x800); shape_angle.y = current.angle.y; - field_0xd78.y = current.angle.y; - field_0xd7e.y = field_0xd78.y; + mCurAngle.y = current.angle.y; + field_0xd7e.y = mCurAngle.y; cLib_chaseF(&speedF, daNpc_Hanjo_Param_c::m.field_0x90, 0.5f); if (field_0xdc4 != 0 && @@ -2049,9 +2049,9 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { switch (local_b4) { case 0: daNpcT_offTmpBit(0x27); - field_0xb50.setNo(7, 0.0f, 0, 0); - field_0xb74.setNo(11, 0.0f, 1, 0); - field_0xba8.lookNone(1); + mFaceMotionSeqMngr.setNo(7, 0.0f, 0, 0); + mMotionSeqMngr.setNo(11, 0.0f, 1, 0); + mJntAnm.lookNone(1); home.angle.y += 0x8000; setAngle(home.angle.y); initTalk(0xcf, NULL); @@ -2074,7 +2074,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { field_0xdc4 = iVar7; break; case 4: - field_0xb74.setNo(13, -1.0f, 0, 0); + mMotionSeqMngr.setNo(13, -1.0f, 0, 0); break; case 5: field_0xdc4 = iVar7; @@ -2087,7 +2087,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { field_0x1722 = 1; break; case 99: - field_0xb74.setNo(13, 0.0, 1, + mMotionSeqMngr.setNo(13, 0.0, 1, 0); dComIfGs_onSaveSwitch(0x2b); actor_p = field_0x10c8[2].getActorP(); @@ -2113,7 +2113,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { } break; case 2: - field_0xba8.lookCamera(0); + mJntAnm.lookCamera(0); if (talkProc(NULL, 0, NULL, 0) && mFlow.checkEndFlow()) { rv = 1; } @@ -2121,12 +2121,12 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { case 3: if (field_0xdc4 != 0) { if (cLib_calcTimer(&field_0xdc4) == 0) { - field_0xb74.setNo(12, 8.0f, 0, 0); + mMotionSeqMngr.setNo(12, 8.0f, 0, 0); actor_p = field_0x10c8[2].getActorP(); JUT_ASSERT(3068, 0 != actor_p); ((daNPC_TK_c*)actor_p)->setHanjoHand(); } - } else if (field_0xb74.checkEndSequence()) { + } else if (mMotionSeqMngr.checkEndSequence()) { rv = 1; } else if (mpMorf[0]->checkFrame(8.0f)) { Z2GetAudioMgr()->seStart(Z2SE_PLAY_REED_TOBIKUSA, ¤t.pos, 0, 0, 1.0f, 1.0f, @@ -2134,7 +2134,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { } break; case 4: - field_0xba8.lookNone(0); + mJntAnm.lookNone(0); actor_p = field_0x10c8[2].getActorP(); JUT_ASSERT(3090, 0 != actor_p); if (((daNPC_TK_c*)actor_p)->isHanjoHand()) { @@ -2142,7 +2142,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { } break; case 5: - field_0xba8.lookCamera(0); + mJntAnm.lookCamera(0); if (cLib_calcTimer(&field_0xdc4) == 0) { rv = 1; } @@ -2201,11 +2201,11 @@ int daNpc_Hanjo_c::cutDive(int param_1) { } break; case 2: - field_0xb50.setNo(6, -1.0f, 0, 0); - field_0xb74.setNo(17, -1.0f, 0, + mFaceMotionSeqMngr.setNo(6, -1.0f, 0, 0); + mMotionSeqMngr.setNo(17, -1.0f, 0, 0); - field_0xba8.lookNone(1); - field_0x580.startCreatureVoice(Z2SE_M077_HANJO_05, -1); + mJntAnm.lookNone(1); + mSound.startCreatureVoice(Z2SE_M077_HANJO_05, -1); break; case 3: initDive(); @@ -2215,8 +2215,8 @@ int daNpc_Hanjo_c::cutDive(int param_1) { switch(iVar5) { case 0: if (cLib_calcTimer(&field_0xdc4) == 0) { - field_0xba8.lookPlayer(0); - if (field_0xdc8 == field_0xd78.y) { + mJntAnm.lookPlayer(0); + if (field_0xdc8 == mCurAngle.y) { rv = 1; } else if (mType == TYPE_1) { step(field_0xdc8, 7, 10, 0xf, 0); @@ -2232,13 +2232,13 @@ int daNpc_Hanjo_c::cutDive(int param_1) { break; case 2: cStack_2c.set(0.0f, 0.0f, 50.0f); - mDoMtx_stack_c::YrotS(field_0xd78.y); + mDoMtx_stack_c::YrotS(mCurAngle.y); mDoMtx_stack_c::multVec(&cStack_2c, &cStack_2c); cStack_2c += current.pos; cStack_2c.y = attention_info.position.y; - field_0x930.SetPos(&cStack_2c); - f32 dVar7 = dComIfG_Bgsp().GroundCross(&field_0x930); - if ((dVar7 - field_0xdf4) < -daNpc_Hanjo_Param_c::m.field_0x18) { + mGndChk.SetPos(&cStack_2c); + f32 dVar7 = dComIfG_Bgsp().GroundCross(&mGndChk); + if ((dVar7 - mGroundH) < -daNpc_Hanjo_Param_c::m.field_0x18) { rv = 1; } if (mType == TYPE_1) { @@ -2253,7 +2253,7 @@ int daNpc_Hanjo_c::cutDive(int param_1) { } cLib_addCalcAngleS2(¤t.angle.y, cStack_34.y, 4, 0x800); shape_angle.y = current.angle.y; - field_0xd78.y = current.angle.y; + mCurAngle.y = current.angle.y; cLib_chaseF(&speedF, daNpc_Hanjo_Param_c::m.field_0x90, 1.0f); break; case 3: @@ -2277,22 +2277,22 @@ int daNpc_Hanjo_c::wait(void* param_0) { switch (mType) { case TYPE_0: if (field_0x1721 != 0) { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(19, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(19, -1.0f, 0, 0); } else { - field_0xb50.setNo(7, -1.0f, 0, 0); - if (field_0xb98.getActorP() != NULL || daNpcT_chkEvtBit(0xab) || + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + if (mPlayerActorMngr.getActorP() != NULL || daNpcT_chkEvtBit(0xab) || daNpcT_chkEvtBit(0xb7)) { - field_0xb74.setNo(0, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } else { - field_0xb74.setNo(2, -1.0f, 0, 0); + mMotionSeqMngr.setNo(2, -1.0f, 0, 0); } } break; default: - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(0, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); break; } field_0xe22 = 2; @@ -2304,7 +2304,7 @@ int daNpc_Hanjo_c::wait(void* param_0) { daNpc_Hanjo_Param_c::m.field_0x54, 150.0f, -150.0f, 0)) { if (daPy_getPlayerActorClass()->checkBeeChildDrink()) { - field_0xe32 = 1; + mSpeakEvent = 1; field_0x1723 = 1; } } @@ -2317,7 +2317,7 @@ int daNpc_Hanjo_c::wait(void* param_0) { daPy_getPlayerActorClass()->checkAutoJump() || daPy_getPlayerActorClass()->checkWolfTriggerJump()) { - field_0xe30 = 10; + mEvtNo = 10; } } } @@ -2325,25 +2325,25 @@ int daNpc_Hanjo_c::wait(void* param_0) { if (!field_0xd08.checkStagger()) { if (mType == TYPE_0) { if ((daNpcT_chkEvtBit(0xab) || - daNpcT_chkEvtBit(0xb7)) && field_0x1721 == 0 && field_0xb74.getNo() == 2) + daNpcT_chkEvtBit(0xb7)) && field_0x1721 == 0 && mMotionSeqMngr.getNo() == 2) { - field_0xb74.setNo(0, -1.0, 0, 0); + mMotionSeqMngr.setNo(0, -1.0, 0, 0); } } else if (mType == TYPE_3) { - field_0xb98.remove(); + mPlayerActorMngr.remove(); } - if (field_0xb98.getActorP() != NULL) { - field_0xba8.lookPlayer(0); - if (!chkActorInSight(field_0xb98.getActorP(), field_0xdf8, - field_0xd78.y)) { - field_0xba8.lookNone(0); + if (mPlayerActorMngr.getActorP() != NULL) { + mJntAnm.lookPlayer(0); + if (!chkActorInSight(mPlayerActorMngr.getActorP(), field_0xdf8, + mCurAngle.y)) { + mJntAnm.lookNone(0); } - if (!srchPlayerActor() && home.angle.y == field_0xd78.y) { + if (!srchPlayerActor() && home.angle.y == mCurAngle.y) { field_0xe22 = 1; } } else { - field_0xba8.lookNone(0); - if (home.angle.y != field_0xd78.y) { + mJntAnm.lookNone(0); + if (home.angle.y != mCurAngle.y) { if (field_0xe34 != 0) { if (field_0x1721 != 0) { if (step(home.angle.y, -1, -1, 15, 0)) { @@ -2363,12 +2363,12 @@ int daNpc_Hanjo_c::wait(void* param_0) { srchPlayerActor(); } } - switch(field_0xba8.getMode()) { + switch(mJntAnm.getMode()) { case 1: switch (mType) { case TYPE_0: - if (field_0x1721 == 0 && field_0xb74.getNo() == 2) { - field_0xb74.setNo(0, -1.0f, 0, 0); + if (field_0x1721 == 0 && mMotionSeqMngr.getNo() == 2) { + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } break; } @@ -2378,7 +2378,7 @@ int daNpc_Hanjo_c::wait(void* param_0) { case TYPE_3: fopAc_ac_c* actor_p = field_0x10c8[1].getActorP(); if (actor_p != NULL) { - field_0xba8.lookActor(actor_p, -40.0f, 0); + mJntAnm.lookActor(actor_p, -40.0f, 0); } break; } @@ -2400,11 +2400,11 @@ int daNpc_Hanjo_c::throwStone(void* param_0) { case 1: if (!field_0xd08.checkStagger()) { if (daNpcT_chkEvtBit(0x8b)) { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(0, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } else { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(2, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(2, -1.0f, 0, 0); field_0x1704 = cLib_getRndValue(sVar4 * 0.5f, sVar4 * 1.5f); } field_0xe22 = 2; @@ -2414,16 +2414,16 @@ int daNpc_Hanjo_c::throwStone(void* param_0) { if (chkPointInArea(daPy_getPlayerActorClass()->current.pos, current.pos, daNpc_Hanjo_Param_c::m.field_0xa4, 1000.0f, -1000.0f, 0) == false) { - field_0xe30 = 8; + mEvtNo = 8; } } if (!field_0xd08.checkStagger()) { if (daNpcT_chkEvtBit(0x8b)) { - field_0xba8.lookPlayer(0); + mJntAnm.lookPlayer(0); lookround(fopAcM_searchPlayerAngleY(this)); } else { - field_0xba8.lookNone(0); - if (home.angle.y != field_0xd78.y) { + mJntAnm.lookNone(0); + if (home.angle.y != mCurAngle.y) { if (field_0xe34 != 0) { if (step(home.angle.y, 7, 14, 15, 0)) { field_0xe22 = 1; @@ -2443,7 +2443,7 @@ int daNpc_Hanjo_c::throwStone(void* param_0) { } else { if (shoot(0)) { if (field_0x1708 != 0) { - field_0xb74.setNo(15, -1.0f, 1, 0); + mMotionSeqMngr.setNo(15, -1.0f, 1, 0); cLib_calcTimer(&field_0x1708); field_0x170c = 0xffffffff; } else { @@ -2475,21 +2475,21 @@ int daNpc_Hanjo_c::takayose(void* param_0) { if (!field_0xd08.checkStagger()) { if (mType == 1) { if (daNpcT_chkEvtBit(0xcf)) { - field_0xb50.setNo(0, -1.0f, 0, 0); - field_0xb74.setNo(13, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0); + mMotionSeqMngr.setNo(13, -1.0f, 0, 0); field_0x1714 = 0; } else { if (field_0x1714 != 0) { - field_0xb50.setNo(0, -1.0f, 0, 0); - field_0xb74.setNo(0, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } else { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(2, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(2, -1.0f, 0, 0); } } } else { - field_0xb50.setNo(0, -1.0f, 0, 0); - field_0xb74.setNo(0, -1.0f, 0, 0); + mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0); + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } field_0x1710 = cLib_getRndValue(dVar8 * 0.5f, dVar8 * 1.5f); field_0xe22 = 2; @@ -2508,7 +2508,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) { daTag_EvtArea_c* evtArea = (daTag_EvtArea_c*)field_0x10c8[3].getActorP(); if (evtArea != NULL) { if (evtArea->chkPointInArea(daPy_getPlayerActorClass()->current.pos)) { - field_0xe30 = 9; + mEvtNo = 9; } } } @@ -2518,24 +2518,24 @@ int daNpc_Hanjo_c::takayose(void* param_0) { daPy_getPlayerActorClass()->checkAutoJump() || daPy_getPlayerActorClass()->checkWolfTriggerJump()) { - field_0xe30 = 10; + mEvtNo = 10; } } if (!field_0xd08.checkStagger()) { if (mType == 1) { - field_0xb98.remove(); + mPlayerActorMngr.remove(); } - if (field_0xb98.getActorP() != NULL) { - field_0xba8.lookPlayer(0); - if (!chkActorInSight(field_0xb98.getActorP(), field_0xdf8, field_0xd78.y)) { - field_0xba8.lookNone(0); + if (mPlayerActorMngr.getActorP() != NULL) { + mJntAnm.lookPlayer(0); + if (!chkActorInSight(mPlayerActorMngr.getActorP(), field_0xdf8, mCurAngle.y)) { + mJntAnm.lookNone(0); } - if (!srchPlayerActor() && home.angle.y == field_0xd78.y) { + if (!srchPlayerActor() && home.angle.y == mCurAngle.y) { field_0xe22 = 1; } } else { - field_0xba8.lookNone(0); - if (home.angle.y != field_0xd78.y) { + mJntAnm.lookNone(0); + if (home.angle.y != mCurAngle.y) { if (field_0xe34 != 0) { if (step(home.angle.y, 7, 14, 15, 0)) { field_0xe22 = 1; @@ -2553,10 +2553,10 @@ int daNpc_Hanjo_c::takayose(void* param_0) { if (actor_p != NULL) { field_0x1722 = commandToHawk(); if (field_0x1722 != 0) { - field_0xba8.lookPlayer(0); - if (field_0xb74.getNo() != 11) { - field_0xb50.setNo(7, -1.0f, 0, 0); - field_0xb74.setNo(11, -1.0f, 0, 0); + mJntAnm.lookPlayer(0); + if (mMotionSeqMngr.getNo() != 11) { + mFaceMotionSeqMngr.setNo(7, -1.0f, 0, 0); + mMotionSeqMngr.setNo(11, -1.0f, 0, 0); } } else { if (dVar1 != 0) { @@ -2564,18 +2564,18 @@ int daNpc_Hanjo_c::takayose(void* param_0) { field_0xe22 = 1; } else { if (field_0x1714 != 0) { - field_0xba8.lookNone(0); - if (field_0xb74.getStepNo() > 0) { + mJntAnm.lookNone(0); + if (mMotionSeqMngr.getStepNo() > 0) { field_0x1714++; field_0x1714 &= 1; field_0xe22 = 1; } } else { - field_0xba8.lookActor(actor_p, 0.0, 0); + mJntAnm.lookActor(actor_p, 0.0, 0); if (((daNPC_TK_c*)actor_p)->isHanjoHand() && cLib_calcTimer(&field_0x1710) == 0) { - field_0xb74.setNo(9, -1.0, 0, 0); + mMotionSeqMngr.setNo(9, -1.0, 0, 0); field_0x1714 = field_0x1714 + 1; field_0x1714 &= 1; } @@ -2611,8 +2611,8 @@ int daNpc_Hanjo_c::talk(void* param_0) { case 0: case 1: if (!field_0xd08.checkStagger()) { - if (mType == TYPE_0 && field_0xb74.getNo() == 2) { - field_0xb74.setNo(0, -1.0f, 0, 0); + if (mType == TYPE_0 && mMotionSeqMngr.getNo() == 2) { + mMotionSeqMngr.setNo(0, -1.0f, 0, 0); } if (field_0x1723 != 0) { initTalk(44, NULL); @@ -2624,18 +2624,18 @@ int daNpc_Hanjo_c::talk(void* param_0) { } case 2: if (!field_0xd08.checkStagger()) { - if (field_0xa89 != 0 || field_0xdc8 == field_0xd78.y) { + if (mTwilight != 0 || field_0xdc8 == mCurAngle.y) { if (talkProc(NULL, 0, NULL, 0) && mFlow.checkEndFlow()) { - field_0xb98.entry(daPy_getPlayerActorClass()); + mPlayerActorMngr.entry(daPy_getPlayerActorClass()); dComIfGp_event_reset(); field_0xe22 = 3; } - field_0xba8.lookPlayer(0); - if (field_0xa89 != 0) { - field_0xba8.lookNone(0); + mJntAnm.lookPlayer(0); + if (mTwilight != 0) { + mJntAnm.lookNone(0); } } else { - field_0xba8.lookPlayer(0); + mJntAnm.lookPlayer(0); if (field_0x1721 != 0) { step(field_0xdc8, -1, -1, 15, 0); } else { diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 2f480a88599..e3e8ef22d51 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -1225,22 +1225,22 @@ void daNpc_Hoz_c::srchActors() { } /* 80A02374-80A023EC 000F54 0078+00 1/0 0/0 0/0 .text checkChangeEvt__11daNpc_Hoz_cFv */ -bool daNpc_Hoz_c::checkChangeEvt() { +BOOL daNpc_Hoz_c::checkChangeEvt() { // NONMATCHING } /* 80A023EC-80A024D0 000FCC 00E4+00 1/0 0/0 0/0 .text evtTalk__11daNpc_Hoz_cFv */ -bool daNpc_Hoz_c::evtTalk() { +BOOL daNpc_Hoz_c::evtTalk() { // NONMATCHING } /* 80A024D0-80A0260C 0010B0 013C+00 2/0 0/0 0/0 .text evtEndProc__11daNpc_Hoz_cFv */ -bool daNpc_Hoz_c::evtEndProc() { +BOOL daNpc_Hoz_c::evtEndProc() { // NONMATCHING } /* 80A0260C-80A026D4 0011EC 00C8+00 1/0 0/0 0/0 .text evtCutProc__11daNpc_Hoz_cFv */ -bool daNpc_Hoz_c::evtCutProc() { +BOOL daNpc_Hoz_c::evtCutProc() { // NONMATCHING } @@ -1645,16 +1645,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A062EC-80A062F4 004ECC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A062F4-80A062FC 004ED4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80A062FC-80A06304 004EDC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1669,16 +1659,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80A0630C-80A06310 004EEC 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80A06310-80A06314 004EF0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A06314-80A0632C 004EF4 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */ // void daNpcT_c::decTmr() { extern "C" void decTmr__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index b3a340ccc79..61bbcfe60eb 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -1696,11 +1696,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A19F98-80A19F9C 005978 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A19F9C-80A19FA4 00597C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index c3c39d4cff2..f550b7c2007 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -1371,31 +1371,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 8054E640-8054E648 0033C0 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 8054E648-8054E650 0033C8 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 8054E650-8054E658 0033D0 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 8054E658-8054E660 0033D8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 8054E660-8054E668 0033E0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 8054E668-8054E670 0033E8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1410,21 +1385,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 8054E680-8054E684 003400 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 8054E684-8054E688 003404 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 8054E688-8054E68C 003408 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 8054E68C-8054E694 00340C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 4408c289be2..1c5a1a102ee 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -1348,16 +1348,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 805530F8-80553100 003E38 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80553100-80553108 003E40 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80553108-80553110 003E48 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1372,22 +1362,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80553118-8055311C 003E58 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - /* 8055311C-80553124 003E5C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80553124-80553128 003E64 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80553128-80553130 003E68 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 0c3f0705134..af1e3e18669 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -795,31 +795,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A45304-80A4530C 001E84 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 80A4530C-80A45314 001E8C 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 80A45314-80A4531C 001E94 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 80A4531C-80A45324 001E9C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A45324-80A4532C 001EA4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80A4532C-80A45334 001EAC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -834,37 +809,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80A4533C-80A45340 001EBC 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80A45340-80A45348 001EC0 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80A45348-80A45350 001EC8 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A45350-80A45354 001ED0 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 80A45354-80A45358 001ED4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - -/* 80A45358-80A4535C 001ED8 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */ -void daNpcT_c::setCollision() { - /* empty function */ -} - /* 80A4535C-80A45364 001EDC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index 12627f8db4c..bad59a5ccd3 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -1254,7 +1254,7 @@ void daNpc_Kolin_c::setParam() { /* 80555118-8055523C 001218 0124+00 1/0 0/0 0/0 .text checkChangeEvt__13daNpc_Kolin_cFv */ -bool daNpc_Kolin_c::checkChangeEvt() { +BOOL daNpc_Kolin_c::checkChangeEvt() { // NONMATCHING } @@ -1274,12 +1274,12 @@ void daNpc_Kolin_c::srchActors() { } /* 80555448-805554E8 001548 00A0+00 1/0 0/0 0/0 .text evtTalk__13daNpc_Kolin_cFv */ -bool daNpc_Kolin_c::evtTalk() { +BOOL daNpc_Kolin_c::evtTalk() { // NONMATCHING } /* 805554E8-805555B0 0015E8 00C8+00 1/0 0/0 0/0 .text evtCutProc__13daNpc_Kolin_cFv */ -bool daNpc_Kolin_c::evtCutProc() { +BOOL daNpc_Kolin_c::evtCutProc() { // NONMATCHING } @@ -2040,11 +2040,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 8055A124-8055A128 006224 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 8055A128-8055A130 006228 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index 75711f67c6d..39d2dd9aa57 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -1075,16 +1075,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A4835C-80A48364 002ABC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A48364-80A4836C 002AC4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80A4836C-80A48374 002ACC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1099,22 +1089,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80A4837C-80A48380 002ADC 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - /* 80A48380-80A48388 002AE0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A48388-80A4838C 002AE8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A4838C-80A48394 002AEC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 4d03f9f0dab..e85de2383be 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -1265,16 +1265,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A635C8-80A635D0 0035E8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A635D0-80A635D8 0035F0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80A635D8-80A635E0 0035F8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1295,11 +1285,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A635F0-80A635F4 003610 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A635F4-80A635FC 003614 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 38c9dcb4f59..a217566b041 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -1427,11 +1427,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A68B10-80A68B14 0048D0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A68B14-80A68B2C 0048D4 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */ // void daNpcT_c::decTmr() { extern "C" void decTmr__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index 35680edeb4b..1581f517f81 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -1598,16 +1598,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A6FA0C-80A6FA14 004F4C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A6FA14-80A6FA1C 004F54 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80A6FA1C-80A6FA24 004F5C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1628,11 +1618,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A6FA34-80A6FA38 004F74 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A6FA38-80A6FA40 004F78 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 594f6ecf3eb..c5f48b413eb 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -2389,11 +2389,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80564654-80564658 0091B4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80564658-80564660 0091B8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 2067f12e931..c6e787f01ef 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -1014,32 +1014,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A73698-80A736A0 002B18 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A736A0-80A736A8 002B20 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - -/* 80A736B0-80A736B8 002B30 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80A736B8-80A736C0 002B38 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A736C0-80A736C4 002B40 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A736C4-80A736CC 002B44 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 480ef32d020..928cc1f812c 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -2041,11 +2041,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80A7AAD4-80A7AAD8 006C74 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80A7AAD8-80A7AAE0 006C78 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 9defe06ccb1..6843d636bc6 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -1805,16 +1805,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A966C8-80A966D0 003A48 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A966D0-80A966D8 003A50 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80A966D8-80A966E0 003A58 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 61c65a449e8..d73fa46b26b 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -1573,16 +1573,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80A9B548-80A9B550 0039A8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80A9B550-80A9B558 0039B0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80A9B558-80A9B560 0039B8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index dde3799d958..0d719d42cc9 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -2232,16 +2232,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AA1268-80AA1270 0050C8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AA1270-80AA1278 0050D0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AA1278-80AA1280 0050D8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -2256,11 +2246,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80AA1288-80AA128C 0050E8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80AA128C-80AA1294 0050EC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 981fd222548..bc379560c09 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -1462,16 +1462,6 @@ extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs() { // NONMATCHING } -/* 80AB1D14-80AB1D1C 004054 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AB1D1C-80AB1D24 00405C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AB1D24-80AB1D2C 004064 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1492,11 +1482,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AB1D3C-80AB1D40 00407C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80AB1D40-80AB1D48 004080 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index bf148bf00fa..7a91799b4af 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -1145,22 +1145,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80AB8BA8-80AB8BB0 002FE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80AB8BB0-80AB8BB8 002FF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AB8BB8-80AB8BBC 002FF8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80AB8BBC-80AB8BC4 002FFC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index b15a01e09bd..c54cc0d600d 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -1357,16 +1357,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AC41EC-80AC41F4 003EAC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AC41F4-80AC41FC 003EB4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AC41FC-80AC4204 003EBC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1388,11 +1378,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AC421C-80AC4220 003EDC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80AC4220-80AC4228 003EE0 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 9d0b9ae8a94..f1338c81be3 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -808,30 +808,6 @@ extern "C" void __dt__12J3DFrameCtrlFv() { extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AC6E14-80AC6E1C 001E14 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 80AC6E1C-80AC6E24 001E1C 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 80AC6E24-80AC6E2C 001E24 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 80AC6E2C-80AC6E34 001E2C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AC6E34-80AC6E3C 001E34 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} /* 80AC6E3C-80AC6E44 001E3C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ @@ -847,37 +823,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80AC6E4C-80AC6E50 001E4C 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80AC6E50-80AC6E58 001E50 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80AC6E58-80AC6E60 001E58 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AC6E60-80AC6E64 001E60 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 80AC6E64-80AC6E68 001E64 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - -/* 80AC6E68-80AC6E6C 001E68 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */ -void daNpcT_c::setCollision() { - /* empty function */ -} - /* 80AC6E6C-80AC6E74 001E6C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 0cbb05d2c92..a0d82e2bbbb 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -801,31 +801,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AC900C-80AC9014 001BAC 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 80AC9014-80AC901C 001BB4 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 80AC901C-80AC9024 001BBC 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 80AC9024-80AC902C 001BC4 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AC902C-80AC9034 001BCC 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AC9034-80AC903C 001BD4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -840,37 +815,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80AC9044-80AC9048 001BE4 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80AC9048-80AC9050 001BE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80AC9050-80AC9058 001BF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AC9058-80AC905C 001BF8 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 80AC905C-80AC9060 001BFC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - -/* 80AC9060-80AC9064 001C00 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */ -void daNpcT_c::setCollision() { - /* empty function */ -} - /* 80AC9064-80AC906C 001C04 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index ac31151c73f..c0b74655000 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -801,31 +801,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80ACB14C-80ACB154 001BAC 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 80ACB154-80ACB15C 001BB4 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 80ACB15C-80ACB164 001BBC 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 80ACB164-80ACB16C 001BC4 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80ACB16C-80ACB174 001BCC 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80ACB174-80ACB17C 001BD4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -840,37 +815,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80ACB184-80ACB188 001BE4 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80ACB188-80ACB190 001BE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80ACB190-80ACB198 001BF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80ACB198-80ACB19C 001BF8 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 80ACB19C-80ACB1A0 001BFC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - -/* 80ACB1A0-80ACB1A4 001C00 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */ -void daNpcT_c::setCollision() { - /* empty function */ -} - /* 80ACB1A4-80ACB1AC 001C04 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index 876a1785ae7..b9c5532dd93 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -1585,16 +1585,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80ACF970-80ACF978 004290 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80ACF978-80ACF980 004298 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80ACF980-80ACF988 0042A0 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1615,11 +1605,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80ACF998-80ACF99C 0042B8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80ACF99C-80ACF9A4 0042BC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 62b61266b77..c0ec963d60e 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -1436,16 +1436,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AD45E8-80AD45F0 003AC8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AD45F0-80AD45F8 003AD0 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AD45F8-80AD4600 003AD8 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1460,22 +1450,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80AD4608-80AD4610 003AE8 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80AD4610-80AD4618 003AF0 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AD4618-80AD461C 003AF8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80AD461C-80AD4624 003AFC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 4f86b8f2070..16b478d3ccb 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -956,31 +956,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AD7A64-80AD7A6C 002424 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - -/* 80AD7A6C-80AD7A74 00242C 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 80AD7A74-80AD7A7C 002434 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 80AD7A7C-80AD7A84 00243C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AD7A84-80AD7A8C 002444 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AD7A8C-80AD7A94 00244C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -995,32 +970,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80AD7A9C-80AD7AA0 00245C 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - /* 80AD7AA0-80AD7AA8 002460 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AD7AA8-80AD7AAC 002468 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__8daNpcT_cFv */ -void daNpcT_c::setAfterTalkMotion() { - /* empty function */ -} - -/* 80AD7AAC-80AD7AB0 00246C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - -/* 80AD7AB0-80AD7AB4 002470 0004+00 1/0 0/0 0/0 .text setCollision__8daNpcT_cFv */ -void daNpcT_c::setCollision() { - /* empty function */ -} - /* 80AD7AB4-80AD7ABC 002474 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 1fc535ccd52..144ff388cdc 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -1802,16 +1802,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AE6364-80AE636C 003684 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AE636C-80AE6374 00368C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AE6374-80AE637C 003694 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1832,11 +1822,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AE638C-80AE6390 0036AC 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80AE6390-80AE6398 0036B0 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index 052921782ed..ce01aa2f5a1 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -905,16 +905,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80AEEDFC-80AEEE04 00233C 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80AEEE04-80AEEE0C 002344 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80AEEE0C-80AEEE14 00234C 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -929,27 +919,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80AEEE1C-80AEEE20 00235C 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80AEEE20-80AEEE28 002360 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80AEEE28-80AEEE30 002368 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80AEEE30-80AEEE34 002370 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80AEEE34-80AEEE3C 002374 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 64d86abd465..b72c298c955 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -2972,11 +2972,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80571190-80571194 00B3F0 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80571194-8057119C 00B3F4 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 73cd93cb2ec..1d96d01a069 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -1061,16 +1061,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80576248-80576250 002C08 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80576250-80576258 002C10 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80576258-80576260 002C18 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1085,27 +1075,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80576268-8057626C 002C28 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 8057626C-80576274 002C2C 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80576274-8057627C 002C34 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 8057627C-80576280 002C3C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80576280-80576288 002C40 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 324af15b5dd..52b6205a011 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -1976,11 +1976,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B24698-80B2469C 006138 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B2469C-80B246B4 00613C 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */ // void daNpcT_c::decTmr() { extern "C" void decTmr__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index af0f9ad150c..ca566cc7a25 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -1813,11 +1813,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B2CA78-80B2CA7C 0063B8 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B2CA7C-80B2CA84 0063BC 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index eeced507564..4d5fafa552b 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -1100,16 +1100,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B45D1C-80B45D24 002EBC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B45D24-80B45D2C 002EC4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B45D2C-80B45D34 002ECC 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1124,16 +1114,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80B45D3C-80B45D44 002EDC 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - -/* 80B45D44-80B45D48 002EE4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B45D48-80B45D50 002EE8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 93113049db8..c0b3099a9f6 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -1100,16 +1100,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B49380-80B49388 002F00 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B49388-80B49390 002F08 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B49390-80B49398 002F10 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1124,16 +1114,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80B493A0-80B493A8 002F20 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - -/* 80B493A8-80B493AC 002F28 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B493AC-80B493B4 002F2C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 358e2a51a01..e9f130affb8 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -1116,16 +1116,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B4CAE0-80B4CAE8 002FE0 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B4CAE8-80B4CAF0 002FE8 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B4CAF0-80B4CAF8 002FF0 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1140,16 +1130,6 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80B4CB00-80B4CB08 003000 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - -/* 80B4CB08-80B4CB0C 003008 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B4CB0C-80B4CB14 00300C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index bb93225f131..46662d29d8b 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -1662,16 +1662,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B51F38-80B51F40 004D18 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B51F40-80B51F48 004D20 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B51F48-80B51F50 004D28 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1692,11 +1682,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B51F60-80B51F64 004D40 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B51F64-80B51F7C 004D44 0018+00 1/0 0/0 0/0 .text decTmr__8daNpcT_cFv */ // void daNpcT_c::decTmr() { extern "C" void decTmr__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 4c4fd758ffa..2bf666e04c3 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -2432,16 +2432,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B5D2B4-80B5D2BC 009EB4 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B5D2BC-80B5D2C4 009EBC 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B5D2C4-80B5D2CC 009EC4 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index afafed41636..ae4a95c45ce 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -1063,16 +1063,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B6B9A4-80B6B9AC 002B64 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B6B9AC-80B6B9B4 002B6C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B6B9B4-80B6B9BC 002B74 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1093,11 +1083,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B6B9CC-80B6B9D0 002B8C 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B6B9D0-80B6B9D8 002B90 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 6b62c7d8946..dd21c13765c 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -903,37 +903,12 @@ extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs() { // NONMATCHING } -/* 80B6E694-80B6E69C 0025D4 0008+00 1/0 0/0 0/0 .text getHeadJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getHeadJointNo() { - return -1; -} - -/* 80B6E69C-80B6E6A4 0025DC 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - -/* 80B6E6A4-80B6E6AC 0025E4 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getBackboneJointNo() { - return -1; -} - /* 80B6E6AC-80B6E6B0 0025EC 0004+00 1/0 0/0 0/0 .text ctrlSubFaceMotion__8daNpcT_cFi */ // void daNpcT_c::ctrlSubFaceMotion(int param_0) { extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B6E6C0-80B6E6C8 002600 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B6E6C8-80B6E6D0 002608 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B6E6D0-80B6E6D8 002610 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -948,22 +923,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80B6E6E0-80B6E6E8 002620 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80B6E6E8-80B6E6F0 002628 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B6E6F0-80B6E6F4 002630 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B6E6F4-80B6E6FC 002634 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 8ff3b0236ca..dd45ac761c4 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -1047,43 +1047,18 @@ extern "C" void setEyeAngleX__15daNpcT_JntAnm_cF4cXyzfs() { // NONMATCHING } -/* 80B7182C-80B71834 002AEC 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - /* 80B71834-80B71838 002AF4 0004+00 1/0 0/0 0/0 .text ctrlSubFaceMotion__8daNpcT_cFi */ // void daNpcT_c::ctrlSubFaceMotion(int param_0) { extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B71838-80B71840 002AF8 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B71840-80B71848 002B00 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - -/* 80B71850-80B71858 002B10 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80B71858-80B71860 002B18 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B71860-80B71864 002B20 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B71864-80B7186C 002B24 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index fddce1ce04d..6be6dadba93 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -1053,32 +1053,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B749AC-80B749B4 002AEC 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B749B4-80B749BC 002AF4 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - -/* 80B749C4-80B749CC 002B04 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80B749CC-80B749D4 002B0C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B749D4-80B749D8 002B14 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B749D8-80B749E0 002B18 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 3fef742bd38..0ce5e4685b7 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -1070,27 +1070,12 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80B77CA4-80B77CAC 002C64 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80B77CAC-80B77CB4 002C6C 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80B77CBC-80B77CC4 002C7C 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80B77CC4-80B77CC8 002C84 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80B77CC8-80B77CD0 002C88 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 5e0258e58c7..7ece562df2e 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -2169,27 +2169,12 @@ void daNpcT_JntAnm_c::setEyeAngleX(cXyz param_0, f32 param_1, s16 param_2) { // NONMATCHING } -/* 80CD57A4-80CD57AC 007544 0008+00 1/0 0/0 0/0 .text getNeckJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getNeckJointNo() { - return -1; -} - /* 80CD57AC-80CD57B0 00754C 0004+00 1/0 0/0 0/0 .text ctrlSubFaceMotion__8daNpcT_cFi */ //void daNpcT_c::ctrlSubFaceMotion(int param_0) { void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80CD57C0-80CD57C8 007560 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80CD57C8-80CD57D0 007568 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80CD57D0-80CD57D8 007570 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -2210,11 +2195,6 @@ extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80CD57E8-80CD57EC 007588 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80CD57EC-80CD57F4 00758C 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index 20dd9e69958..3a67093f09c 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -1656,16 +1656,6 @@ extern "C" void ctrlSubFaceMotion__8daNpcT_cFi() { /* empty function */ } -/* 80D4BCB0-80D4BCB8 004EB0 0008+00 1/0 0/0 0/0 .text getFootLJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootLJointNo() { - return -1; -} - -/* 80D4BCB8-80D4BCC0 004EB8 0008+00 1/0 0/0 0/0 .text getFootRJointNo__8daNpcT_cFv */ -s32 daNpcT_c::getFootRJointNo() { - return -1; -} - /* 80D4BCC0-80D4BCC8 004EC0 0008+00 1/0 0/0 0/0 .text getEyeballLMaterialNo__8daNpcT_cFv */ // bool daNpcT_c::getEyeballLMaterialNo() { @@ -1680,27 +1670,12 @@ extern "C" bool getEyeballRMaterialNo__8daNpcT_cFv() { return false; } -/* 80D4BCD0-80D4BCD4 004ED0 0004+00 1/0 0/0 0/0 .text afterJntAnm__8daNpcT_cFi */ -void daNpcT_c::afterJntAnm(int param_0) { - /* empty function */ -} - -/* 80D4BCD4-80D4BCDC 004ED4 0008+00 1/0 0/0 0/0 .text checkChangeEvt__8daNpcT_cFv */ -bool daNpcT_c::checkChangeEvt() { - return false; -} - /* 80D4BCDC-80D4BCE4 004EDC 0008+00 1/0 0/0 0/0 .text evtEndProc__8daNpcT_cFv */ // bool daNpcT_c::evtEndProc() { extern "C" bool evtEndProc__8daNpcT_cFv() { return true; } -/* 80D4BCE4-80D4BCE8 004EE4 0004+00 1/0 0/0 0/0 .text afterMoved__8daNpcT_cFv */ -void daNpcT_c::afterMoved() { - /* empty function */ -} - /* 80D4BCE8-80D4BCF0 004EE8 0008+00 1/0 0/0 0/0 .text chkXYItems__8daNpcT_cFv */ // bool daNpcT_c::chkXYItems() { extern "C" bool chkXYItems__8daNpcT_cFv() { diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index 2c268b08706..357e7fe0971 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -60,9 +60,8 @@ s32 daTagChgRestart_c::execute() { u8 playerNo = daTagChgRestart_prm::getPlayerNo(this); if (playerNo != 0xFF) { - dStage_roomStatus_c* roomStatusDt = - dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this)); - stage_actor_class* player_data = roomStatusDt->mRoomDt.getPlayer(); + dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this)); + stage_actor_class* player_data = roomDt->getPlayer(); stage_actor_data_class* entry_p = player_data->mEntries; for (int i = 0; i < player_data->mEntryNum; i++) { diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 55960a7f12d..9eee10556f3 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -46,7 +46,7 @@ int daTalk_c::execute() { } } else { if (fopAcM_searchPlayerDistanceXZ(this) > - dAttention_c::i_getDistTable(attention_info.distances[fopAc_attn_TALK_e]).mDistMaxRelease) + dAttention_c::getDistTable(attention_info.distances[fopAc_attn_TALK_e]).mDistMaxRelease) { mMessageID = -1; fopAcM_delete(this); diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 5c4438990b3..361c6ec8b97 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1536,14 +1536,14 @@ void daTbox_c::settingDropDemoCamera() { player_camera->mCamera.SetTrimSize(maptooldata->field_0x1); - dStage_roomStatus_c* roomdt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this)); + dStage_roomDt_c* roomdt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this)); JUT_ASSERT(0xB8E, roomdt != 0); - stage_camera_class* stage_camera = roomdt->mRoomDt.getCamera(); + stage_camera_class* stage_camera = roomdt->getCamera(); stage_camera2_data_class* stage_camera_data = stage_camera->mEntries; stage_camera_data += maptooldata->field_0x16; - stage_arrow_class* stage_arrow = roomdt->mRoomDt.getArrow(); + stage_arrow_class* stage_arrow = roomdt->getArrow(); stage_arrow_data_class* stage_arrow_data = stage_arrow->mEntries; stage_arrow_data += stage_camera_data->field_0x10; diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index b3124cbbac4..a11356d4039 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -23,7 +23,7 @@ static int daVrbox_Draw(vrbox_class* i_this) { if (dComIfGp_roomControl_getStayNo() >= 0) { s32 stayNo = dComIfGp_roomControl_getStayNo(); - filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo(); + filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo(); } if (filelist_p != NULL) { diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index a8ca282f1a6..83c3d3d9ca4 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -252,7 +252,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { if (dComIfGp_roomControl_getStayNo() >= 0) { s32 stayNo = dComIfGp_roomControl_getStayNo(); - filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo(); + filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo(); } if (filelist_p != NULL) { diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc index e4362ca5a3b..5774bb9067f 100644 --- a/src/d/actor/d_flower.inc +++ b/src/d/actor/d_flower.inc @@ -600,7 +600,7 @@ void dFlower_packet_c::draw() { int sp4C = 6; if (dComIfGp_roomControl_getStatusRoomDt(i) != NULL) { - sp4C = dComIfGp_roomControl_getStatusRoomDt(i)->mRoomDt.getLightVecInfoNum(); + sp4C = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum(); } if (dKy_SunMoon_Light_Check() == TRUE && sp4C < 2) { @@ -689,7 +689,7 @@ void dFlower_packet_c::draw() { int sp7C = 0; if (dComIfGp_roomControl_getStatusRoomDt(i) != NULL) { - sp2C = dComIfGp_roomControl_getStatusRoomDt(i)->mRoomDt.getLightVecInfoNum(); + sp2C = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum(); } if (dKy_SunMoon_Light_Check() == TRUE && sp2C < 2) { diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index aaa6b1bb33f..96bac4cf995 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -597,7 +597,7 @@ void dGrass_packet_c::draw() { GFSetTevColorS10(GX_TEVREG1, sp98); if (dComIfGp_roomControl_getStatusRoomDt(i) != NULL) { - sp48 = dComIfGp_roomControl_getStatusRoomDt(i)->mRoomDt.getLightVecInfoNum(); + sp48 = dComIfGp_roomControl_getStatusRoomDt(i)->getLightVecInfoNum(); } if (dKy_SunMoon_Light_Check() == TRUE && sp48 < 2) { diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 79964c2ea7d..9a2ddcbc9aa 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -963,9 +963,9 @@ void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_c int sp108 = 0xFF; int sp10C = dComIfGp_roomControl_getStayNo(); - dStage_roomStatus_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(sp10C); + dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(sp10C); if (room_dt != NULL) { - dStage_FileList_dt_c* filelist = room_dt->mRoomDt.getFileListInfo(); + dStage_FileList_dt_c* filelist = room_dt->getFileListInfo(); if (filelist != NULL) { sp108 = dStage_FileList_dt_GetDefaultCamera(filelist); } @@ -2323,9 +2323,9 @@ int dCamera_c::onRoomChange(s32 i_roomNo) { setFlag(0x1000); int var_r29 = 0xFF; - dStage_roomStatus_c* room_status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); - if (room_status != NULL) { - dStage_FileList_dt_c* filelist = room_status->mRoomDt.getFileListInfo(); + dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); + if (room_dt != NULL) { + dStage_FileList_dt_c* filelist = room_dt->getFileListInfo(); if (filelist != NULL) { var_r29 = dStage_FileList_dt_GetDefaultCamera(filelist); } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index ecf756e7561..f949fddf4f7 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1169,24 +1169,24 @@ bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_ang /* 8002D25C-8002D2AC 027B9C 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomCamera__Fi */ stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo) { - dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); + dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); - if (status == NULL) { + if (room_dt == NULL) { return NULL; } - return status->mRoomDt.getCamera(); + return room_dt->getCamera(); } /* 8002D2AC-8002D2FC 027BEC 0050+00 0/0 3/3 3/3 .text dComIfGp_getRoomArrow__Fi */ stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) { - dStage_roomStatus_c* status = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); + dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo); - if (status == NULL) { + if (room_dt == NULL) { return NULL; } - return status->mRoomDt.getArrow(); + return room_dt->getArrow(); } /* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */ diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 8dda1ab5be1..107ceecbe3a 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -190,7 +190,7 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par /* 80183480-801835A0 17DDC0 0120+00 1/1 0/0 0/0 .text execute__8dEnvSe_cFv */ int dEnvSe_c::execute() { s32 roomNo = dComIfGp_roomControl_getStayNo(); - dStage_roomDt_c* roomDt_p = &dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt; + dStage_roomDt_c* roomDt_p = dComIfGp_roomControl_getStatusRoomDt(roomNo); if (roomDt_p == NULL) { return 1; diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 13d55cd8dfd..10a8a9f04ae 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -1160,24 +1160,24 @@ dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 mapToolID, s32 roomN return NULL; } - dStage_roomStatus_c* room = dComIfGp_roomControl_getStatusRoomDt(roomNo); - if (room != NULL) { - dStage_MapEventInfo_c* roomDt = room->mRoomDt.getMapEventInfo(); - - if (roomDt != NULL) { - for (int i = 0; i < roomDt->mCount; i++) { - if (mapToolID == roomDt->mData[i].field_0x4) { - return &roomDt->mData[i]; + dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(roomNo); + if (room_dt != NULL) { + dStage_MapEventInfo_c* roomInfo = room_dt->getMapEventInfo(); + + if (roomInfo != NULL) { + for (int i = 0; i < roomInfo->mCount; i++) { + if (mapToolID == roomInfo->mData[i].field_0x4) { + return &roomInfo->mData[i]; } } } } - dStage_MapEventInfo_c* stageDt = dComIfGp_getStage()->getMapEventInfo(); - if (stageDt != NULL) { - for (int i = 0; i < stageDt->mCount; i++) { - if (mapToolID == stageDt->mData[i].field_0x4) { - return &stageDt->mData[i]; + dStage_MapEventInfo_c* stageInfo = dComIfGp_getStage()->getMapEventInfo(); + if (stageInfo != NULL) { + for (int i = 0; i < stageInfo->mCount; i++) { + if (mapToolID == stageInfo->mData[i].field_0x4) { + return &stageInfo->mData[i]; } } } diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 24ff5ffee1b..380324c86ad 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -146,7 +146,7 @@ static int dEvDt_Next_Stage(int index, int wipe_type) { if (room_no == -1) { info = dComIfGp_getStageSclsInfo(); } else { - info = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo(); + info = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo(); } if (info != NULL && id >= 0 && id < info->numEntries) { diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index dff37650270..007849c247d 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -43,8 +43,8 @@ const char* dEvent_exception_c::getEventName() { }; s32 roomNo = dComIfGp_roomControl_getStayNo(); - dStage_roomStatus_c* roomStatus = dComIfGp_roomControl_getStatusRoomDt(roomNo); - dStage_MapEventInfo_c* eventInfo = roomStatus->mRoomDt.getMapEventInfo(); + dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo); + dStage_MapEventInfo_c* eventInfo = roomDt->getMapEventInfo(); if (mEventInfoIdx == -1) { return "(!NO REGIST!)"; } diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 52e64014154..e937a4bab4e 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -4294,8 +4294,8 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { dKy_tevstr_c* room_tevstr = dComIfGp_roomControl_getTevStr(room_no); if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) { - stage_pure_lightvec_info_class* room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo(); - int room_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum(); + stage_pure_lightvec_info_class* room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); + int room_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum(); if (room_light_info_num > 6) { room_light_info_num = 6; } @@ -4309,7 +4309,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { room_light_info++; } - room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo(); + room_light_info = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); if (dKy_SunMoon_Light_Check() == TRUE && room_light_info == NULL) { lightMask |= lightMaskData[2]; lightMask |= lightMaskData[3]; @@ -4513,7 +4513,7 @@ void dKy_setLight_nowroom_grass(char room_no, f32 light_ratio) { MtxP view_mtx = j3dSys.getViewMtx(); if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) { - dStage_FileList_dt_c* filelist = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getFileListInfo(); + dStage_FileList_dt_c* filelist = dComIfGp_roomControl_getStatusRoomDt(room_no)->getFileListInfo(); if (filelist == NULL) { return; } @@ -4587,8 +4587,8 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) { if (dComIfGp_roomControl_getStatusRoomDt(room_no) != NULL) { J3DLightInfo* light; - stage_pure_lightvec_info_class* room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo(); - int room_light_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum(); + stage_pure_lightvec_info_class* room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); + int room_light_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum(); if (room_light_num > 6) { room_light_num = 6; } @@ -4602,7 +4602,7 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) { room_lights++; } - room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo(); + room_lights = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); for (int i = 0; i < 6; i++) { light = &tevstr_p->mLights[i].getLightInfo(); @@ -5416,8 +5416,8 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p sp40 = g_env_light.dungeonlight[i].mColor; } else if (dComIfGp_roomControl_getStatusRoomDt(sp38) != NULL) { stage_light_info_p = - dComIfGp_roomControl_getStatusRoomDt(sp38)->mRoomDt.getLightVecInfo(); - sp30 = dComIfGp_roomControl_getStatusRoomDt(sp38)->mRoomDt.getLightVecInfoNum(); + dComIfGp_roomControl_getStatusRoomDt(sp38)->getLightVecInfo(); + sp30 = dComIfGp_roomControl_getStatusRoomDt(sp38)->getLightVecInfoNum(); if (i < sp30) { sp40 = g_env_light.dungeonlight[i].mColor; } else { @@ -5459,14 +5459,14 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p stage_pure_lightvec_info_class* stage_light_info_p; if (param_1 != NULL && param_1->room_no >= 0) { stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(param_1->room_no) - ->mRoomDt.getLightVecInfo(); + ->getLightVecInfo(); sp3C = dComIfGp_roomControl_getStatusRoomDt(param_1->room_no) - ->mRoomDt.getLightVecInfoNum(); + ->getLightVecInfoNum(); } else { s32 room_no = dComIfGp_roomControl_getStayNo(); // fakematch, fixes instruction order - stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfo(); + stage_light_info_p = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfo(); room_no = dComIfGp_roomControl_getStayNo(); // fakematch, fixes instruction order - sp3C = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum(); + sp3C = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum(); } f32 var_f27; @@ -5659,7 +5659,7 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) { return 0; } - stage_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLightVecInfoNum(); + stage_light_info_num = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLightVecInfoNum(); if (stage_light_info_num < 0 || stage_light_info_num > 6) { stage_light_info_num = 6; } diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index d177c9b58fe..aa018e24090 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1891,7 +1891,7 @@ void vrkumo_move() { dStage_FileList_dt_c* filelist = NULL; if (dComIfGp_roomControl_getStayNo() >= 0) { - filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->mRoomDt.getFileListInfo(); + filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo(); } if (filelist != NULL) { @@ -4605,7 +4605,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { f32 sp70 = 0.0f; dStage_FileList_dt_c* filelist = NULL; if (dComIfGp_roomControl_getStayNo() >= 0) { - filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->mRoomDt.getFileListInfo(); + filelist = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo(); } if (filelist != NULL) { diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 49c15c27ab4..8377e478314 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -1260,7 +1260,7 @@ void dKyw_wind_set() { if (dComIfGp_roomControl_getStayNo() >= 0) { fili_p = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo()) - ->mRoomDt.getFileListInfo(); + ->getFileListInfo(); } var_r30 = 0; @@ -1273,7 +1273,7 @@ void dKyw_wind_set() { if (dComIfGp_roomControl_getStatusRoomDt(var_r4) != NULL) { s32 var_r4_2 = dComIfGp_roomControl_getStayNo(); dStage_Lbnk_c* lbnk_p = - dComIfGp_roomControl_getStatusRoomDt(var_r4_2)->mRoomDt.getLbnk(); + dComIfGp_roomControl_getStatusRoomDt(var_r4_2)->getLbnk(); if (lbnk_p != NULL) { dStage_Lbnk_dt_c* data_p = lbnk_p->entries; @@ -1322,7 +1322,7 @@ void dKyw_wind_set() { if (dComIfGp_roomControl_getStatusRoomDt(var_r4_3) != NULL) { s32 var_r4_4 = dComIfGp_roomControl_getStayNo(); dStage_Lbnk_c* lbnk_p = - dComIfGp_roomControl_getStatusRoomDt(var_r4_4)->mRoomDt.getLbnk(); + dComIfGp_roomControl_getStatusRoomDt(var_r4_4)->getLbnk(); if (lbnk_p != NULL) { dStage_Lbnk_dt_c* data_p = lbnk_p->entries; diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp index 24986799354..ba1f6e6c1cf 100644 --- a/src/d/d_meter_map.cpp +++ b/src/d/d_meter_map.cpp @@ -35,7 +35,7 @@ int dMeterMap_c::getMapDispSizeTypeNo() { s32 stayNo = dComIfGp_roomControl_getStayNo(); dStage_FileList_dt_c* fList = - dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo(); + dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo(); if (fList != NULL) { uvar6 = dStage_FileList_dt_getMiniMap(fList); } @@ -593,4 +593,4 @@ void dMeterMap_c::keyCheck() { } } } -} \ No newline at end of file +} diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index e77a2ab1116..317cfa0c45c 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -593,7 +593,7 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* param_0, fopAc_ac_c** param_1) { if (daAlink_getAlinkActorClass()->getMidnaMsgNum() == 0xFFFF) { s32 stayNo = dComIfGp_roomControl_getStayNo(); msgNum = - dComIfGp_roomControl_getStatusRoomDt(stayNo)->mRoomDt.getFileListInfo()->mMsg; + dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo()->mMsg; } else { msgNum = daAlink_getAlinkActorClass()->getMidnaMsgNum(); daAlink_getAlinkActorClass()->setMidnaMsg(); @@ -1615,10 +1615,10 @@ int dMsgFlow_c::event019(mesg_flow_node_event*, fopAc_ac_c*) { int dMsgFlow_c::event020(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { int prm0 = getParam(flow_node->params); daPy_py_c* player = daPy_getPlayerActorClass(); - dStage_roomStatus_c* room = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(actor)); - stage_actor_data_class* actor_data = room->mRoomDt.getPlayer()->mEntries; + dStage_roomDt_c* room = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(actor)); + stage_actor_data_class* actor_data = room->getPlayer()->mEntries; - for (int i = 0; i < room->mRoomDt.getPlayerNum(); i++, actor_data++) { + for (int i = 0; i < room->getPlayerNum(); i++, actor_data++) { if ((u8)actor_data->mAngle.z == prm0) { player->setPlayerPosAndAngle(&actor_data->mSpawnPos, player->current.angle.y, 0); break; diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index ff07c014166..3b686c8eb66 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -22,12 +22,12 @@ dPath* dPath_GetRoomPath(int path_index, int room_no) { if (room_no == -1) { path = dComIfGp_getStage()->getPath2Inf(); } else { - dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no); - if (roomSt == NULL) { + dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(room_no); + if (roomDt == NULL) { return NULL; } - path = roomSt->mRoomDt.getPath2Inf(); + path = roomDt->getPath2Inf(); } if (path == NULL || path_index < 0 || path_index >= path->m_num) { @@ -45,12 +45,12 @@ dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) { if (room_no == -1) { path = dComIfGp_getStage()->getPath2Inf(); } else { - dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no); - if (roomSt == NULL) { + dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(room_no); + if (roomDt == NULL) { return NULL; } - path = roomSt->mRoomDt.getPath2Inf(); + path = roomDt->getPath2Inf(); } int next_id = p_path->m_nextID; @@ -110,4 +110,4 @@ u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* par *param_2 = path->field_0x4; return 1; -} \ No newline at end of file +} diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index c558715abe2..705e195a5f9 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -138,7 +138,7 @@ static bool isCreating(fpc_ProcID param_0) { /* 8025B1D0-8025B2EC 255B10 011C+00 1/1 0/0 0/0 .text loadDemoArchive__Fi */ static int loadDemoArchive(int room_no) { if (*dStage_roomControl_c::getDemoArcName() == 0) { - dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getLbnk(); + dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLbnk(); if (lbnk != NULL) { dStage_Lbnk_dt_c* entries = lbnk->entries; @@ -293,7 +293,7 @@ inline const char* setArcName(room_of_scene_class* i_room) { static int dScnRoom_Delete(room_of_scene_class* i_this) { int roomNo = fopScnM_GetParam(i_this); dComIfGp_roomControl_setStatusFlag(roomNo, 0); - dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt.init(); + dComIfGp_roomControl_getStatusRoomDt(roomNo)->init(); if (mDoRst::isReset() || !dComIfGp_isEnableNextStage() || strcmp(dComIfGp_getNextStageName(), dComIfGp_getStartStageName()) || @@ -307,7 +307,7 @@ static int dScnRoom_Delete(room_of_scene_class* i_this) { } } - dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt.init(); + dComIfGp_roomControl_getStatusRoomDt(roomNo)->init(); dComIfGp_getPEvtManager()->roomFinish(roomNo); return 1; } @@ -367,7 +367,7 @@ static int phase_2(room_of_scene_class* i_this) { dComIfGp_roomControl_setZoneNo(roomNo, dComIfGs_createZone(roomNo)); } - i_this->mpRoomDt = &dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt; + i_this->mpRoomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo); i_this->mpRoomDt->setRoomNo(roomNo); i_this->mpDzrRes = dComIfG_getStageRes(arcName, "room.dzr"); diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 5b43be94e58..9dbe09c1462 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -940,13 +940,13 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* i_flow) { if (i_flow->doFlow(actor, NULL, 0)) { int itemNo; if (mFlow.getEventId(&itemNo) == 1) { - if (field_0xd90 == -1) { - field_0xd90 = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, + if (mItemId == -1) { + mItemId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, -1, NULL, NULL); } - if (fpcEx_IsExist(field_0xd90)) { - field_0xe30 = 1; + if (fpcEx_IsExist(mItemId)) { + mEvtNo = 1; evtChange(); return 1; } else { @@ -1244,15 +1244,15 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* i_flow) { int itemNo; if (mFlow.getEventId(&itemNo) == 1) { if (i_flow->doFlow(actor, NULL, 0)) { - if (field_0xd90 == -1) { - field_0xd90 = + if (mItemId == -1) { + mItemId = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, -1, NULL, NULL); } - if (fpcEx_IsExist(field_0xd90)) { + if (fpcEx_IsExist(mItemId)) { offFlag(8); setSoldOutItemHide(); - field_0xe30 = 1; + mEvtNo = 1; evtChange(); return 2; } @@ -1303,7 +1303,7 @@ int dShopSystem_c::seq_finish(fopAc_ac_c* actor, dMsgFlow_c* i_flow) { /* 8019A0C0-8019A0D0 194A00 0010+00 1/0 0/0 0/0 .text * seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ bool dShopSystem_c::seq_event(fopAc_ac_c*, dMsgFlow_c*) { - return field_0xe30 == 0; + return mEvtNo == 0; } /* 8019A0D0-8019A158 194A10 0088+00 0/0 0/0 9/9 .text shop_init__13dShopSystem_cFb */ @@ -1659,74 +1659,3 @@ bool dShopSystem_c::checkRightTrigger(STControl* i_stick) { bool dShopSystem_c::dpdMove() { return false; } - -#pragma nosyminline on - -// Need 0x78 bytes of padding with no symbol between process and dShopSystem_c::__vtable -// This is likely caused by the vtables of abstract base classes getting put there and then stripped out. -// Not sure which abstract base class could go there though, so we simulate it with some dummy classes for now. -class dummy_abstract_class { -public: - virtual void virt_func_0() = 0; - virtual void virt_func_1() = 0; - virtual void virt_func_2() = 0; - virtual void virt_func_3() = 0; - virtual void virt_func_4() = 0; - virtual void virt_func_5() = 0; - virtual void virt_func_6() = 0; - virtual void virt_func_7() = 0; - virtual void virt_func_8() = 0; - virtual void virt_func_9() = 0; - virtual void virt_func_10() = 0; - virtual void virt_func_11() = 0; - virtual void virt_func_12() = 0; - virtual void virt_func_13() = 0; - virtual void virt_func_14() = 0; - virtual void virt_func_15() = 0; - virtual void virt_func_16() = 0; - virtual void virt_func_17() = 0; - virtual void virt_func_18() = 0; - virtual void virt_func_19() = 0; - virtual void virt_func_20() = 0; - virtual void virt_func_21() = 0; - virtual void virt_func_22() = 0; - virtual void virt_func_23() = 0; - virtual void virt_func_24() = 0; - virtual void virt_func_25() = 0; - virtual void virt_func_26() = 0; - virtual void virt_func_27() = 0; -}; -class dummy_child_class : dummy_abstract_class { - virtual void virt_func_0(); - virtual void virt_func_1(); - virtual void virt_func_2(); - virtual void virt_func_3(); - virtual void virt_func_4(); - virtual void virt_func_5(); - virtual void virt_func_6(); - virtual void virt_func_7(); - virtual void virt_func_8(); - virtual void virt_func_9(); - virtual void virt_func_10(); - virtual void virt_func_11(); - virtual void virt_func_12(); - virtual void virt_func_13(); - virtual void virt_func_14(); - virtual void virt_func_15(); - virtual void virt_func_16(); - virtual void virt_func_17(); - virtual void virt_func_18(); - virtual void virt_func_19(); - virtual void virt_func_20(); - virtual void virt_func_21(); - virtual void virt_func_22(); - virtual void virt_func_23(); - virtual void virt_func_24(); - virtual void virt_func_25(); - virtual void virt_func_26(); - virtual void virt_func_27(); -}; -static dummy_child_class dummy() { - dummy_child_class temp; - return temp; -} diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index b270b498976..710ea597865 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -194,11 +194,11 @@ void dStage_roomControl_c::initZone() { /* 80024384-800243B0 01ECC4 002C+00 2/2 27/27 6/6 .text getStatusRoomDt__20dStage_roomControl_cFi */ -dStage_roomStatus_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) { +dStage_roomDt_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) { if (i_statusIdx < 0 || i_statusIdx >= 0x40) { return NULL; } - return &mStatus[i_statusIdx]; + return &mStatus[i_statusIdx].mRoomDt; } // clang-format off @@ -2685,7 +2685,7 @@ int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no, s16 angle, if (room_no == -1) { scls = dComIfGp_getStageSclsInfo(); } else { - scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo(); + scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo(); } if (scls == NULL) { @@ -2736,7 +2736,7 @@ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3, if (room_no == -1) { scls = dComIfGp_getStageSclsInfo(); } else { - scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo(); + scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo(); } if (scls == NULL) { diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 5c6b3e17352..83c2dd1af27 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -177,13 +177,13 @@ static int fopAc_Create(void* i_this) { int roomNo = dComIfGp_roomControl_getStayNo(); if (roomNo >= 0) { - dComIfGp_roomControl_getStatusRoomDt(roomNo)->mRoomDt.getFileListInfo(); + dComIfGp_roomControl_getStatusRoomDt(roomNo)->getFileListInfo(); } dStage_FileList_dt_c* filelist = NULL; if (a_this->home.roomNo >= 0) { filelist = - dComIfGp_roomControl_getStatusRoomDt(a_this->home.roomNo)->mRoomDt.getFileListInfo(); + dComIfGp_roomControl_getStatusRoomDt(a_this->home.roomNo)->getFileListInfo(); } if (filelist != NULL) {