From 4373bba251c50fa78a995fc5b8a66e3bdf184c69 Mon Sep 17 00:00:00 2001 From: hev7 <143887945+hev7@users.noreply.github.com> Date: Wed, 19 Nov 2025 20:53:12 +0000 Subject: [PATCH] d_a_npc_soldierB matching (#2828) --- configure.py | 2 +- include/d/actor/d_a_npc_soldierA.h | 6 +- include/d/actor/d_a_npc_soldierB.h | 103 +- src/d/actor/d_a_npc_soldierB.cpp | 1776 ++++++++++++++-------------- 4 files changed, 954 insertions(+), 933 deletions(-) diff --git a/configure.py b/configure.py index 2385429416a..cfcfed31172 100755 --- a/configure.py +++ b/configure.py @@ -1932,7 +1932,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shop_maro"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_sola"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_soldierA", extra_cflags=[DANPCF_C_HACK]), - ActorRel(NonMatching, "d_a_npc_soldierB"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_soldierB", extra_cflags=[DANPCF_C_HACK]), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_sq"), ActorRel(NonMatching, "d_a_npc_the", extra_cflags=[DANPCF_C_HACK]), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_theB", extra_cflags=[DANPCF_C_HACK]), diff --git a/include/d/actor/d_a_npc_soldierA.h b/include/d/actor/d_a_npc_soldierA.h index 7771fdc12f1..d129fe0000b 100644 --- a/include/d/actor/d_a_npc_soldierA.h +++ b/include/d/actor/d_a_npc_soldierA.h @@ -10,7 +10,7 @@ * * @details * -*/ + */ struct daNpc_SoldierA_HIOParam { /* 0x00 */ daNpcF_HIOParam common; @@ -41,7 +41,7 @@ class daNpc_SoldierA_c : public daNpcF_c { public: typedef int (daNpc_SoldierA_c::*actionFunc)(void*); typedef int (daNpc_SoldierA_c::*cutFunc)(int); - + /* 80AEF58C */ daNpc_SoldierA_c(); /* 80AEF7A0 */ ~daNpc_SoldierA_c(); /* 80AEF9A0 */ cPhs__Step create(); @@ -77,6 +77,8 @@ public: /* 80AF1B8C */ int ECut_listenLake(int); /* 80AF1CA4 */ int test(void*); + u8 getType() { return mType; } + static char* mEvtCutNameList[3]; static cutFunc mEvtCutList[3]; diff --git a/include/d/actor/d_a_npc_soldierB.h b/include/d/actor/d_a_npc_soldierB.h index 7e816e2208c..ff6c69e2527 100644 --- a/include/d/actor/d_a_npc_soldierB.h +++ b/include/d/actor/d_a_npc_soldierB.h @@ -3,6 +3,31 @@ #include "d/actor/d_a_npc.h" +struct daNpc_SoldierB_HIOParam { + /* 0x00 */ daNpcF_HIOParam common; +}; + +class daNpc_SoldierB_Param_c { +public: + /* 80AF267C */ virtual ~daNpc_SoldierB_Param_c() {} + + static daNpc_SoldierB_HIOParam const m; +}; + +#if DEBUG +class daNpc_SoldierB_HIO_c : public mDoHIO_entry_c { +public: + daNpc_SoldierB_HIO_c(); + void listenPropertyEvent(const JORPropertyEvent*); + void genMessage(JORMContext*); + + daNpc_SoldierB_HIOParam m; +}; +#define NPC_SOLDIERB_HIO_CLASS daNpc_SoldierB_HIO_c +#else +#define NPC_SOLDIERB_HIO_CLASS daNpc_SoldierB_Param_c +#endif + /** * @ingroup actors-npcs * @class daNpc_SoldierB_c @@ -11,57 +36,69 @@ * @details * */ -class daNpc_SoldierB_c : public fopAc_ac_c { +class daNpc_SoldierB_c : public daNpcF_c { public: + typedef int (daNpc_SoldierB_c::*actionFunc)(void*); + typedef int (daNpc_SoldierB_c::*cutFunc)(int); + /* 80AF2CAC */ daNpc_SoldierB_c(); /* 80AF2EC0 */ ~daNpc_SoldierB_c(); - /* 80AF30C0 */ void create(); - /* 80AF33A0 */ void CreateHeap(); - /* 80AF356C */ void Delete(); - /* 80AF35A0 */ void Execute(); - /* 80AF35C0 */ void Draw(); - /* 80AF3634 */ void ctrlJoint(J3DJoint*, J3DModel*); - /* 80AF3830 */ void createHeapCallBack(fopAc_ac_c*); - /* 80AF3850 */ void ctrlJointCallBack(J3DJoint*, int); + /* 80AF30C0 */ cPhs__Step create(); + /* 80AF33A0 */ int CreateHeap(); + /* 80AF356C */ int Delete(); + /* 80AF35A0 */ int Execute(); + /* 80AF35C0 */ int Draw(); + /* 80AF3634 */ int ctrlJoint(J3DJoint*, J3DModel*); + /* 80AF3830 */ static int createHeapCallBack(fopAc_ac_c*); + /* 80AF3850 */ static int ctrlJointCallBack(J3DJoint*, int); /* 80AF389C */ void setParam(); - /* 80AF39B8 */ void main(); - /* 80AF3B30 */ bool ctrlBtk(); + /* 80AF39B8 */ BOOL main(); + /* 80AF3B30 */ BOOL ctrlBtk(); /* 80AF3B38 */ void setAttnPos(); - /* 80AF4030 */ bool setMotionAnm(int, f32); + /* 80AF4030 */ void setMotionAnm(int, f32); /* 80AF4130 */ void setMotion(int, f32, int); - /* 80AF4174 */ bool drawDbgInfo(); + /* 80AF4174 */ int drawDbgInfo(); /* 80AF417C */ void drawOtherMdls(); - /* 80AF4228 */ void getTypeFromParam(); - /* 80AF4248 */ void isDelete(); + /* 80AF4228 */ u8 getTypeFromParam(); + /* 80AF4248 */ BOOL isDelete(); /* 80AF426C */ void reset(); /* 80AF43E4 */ void playMotion(); - /* 80AF4508 */ void chkAction(int (daNpc_SoldierB_c::*)(void*)); - /* 80AF4534 */ void setAction(int (daNpc_SoldierB_c::*)(void*)); - /* 80AF45DC */ void selectAction(); + /* 80AF4508 */ BOOL chkAction(int (daNpc_SoldierB_c::*)(void*)); + /* 80AF4534 */ BOOL setAction(int (daNpc_SoldierB_c::*)(void*)); + /* 80AF45DC */ BOOL selectAction(); /* 80AF465C */ void doNormalAction(int); - /* 80AF4770 */ void doEvent(); + /* 80AF4770 */ BOOL doEvent(); /* 80AF49E4 */ void setLookMode(int); /* 80AF4A08 */ void lookat(); - /* 80AF4CFC */ void wait(void*); - /* 80AF4DBC */ void talk(void*); - /* 80AF4F54 */ void ECut_listenLake(int); - /* 80AF50AC */ void test(void*); + /* 80AF4CFC */ int wait(void*); + /* 80AF4DBC */ int talk(void*); + /* 80AF4F54 */ int ECut_listenLake(int); + /* 80AF50AC */ int test(void*); static char* mEvtCutNameList[2]; - static u8 mEvtCutList[24]; + static cutFunc mEvtCutList[2]; private: - /* 0x568 */ u8 field_0x568[0xe20 - 0x568]; + /* 0xB48 */ Z2Creature mSound; + /* 0xBD8 */ J3DModel* mSpearModel; + /* 0xBDC */ daNpcF_Lookat_c mLookat; + /* 0xC78 */ daNpcF_ActorMngr_c mActorMngrs[3]; + /* 0xC90 */ NPC_SOLDIERB_HIO_CLASS* mHIO; + /* 0xC94 */ dCcD_Cyl mCyl; + /* 0xDD0 */ actionFunc mNextAction; + /* 0xDDC */ actionFunc mAction; + /* 0xDE8 */ request_of_phase_process_class mPhases[3]; + /* 0xE00 */ int field_0xe00; + /* 0xE04 */ int field_0xe04; + /* 0xE08 */ int field_0xe08; + /* 0xE0C */ int field_0xe0c; + /* 0xE10 */ int mMsgNo; + /* 0xE14 */ s16 mLookMode; + /* 0xE16 */ u16 mMode; + /* 0xE18 */ u8 mType; + /* 0xE1C */ int mAnm; }; STATIC_ASSERT(sizeof(daNpc_SoldierB_c) == 0xe20); -class daNpc_SoldierB_Param_c { -public: - /* 80AF5A68 */ ~daNpc_SoldierB_Param_c(); - - static u8 const m[108]; -}; - - #endif /* D_A_NPC_SOLDIERB_H */ diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index a5c8a122f82..42a3250100d 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -1,275 +1,112 @@ /** * @file d_a_npc_soldierB.cpp - * -*/ + * + */ -#include "d/dolzel_rel.h" // IWYU pragma: keep +#include "d/dolzel_rel.h" // IWYU pragma: keep -#include "d/actor/d_a_npc_soldierB.h" #include "Z2AudioLib/Z2Instances.h" -#include "dol2asm.h" +#include "d/actor/d_a_npc_soldierA.h" +#include "d/actor/d_a_npc_soldierB.h" -// -// Forward References: -// - -extern "C" void __ct__16daNpc_SoldierB_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__16daNpc_SoldierB_cFv(); -extern "C" void create__16daNpc_SoldierB_cFv(); -extern "C" void CreateHeap__16daNpc_SoldierB_cFv(); -extern "C" void Delete__16daNpc_SoldierB_cFv(); -extern "C" void Execute__16daNpc_SoldierB_cFv(); -extern "C" void Draw__16daNpc_SoldierB_cFv(); -extern "C" void ctrlJoint__16daNpc_SoldierB_cFP8J3DJointP8J3DModel(); -extern "C" void createHeapCallBack__16daNpc_SoldierB_cFP10fopAc_ac_c(); -extern "C" void ctrlJointCallBack__16daNpc_SoldierB_cFP8J3DJointi(); -extern "C" void setParam__16daNpc_SoldierB_cFv(); -extern "C" void main__16daNpc_SoldierB_cFv(); -extern "C" bool ctrlBtk__16daNpc_SoldierB_cFv(); -extern "C" void setAttnPos__16daNpc_SoldierB_cFv(); -extern "C" void setMotionAnm__16daNpc_SoldierB_cFif(); -extern "C" void setMotion__16daNpc_SoldierB_cFifi(); -extern "C" bool drawDbgInfo__16daNpc_SoldierB_cFv(); -extern "C" void drawOtherMdls__16daNpc_SoldierB_cFv(); -extern "C" void getTypeFromParam__16daNpc_SoldierB_cFv(); -extern "C" void isDelete__16daNpc_SoldierB_cFv(); -extern "C" void reset__16daNpc_SoldierB_cFv(); -extern "C" void playMotion__16daNpc_SoldierB_cFv(); -extern "C" void chkAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i(); -extern "C" void setAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i(); -extern "C" void selectAction__16daNpc_SoldierB_cFv(); -extern "C" void doNormalAction__16daNpc_SoldierB_cFi(); -extern "C" void doEvent__16daNpc_SoldierB_cFv(); -extern "C" void setLookMode__16daNpc_SoldierB_cFi(); -extern "C" void lookat__16daNpc_SoldierB_cFv(); -extern "C" static void s_sub__FPvPv(); -extern "C" void wait__16daNpc_SoldierB_cFPv(); -extern "C" void talk__16daNpc_SoldierB_cFPv(); -extern "C" void ECut_listenLake__16daNpc_SoldierB_cFi(); -extern "C" void test__16daNpc_SoldierB_cFPv(); -extern "C" static void daNpc_SoldierB_Create__FPv(); -extern "C" static void daNpc_SoldierB_Delete__FPv(); -extern "C" static void daNpc_SoldierB_Execute__FPv(); -extern "C" static void daNpc_SoldierB_Draw__FPv(); -extern "C" static bool daNpc_SoldierB_IsDelete__FPv(); -extern "C" void __dt__18daNpcF_ActorMngr_cFv(); -extern "C" void __ct__18daNpcF_ActorMngr_cFv(); -extern "C" void __dt__15daNpcF_Lookat_cFv(); -extern "C" void __dt__5csXyzFv(); -extern "C" void __ct__5csXyzFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" void __dt__8daNpcF_cFv(); -extern "C" void __ct__8daNpcF_cFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void adjustShapeAngle__8daNpcF_cFv(); -extern "C" void setCollisions__8daNpcF_cFv(); -extern "C" bool setExpressionAnm__8daNpcF_cFib(); -extern "C" bool setExpressionBtp__8daNpcF_cFi(); -extern "C" void setExpression__8daNpcF_cFif(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __sinit_d_a_npc_soldierB_cpp(); -extern "C" void __dt__22daNpc_SoldierB_Param_cFv(); -extern "C" static void func_80AF5AB0(); -extern "C" static void func_80AF5AB8(); -extern "C" u8 const m__22daNpc_SoldierB_Param_c[108]; -extern "C" extern char const* const d_a_npc_soldierB__stringBase0; -extern "C" void* mEvtCutNameList__16daNpc_SoldierB_c[2]; -extern "C" u8 mEvtCutList__16daNpc_SoldierB_c[24]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGs_wolfeye_effect_check__Fv(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void ChkPresentEnd__16dEvent_manager_cFv(); -extern "C" void addReal__21dDlst_shadowControl_cFUlP8J3DModel(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWallR__12dBgS_AcchCirFf(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void initialize__18daNpcF_ActorMngr_cFv(); -extern "C" void entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c(); -extern "C" void getActorP__18daNpcF_ActorMngr_cFv(); -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 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 setMtx__8daNpcF_cFv(); -extern "C" void setMtx2__8daNpcF_cFv(); -extern "C" void initialize__8daNpcF_cFv(); -extern "C" void getTrnsfrmKeyAnmP__8daNpcF_cFPci(); -extern "C" void setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii(); -extern "C" void setEnvTevColor__8daNpcF_cFv(); -extern "C" void setRoomNo__8daNpcF_cFv(); -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 initTalk__8daNpcF_cFiPP10fopAc_ac_c(); -extern "C" void talkProc__8daNpcF_cFPiiPP10fopAc_ac_c(); -extern "C" void step__8daNpcF_cFsiii(); -extern "C" void getDistTableIdx__8daNpcF_cFii(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_darkworld_check__Fv(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void __dt__10dMsgFlow_cFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_chaseS__FPsss(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz(); -extern "C" void __ct__10Z2CreatureFv(); -extern "C" void __dt__10Z2CreatureFv(); -extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void __ptmf_test(); -extern "C" void __ptmf_cmpr(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mCurrentMtx__6J3DSys[48]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80AF5BF4-80AF5BF4 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AF5BF4 = "chtSolB"; -SECTION_DEAD static char const* const stringBase_80AF5BFC = ""; -SECTION_DEAD static char const* const stringBase_80AF5BFD = "LISTEN_LAKE"; -#pragma pop - -/* 80AF5C30-80AF5C40 000020 0010+00 1/1 0/0 0/0 .data l_bmdGetParamList */ -SECTION_DATA static u8 l_bmdGetParamList[16] = { - 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, +enum Joint { + /* 0x00 */ JNT_CENTER, + /* 0x01 */ JNT_BACKBONE1, + /* 0x02 */ JNT_BACKBONE2, + /* 0x03 */ JNT_NECK, + /* 0x04 */ JNT_HEAD, + /* 0x05 */ JNT_SHOULDERL, + /* 0x06 */ JNT_ARM1L, + /* 0x07 */ JNT_ARM2L, + /* 0x08 */ JNT_HANDL, + /* 0x09 */ JNT_FINGERL, + /* 0x0A */ JNT_THUMBL, + /* 0x0B */ JNT_SHOULDERR, + /* 0x0C */ JNT_ARM1R, + /* 0x0D */ JNT_ARM2R, + /* 0x0E */ JNT_HANDR, + /* 0x0F */ JNT_FINGERR, + /* 0x10 */ JNT_THUMBR, + /* 0x11 */ JNT_WAIST, + /* 0x12 */ JNT_LEG1L, + /* 0x13 */ JNT_LEG2L, + /* 0x14 */ JNT_FOOTL, + /* 0x15 */ JNT_LEG1R, + /* 0x16 */ JNT_LEG2R, + /* 0x17 */ JNT_FOOTR, + /* 0x18 */ JNT_SAYA }; +enum Animation { + /* 0x0 */ ANM_NONE, + /* 0x1 */ ANM_WAIT_A, + /* 0x2 */ ANM_FEAR_WAIT, + /* 0x3 */ ANM_FEAR_TALK, + /* 0x4 */ ANM_WAIT, + /* 0x5 */ ANM_TALK_A, + /* 0x6 */ ANM_TALK_B, +}; + +enum Motion { + /* 0x0 */ MOT_WAIT, + /* 0x1 */ MOT_TALK_B, + /* 0x2 */ MOT_TALK_A, + /* 0x3 */ MOT_FEAR_WAIT, + /* 0x4 */ MOT_FEAR_TALK, + /* 0x5 */ MOT_WAIT_A, +}; + +enum Event { + /* 0x0 */ EVT_NONE, + /* 0x1 */ EVT_TALK_LAKE, +}; + +enum Event_Cut_Nums { + /* 0x3 */ NUM_EVT_CUTS_e = 0x3, +}; + +/* 80AF5E7C-80AF5E80 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ +static NPC_SOLDIERB_HIO_CLASS l_HIO; + +/* 80AF5C30-80AF5C40 000020 0010+00 1/1 0/0 0/0 .data l_bmdGetParamList */ +static daNpc_GetParam1 l_bmdGetParamList[2] = {{10, 0}, {9, 0}}; + /* 80AF5C40-80AF5C60 000030 0020+00 1/1 0/0 0/0 .data l_bckGetParamList */ -SECTION_DATA static u8 l_bckGetParamList[32] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, +static daNpc_GetParam1 l_bckGetParamList[4] = { + {-1, 0}, + {4, 0}, + {6, 0}, + {5, 0}, }; /* 80AF5C60-80AF5C68 000050 0008+00 0/1 0/0 0/0 .data l_evtGetParamList */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_evtGetParamList[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static daNpc_GetParam1 l_evtGetParamList[1] = { + {0, 0}, }; -#pragma pop /* 80AF5C68-80AF5C6C 000058 0004+00 0/1 0/0 0/0 .data l_evtNames */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_evtNames[4] = { - 0x00, - 0x00, - 0x00, - 0x00, +static char* l_evtNames[1] = { + NULL, }; -#pragma pop /* 80AF5C6C-80AF5C78 00005C 000C+00 1/0 0/0 0/0 .data l_loadRes_SOLDIERba */ -SECTION_DATA static u8 l_loadRes_SOLDIERba[12] = { - 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +static int l_loadRes_SOLDIERba[3] = { + 0, + -1, + -1, }; /* 80AF5C78-80AF5C84 000068 000C+00 1/0 0/0 0/0 .data l_loadRes_SOLDIERb0 */ -SECTION_DATA static u8 l_loadRes_SOLDIERb0[12] = { - 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, +static int l_loadRes_SOLDIERb0[3] = { + 0, + -1, + -1, }; /* 80AF5C84-80AF5C8C -00001 0008+00 2/2 0/0 0/0 .data l_loadRes_list */ -SECTION_DATA static void* l_loadRes_list[2] = { - (void*)&l_loadRes_SOLDIERba, - (void*)&l_loadRes_SOLDIERb0, +static int* l_loadRes_list[2] = { + l_loadRes_SOLDIERba, + l_loadRes_SOLDIERb0, }; /* 80AF5C8C-80AF5C90 -00001 0004+00 4/5 0/0 0/0 .data l_resNames */ @@ -285,796 +122,941 @@ char* daNpc_SoldierB_c::mEvtCutNameList[2] = { "LISTEN_LAKE", }; -/* 80AF5C9C-80AF5CA8 -00001 000C+00 1/1 0/0 0/0 .data @4024 */ -SECTION_DATA static void* lit_4024[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)ECut_listenLake__16daNpc_SoldierB_cFi, -}; - /* 80AF5CA8-80AF5CC0 000098 0018+00 1/2 0/0 0/0 .data mEvtCutList__16daNpc_SoldierB_c */ -SECTION_DATA u8 daNpc_SoldierB_c::mEvtCutList[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AF5CC0-80AF5CCC -00001 000C+00 1/1 0/0 0/0 .data @4468 */ -SECTION_DATA static void* lit_4468[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)test__16daNpc_SoldierB_cFPv, -}; - -/* 80AF5CCC-80AF5CD8 -00001 000C+00 1/1 0/0 0/0 .data @4942 */ -SECTION_DATA static void* lit_4942[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)test__16daNpc_SoldierB_cFPv, -}; - -/* 80AF5CD8-80AF5CE4 -00001 000C+00 1/1 0/0 0/0 .data @4946 */ -SECTION_DATA static void* lit_4946[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait__16daNpc_SoldierB_cFPv, -}; - -/* 80AF5CE4-80AF5CF0 -00001 000C+00 0/1 0/0 0/0 .data @4986 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4986[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__16daNpc_SoldierB_cFPv, -}; -#pragma pop - -/* 80AF5CF0-80AF5CFC -00001 000C+00 0/1 0/0 0/0 .data @4994 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4994[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talk__16daNpc_SoldierB_cFPv, -}; -#pragma pop - -/* 80AF5CFC-80AF5D1C -00001 0020+00 1/0 0/0 0/0 .data daNpc_SoldierB_MethodTable */ -static actor_method_class daNpc_SoldierB_MethodTable = { - (process_method_func)daNpc_SoldierB_Create__FPv, - (process_method_func)daNpc_SoldierB_Delete__FPv, - (process_method_func)daNpc_SoldierB_Execute__FPv, - (process_method_func)daNpc_SoldierB_IsDelete__FPv, - (process_method_func)daNpc_SoldierB_Draw__FPv, -}; - -/* 80AF5D1C-80AF5D4C -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_SOLDIERb */ -extern actor_process_profile_definition g_profile_NPC_SOLDIERb = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SOLDIERb, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_SoldierB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 400, // mPriority - &daNpc_SoldierB_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80AF5D4C-80AF5D94 00013C 0048+00 2/2 0/0 0/0 .data __vt__16daNpc_SoldierB_c */ -SECTION_DATA extern void* __vt__16daNpc_SoldierB_c[18] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daNpc_SoldierB_cFv, - (void*)setParam__16daNpc_SoldierB_cFv, - (void*)main__16daNpc_SoldierB_cFv, - (void*)ctrlBtk__16daNpc_SoldierB_cFv, - (void*)adjustShapeAngle__8daNpcF_cFv, - (void*)setMtx__8daNpcF_cFv, - (void*)setMtx2__8daNpcF_cFv, - (void*)setAttnPos__16daNpc_SoldierB_cFv, - (void*)setCollisions__8daNpcF_cFv, - (void*)setExpressionAnm__8daNpcF_cFib, - (void*)setExpressionBtp__8daNpcF_cFi, - (void*)setExpression__8daNpcF_cFif, - (void*)setMotionAnm__16daNpc_SoldierB_cFif, - (void*)setMotion__16daNpc_SoldierB_cFifi, - (void*)drawDbgInfo__16daNpc_SoldierB_cFv, - (void*)drawOtherMdls__16daNpc_SoldierB_cFv, -}; - -/* 80AF5D94-80AF5DA0 000184 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80AF5DA0-80AF5DC4 000190 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80AF5AB8, - (void*)NULL, - (void*)NULL, - (void*)func_80AF5AB0, -}; - -/* 80AF5DC4-80AF5DD0 0001B4 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80AF5DD0-80AF5DDC 0001C0 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80AF5DDC-80AF5DE8 0001CC 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80AF5DE8-80AF5DF4 0001D8 000C+00 4/4 0/0 0/0 .data __vt__18daNpcF_ActorMngr_c */ -SECTION_DATA extern void* __vt__18daNpcF_ActorMngr_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18daNpcF_ActorMngr_cFv, -}; - -/* 80AF5DF4-80AF5E00 0001E4 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80AF5E00-80AF5E0C 0001F0 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80AF5E0C-80AF5E18 0001FC 000C+00 3/3 0/0 0/0 .data __vt__15daNpcF_Lookat_c */ -SECTION_DATA extern void* __vt__15daNpcF_Lookat_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daNpcF_Lookat_cFv, +daNpc_SoldierB_c::cutFunc daNpc_SoldierB_c::mEvtCutList[2] = { + NULL, + &daNpc_SoldierB_c::ECut_listenLake, }; /* 80AF2CAC-80AF2E30 0000EC 0184+00 1/1 0/0 0/0 .text __ct__16daNpc_SoldierB_cFv */ -daNpc_SoldierB_c::daNpc_SoldierB_c() { - // NONMATCHING -} - -/* 80AF2E30-80AF2E78 000270 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80AF2E78-80AF2EC0 0002B8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} +daNpc_SoldierB_c::daNpc_SoldierB_c() {} /* 80AF2EC0-80AF30C0 000300 0200+00 1/0 0/0 0/0 .text __dt__16daNpc_SoldierB_cFv */ daNpc_SoldierB_c::~daNpc_SoldierB_c() { - // NONMATCHING + for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) { + dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]); + } + + if (heap != NULL) { + mAnm_p->stopZelAnime(); + } } -/* ############################################################################################## */ /* 80AF5AD4-80AF5B40 000000 006C+00 11/11 0/0 0/0 .rodata m__22daNpc_SoldierB_Param_c */ -SECTION_RODATA u8 const daNpc_SoldierB_Param_c::m[108] = { - 0x41, 0xF0, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, - 0x43, 0x7F, 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, - 0x41, 0xF0, 0x00, 0x00, 0xC1, 0xF0, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0xC2, 0x34, 0x00, 0x00, - 0x3F, 0x19, 0x99, 0x9A, 0x41, 0x40, 0x00, 0x00, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x06, - 0x43, 0x34, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +daNpc_SoldierB_HIOParam const daNpc_SoldierB_Param_c::m = { + 30.0f, // attention_offset + -4.0f, // gravity + 1.0f, // scale + 600.0f, // real_shadow_size + 255.0f, // weight + 240.0f, // height + 35.0f, // knee_length + 45.0f, // width + 0.0f, // body_angleX_max + 0.0f, // body_angleX_min + 10.0f, // body_angleY_max + -10.0f, // body_angleY_min + 30.0f, // head_angleX_max + -30.0f, // head_angleX_min + 45.0f, // head_angleY_max + -45.0f, // head_angleY_min + 0.6f, // neck_rotation_ratio + 12.0f, // morf_frame + 5, // talk_distance + 6, // talk_angle + 7, // attention_distance + 6, // attention_angle + 180.0f, // fov + 500.0f, // search_distance + 300.0f, // search_height + -300.0f, // search_depth + 60, // attention_time + 8, // damage_time + 0, // face_expression + 0, // motion + 0, // look_mode + false, // debug_mode_ON + false, // debug_info_ON }; -COMPILER_STRIP_GATE(0x80AF5AD4, &daNpc_SoldierB_Param_c::m); - -/* 80AF5B40-80AF5B44 00006C 0004+00 0/1 0/0 0/0 .rodata @4399 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4399 = -300.0f; -COMPILER_STRIP_GATE(0x80AF5B40, &lit_4399); -#pragma pop - -/* 80AF5B44-80AF5B48 000070 0004+00 0/1 0/0 0/0 .rodata @4400 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4400 = -50.0f; -COMPILER_STRIP_GATE(0x80AF5B44, &lit_4400); -#pragma pop - -/* 80AF5B48-80AF5B4C 000074 0004+00 0/1 0/0 0/0 .rodata @4401 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4401 = 300.0f; -COMPILER_STRIP_GATE(0x80AF5B48, &lit_4401); -#pragma pop - -/* 80AF5B4C-80AF5B50 000078 0004+00 0/1 0/0 0/0 .rodata @4402 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4402 = 450.0f; -COMPILER_STRIP_GATE(0x80AF5B4C, &lit_4402); -#pragma pop /* 80AF30C0-80AF33A0 000500 02E0+00 1/1 0/0 0/0 .text create__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::create() { - // NONMATCHING +cPhs__Step daNpc_SoldierB_c::create() { + mTwilight = dKy_darkworld_check(); + + fopAcM_ct(this, daNpc_SoldierB_c); + + mType = getTypeFromParam(); + + if (home.angle.x != 0xFFFF) { + mMsgNo = home.angle.x; + } else { + mMsgNo = -1; + } + + if (isDelete()) { + return cPhs_ERROR_e; + } + + int res_count = 0; + int i = 0; + for (; l_loadRes_list[mType][i] >= 0; i++) { + cPhs__Step phase = + (cPhs__Step)dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]); + if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) { + return cPhs_ERROR_e; + } + + if (phase == cPhs_COMPLEATE_e) { + res_count++; + } + } + + if (res_count == i) { + if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x2CE0)) { + return cPhs_ERROR_e; + } + + J3DModelData* modelData = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); + mSound.init(¤t.pos, &eyePos, 3, 1); + + mAcchCir.SetWall(mHIO->m.common.width, mHIO->m.common.knee_length); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); + mCcStts.Init(mHIO->m.common.weight, 0, this); + mCyl.Set(mCcDCyl); + mCyl.SetStts(&mCcStts); + mCyl.SetTgHitCallback(tgHitCallBack); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + mGroundH = mAcch.GetGroundH(); + + setEnvTevColor(); + setRoomNo(); + reset(); + Execute(); + + return cPhs_COMPLEATE_e; + } + + return cPhs_INIT_e; } -/* ############################################################################################## */ -/* 80AF5B50-80AF5B54 00007C 0004+00 2/2 0/0 0/0 .rodata @4453 */ -SECTION_RODATA static f32 const lit_4453 = 1.0f; -COMPILER_STRIP_GATE(0x80AF5B50, &lit_4453); - -/* 80AF5B54-80AF5B58 000080 0004+00 4/6 0/0 0/0 .rodata @4454 */ -SECTION_RODATA static u8 const lit_4454[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5B54, &lit_4454); - /* 80AF33A0-80AF356C 0007E0 01CC+00 1/1 0/0 0/0 .text CreateHeap__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::CreateHeap() { - // NONMATCHING +int daNpc_SoldierB_c::CreateHeap() { + J3DModelData* mdlData_p = NULL; + J3DModel* model = NULL; + + if (l_bmdGetParamList[0].fileIdx >= 0) { + mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[0].arcIdx], + l_bmdGetParamList[0].fileIdx); + } + + u32 uVar1 = 0x11020284; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + J3DMdlFlag_DifferedDLBuffer, uVar1); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; + } + + if (mAnm_p == NULL) { + return 0; + } + + model = mAnm_p->getModel(); + for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { + mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); + } + model->setUserArea((uintptr_t)this); + + setMotionAnm(ANM_FEAR_WAIT, 0.0f); + + int arcIdx = 0; + arcIdx = l_bmdGetParamList[1].arcIdx; + mdlData_p = + (J3DModelData*)dComIfG_getObjectRes(l_resNames[arcIdx], l_bmdGetParamList[1].fileIdx); + if (mdlData_p != NULL) { + mSpearModel = mDoExt_J3DModel__create(mdlData_p, J3DMdlFlag_DifferedDLBuffer, 0x11000084); + if (mSpearModel == NULL) { + return 0; + } + } else { + return 0; + } + + return 1; } /* 80AF356C-80AF35A0 0009AC 0034+00 1/1 0/0 0/0 .text Delete__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::Delete() { - // NONMATCHING +int daNpc_SoldierB_c::Delete() { + fpc_ProcID id = fopAcM_GetID(this); + this->~daNpc_SoldierB_c(); + return 1; } /* 80AF35A0-80AF35C0 0009E0 0020+00 2/2 0/0 0/0 .text Execute__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::Execute() { - // NONMATCHING +int daNpc_SoldierB_c::Execute() { + return execute(); } /* 80AF35C0-80AF3634 000A00 0074+00 1/1 0/0 0/0 .text Draw__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::Draw() { - // NONMATCHING +int daNpc_SoldierB_c::Draw() { + return draw(chkAction(&daNpc_SoldierB_c::test), FALSE, mHIO->m.common.real_shadow_size, NULL, + FALSE); } -/* ############################################################################################## */ -/* 80AF5B58-80AF5B64 000084 000C+00 1/1 0/0 0/0 .rodata @4477 */ -SECTION_RODATA static u8 const lit_4477[12] = { - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, -}; -COMPILER_STRIP_GATE(0x80AF5B58, &lit_4477); - /* 80AF3634-80AF3830 000A74 01FC+00 1/1 0/0 0/0 .text * ctrlJoint__16daNpc_SoldierB_cFP8J3DJointP8J3DModel */ -void daNpc_SoldierB_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - // NONMATCHING +int daNpc_SoldierB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { + int jntNo = i_joint->getJntNo(); + int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; + + if (jntNo == JNT_CENTER) { + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::multVecZero(&mLookatPos[0]); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::multVecZero(&mLookatPos[1]); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::multVecZero(&mLookatPos[2]); + } + + mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo)); + + switch (jntNo) { + case JNT_BACKBONE1: + case JNT_NECK: + case JNT_HEAD: + setLookatMtx(jntNo, i_jointList, mHIO->m.common.neck_rotation_ratio); + break; + } + + if (jntNo == JNT_BACKBONE1) { + mDoMtx_stack_c::YrotM(-field_0x908[0].z); + mDoMtx_stack_c::ZrotM(field_0x908[0].x); + } else if (jntNo == JNT_HEAD) { + mDoMtx_stack_c::YrotM(-field_0x908[2].z); + mDoMtx_stack_c::ZrotM(field_0x908[2].x); + } + + i_model->setAnmMtx(jntNo, mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + + return 1; } /* 80AF3830-80AF3850 000C70 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__16daNpc_SoldierB_cFP10fopAc_ac_c */ -void daNpc_SoldierB_c::createHeapCallBack(fopAc_ac_c* param_0) { - // NONMATCHING +int daNpc_SoldierB_c::createHeapCallBack(fopAc_ac_c* i_this) { + daNpc_SoldierB_c* actor = (daNpc_SoldierB_c*)i_this; + return actor->CreateHeap(); } /* 80AF3850-80AF389C 000C90 004C+00 1/1 0/0 0/0 .text * ctrlJointCallBack__16daNpc_SoldierB_cFP8J3DJointi */ -void daNpc_SoldierB_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) { - // NONMATCHING +int daNpc_SoldierB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { + if (param_2 == 0) { + J3DModel* model = j3dSys.getModel(); + daNpc_SoldierB_c* actor = (daNpc_SoldierB_c*)model->getUserArea(); + if (actor != NULL) { + actor->ctrlJoint(i_joint, model); + } + } + + return 1; } /* 80AF389C-80AF39B8 000CDC 011C+00 1/0 0/0 0/0 .text setParam__16daNpc_SoldierB_cFv */ void daNpc_SoldierB_c::setParam() { - // NONMATCHING + actionFunc action = mNextAction; + + selectAction(); + + if (mNextAction != action) { + /* Bug??? - Loop never actually runs */ + for (int i = 3; i < 3; i++) { + mActorMngrs[i].initialize(); + } + } + + field_0xe00 = 0; + field_0xe04 = 0; + + s16 talk_distance, talk_angle, attention_distance, attention_angle; + attention_distance = 3; + attention_angle = 6; + talk_distance = 5; + talk_angle = 6; + + attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(talk_distance, talk_angle); + attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; + attention_info.distances[fopAc_attn_SPEAK_e] = + getDistTableIdx(attention_distance, attention_angle); + attention_info.flags = 0; + scale.set(mHIO->m.common.scale, mHIO->m.common.scale, mHIO->m.common.scale); + mAcchCir.SetWallR(mHIO->m.common.width); + mAcchCir.SetWallH(mHIO->m.common.knee_length); + + if (!dComIfGp_event_runCheck()) { + gravity = mHIO->m.common.gravity; + } } /* 80AF39B8-80AF3B30 000DF8 0178+00 1/0 0/0 0/0 .text main__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::main() { - // NONMATCHING +BOOL daNpc_SoldierB_c::main() { + if (!doEvent()) { + doNormalAction(1); + } + + if (checkHide()) { + attention_info.flags = 0; + } + + if (!mHIO->m.common.debug_mode_ON) { + if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) { + if (mOrderEvtNo != EVT_NONE) { + eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); + } + + orderEvent(mOrderSpeakEvt, l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx], 0xFFFF, + 0x28, 0xFF, 1); + } + } + + if (field_0x9ee) { + mExpressionMorfOverride = 0.0f; + mMotionMorfOverride = 0.0f; + field_0x9ee = false; + } + + playMotion(); + + return TRUE; } /* 80AF3B30-80AF3B38 000F70 0008+00 1/0 0/0 0/0 .text ctrlBtk__16daNpc_SoldierB_cFv */ -bool daNpc_SoldierB_c::ctrlBtk() { - return false; +BOOL daNpc_SoldierB_c::ctrlBtk() { + return FALSE; } -/* ############################################################################################## */ -/* 80AF5B64-80AF5B68 000090 0004+00 0/1 0/0 0/0 .rodata @4790 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4790 = 20.0f; -COMPILER_STRIP_GATE(0x80AF5B64, &lit_4790); -#pragma pop - -/* 80AF5B68-80AF5B6C 000094 0004+00 0/1 0/0 0/0 .rodata @4791 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4791 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80AF5B68, &lit_4791); -#pragma pop - -/* 80AF5B6C-80AF5B74 000098 0004+04 0/1 0/0 0/0 .rodata @4792 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4792[1 + 1 /* padding */] = { - 125.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80AF5B6C, &lit_4792); -#pragma pop - -/* 80AF5B74-80AF5B7C 0000A0 0008+00 0/1 0/0 0/0 .rodata @4793 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4793[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5B74, &lit_4793); -#pragma pop - -/* 80AF5B7C-80AF5B84 0000A8 0008+00 0/1 0/0 0/0 .rodata @4794 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4794[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5B7C, &lit_4794); -#pragma pop - -/* 80AF5B84-80AF5B8C 0000B0 0008+00 0/1 0/0 0/0 .rodata @4795 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4795[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5B84, &lit_4795); -#pragma pop - -/* 80AF5E70-80AF5E7C 000048 000C+00 1/1 0/0 0/0 .bss @4023 */ -static u8 lit_4023[12]; - -/* 80AF5E7C-80AF5E80 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[4]; - -/* 80AF5E80-80AF5E90 000058 000C+04 0/1 0/0 0/0 .bss @4642 */ -#pragma push -#pragma force_active on -static u8 lit_4642[12 + 4 /* padding */]; -#pragma pop - -/* 80AF5E90-80AF5E9C 000068 000C+00 0/1 0/0 0/0 .bss eyeOffset$4641 */ -#pragma push -#pragma force_active on -static u8 eyeOffset[12]; -#pragma pop - /* 80AF3B38-80AF4030 000F78 04F8+00 1/0 0/0 0/0 .text setAttnPos__16daNpc_SoldierB_cFv */ void daNpc_SoldierB_c::setAttnPos() { - // NONMATCHING + static cXyz eyeOffset(0.0f, 20.0f, 0.0f); + cXyz sp74, sp80, sp8c, sp98; + f32 attn_offset = mHIO->m.common.attention_offset; + + mDoMtx_stack_c::YrotS(field_0x990); + cLib_addCalc2(&field_0x984[0], 0.0f, 0.1f, 125.0f); + cLib_addCalc2(&field_0x984[2], 0.0f, 0.1f, 125.0f); + + for (int i = 0; i < 3; i++) { + sp8c.set(0.0f, 0.0f, field_0x984[i] * cM_ssin(field_0x992)); + mDoMtx_stack_c::multVec(&sp8c, &sp98); + field_0x908[i].x = -sp98.z; + field_0x908[i].z = -sp98.x; + } + + cLib_chaseS(&field_0x992, 0, 0x555); + + if (mLookMode == LOOK_RESET) { + for (int i = 0; i < 3; i++) { + mLookatAngle[i].setall(0); + } + } + + setMtx(); + lookat(); + + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::multVecZero(&mHeadPos); + mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); + mDoMtx_stack_c::multVec(&eyeOffset, &sp8c); + mHeadAngle.x = cLib_targetAngleX(&mHeadPos, &sp8c); + mHeadAngle.y = cLib_targetAngleY(&mHeadPos, &sp8c); + + cXyz* attn_pos = mLookat.getAttnPos(); + if (attn_pos != NULL) { + sp80 = *attn_pos - eyePos; + mEyeAngle.y = -(mLookatAngle[2].y + mCurAngle.y); + mEyeAngle.y += cM_atan2s(sp80.x, sp80.z); + mEyeAngle.x = -cM_atan2s(sp80.y, sp80.absXZ()); + mEyeAngle.x += mHeadAngle.x; + } else { + mEyeAngle.y = 0; + mEyeAngle.x = 0; + } + + f32 fVar2 = 0.0f; + f32 fVar3 = 0.0f; + f32 fVar4 = 0.0f; + sp80.set(0.0f, 0.0f, 0.0f); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(mCurAngle.x, mCurAngle.y, mCurAngle.z); + mDoMtx_stack_c::multVec(&sp80, &sp74); + attention_info.position.set(mHeadPos.x, mHeadPos.y + attn_offset, mHeadPos.z); + + if (!mHide) { + if (!mIsDamaged) { + mCyl.SetTgType(0xD8FBFDFF); + mCyl.SetTgSPrm(0x1F); + mCyl.OnTgNoHitMark(); + } else { + mCyl.SetTgType(0); + mCyl.SetTgSPrm(0); + } + + mCyl.SetC(sp74); + mCyl.SetH(mHIO->m.common.height + fVar3); + mCyl.SetR(mHIO->m.common.width + fVar4); + dComIfG_Ccsp()->Set(&mCyl); + } + + mCyl.ClrTgHit(); } /* 80AF4030-80AF4130 001470 0100+00 1/0 0/0 0/0 .text setMotionAnm__16daNpc_SoldierB_cFif */ -bool daNpc_SoldierB_c::setMotionAnm(int param_0, f32 param_1) { - // NONMATCHING +void daNpc_SoldierB_c::setMotionAnm(int i_idx, f32 i_morf) { + J3DAnmTransformKey* anm = NULL; + int attr = J3DFrameCtrl::EMode_LOOP; + + mAnmFlags &= ~ANM_MOTION_FLAGS; + + if (l_bckGetParamList[i_idx].fileIdx >= 0) { + anm = getTrnsfrmKeyAnmP(l_resNames[l_bckGetParamList[i_idx].arcIdx], + l_bckGetParamList[i_idx].fileIdx); + } + + mAnm = i_idx; + + switch (i_idx) { + case ANM_WAIT_A: + case ANM_FEAR_WAIT: + break; + + case ANM_FEAR_TALK: + attr = J3DFrameCtrl::EMode_NONE; + break; + + default: + anm = NULL; + break; + } + + if (anm != NULL && setMcaMorfAnm(anm, 1.0f, i_morf, attr, 0, -1)) { + mAnmFlags |= ANM_PLAY_MORF | ANM_PAUSE_MORF; + mMotionLoops = 0; + } } /* 80AF4130-80AF4174 001570 0044+00 1/0 0/0 0/0 .text setMotion__16daNpc_SoldierB_cFifi */ -void daNpc_SoldierB_c::setMotion(int param_0, f32 param_1, int param_2) { - // NONMATCHING +void daNpc_SoldierB_c::setMotion(int i_motion, f32 i_morf, int param_3) { + s16 motion = i_motion; + if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 3) { + mMotion = motion; + mMotionMorfOverride = i_morf; + mMotionPrevPhase = -1; + mMotionPhase = 0; + } } /* 80AF4174-80AF417C 0015B4 0008+00 1/0 0/0 0/0 .text drawDbgInfo__16daNpc_SoldierB_cFv */ -bool daNpc_SoldierB_c::drawDbgInfo() { - return false; +int daNpc_SoldierB_c::drawDbgInfo() { + return 0; } /* 80AF417C-80AF4228 0015BC 00AC+00 1/0 0/0 0/0 .text drawOtherMdls__16daNpc_SoldierB_cFv */ void daNpc_SoldierB_c::drawOtherMdls() { - // NONMATCHING + g_env_light.setLightTevColorType_MAJI(mSpearModel, &tevStr); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HANDR)); + mDoMtx_stack_c::scaleM(scale); + mSpearModel->setBaseTRMtx(mDoMtx_stack_c::get()); + J3DModelData* mdlData_p = mSpearModel->getModelData(); + fopAcM_setEffectMtx(this, mdlData_p); + mDoExt_modelUpdateDL(mSpearModel); + dComIfGd_addRealShadow(mShadowKey, mSpearModel); } /* 80AF4228-80AF4248 001668 0020+00 1/1 0/0 0/0 .text getTypeFromParam__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::getTypeFromParam() { - // NONMATCHING +u8 daNpc_SoldierB_c::getTypeFromParam() { + u8 param = fopAcM_GetParam(this) & 0xFF; + switch (param) { + case 0: + return 0; + default: + return 1; + } } /* 80AF4248-80AF426C 001688 0024+00 1/1 0/0 0/0 .text isDelete__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::isDelete() { - // NONMATCHING +BOOL daNpc_SoldierB_c::isDelete() { + if (mType == 0 || mType == 1) { + return FALSE; + } + + return TRUE; } /* 80AF426C-80AF43E4 0016AC 0178+00 1/1 0/0 0/0 .text reset__16daNpc_SoldierB_cFv */ void daNpc_SoldierB_c::reset() { - // NONMATCHING + initialize(); + mLookat.initialize(); + for (int i = 0; i < 3; i++) { + mActorMngrs[i].initialize(); + } + + mNextAction = NULL; + mAction = NULL; + field_0xe00 = 0; + field_0xe04 = 0; + field_0xe08 = 0; + field_0xe0c = 0; + mLookMode = -1; + mMode = 0; + current.pos = home.pos; + old.pos = current.pos; + current.angle.set(0, home.angle.y, 0); + old.angle = current.angle; + shape_angle = current.angle; + mCurAngle = current.angle; + mOldAngle = mCurAngle; + speedF = 0.0f; + speed.setall(0.0f); + field_0x9ee = true; } -/* ############################################################################################## */ -/* 80AF5B8C-80AF5B98 0000B8 000C+00 0/1 0/0 0/0 .rodata @4906 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4906[12] = { - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5B8C, &lit_4906); -#pragma pop - -/* 80AF5B98-80AF5B9C 0000C4 0004+00 0/1 0/0 0/0 .rodata @4907 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4907[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5B98, &lit_4907); -#pragma pop - -/* 80AF5B9C-80AF5BA8 0000C8 000C+00 0/1 0/0 0/0 .rodata @4908 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4908[12] = { - 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80AF5B9C, &lit_4908); -#pragma pop - -/* 80AF5BA8-80AF5BB4 0000D4 000C+00 0/1 0/0 0/0 .rodata @4909 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4909[12] = { - 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5BA8, &lit_4909); -#pragma pop - -/* 80AF5BB4-80AF5BBC 0000E0 0008+00 0/1 0/0 0/0 .rodata @4910 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4910[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5BB4, &lit_4910); -#pragma pop - -/* 80AF5BBC-80AF5BC8 0000E8 000C+00 0/1 0/0 0/0 .rodata @4911 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4911[12] = { - 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5BBC, &lit_4911); -#pragma pop - -/* 80AF5BC8-80AF5BCC 0000F4 0004+00 0/1 0/0 0/0 .rodata @4912 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4912[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5BC8, &lit_4912); -#pragma pop - -/* 80AF5BCC-80AF5BD8 0000F8 000C+00 0/1 0/0 0/0 .rodata @4913 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4913[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5BCC, &lit_4913); -#pragma pop - /* 80AF43E4-80AF4508 001824 0124+00 1/1 0/0 0/0 .text playMotion__16daNpc_SoldierB_cFv */ void daNpc_SoldierB_c::playMotion() { - // NONMATCHING + daNpcF_anmPlayData dat0 = {ANM_FEAR_WAIT, mHIO->m.common.morf_frame, 0}; + daNpcF_anmPlayData* pDat0[1] = {&dat0}; + daNpcF_anmPlayData dat1a = {ANM_FEAR_TALK, mHIO->m.common.morf_frame, 1}; + daNpcF_anmPlayData dat1b = {ANM_FEAR_WAIT, 0.0f, 0}; + daNpcF_anmPlayData* pDat1[2] = {&dat1a, &dat1b}; + daNpcF_anmPlayData dat2 = {ANM_WAIT_A, mHIO->m.common.morf_frame, 0}; + daNpcF_anmPlayData* pDat2[1] = {&dat2}; + + daNpcF_anmPlayData** ppDat[3] = {pDat0, pDat1, pDat2}; + + if (mMotion >= 0 && mMotion < 3) { + playMotionAnm(ppDat); + } } /* 80AF4508-80AF4534 001948 002C+00 2/2 0/0 0/0 .text * chkAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i */ -void daNpc_SoldierB_c::chkAction(int (daNpc_SoldierB_c::*param_0)(void*)) { - // NONMATCHING +BOOL daNpc_SoldierB_c::chkAction(actionFunc action) { + return mAction == action; } /* 80AF4534-80AF45DC 001974 00A8+00 2/2 0/0 0/0 .text * setAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i */ -void daNpc_SoldierB_c::setAction(int (daNpc_SoldierB_c::*param_0)(void*)) { - // NONMATCHING +BOOL daNpc_SoldierB_c::setAction(actionFunc action) { + mMode = 3; + + if (mAction) { + (this->*mAction)(NULL); + } + + mMode = 0; + mAction = action; + + if (mAction) { + (this->*mAction)(NULL); + } + + return TRUE; } /* 80AF45DC-80AF465C 001A1C 0080+00 1/1 0/0 0/0 .text selectAction__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::selectAction() { - // NONMATCHING +BOOL daNpc_SoldierB_c::selectAction() { + mNextAction = NULL; + + if (mHIO->m.common.debug_mode_ON) { + mNextAction = &daNpc_SoldierB_c::test; + } else { + mNextAction = &daNpc_SoldierB_c::wait; + } + + return TRUE; } /* 80AF465C-80AF4770 001A9C 0114+00 1/1 0/0 0/0 .text doNormalAction__16daNpc_SoldierB_cFi */ -void daNpc_SoldierB_c::doNormalAction(int param_0) { - // NONMATCHING +void daNpc_SoldierB_c::doNormalAction(int param_1) { + if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) { + int damage_time = + mCutType == daPy_py_c::CUT_TYPE_TURN_RIGHT ? 20 : mHIO->m.common.damage_time; + setDamage(damage_time, -1, 0); + setLookMode(LOOK_RESET); + } else if (mIsDamaged && mDamageTimer == 0) { + mMode = 0; + mIsDamaged = false; + } + + mOrderEvtNo = EVT_NONE; + if (mNextAction) { + if (mAction == mNextAction) { + (this->*mAction)(NULL); + } else { + setAction(mNextAction); + } + } } -/* ############################################################################################## */ -/* 80AF5BD8-80AF5BDC 000104 0004+00 4/4 0/0 0/0 .rodata @5036 */ -SECTION_RODATA static f32 const lit_5036 = -1.0f; -COMPILER_STRIP_GATE(0x80AF5BD8, &lit_5036); - /* 80AF4770-80AF49E4 001BB0 0274+00 1/1 0/0 0/0 .text doEvent__16daNpc_SoldierB_cFv */ -void daNpc_SoldierB_c::doEvent() { - // NONMATCHING +BOOL daNpc_SoldierB_c::doEvent() { + BOOL rv = FALSE; + + if (dComIfGp_event_runCheck() != FALSE) { + dEvent_manager_c& event_manager = dComIfGp_getEventManager(); + + if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { + mOrderNewEvt = false; + } + + if (eventInfo.checkCommandTalk()) { + if (chkAction(&daNpc_SoldierB_c::talk)) { + (this->*mAction)(NULL); + } else if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) { + setAction(&daNpc_SoldierB_c::talk); + } + + rv = TRUE; + } else { + int staffId = event_manager.getMyStaffId(l_myName, NULL, 0); + if (staffId != -1) { + mStaffID = staffId; + int evtCutNo = event_manager.getMyActIdx(staffId, mEvtCutNameList, 2, FALSE, FALSE); + + if ((this->*mEvtCutList[evtCutNo])(staffId)) { + event_manager.cutEnd(staffId); + } + + rv = TRUE; + } + + if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && + event_manager.endCheck(mEventIdx)) + { + dComIfGp_event_reset(); + mOrderEvtNo = EVT_NONE; + mEventIdx = -1; + } + } + + int i_expression, i_motion; + int msgTimer = mMsgTimer; + if (ctrlMsgAnm(i_expression, i_motion, this, FALSE)) { + if (!field_0x9eb) { + setMotion(i_motion, -1.0f, 0); + } + } + } else { + mMsgTimer = 0; + + if (mStaffID != -1) { + mAction = NULL; + mStaffID = -1; + } + } + + return rv; } /* 80AF49E4-80AF4A08 001E24 0024+00 5/5 0/0 0/0 .text setLookMode__16daNpc_SoldierB_cFi */ -void daNpc_SoldierB_c::setLookMode(int param_0) { - // NONMATCHING +void daNpc_SoldierB_c::setLookMode(int i_lookMode) { + if (i_lookMode >= 0 && i_lookMode < 6 && i_lookMode != mLookMode) { + mLookMode = i_lookMode; + } } -/* ############################################################################################## */ -/* 80AF5BDC-80AF5BE8 000108 000C+00 0/1 0/0 0/0 .rodata @5048 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_5048[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80AF5BDC, &lit_5048); -#pragma pop - -/* 80AF5BE8-80AF5BEC 000114 0004+00 0/1 0/0 0/0 .rodata @5102 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5102 = -80.0f; -COMPILER_STRIP_GATE(0x80AF5BE8, &lit_5102); -#pragma pop - -/* 80AF5BEC-80AF5BF0 000118 0004+00 0/1 0/0 0/0 .rodata @5103 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5103 = 80.0f; -COMPILER_STRIP_GATE(0x80AF5BEC, &lit_5103); -#pragma pop - -/* 80AF5BF0-80AF5BF4 00011C 0004+00 0/1 0/0 0/0 .rodata @5104 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_5104 = 40.0f; -COMPILER_STRIP_GATE(0x80AF5BF0, &lit_5104); -#pragma pop - /* 80AF4A08-80AF4CA4 001E48 029C+00 1/1 0/0 0/0 .text lookat__16daNpc_SoldierB_cFv */ void daNpc_SoldierB_c::lookat() { - // NONMATCHING + daPy_py_c* player = NULL; + J3DModel* model = mAnm_p->getModel(); + BOOL i_snap = FALSE; + f32 body_angleX_min = mHIO->m.common.body_angleX_min; + f32 body_angleX_max = mHIO->m.common.body_angleX_max; + f32 body_angleY_min = mHIO->m.common.body_angleY_min; + f32 body_angleY_max = mHIO->m.common.body_angleY_max; + f32 head_angleX_min = mHIO->m.common.head_angleX_min; + f32 head_angleX_max = mHIO->m.common.head_angleX_max; + f32 head_angleY_min = mHIO->m.common.head_angleY_min; + f32 head_angleY_max = mHIO->m.common.head_angleY_max; + s16 angle_delta = mCurAngle.y - mOldAngle.y; + cXyz lookatPos[3] = {mLookatPos[0], mLookatPos[1], mLookatPos[2]}; + csXyz* lookatAngle[3] = {&mLookatAngle[0], &mLookatAngle[1], &mLookatAngle[2]}; + cXyz spe8; + + switch (mLookMode) { + case LOOK_NONE: + break; + + case LOOK_RESET: + i_snap = TRUE; + break; + + case LOOK_PLAYER: + case LOOK_PLAYER_TALK: + player = daPy_getPlayerActorClass(); + + if (mLookMode == LOOK_PLAYER_TALK) { + head_angleY_min = -80.0f; + head_angleY_max = 80.0f; + } + break; + + case LOOK_ACTOR: + player = (daPy_py_c*)mActorMngrs[1].getActorP(); + break; + + case LOOK_ATTN: + player = (daPy_py_c*)mActorMngrs[2].getActorP(); + break; + } + + if (player != NULL) { + mLookPos = player->attention_info.position; + + if (mLookMode != LOOK_PLAYER && mLookMode != LOOK_PLAYER_TALK && mLookMode != LOOK_ACTOR) { + mLookPos.y -= 40.0f; + } + + mLookat.setAttnPos(&mLookPos); + } else { + mLookat.setAttnPos(NULL); + } + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, + 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, + mCurAngle.y, lookatPos); + mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE); } /* 80AF4CA4-80AF4CFC 0020E4 0058+00 2/2 0/0 0/0 .text s_sub__FPvPv */ -static void s_sub(void* param_0, void* param_1) { - // NONMATCHING +static void* s_sub(void* i_actor, void* i_data) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_SOLDIERa && + ((daNpc_SoldierA_c*)i_actor)->getType() == 0) + { + return i_actor; + } + + return NULL; } /* 80AF4CFC-80AF4DBC 00213C 00C0+00 1/0 0/0 0/0 .text wait__16daNpc_SoldierB_cFPv */ -void daNpc_SoldierB_c::wait(void* param_0) { - // NONMATCHING +int daNpc_SoldierB_c::wait(void* param_1) { + switch (mMode) { + case 0: + setMotion(MOT_WAIT, -1.0f, 0); + mTurnMode = 0; + field_0x9ea = true; + mMode = 2; + // fallthrough + case 2: + if (mActorMngrs[2].getActorP() == NULL) { + fopAc_ac_c* actor_p = (fopAc_ac_c*)fpcM_Search(s_sub, this); + if (actor_p != NULL) { + mActorMngrs[2].entry(actor_p); + setLookMode(LOOK_ATTN); + } + } + break; + + case 3: + break; + } + + return 1; } /* 80AF4DBC-80AF4F54 0021FC 0198+00 2/0 0/0 0/0 .text talk__16daNpc_SoldierB_cFPv */ -void daNpc_SoldierB_c::talk(void* param_0) { - // NONMATCHING +int daNpc_SoldierB_c::talk(void* param_1) { + int rv = 0; + BOOL unkFlag = FALSE; + + switch (mMode) { + case 0: { + if (mIsDamaged) { + break; + } + + int msgNo = mMsgNo; + mOrderSpeakEvt = false; + initTalk(msgNo, NULL); + mTurnMode = 0; + mMode = 2; + // fallthrough + } + case 2: + if (field_0x9ea) { + unkFlag = TRUE; + } else { + setLookMode(LOOK_PLAYER_TALK); + mActorMngrs[0].entry(daPy_getPlayerActorClass()); + + if (mCurAngle.y == fopAcM_searchPlayerAngleY(this)) { + unkFlag = TRUE; + } else if (step(fopAcM_searchPlayerAngleY(this), -1, -1, 15)) { + setMotion(MOT_WAIT, -1.0f, 0); + mTurnMode = 0; + } + } + + if (unkFlag && talkProc(NULL, TRUE, NULL)) { + rv = 1; + } + + if (rv) { + mMode = 3; + + if (!field_0x9ec) { + dComIfGp_event_reset(); + } + + field_0x9ec = false; + } + break; + + case 3: + break; + } + + return rv; } -/* ############################################################################################## */ -/* 80AF5BF4-80AF5BF4 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80AF5C09 = "prm"; -#pragma pop - /* 80AF4F54-80AF50AC 002394 0158+00 1/0 0/0 0/0 .text ECut_listenLake__16daNpc_SoldierB_cFi */ -void daNpc_SoldierB_c::ECut_listenLake(int param_0) { - // NONMATCHING +int daNpc_SoldierB_c::ECut_listenLake(int i_staffId) { + dEvent_manager_c& eventManager = dComIfGp_getEventManager(); + daPy_py_c* player = daPy_getPlayerActorClass(); + int rv = 0; + int* piVar1 = NULL; + int prm = -1; + + piVar1 = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); + if (piVar1 != NULL) { + prm = *piVar1; + } + + if (eventManager.getIsAddvance(i_staffId)) { + switch (prm) { + case 0: + if (mActorMngrs[2].getActorP() == NULL) { + fopAc_ac_c* actor_p = (fopAc_ac_c*)fpcM_Search(s_sub, this); + if (actor_p != NULL) { + mActorMngrs[2].entry(actor_p); + setLookMode(LOOK_ATTN); + } + } + break; + + case 10: + setMotion(MOT_TALK_B, -1.0f, 0); + break; + + case 20: + break; + } + } + + switch (prm) { + case 0: + rv = 1; + break; + + case 10: + if (mMotionPhase > 0) { + rv = 1; + } + break; + + case 20: + rv = 1; + break; + + default: + rv = 1; + break; + } + + return rv; } /* 80AF50AC-80AF5160 0024EC 00B4+00 2/0 0/0 0/0 .text test__16daNpc_SoldierB_cFPv */ -void daNpc_SoldierB_c::test(void* param_0) { - // NONMATCHING +int daNpc_SoldierB_c::test(void* param_1) { + switch (mMode) { + case 0: + speedF = 0.0f; + speed.setall(0.0f); + mMode = 2; + // fallthrough + case 2: + setMotion(mHIO->m.common.motion, mHIO->m.common.morf_frame, 0); + setLookMode(mHIO->m.common.look_mode); + mOrderEvtNo = EVT_NONE; + attention_info.flags = 0; + break; + + case 3: + break; + } + + return 1; } /* 80AF5160-80AF5180 0025A0 0020+00 1/0 0/0 0/0 .text daNpc_SoldierB_Create__FPv */ -static void daNpc_SoldierB_Create(void* param_0) { - // NONMATCHING +static int daNpc_SoldierB_Create(void* i_this) { + return static_cast(i_this)->create(); } /* 80AF5180-80AF51A0 0025C0 0020+00 1/0 0/0 0/0 .text daNpc_SoldierB_Delete__FPv */ -static void daNpc_SoldierB_Delete(void* param_0) { - // NONMATCHING +static int daNpc_SoldierB_Delete(void* i_this) { + return static_cast(i_this)->Delete(); } /* 80AF51A0-80AF51C0 0025E0 0020+00 1/0 0/0 0/0 .text daNpc_SoldierB_Execute__FPv */ -static void daNpc_SoldierB_Execute(void* param_0) { - // NONMATCHING +static int daNpc_SoldierB_Execute(void* i_this) { + return static_cast(i_this)->Execute(); } /* 80AF51C0-80AF51E0 002600 0020+00 1/0 0/0 0/0 .text daNpc_SoldierB_Draw__FPv */ -static void daNpc_SoldierB_Draw(void* param_0) { - // NONMATCHING +static int daNpc_SoldierB_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } /* 80AF51E0-80AF51E8 002620 0008+00 1/0 0/0 0/0 .text daNpc_SoldierB_IsDelete__FPv */ -static bool daNpc_SoldierB_IsDelete(void* param_0) { - return true; +static int daNpc_SoldierB_IsDelete(void* i_this) { + return 1; } -/* 80AF51E8-80AF5230 002628 0048+00 5/4 0/0 0/0 .text __dt__18daNpcF_ActorMngr_cFv */ -// daNpcF_ActorMngr_c::~daNpcF_ActorMngr_c() { -extern "C" void __dt__18daNpcF_ActorMngr_cFv() { - // NONMATCHING -} - -/* 80AF5230-80AF526C 002670 003C+00 2/2 0/0 0/0 .text __ct__18daNpcF_ActorMngr_cFv */ -// daNpcF_ActorMngr_c::daNpcF_ActorMngr_c() { -extern "C" void __ct__18daNpcF_ActorMngr_cFv() { - // NONMATCHING -} - -/* 80AF526C-80AF533C 0026AC 00D0+00 1/0 0/0 0/0 .text __dt__15daNpcF_Lookat_cFv */ -// daNpcF_Lookat_c::~daNpcF_Lookat_c() { -extern "C" void __dt__15daNpcF_Lookat_cFv() { - // NONMATCHING -} - -/* 80AF533C-80AF5378 00277C 003C+00 5/5 0/0 0/0 .text __dt__5csXyzFv */ -// csXyz::~csXyz() { -extern "C" void __dt__5csXyzFv() { - // NONMATCHING -} - -/* 80AF5378-80AF537C 0027B8 0004+00 2/2 0/0 0/0 .text __ct__5csXyzFv */ -// csXyz::csXyz() { -extern "C" void __ct__5csXyzFv() { - /* empty function */ -} - -/* 80AF537C-80AF53B8 0027BC 003C+00 6/6 0/0 0/0 .text __dt__4cXyzFv */ -// cXyz::~cXyz() { -extern "C" void __dt__4cXyzFv() { - // NONMATCHING -} - -/* 80AF53B8-80AF53BC 0027F8 0004+00 2/2 0/0 0/0 .text __ct__4cXyzFv */ -// cXyz::cXyz() { -extern "C" void __ct__4cXyzFv() { - /* empty function */ -} - -/* 80AF53BC-80AF5608 0027FC 024C+00 1/1 0/0 0/0 .text __dt__8daNpcF_cFv */ -// daNpcF_c::~daNpcF_c() { -extern "C" void __dt__8daNpcF_cFv() { - // NONMATCHING -} - -/* 80AF5608-80AF57F8 002A48 01F0+00 1/1 0/0 0/0 .text __ct__8daNpcF_cFv */ -// daNpcF_c::daNpcF_c() { -extern "C" void __ct__8daNpcF_cFv() { - // NONMATCHING -} - -/* 80AF57F8-80AF5868 002C38 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -// dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" void __dt__12dBgS_AcchCirFv() { - // NONMATCHING -} - -/* 80AF5868-80AF58C4 002CA8 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING -} - -/* 80AF58C4-80AF5934 002D04 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" void __dt__12dBgS_ObjAcchFv() { - // NONMATCHING -} - -/* 80AF5934-80AF597C 002D74 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING -} - -/* 80AF597C-80AF5980 002DBC 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__8daNpcF_cFv */ -// void daNpcF_c::adjustShapeAngle() { -extern "C" void adjustShapeAngle__8daNpcF_cFv() { - /* empty function */ -} - -/* 80AF5980-80AF5984 002DC0 0004+00 1/0 0/0 0/0 .text setCollisions__8daNpcF_cFv */ -// void daNpcF_c::setCollisions() { -extern "C" void setCollisions__8daNpcF_cFv() { - /* empty function */ -} - -/* 80AF5984-80AF598C 002DC4 0008+00 1/0 0/0 0/0 .text setExpressionAnm__8daNpcF_cFib */ -// bool daNpcF_c::setExpressionAnm(int param_0, bool param_1) { -extern "C" bool setExpressionAnm__8daNpcF_cFib() { - return true; -} - -/* 80AF598C-80AF5994 002DCC 0008+00 1/0 0/0 0/0 .text setExpressionBtp__8daNpcF_cFi */ -// bool daNpcF_c::setExpressionBtp(int param_0) { -extern "C" bool setExpressionBtp__8daNpcF_cFi() { - return true; -} - -/* 80AF5994-80AF5998 002DD4 0004+00 1/0 0/0 0/0 .text setExpression__8daNpcF_cFif */ -// void daNpcF_c::setExpression(int param_0, f32 param_1) { -extern "C" void setExpression__8daNpcF_cFif() { - /* empty function */ -} - -/* 80AF5998-80AF59E0 002DD8 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80AF5E18-80AF5E24 000208 000C+00 2/2 0/0 0/0 .data __vt__22daNpc_SoldierB_Param_c */ -SECTION_DATA extern void* __vt__22daNpc_SoldierB_Param_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__22daNpc_SoldierB_Param_cFv, +/* 80AF5CFC-80AF5D1C -00001 0020+00 1/0 0/0 0/0 .data daNpc_SoldierB_MethodTable */ +static actor_method_class daNpc_SoldierB_MethodTable = { + (process_method_func)daNpc_SoldierB_Create, (process_method_func)daNpc_SoldierB_Delete, + (process_method_func)daNpc_SoldierB_Execute, (process_method_func)daNpc_SoldierB_IsDelete, + (process_method_func)daNpc_SoldierB_Draw, }; -/* 80AF59E0-80AF5A68 002E20 0088+00 0/0 1/0 0/0 .text __sinit_d_a_npc_soldierB_cpp */ -void __sinit_d_a_npc_soldierB_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80AF59E0, __sinit_d_a_npc_soldierB_cpp); -#pragma pop - -/* 80AF5A68-80AF5AB0 002EA8 0048+00 2/1 0/0 0/0 .text __dt__22daNpc_SoldierB_Param_cFv */ -daNpc_SoldierB_Param_c::~daNpc_SoldierB_Param_c() { - // NONMATCHING -} - -/* 80AF5AB0-80AF5AB8 002EF0 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -static void func_80AF5AB0() { - // NONMATCHING -} - -/* 80AF5AB8-80AF5AC0 002EF8 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -static void func_80AF5AB8() { - // NONMATCHING -} +/* 80AF5D1C-80AF5D4C -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_SOLDIERb */ +extern actor_process_profile_definition g_profile_NPC_SOLDIERb = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_NPC_SOLDIERb, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daNpc_SoldierB_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 400, // mPriority + &daNpc_SoldierB_MethodTable, // sub_method + 0x00044100, // mStatus + fopAc_NPC_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; AUDIO_INSTANCES;