falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_zanb matching (#2777) 

* matching

* cleanup

* added correct constructor macro
This commit is contained in:
Carco_21 2025-11-07 16:42:18 -05:00 committed by GitHub
parent 3c2ed235b3
commit 833530b249
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 780 additions and 1191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1941,7 +1941,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_yelia"),
ActorRel(NonMatching, "d_a_npc_ykm"),
ActorRel(NonMatching, "d_a_npc_ykw"),
ActorRel(NonMatching, "d_a_npc_zanb"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_zanb"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_zant"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_zelR"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_zelRo"),

123
include/d/actor/d_a_npc_zanb.h
View File

@ -10,64 +10,107 @@
*
* @details
*
*/
class daNpc_zanB_c : public fopAc_ac_c {
*/
struct daNpc_zanB_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
};
class daNpc_zanB_Param_c {
public:
/* 80B6BC58 */ virtual ~daNpc_zanB_Param_c() {}
static daNpc_zanB_HIOParam const m;
};
#if DEBUG
class daNpc_zanB_HIO_c : public mDoHIO_entry_c {
public:
daNpc_zanB_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
/* 0x8 */ daNpc_zanB_HIOParam m;
};
#define NPC_ZANB_HIO_CLASS daNpc_zanB_HIO_c
#else
#define NPC_ZANB_HIO_CLASS daNpc_zanB_Param_c
#endif
class daNpc_zanB_c : public daNpcT_c {
public:
typedef int (daNpc_zanB_c::*actionFunc)(void*);
typedef int (daNpc_zanB_c::*cutFunc)(int);
/* 80B68F2C */ ~daNpc_zanB_c();
/* 80B6904C */ void create();
/* 80B69330 */ void CreateHeap();
/* 80B6975C */ void Delete();
/* 80B69790 */ void Execute();
/* 80B697B0 */ void Draw();
/* 80B69844 */ void createHeapCallBack(fopAc_ac_c*);
/* 80B69864 */ void ctrlJointCallBack(J3DJoint*, int);
/* 80B698BC */ void getType();
/* 80B698DC */ bool isDelete();
/* 80B6904C */ cPhs__Step create();
/* 80B69330 */ int CreateHeap();
/* 80B6975C */ int Delete();
/* 80B69790 */ int Execute();
/* 80B697B0 */ int Draw();
/* 80B69844 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80B69864 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80B698BC */ u8 getType();
/* 80B698DC */ BOOL isDelete();
/* 80B698E4 */ void reset();
/* 80B69A3C */ void afterJntAnm(int);
/* 80B69AC8 */ void checkChangeEvt();
/* 80B69AC8 */ BOOL checkChangeEvt();
/* 80B69B7C */ void setParam();
/* 80B69CA8 */ void setAfterTalkMotion();
/* 80B69D08 */ void srchActors();
/* 80B69D0C */ void evtTalk();
/* 80B69DAC */ void evtCutProc();
/* 80B69D0C */ BOOL evtTalk();
/* 80B69DAC */ BOOL evtCutProc();
/* 80B69E74 */ void action();
/* 80B69F60 */ void beforeMove();
/* 80B69FD8 */ void setAttnPos();
/* 80B6A268 */ void setCollision();
/* 80B6A408 */ bool drawDbgInfo();
/* 80B6A408 */ int drawDbgInfo();
/* 80B6A410 */ void drawGhost();
/* 80B6A47C */ void selectAction();
/* 80B6A4C4 */ void chkAction(int (daNpc_zanB_c::*)(void*));
/* 80B6A4F0 */ void setAction(int (daNpc_zanB_c::*)(void*));
/* 80B6A598 */ void wait(void*);
/* 80B6A874 */ void talk(void*);
/* 80B6BADC */ daNpc_zanB_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B6BC18 */ u16 getEyeballMaterialNo();
/* 80B6BC20 */ s32 getHeadJointNo();
/* 80B6BC28 */ s32 getNeckJointNo();
/* 80B6BC30 */ bool getBackboneJointNo();
/* 80B6BC38 */ void checkChangeJoint(int);
/* 80B6BC48 */ void checkRemoveJoint(int);
/* 80B6A47C */ BOOL selectAction();
/* 80B6A4C4 */ BOOL chkAction(actionFunc);
/* 80B6A4F0 */ BOOL setAction(actionFunc);
/* 80B6A598 */ int wait(void*);
/* 80B6A874 */ int talk(void*);
int test(void*);
/* 80B6BADC */ daNpc_zanB_c(
daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
daNpcT_motionAnmData_c const* i_motionAnmData,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
int i_faceMotionStepNum,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {
OS_REPORT("|%06d:%x|daNpc_zanB_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 80B6BC18 */ u16 getEyeballMaterialNo() { return 4; }
/* 80B6BC20 */ s32 getHeadJointNo() { return 3; }
/* 80B6BC28 */ s32 getNeckJointNo() { return 2; }
/* 80B6BC30 */ s32 getBackboneJointNo() { return 1; }
/* 80B6BC38 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 3; }
/* 80B6BC48 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 0x12; }
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
if (nodeNo == 0xFFFF) {
return -1;
}
return nodeNo;
}
static char* mCutNameList[1];
static u8 mCutList[12];
static cutFunc mCutList[1];
private:
/* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
/* 0xE40 */ NPC_ZANB_HIO_CLASS* mHIO;
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 mType;
/* 0xF84 */ actionFunc mNextAction;
/* 0xF90 */ actionFunc mAction;
/* 0xF9C */ u8 field_0xf9c;
};
STATIC_ASSERT(sizeof(daNpc_zanB_c) == 0xfa0);
class daNpc_zanB_Param_c {
public:
/* 80B6BC58 */ ~daNpc_zanB_Param_c();
static u8 const m[140];
};
#endif /* D_A_NPC_ZANB_H */

1846
src/d/actor/d_a_npc_zanb.cpp
View File

File diff suppressed because it is too large Load Diff