mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 22:22:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

npc_clerka matching, npc_clerkb and npc_clerkt equivalent (#2810)

Browse Source
This commit is contained in:
hev7
2025-11-16 02:22:42 +00:00
committed by GitHub
parent 8799ed141d
commit e7a610c5e2
9 changed files with 2498 additions and 3681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+3 -3
View File
@@ -1849,9 +1849,9 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_cdn3"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_chat", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_chin"),
ActorRel(NonMatching, "d_a_npc_clerka"),
ActorRel(NonMatching, "d_a_npc_clerkb"),
ActorRel(NonMatching, "d_a_npc_clerkt"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_clerka"),
ActorRel(Equivalent, "d_a_npc_clerkb"),
ActorRel(Equivalent, "d_a_npc_clerkt"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_coach"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_df"),
ActorRel(NonMatching, "d_a_npc_doc"),
include/d/actor/d_a_npc_clerka.h
+116 -40
View File
@@ -2,6 +2,36 @@
#define D_A_NPC_CLERKA_H
#include "d/actor/d_a_npc.h"
#include "d/d_shop_system.h"
struct daNpc_clerkA_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ s16 field_0x8c;
/* 0x8F */ s16 field_0x8f;
};
class daNpc_clerkA_Param_c {
public:
/* 80B2CD94 */ virtual ~daNpc_clerkA_Param_c() {}
static const daNpc_clerkA_HIOParam m;
};
#if DEBUG
class daNpc_clerkA_HIO_c : public mDoHIO_entry_c {
public:
daNpc_clerkA_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daNpc_clerkA_HIOParam m;
};
#define NPC_CLERKA_HIO_CLASS daNpc_clerkA_HIO_c
#else
#define NPC_CLERKA_HIO_CLASS daNpc_clerkA_Param_c
#endif
/**
* @ingroup actors-npcs
@@ -11,64 +41,110 @@
* @details
*
*/
class daNpc_clerkA_c : public fopAc_ac_c {
class daNpc_clerkA_c : public dShopSystem_c {
public:
typedef int (daNpc_clerkA_c::*cutFunc)(int);
typedef int (daNpc_clerkA_c::*actionFunc)(void*);
enum Type {
TYPE_SHOP,
TYPE_1,
};
enum FaceMotion {
/* 0x01 */ FACE_MOT_UNK_1 = 1,
/* 0x02 */ FACE_MOT_UNK_2 = 2,
/* 0x03 */ FACE_MOT_UNK_3 = 3,
/* 0x04 */ FACE_MOT_UNK_4 = 4,
};
enum Motion {
/* 0x0 */ MOT_UNK_0 = 0,
/* 0x2 */ MOT_UNK_2 = 2,
/* 0x3 */ MOT_UNK_3 = 3,
/* 0x6 */ MOT_UNK_6 = 6,
};
/* 8099252C */ ~daNpc_clerkA_c();
/* 8099266C */ void create();
/* 80992914 */ void CreateHeap();
/* 80992D50 */ void Delete();
/* 80992D84 */ void Execute();
/* 80992E5C */ void Draw();
/* 80992EF0 */ void createHeapCallBack(fopAc_ac_c*);
/* 80992F10 */ void ctrlJointCallBack(J3DJoint*, int);
/* 80992F68 */ void getType();
/* 80992F88 */ void isDelete();
/* 8099266C */ int create();
/* 80992914 */ int CreateHeap();
/* 80992D50 */ int Delete();
/* 80992D84 */ int Execute();
/* 80992E5C */ int Draw();
/* 80992EF0 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80992F10 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80992F68 */ u8 getType();
/* 80992F88 */ int isDelete();
/* 80992FB8 */ void reset();
/* 809930EC */ void afterJntAnm(int);
/* 80993170 */ void setParam();
/* 809932A4 */ void setAfterTalkMotion();
/* 80993330 */ void srchActors();
/* 8099338C */ void evtTalk();
/* 80993568 */ void evtCutProc();
/* 8099338C */ BOOL evtTalk();
/* 80993568 */ BOOL evtCutProc();
/* 80993630 */ void action();
/* 8099371C */ void beforeMove();
/* 80993794 */ void setAttnPos();
/* 80993A40 */ void setCollision();
/* 80993B74 */ bool drawDbgInfo();
/* 80993B74 */ int drawDbgInfo();
/* 80993B7C */ void drawOtherMdl();
/* 80993BDC */ void selectAction();
/* 80993C58 */ void chkAction(int (daNpc_clerkA_c::*)(void*));
/* 80993C84 */ void setAction(int (daNpc_clerkA_c::*)(void*));
/* 80993D2C */ void wait(void*);
/* 80993F84 */ void tend(void*);
/* 809941B8 */ void talk(void*);
/* 809943B0 */ void shop(void*);
/* 809955C8 */ daNpc_clerkA_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**);
/* 80995694 */ u16 getEyeballMaterialNo();
/* 8099569C */ s32 getHeadJointNo();
/* 809956A4 */ s32 getNeckJointNo();
/* 809956AC */ bool getBackboneJointNo();
/* 809956B4 */ void checkChangeJoint(int);
/* 809956C4 */ void checkRemoveJoint(int);
/* 80993BDC */ int selectAction();
/* 80993C58 */ int chkAction(int (daNpc_clerkA_c::*)(void*));
/* 80993C84 */ int setAction(int (daNpc_clerkA_c::*)(void*));
/* 80993D2C */ int wait(void*);
/* 80993F84 */ int tend(void*);
/* 809941B8 */ int talk(void*);
/* 809943B0 */ int shop(void*);
/* 809955C8 */ daNpc_clerkA_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)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
/* 80995694 */ u16 getEyeballMaterialNo() { return 3; }
/* 8099569C */ s32 getHeadJointNo() { return 4; }
/* 809956A4 */ s32 getNeckJointNo() { return 3; }
/* 809956AC */ s32 getBackboneJointNo() { return 1; }
/* 809956B4 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
/* 809956C4 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 8; }
u32 getFlowNodeNo() {
u16 nodeNo = home.angle.x;
u32 rv;
if (nodeNo == 0xffff) {
rv = -1;
} else {
rv = nodeNo;
}
return rv;
}
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
static char* mCutNameList[1];
static u8 mCutList[12];
static cutFunc mCutList[1];
private:
/* 0x568 */ u8 field_0x568[0x10f4 - 0x568];
/* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO;
/* 0x0F80 */ dCcD_Cyl mCyl;
/* 0x10BC */ u8 mType;
/* 0x10C0 */ daNpcT_ActorMngr_c mActorMngr[1];
/* 0x10C8 */ actionFunc mNextAction;
/* 0x10D4 */ actionFunc mAction;
/* 0x10E0 */ int mShopProcess;
/* 0x10E4 */ int field_0x10e4;
/* 0x10E8 */ int field_0x10e8;
/* 0x10EC */ u8 field_0x10ec;
/* 0x10ED */ u8 field_0x10ed;
/* 0x10EE */ u8 field_0x10ee;
/* 0x10EF */ u8 mShopFlag;
/* 0x10F0 */ u8 field_0x10f0;
};
STATIC_ASSERT(sizeof(daNpc_clerkA_c) == 0x10f4);
class daNpc_clerkA_Param_c {
public:
/* 809956D4 */ ~daNpc_clerkA_Param_c();
static u8 const m[144];
};
#endif /* D_A_NPC_CLERKA_H */
include/d/actor/d_a_npc_clerkb.h
+134 -42
View File
@@ -2,6 +2,37 @@
#define D_A_NPC_CLERKB_H
#include "d/actor/d_a_npc.h"
#include "d/d_shop_system.h"
struct daNpc_clerkB_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ s16 field_0x90;
/* 0x92 */ s16 field_0x92;
};
class daNpc_clerkB_Param_c {
public:
/* 80B2CD94 */ virtual ~daNpc_clerkB_Param_c() {}
static const daNpc_clerkB_HIOParam m;
};
#if DEBUG
class daNpc_clerkB_HIO_c : public mDoHIO_entry_c {
public:
daNpc_clerkB_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daNpc_clerkB_HIOParam m;
};
#define NPC_CLERKB_HIO_CLASS daNpc_clerkB_HIO_c
#else
#define NPC_CLERKB_HIO_CLASS daNpc_clerkB_Param_c
#endif
/**
* @ingroup actors-npcs
@@ -11,68 +42,129 @@
* @details
*
*/
class daNpc_clerkB_c : public fopAc_ac_c {
class daNpc_clerkB_c : public dShopSystem_c {
public:
typedef int (daNpc_clerkB_c::*cutFunc)(int);
typedef int (daNpc_clerkB_c::*actionFunc)(void*);
enum Type {
TYPE_SHOP,
TYPE_1,
};
enum FaceMotion {
/* 0x01 */ FACE_MOT_UNK_1 = 1,
/* 0x02 */ FACE_MOT_UNK_2 = 2,
/* 0x03 */ FACE_MOT_UNK_3 = 3,
/* 0x04 */ FACE_MOT_UNK_4 = 4,
/* 0x05 */ FACE_MOT_UNK_5 = 5,
/* 0x06 */ FACE_MOT_UNK_6 = 6,
/* 0x07 */ FACE_MOT_UNK_7 = 7,
/* 0x08 */ FACE_MOT_UNK_8 = 8,
};
enum Motion {
/* 0x0 */ MOT_UNK_0 = 0,
/* 0x1 */ MOT_UNK_1 = 1,
/* 0x2 */ MOT_UNK_2 = 2,
/* 0x3 */ MOT_UNK_3 = 3,
/* 0x5 */ MOT_UNK_5 = 5,
/* 0x6 */ MOT_UNK_6 = 6,
/* 0x7 */ MOT_UNK_7 = 7,
/* 0x8 */ MOT_UNK_8 = 8,
};
/* 80995F2C */ ~daNpc_clerkB_c();
/* 80996090 */ void create();
/* 80996338 */ void CreateHeap();
/* 809967C4 */ void Delete();
/* 809967F8 */ void Execute();
/* 809968D0 */ void Draw();
/* 80996964 */ void createHeapCallBack(fopAc_ac_c*);
/* 80996984 */ void ctrlJointCallBack(J3DJoint*, int);
/* 809969DC */ void getType();
/* 809969FC */ void beforeStartSeqAction(dMsgFlow_c*, int);
/* 80996CCC */ void beforeSelectSeqAction(dMsgFlow_c*, int);
/* 80996F7C */ void isDelete();
/* 80996090 */ int create();
/* 80996338 */ int CreateHeap();
/* 809967C4 */ int Delete();
/* 809967F8 */ int Execute();
/* 809968D0 */ int Draw();
/* 80996964 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80996984 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 809969DC */ u8 getType();
/* 809969FC */ int beforeStartSeqAction(dMsgFlow_c*, int);
/* 80996CCC */ int beforeSelectSeqAction(dMsgFlow_c*, int);
/* 80996F7C */ int isDelete();
/* 80996FAC */ void reset();
/* 809970E0 */ void afterJntAnm(int);
/* 80997188 */ void setParam();
/* 809972BC */ void setAfterTalkMotion();
/* 80997360 */ void srchActors();
/* 809973BC */ void evtTalk();
/* 80997598 */ void evtCutProc();
/* 809973BC */ BOOL evtTalk();
/* 80997598 */ BOOL evtCutProc();
/* 80997660 */ void action();
/* 8099774C */ void beforeMove();
/* 809977C4 */ void setAttnPos();
/* 80997A1C */ void setCollision();
/* 80997B50 */ bool drawDbgInfo();
/* 80997B50 */ int drawDbgInfo();
/* 80997B58 */ void drawOtherMdl();
/* 80997BB8 */ void drawGhost();
/* 80997C44 */ void selectAction();
/* 80997CC0 */ void chkAction(int (daNpc_clerkB_c::*)(void*));
/* 80997CEC */ void setAction(int (daNpc_clerkB_c::*)(void*));
/* 80997C44 */ int selectAction();
/* 80997CC0 */ int chkAction(int (daNpc_clerkB_c::*)(void*));
/* 80997CEC */ int setAction(int (daNpc_clerkB_c::*)(void*));
/* 80997D94 */ void setSe();
/* 80997E54 */ void wait(void*);
/* 809980AC */ void tend(void*);
/* 80998328 */ void talk(void*);
/* 80998520 */ void shop(void*);
/* 80999680 */ daNpc_clerkB_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**);
/* 809997AC */ u16 getEyeballMaterialNo();
/* 809997B4 */ s32 getHeadJointNo();
/* 809997BC */ s32 getNeckJointNo();
/* 809997C4 */ bool getBackboneJointNo();
/* 809997CC */ void checkChangeJoint(int);
/* 809997DC */ void checkRemoveJoint(int);
/* 80997E54 */ int wait(void*);
/* 809980AC */ int tend(void*);
/* 80998328 */ int talk(void*);
/* 80998520 */ int shop(void*);
/* 80999680 */ daNpc_clerkB_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)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
/* 809997AC */ u16 getEyeballMaterialNo() { return 3; }
/* 809997B4 */ s32 getHeadJointNo() { return 4; }
/* 809997BC */ s32 getNeckJointNo() { return 3; }
/* 809997C4 */ s32 getBackboneJointNo() { return 1; }
/* 809997CC */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
/* 809997DC */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 9; }
u32 getFlowNodeNo() {
u16 nodeNo = home.angle.x;
u32 rv;
if (nodeNo == 0xffff) {
rv = -1;
} else {
rv = nodeNo;
}
return rv;
}
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
static char* mCutNameList[1];
static u8 mCutList[12];
static cutFunc mCutList[1];
private:
/* 0x568 */ u8 field_0x568[0x1118 - 0x568];
/* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2;
/* 0x0F7C */ NPC_CLERKB_HIO_CLASS* mpHIO;
/* 0x0F98 */ dCcD_Cyl mCyl;
/* 0x10D4 */ u8 mType;
/* 0x10D8 */ daNpcT_ActorMngr_c mActorMngr[1];
/* 0x10E0 */ actionFunc mNextAction;
/* 0x10EC */ actionFunc mAction;
/* 0x10F8 */ u8 field_0x10f8[0x10fa - 0x10f8];
/* 0x10FA */ s16 field_0x10fa;
/* 0x10FC */ u8 field_0x10fc[0x1100 - 0x10fc];
/* 0x1100 */ int mShopProcess;
/* 0x1104 */ int field_0x1104;
/* 0x1108 */ f32 field_0x1108;
/* 0x110C */ u8 field_0x110c;
/* 0x110D */ u8 field_0x110d;
/* 0x110E */ u8 field_0x110e;
/* 0x110F */ u8 field_0x110f;
/* 0x1110 */ u8 field_0x1110;
/* 0x1111 */ u8 mShopFlag;
/* 0x1112 */ u8 field_0x1112[0x1114 - 0x1112];
/* 0x1114 */ u8 field_0x1114;
};
STATIC_ASSERT(sizeof(daNpc_clerkB_c) == 0x1118);
class daNpc_clerkB_Param_c {
public:
/* 809997EC */ ~daNpc_clerkB_Param_c();
static u8 const m[148];
};
#endif /* D_A_NPC_CLERKB_H */
include/d/actor/d_a_npc_clerkt.h
+116 -39
View File
@@ -2,6 +2,34 @@
#define D_A_NPC_CLERKT_H
#include "d/actor/d_a_npc.h"
#include "d/d_shop_system.h"
struct daNpcClerkt_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
};
class daNpcClerkt_Param_c {
public:
/* 80B2CD94 */ virtual ~daNpcClerkt_Param_c() {}
static const daNpcClerkt_HIOParam m;
};
#if DEBUG
class daNpcClerkt_HIO_c : public mDoHIO_entry_c {
public:
daNpcClerkt_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daNpcClerkt_HIOParam m;
};
#define NPC_CLERKT_HIO_CLASS daNpcClerkt_HIO_c
#else
#define NPC_CLERKT_HIO_CLASS daNpcClerkt_Param_c
#endif
/**
* @ingroup actors-npcs
@@ -11,62 +39,111 @@
* @details
*
*/
class daNpcClerkT_c : public fopAc_ac_c {
class daNpcClerkT_c : public dShopSystem_c {
public:
typedef int (daNpcClerkT_c::*cutFunc)(int);
typedef int (daNpcClerkT_c::*actionFunc)(void*);
enum Type {
TYPE_SHOP,
TYPE_1,
};
enum FaceMotion {
/* 0x01 */ FACE_MOT_UNK_1 = 1,
};
enum Motion {
/* 0x0 */ MOT_UNK_0,
};
/* 8099A14C */ ~daNpcClerkT_c();
/* 8099A28C */ void create();
/* 8099A530 */ void CreateHeap();
/* 8099A96C */ void Delete();
/* 8099A9A0 */ void Execute();
/* 8099AA80 */ void Draw();
/* 8099AB14 */ void createHeapCallBack(fopAc_ac_c*);
/* 8099AB34 */ void ctrlJointCallBack(J3DJoint*, int);
/* 8099AB8C */ void isDelete();
/* 8099A28C */ int create();
/* 8099A530 */ int CreateHeap();
/* 8099A96C */ int Delete();
/* 8099A9A0 */ int Execute();
/* 8099AA80 */ int Draw();
/* 8099AB14 */ static int createHeapCallBack(fopAc_ac_c*);
/* 8099AB34 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 8099AB8C */ int isDelete();
/* 8099ABBC */ void reset();
/* 8099ACF0 */ void afterJntAnm(int);
/* 8099AD74 */ void evtTalk();
/* 8099AF18 */ void evtCutProc();
/* 8099AD74 */ BOOL evtTalk();
/* 8099AF18 */ BOOL evtCutProc();
/* 8099AFE0 */ void action();
/* 8099B0CC */ bool drawDbgInfo();
/* 8099B0CC */ int drawDbgInfo();
/* 8099B0D4 */ void drawOtherMdl();
/* 8099B134 */ void selectAction();
/* 8099B1B0 */ void chkAction(int (daNpcClerkT_c::*)(void*));
/* 8099B1DC */ void setAction(int (daNpcClerkT_c::*)(void*));
/* 8099B284 */ void wait(void*);
/* 8099B4DC */ void tend(void*);
/* 8099B60C */ void talk(void*);
/* 8099B804 */ void shop(void*);
/* 8099B134 */ int selectAction();
/* 8099B1B0 */ int chkAction(int (daNpcClerkT_c::*)(void*));
/* 8099B1DC */ int setAction(int (daNpcClerkT_c::*)(void*));
/* 8099B284 */ int wait(void*);
/* 8099B4DC */ int tend(void*);
/* 8099B60C */ int talk(void*);
/* 8099B804 */ int shop(void*);
/* 8099BCE8 */ void setParam();
/* 8099BE48 */ void setAfterTalkMotion();
/* 8099BEA8 */ void beforeMove();
/* 8099BF20 */ void setAttnPos();
/* 8099C1A0 */ void setCollision();
/* 8099CF9C */ daNpcClerkT_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**);
/* 8099D068 */ u16 getEyeballMaterialNo();
/* 8099D070 */ void checkChangeJoint(int);
/* 8099D080 */ void checkRemoveJoint(int);
/* 8099D090 */ s32 getBackboneJointNo();
/* 8099D098 */ s32 getNeckJointNo();
/* 8099D0A0 */ s32 getHeadJointNo();
/* 8099CF9C */ daNpcClerkT_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)
: dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
/* 8099D068 */ u16 getEyeballMaterialNo() { return 2; }
/* 8099D070 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 17; }
/* 8099D080 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 19; }
/* 8099D090 */ s32 getBackboneJointNo() { return 15; }
/* 8099D098 */ s32 getNeckJointNo() { return 16; }
/* 8099D0A0 */ s32 getHeadJointNo() { return 17; }
u32 getFlowNodeNo() {
u16 nodeNo = home.angle.x;
u32 rv;
if (nodeNo == 0xffff) {
rv = -1;
} else {
rv = nodeNo;
}
return rv;
}
u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
void srchActors() {
switch (mType) {
case TYPE_SHOP:
if (mActorMngr[0].getActorP() == NULL) {
mActorMngr[0].entry(getShopItemTagP());
}
break;
}
}
static char* mCutNameList[1];
static u8 mCutList[12];
static cutFunc mCutList[1];
private:
/* 0x568 */ u8 field_0x568[0x10f0 - 0x568];
/* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO;
/* 0x0F80 */ dCcD_Cyl mCyl;
/* 0x10BC */ u8 mType;
/* 0x10C0 */ daNpcT_ActorMngr_c mActorMngr[1];
/* 0x10C8 */ actionFunc mNextAction;
/* 0x10D4 */ actionFunc mAction;
/* 0x10E0 */ int mShopProcess;
/* 0x10E4 */ int field_0x10e4;
/* 0x10E8 */ u8 field_0x10e8;
/* 0x10E9 */ u8 field_0x10e9;
/* 0x10EA */ u8 mShopFlag;
/* 0x10EB */ u8 field_0x10eb;
/* 0x10EC */ int field_0x10ec;
};
STATIC_ASSERT(sizeof(daNpcClerkT_c) == 0x10f0);
class daNpcClerkt_Param_c {
public:
/* 8099D0A8 */ ~daNpcClerkt_Param_c();
static u8 const m[140];
};
#endif /* D_A_NPC_CLERKT_H */
include/d/d_shop_camera.h
+2
View File
@@ -58,6 +58,8 @@ public:
void setCamDataIdx(int data_idx) { mCamDataIdx = data_idx; }
bool isCameraStopFlag() { return field_0xda; }
/* 0x00 */ ShopCamFunc mCamAction;
/* 0x0c */ u8 field_0xc[0x18 - 0xc];
/* 0x18 */ fopAc_ac_c* field_0x18;
include/d/d_shop_system.h
+11
View File
@@ -87,10 +87,21 @@ public:
/* 8019ACE8 */ virtual int beforeSelectSeqAction(dMsgFlow_c*, int) { return 1; }
bool chkSpMode() { return mSpMode == 1; }
void onSpMode() { mSpMode = 1; }
void offSpMode() { mSpMode = 0; }
u8 getEventParamU8(int param_0) { return (mEventParam >> (3 - param_0) * 8) & 0xFF; }
void setEventParam(u32 param) { mEventParam = param; }
void setMasterType(u8 master_type) { mMasterType = master_type; }
u8 getCursorPos() { return mCursorPos; }
dShopItemCtrl_c* getShopItemCtrlP() { return &mItemCtrl; }
u8 chkExplainItem() {
u8 rv = 0;
if (mSeq == 2 || mSeq == 3 || mSeq == 4 || mSeq == 5) {
rv = 1;
}
return rv;
}
public:
/* 0xE40 */ STControl* mpStick;
src/d/actor/d_a_npc_clerka.cpp
+685 -1187
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_clerkb.cpp
+827 -1222
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_clerkt.cpp
+604 -1148
View File
File diff suppressed because it is too large Load Diff