d_a_npc_doorboy equivalent (#2581)

* initial work

* doorboy equivalent

* Update d_a_npc_doorboy.h

---------

Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
This commit is contained in:
Carco_21 2025-08-15 06:01:44 -04:00 committed by GitHub
parent 41c72dc6d9
commit 0e8d06c29f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 924 additions and 1050 deletions

View File

@ -1776,7 +1776,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_coach"),
ActorRel(NonMatching, "d_a_npc_df"),
ActorRel(NonMatching, "d_a_npc_doc"),
ActorRel(NonMatching, "d_a_npc_doorboy"),
ActorRel(Equivalent, "d_a_npc_doorboy", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_drainSol"),
ActorRel(NonMatching, "d_a_npc_du"),
ActorRel(NonMatching, "d_a_npc_fairy"),

View File

@ -2,6 +2,7 @@
#define D_A_NPC_DOORBOY_H
#include "d/actor/d_a_npc.h"
#include "d/d_msg_object.h"
/**
* @ingroup actors-npcs
@ -10,48 +11,80 @@
*
* @details
*
*/
class daNpcDoorBoy_c : public fopAc_ac_c {
*/
struct daNpcDoorBoy_HIOParam {
/* 0x0 */ daNpcF_HIOParam common;
};
class daNpcDoorBoy_c : public daNpcF_c {
public:
typedef bool (daNpcDoorBoy_c::*actionFunc)(void*);
typedef BOOL (daNpcDoorBoy_c::*EventFn)(int);
/* 809AAC8C */ daNpcDoorBoy_c();
/* 809AAEA0 */ ~daNpcDoorBoy_c();
/* 809AB088 */ void Create();
/* 809AB320 */ void CreateHeap();
/* 809AB4A4 */ void Delete();
/* 809AB4D8 */ void Execute();
/* 809AB4FC */ void Draw();
/* 809AB578 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 809AB704 */ void createHeapCallBack(fopAc_ac_c*);
/* 809AB724 */ void ctrlJointCallBack(J3DJoint*, int);
/* 809AB088 */ cPhs__Step Create();
/* 809AB320 */ int CreateHeap();
/* 809AB4A4 */ int Delete();
/* 809AB4D8 */ int Execute();
/* 809AB4FC */ int Draw();
/* 809AB578 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 809AB704 */ static int createHeapCallBack(fopAc_ac_c*);
/* 809AB724 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 809AB770 */ void setMotion(int, f32, int);
/* 809AB7B8 */ void reset();
/* 809AB984 */ void setAction(bool (daNpcDoorBoy_c::*)(void*));
/* 809ABA2C */ void wait(void*);
/* 809AC064 */ void fear(void*);
/* 809AC114 */ void talk(void*);
/* 809AC528 */ void demo(void*);
/* 809AC6F4 */ void dummyTalk(void*);
/* 809AB984 */ inline BOOL setAction(bool (daNpcDoorBoy_c::*)(void*));
/* 809ABA2C */ bool wait(void*);
/* 809AC064 */ bool fear(void*);
/* 809AC114 */ bool talk(void*);
/* 809AC528 */ bool demo(void*);
/* 809AC6F4 */ bool dummyTalk(void*);
/* 809AC994 */ void setParam();
/* 809ACA58 */ void main();
/* 809ACA58 */ BOOL main();
/* 809ACC5C */ void setAttnPos();
/* 809ACE18 */ void lookat();
/* 809ACFF8 */ bool setMotionAnm(int, f32);
/* 809AD0C8 */ bool drawDbgInfo();
/* 809ACE18 */ inline void lookat();
/* 809ACFF8 */ void setMotionAnm(int, f32);
/* 809AD0C8 */ BOOL drawDbgInfo();
/* 809AD938 */ void adjustShapeAngle();
static u8 mEvtSeqList[12];
inline u16 getMessageNo() { return fopAcM_GetParam(this) >> 8; }
inline void playMotion();
inline bool chkFindPlayer();
inline void setLookMode(int);
inline BOOL step(s16, int);
inline s16 dMsgObject_getNowTalkFlowNo() { return dMsgObject_getMsgObjectClass()->getNowTalkFlowNo(); }
inline int getTimeHour();
inline bool isDummyTalk();
static EventFn mEvtSeqList[1];
private:
/* 0x568 */ u8 field_0x568[0xe08 - 0x568];
/* 0xB48 */ Z2CreatureCitizen mSound;
/* 0xBEC */ u8 field_0xbec[0xbf0 - 0xbec];
/* 0xBF0 */ daNpcF_Lookat_c mLookat;
/* 0xC8C */ daNpcF_ActorMngr_c mActorMngr[1];
/* 0xC95 */ u8 field_0xc94[0xc98 - 0xc94];
/* 0xC98 */ dCcD_Cyl field_0xc98;
/* 0xDD4 */ actionFunc mAction;
/* 0xDE0 */ request_of_phase_process_class mPhases[2];
/* 0xDF0 */ fpc_ProcID field_0xdf0;
/* 0xDF4 */ int field_0xdf4;
/* 0xDF8 */ int field_0xdf8;
/* 0xDFC */ int mMessageNo;
/* 0xE00 */ s16 mLookMode;
/* 0xE02 */ s16 field_0xe02;
/* 0xE04 */ u16 mMode;
/* 0xE06 */ u8 field_0xe06;
};
STATIC_ASSERT(sizeof(daNpcDoorBoy_c) == 0xe08);
class daNpcDoorBoy_Param_c {
public:
/* 809AD93C */ ~daNpcDoorBoy_Param_c();
/* 809AD93C */ virtual ~daNpcDoorBoy_Param_c() {}
static u8 const m[108];
static daNpcDoorBoy_HIOParam const m;
};

File diff suppressed because it is too large Load Diff