Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

d_a_npc_zrc mostly done #2228

Merged
merged 1 commit into from
Oct 28, 2024
Merged

d_a_npc_zrc mostly done #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/d/actor/d_a_npc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ class daNpcF_c : public fopAc_ac_c {
/* 8015276C */ virtual void setMtx();
/* 801527FC */ virtual void setMtx2();
/* 80155BB8 */ virtual void setAttnPos();
/* 80155BB4 */ virtual void setCollisions();
/* 80155BB4 */ virtual void setCollisions() {}
/* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify);
/* 80155EC8 */ virtual bool setExpressionBtp(int i_idx);
/* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf);
Expand Down
207 changes: 173 additions & 34 deletions include/d/actor/d_a_npc_zrc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,67 +11,206 @@
* @details
*
*/
class daNpc_zrC_c : public fopAc_ac_c {
class daNpc_zrC_c : public daNpcF_c {
public:
typedef BOOL (daNpc_zrC_c::*ActionFn)(void*);
typedef BOOL (daNpc_zrC_c::*EventFn)(int);

/* 80B8DC0C */ daNpc_zrC_c();
/* 80B8DE20 */ ~daNpc_zrC_c();
/* 80B8E03C */ void create();
/* 80B8E338 */ void CreateHeap();
/* 80B8E830 */ void Delete();
/* 80B8E864 */ void Execute();
/* 80B8E884 */ void Draw();
/* 80B8E914 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80B8EB48 */ void createHeapCallBack(fopAc_ac_c*);
/* 80B8EB68 */ void ctrlJointCallBack(J3DJoint*, int);
/* 80B8E03C */ cPhs__Step create();
/* 80B8E338 */ int CreateHeap();
/* 80B8E830 */ int Delete();
/* 80B8E864 */ int Execute();
/* 80B8E884 */ int Draw();
/* 80B8E914 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80B8EB48 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80B8EB68 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80B8EBB4 */ void setParam();
/* 80B8ED94 */ void main();
/* 80B8EF2C */ void ctrlBtk();
/* 80B8ED94 */ BOOL main();
/* 80B8EF2C */ BOOL ctrlBtk();
/* 80B8F00C */ void setAttnPos();
/* 80B8F56C */ void setExpressionAnm(int, bool);
/* 80B8F898 */ void setExpressionBtp(int);
/* 80B8F56C */ bool setExpressionAnm(int, bool);
/* 80B8F898 */ bool setExpressionBtp(int);
/* 80B8F9CC */ void setExpression(int, f32);
/* 80B8F9F8 */ bool setMotionAnm(int, f32);
/* 80B8FBE4 */ void setMotion(int, f32, int);
/* 80B8FC28 */ bool drawDbgInfo();
/* 80B8FC28 */ BOOL drawDbgInfo();
/* 80B8FC30 */ void drawOtherMdls();
/* 80B8FC34 */ void getTypeFromParam();
/* 80B8FC8C */ void isDelete();
/* 80B8FC34 */ u8 getTypeFromParam();
/* 80B8FC8C */ int isDelete();
/* 80B8FD10 */ void reset();
/* 80B8FF14 */ void playExpression();
/* 80B904DC */ void playMotion();
/* 80B90940 */ void playMotionAnm2(daNpcF_c::daNpcF_anmPlayData***);
/* 80B90A6C */ void chkAction(int (daNpc_zrC_c::*)(void*));
/* 80B90A98 */ void setAction(int (daNpc_zrC_c::*)(void*));
/* 80B90B40 */ void selectAction();
/* 80B90C34 */ void doNormalAction(int);
/* 80B90D48 */ void doEvent();
/* 80B90A6C */ BOOL chkAction(ActionFn);
/* 80B90A98 */ BOOL setAction(ActionFn);
/* 80B90B40 */ BOOL selectAction();
/* 80B90C34 */ void doNormalAction(BOOL);
/* 80B90D48 */ BOOL doEvent();
/* 80B9113C */ void setLookMode(int);
/* 80B91160 */ void lookat();
/* 80B91418 */ void setExpressionTalkAfter();
/* 80B914F4 */ void wait(void*);
/* 80B916FC */ void waitSick(void*);
/* 80B91808 */ void waitPray(void*);
/* 80B91F78 */ void waitThrone(void*);
/* 80B920EC */ void talk(void*);
/* 80B922D8 */ void test(void*);
/* 80B923BC */ void ECut_earringGet(int);
/* 80B9318C */ void adjustShapeAngle();
/* 80B914F4 */ BOOL wait(void*);
/* 80B916FC */ BOOL waitSick(void*);
/* 80B91808 */ BOOL waitPray(void*);
/* 80B91F78 */ BOOL waitThrone(void*);
/* 80B920EC */ BOOL talk(void*);
/* 80B922D8 */ BOOL test(void*);
/* 80B923BC */ BOOL ECut_earringGet(int);
/* 80B9318C */ void adjustShapeAngle() {}

static void* mEvtCutNameList[2];
static u8 mEvtCutList[24];
static char* mEvtCutNameList[2];
static EventFn mEvtCutList[2];

private:
/* 0x568 */ u8 field_0x568[0xe3c - 0x568];
/* 0xB48 */ Z2Creature mCreatureSound;
/* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBDC */ daNpcF_Lookat_c mLookat;
/* 0xC78 */ daNpcF_ActorMngr_c mActorMngr[3];
/* 0xC90 */ u8 field_0xc90[4];
/* 0xC94 */ dCcD_Cyl mCcCyl;
/* 0xDD0 */ ActionFn mpNextActionFn;
/* 0xDDC */ ActionFn mpActionFn;
/* 0xDE8 */ request_of_phase_process_class mPhase[5];
/* 0xE10 */ int field_0xe10;
/* 0xE14 */ int field_0xe14;
/* 0xE18 */ int field_0xe18;
/* 0xE1C */ int field_0xe1c;
/* 0xE20 */ int mFlowID;
/* 0xE24 */ s16 mLookMode;
/* 0xE26 */ u16 mMode;
/* 0xE28 */ u8 mType;
/* 0xE2C */ int mMotionAnm;
/* 0xE30 */ bool field_0xe30;
/* 0xE34 */ u32 mItemID;
/* 0xE38 */ bool mSpeakEvent;

enum Animation {
/* 0x00 */ ANM_F_WAIT_A,
/* 0x01 */ ANM_F_SIT_TALK,
/* 0x02 */ ANM_F_TALK_A,
/* 0x03 */ ANM_F_TOPRAY,
/* 0x04 */ ANM_F_SAD,
/* 0x05 */ ANM_F_SMILE,
/* 0x06 */ ANM_F_KIZUKU,
/* 0x07 */ ANM_F_SAD_WAIT,
/* 0x08 */ ANM_F_KIZUKU_WAIT,
/* 0x09 */ ANM_F_TALK_NORMAL,
/* 0x0A */ ANM_F_PRAY,
/* 0x0B */ ANM_F_GETUP,
/* 0x0C */ ANM_F_SIT,
/* 0x0D */ ANM_F_STEP,
/* 0x0E */ ANM_FH_SAD,
/* 0x0F */ ANM_FH_SMILE,
/* 0x10 */ ANM_FH_KIZUKU,
/* 0x11 */ ANM_F_SICK_DEMO_WAIT,
/* 0x12 */ ANM_WAIT_A,
/* 0x13 */ ANM_TOPRAY,
/* 0x14 */ ANM_PRAY,
/* 0x15 */ ANM_GETUP,
/* 0x16 */ ANM_STEP,
/* 0x17 */ ANM_SIT,
/* 0x18 */ ANM_SIT_TALK,
/* 0x19 */ ANM_SAD_TALK,
/* 0x1A */ ANM_SAD_WAIT,
/* 0x1B */ ANM_TALK_A,
/* 0x1C */ ANM_KIZUKU,
/* 0x1D */ ANM_KIZUKU_WAIT,
/* 0x1E */ ANM_SMILE_TALK,
/* 0x1F */ ANM_SICK_DEMO_WAIT,
};

enum Expression {
/* 0x00 */ EXPR_TALK_A,
/* 0x01 */ EXPR_SIT_TALK,
/* 0x02 */ EXPR_PRAY,
/* 0x03 */ EXPR_SAD,
/* 0x04 */ EXPR_SMILE,
/* 0x05 */ EXPR_KIZUKU,
/* 0x06 */ EXPR_SAD_WAIT,
/* 0x07 */ EXPR_TALK_NORMAL,
/* 0x08 */ EXPR_KIZUKU_WAIT,
/* 0x09 */ EXPR_H_KIZUKU,
/* 0x0A */ EXPR_H_SAD,
/* 0x0B */ EXPR_H_SMILE,
/* 0x0C */ EXPR_STEP,
/* 0x0D */ EXPR_TOPRAY,
/* 0x0E */ EXPR_GETUP,
/* 0x0F */ EXPR_SIT,
/* 0x10 */ EXPR_SICK_DEMO_WAIT,
/* 0x11 */ EXPR_WAIT_A,
};

enum Motion {
/* 0x0 */ MOT_WAIT_A,
/* 0x1 */ MOT_SIT_TALK,
/* 0x2 */ MOT_PRAY,
/* 0x3 */ MOT_SIT,
/* 0x4 */ MOT_SAD_TALK,
/* 0x5 */ MOT_SAD_WAIT,
/* 0x6 */ MOT_TALK_A,
/* 0x7 */ MOT_KIZUKU,
/* 0x8 */ MOT_KIZUKU_WAIT,
/* 0x9 */ MOT_SMILE_TALK,
/* 0xA */ MOT_TOPRAY,
/* 0xB */ MOT_GETUP,
/* 0xC */ MOT_STEP,
/* 0xD */ MOT_SICK_DEMO_WAIT,
};

enum Event {
/* 0 */ EVT_NONE,
/* 1 */ EVT_EARRING_GET,
};
};

STATIC_ASSERT(sizeof(daNpc_zrC_c) == 0xe3c);

class daNpc_zrC_Param_c {
public:
/* 80B93190 */ ~daNpc_zrC_Param_c();
struct param {
/* 0x00 */ f32 mAttnOffsetY;
/* 0x04 */ f32 mGravity;
/* 0x08 */ f32 mScale;
/* 0x0C */ f32 mShadowDepth;
/* 0x10 */ f32 mCcWeight;
/* 0x14 */ f32 mCylH;
/* 0x18 */ f32 mWallH;
/* 0x1C */ f32 mWallR;
/* 0x20 */ f32 mBodyUpAngle;
/* 0x24 */ f32 mBodyDownAngle;
/* 0x28 */ f32 mBodyLeftAngle;
/* 0x2C */ f32 mBodyRightAngle;
/* 0x30 */ f32 mHeadUpAngle;
/* 0x34 */ f32 mHeadDownAngle;
/* 0x38 */ f32 mHeadLeftAngle;
/* 0x3C */ f32 mHeadRightAngle;
/* 0x40 */ f32 mNeckAngleScl;
/* 0x44 */ f32 mMorfFrames;
/* 0x48 */ s16 mSpeakDistIdx;
/* 0x4A */ s16 mSpeakAngleIdx;
/* 0x4C */ s16 mTalkDistIdx;
/* 0x4E */ s16 mTalkAngleIdx;
/* 0x50 */ f32 mAttnFovY;
/* 0x54 */ f32 mAttnRadius;
/* 0x58 */ f32 mAttnUpperY;
/* 0x5C */ f32 mAttnLowerY;
/* 0x60 */ s16 field_0x60;
/* 0x62 */ s16 mDamageTimer;
/* 0x64 */ s16 mTestExpression;
/* 0x66 */ s16 mTestMotion;
/* 0x68 */ s16 mTestLookMode;
/* 0x6A */ bool mTest;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ f32 field_0x70;
};

/* 80B93190 */ virtual ~daNpc_zrC_Param_c() {}

static u8 const m[116];
static param const m;
};

STATIC_ASSERT(sizeof(daNpc_zrC_Param_c::param) == 0x74);

#endif /* D_A_NPC_ZRC_H */
6 changes: 0 additions & 6 deletions src/d/actor/d_a_npc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4214,7 +4214,6 @@ void daNpcF_c::setDamage(int i_timer, int i_expression, int i_motion) {
mIsDamaged = true;
}


/* 80153718-8015387C 14E058 0164+00 0/0 0/0 81/81 .text ctrlMsgAnm__8daNpcF_cFRiRiP10fopAc_ac_ci
*/
int daNpcF_c::ctrlMsgAnm(int& o_expression, int& o_motion, fopAc_ac_c* param_2, BOOL param_3) {
Expand Down Expand Up @@ -4949,11 +4948,6 @@ daNpcF_MoveBgActor_c::~daNpcF_MoveBgActor_c() {
/* empty function */
}

/* 80155BB4-80155BB8 1504F4 0004+00 2/0 0/0 0/0 .text setCollisions__8daNpcF_cFv */
void daNpcF_c::setCollisions() {
/* empty function */
}

/* 80155BB8-80155BBC 1504F8 0004+00 2/0 0/0 0/0 .text setAttnPos__8daNpcF_cFv */
void daNpcF_c::setAttnPos() {
/* empty function */
Expand Down
Loading