Skip to content

Commit e0c9d16

Browse files
TakaRikkaTakaRikka
authored
npc_kkri done (#2655)
1 parent f0d0818 commit e0c9d16

File tree

5 files changed

+1190
-1379
lines changed

5 files changed

+1190
-1379
lines changed

‎configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,7 @@ def MatchingFor(*versions) -> bool:
16101610
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fish"),
16111611
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_henna"),
16121612
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kakashi"),
1613-
ActorRel(NonMatching, "d_a_npc_kkri"),
1613+
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kkri"),
16141614
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kolin"),
16151615
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_maro"),
16161616
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_taro"),

‎include/d/actor/d_a_npc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ class daNpcT_c : public fopAc_ac_c {
746746
static dCcD_SrcSph mCcDSph;
747747
static fopAc_ac_c* mFindActorPtrs[50];
748748
static s16 mSrchName;
749-
static s32 mFindCount;
749+
static int mFindCount;
750750

751751
enum Mode {
752752
/* 0 */ MODE_ENTER,

‎include/d/actor/d_a_npc_kkri.h‎

Lines changed: 90 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -11,78 +11,116 @@
1111
* @details
1212
*
1313
*/
14-
class daNpc_Kkri_c : public fopAc_ac_c {
14+
class daNpc_Kkri_c : public daNpcT_c {
1515
public:
16-
/* 8054F3AC */ ~daNpc_Kkri_c();
17-
/* 8054F4F8 */ void create();
18-
/* 8054F7D0 */ void CreateHeap();
19-
/* 8054FC10 */ void Delete();
20-
/* 8054FC44 */ void Execute();
21-
/* 8054FC64 */ void Draw();
22-
/* 8054FD00 */ void createHeapCallBack(fopAc_ac_c*);
23-
/* 8054FD20 */ void ctrlJointCallBack(J3DJoint*, int);
24-
/* 8054FD78 */ void srchYm(void*, void*);
25-
/* 8054FE20 */ void getType();
26-
/* 8054FE58 */ void isDelete();
16+
typedef int (daNpc_Kkri_c::*ActionFunc)(void*);
17+
18+
/* 8054F4F8 */ int create();
19+
/* 8054F7D0 */ int CreateHeap();
20+
/* 8054FC10 */ int Delete();
21+
/* 8054FC44 */ int Execute();
22+
/* 8054FC64 */ int Draw();
23+
/* 8054FD00 */ static int createHeapCallBack(fopAc_ac_c*);
24+
/* 8054FD20 */ static int ctrlJointCallBack(J3DJoint*, int);
25+
/* 8054FD78 */ static void* srchYm(void*, void*);
26+
/* 8054FE20 */ int getType();
27+
/* 8054FE58 */ int isDelete();
2728
/* 8054FE8C */ void reset();
28-
/* 8054FFEC */ void checkChangeEvt();
29-
/* 805500A0 */ void setParam();
30-
/* 80550270 */ void setAfterTalkMotion();
3129
/* 8055032C */ void srchActors();
32-
/* 80550398 */ void evtTalk();
33-
/* 80550438 */ void evtCutProc();
34-
/* 80550500 */ void action();
35-
/* 805505F8 */ void beforeMove();
36-
/* 805506BC */ void setAttnPos();
37-
/* 80550ADC */ void setCollision();
38-
/* 80550CA0 */ bool drawDbgInfo();
39-
/* 80550CA8 */ void selectAction();
40-
/* 80550D44 */ void chkAction(int (daNpc_Kkri_c::*)(void*));
41-
/* 80550D70 */ void setAction(int (daNpc_Kkri_c::*)(void*));
42-
/* 80550E18 */ void cutConversationAboutSoup(int);
43-
/* 80550F70 */ void cutYmLook(int);
44-
/* 80551084 */ void sleep();
45-
/* 805512E0 */ void wait(void*);
46-
/* 80551538 */ void sitWait1(void*);
47-
/* 80551A4C */ void fearWait(void*);
48-
/* 80551DA4 */ void talk(void*);
49-
/* 80553304 */ daNpc_Kkri_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
50-
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
51-
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
52-
daNpcT_evtData_c const*, char**);
53-
/* 805533E4 */ u16 getEyeballMaterialNo();
54-
/* 805533EC */ s32 getHeadJointNo();
55-
/* 805533F4 */ s32 getNeckJointNo();
56-
/* 805533FC */ bool getBackboneJointNo();
57-
/* 80553404 */ void checkChangeJoint(int);
58-
/* 80553414 */ void checkRemoveJoint(int);
30+
/* 80550CA8 */ int selectAction();
31+
/* 80550D44 */ BOOL chkAction(ActionFunc);
32+
/* 80550D70 */ BOOL setAction(ActionFunc);
33+
/* 80550E18 */ int cutConversationAboutSoup(int);
34+
/* 80550F70 */ int cutYmLook(int);
35+
/* 80551084 */ int sleep();
36+
/* 805512E0 */ int wait(void*);
37+
/* 80551538 */ int sitWait1(void*);
38+
/* 80551A4C */ int fearWait(void*);
39+
/* 80551DA4 */ int talk(void*);
40+
41+
/* 80553304 */ daNpc_Kkri_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
42+
daNpcT_motionAnmData_c const* i_motionAnmData,
43+
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
44+
int i_faceMotionStepNum,
45+
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
46+
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
47+
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
48+
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
49+
i_arcNames)
50+
{
51+
OS_REPORT("|%06d:%x|daNpc_Kkri_c -> コンストラクト\n", g_Counter.mCounter0, this);
52+
}
53+
54+
/* 8054F3AC */ virtual ~daNpc_Kkri_c();
55+
/* 80553404 */ virtual BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 6; }
56+
/* 80553414 */ virtual BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 10; }
57+
/* 805533FC */ virtual s32 getBackboneJointNo() { return 1; }
58+
/* 805533F4 */ virtual s32 getNeckJointNo() { return 3; }
59+
/* 805533EC */ virtual s32 getHeadJointNo() { return 4; }
60+
/* 805533E4 */ virtual u16 getEyeballMaterialNo() { return 2; }
61+
/* 805500A0 */ virtual void setParam();
62+
/* 8054FFEC */ virtual BOOL checkChangeEvt();
63+
/* 80550398 */ virtual BOOL evtTalk();
64+
/* 80550438 */ virtual BOOL evtCutProc();
65+
/* 80550270 */ virtual void setAfterTalkMotion();
66+
/* 80550500 */ virtual void action();
67+
/* 805505F8 */ virtual void beforeMove();
68+
/* 805506BC */ virtual void setAttnPos();
69+
/* 80550ADC */ virtual void setCollision();
70+
/* 80550CA0 */ virtual int drawDbgInfo();
71+
72+
int getFlowNodeNo() {
73+
u16 prm = home.angle.x;
74+
return prm == 0xFFFF ? -1 : prm;
75+
}
76+
77+
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
78+
u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
79+
u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF000000) >> 24; }
5980

6081
MtxP getBd3Mtx() {
61-
return mpMorf->getModel()->getAnmMtx(0x11);
82+
return mpMorf[0]->getModel()->getAnmMtx(0x11);
6283
}
84+
6385
MtxP getBd2Mtx() {
64-
return mpMorf->getModel()->getAnmMtx(6);
86+
return mpMorf[0]->getModel()->getAnmMtx(6);
6587
}
88+
6689
MtxP getBd1Mtx() {
67-
return mpMorf->getModel()->getAnmMtx(5);
90+
return mpMorf[0]->getModel()->getAnmMtx(5);
6891
}
6992

70-
static void* mCutNameList[3];
71-
static u8 mCutList[36];
93+
static char* mCutNameList[3];
94+
static int (daNpc_Kkri_c::*mCutList[])(int);
7295

7396
private:
74-
/* 0x568 */ u8 field_0x568[0x578 - 0x568];
75-
/* 0x578 */ mDoExt_McaMorfSO* mpMorf;
76-
/* 0x57C */ u8 field_0x57C[0xfdc - 0x57C];
97+
/* 0xE40 */ u8 field_0xE40[0xE44 - 0xE40];
98+
/* 0xE44 */ dCcD_Cyl mCcCyl;
99+
/* 0xF80 */ u8 mType;
100+
/* 0xF84 */ daNpcT_ActorMngr_c mActorMng[1];
101+
/* 0xF8C */ ActionFunc mSelectAction;
102+
/* 0xF98 */ ActionFunc mAction;
103+
/* 0xFA4 */ daNpcT_Path_c mPath;
104+
/* 0xFCC */ int field_0xfcc;
105+
/* 0xFD0 */ int field_0xfd0;
106+
/* 0xFD4 */ u8 field_0xfd4;
107+
/* 0xFD5 */ u8 field_0xfd5;
108+
/* 0xFD6 */ u8 field_0xfd6;
109+
/* 0xFD7 */ u8 field_0xfd7;
110+
/* 0xFD8 */ u8 field_0xfd8;
77111
};
78112

79113
STATIC_ASSERT(sizeof(daNpc_Kkri_c) == 0xfdc);
80114

115+
struct daNpc_Kkri_HIOParam {
116+
/* 0x00 */ daNpcT_HIOParam common;
117+
};
118+
81119
class daNpc_Kkri_Param_c {
82120
public:
83-
/* 80553424 */ ~daNpc_Kkri_Param_c();
121+
/* 80553424 */ virtual ~daNpc_Kkri_Param_c() {}
84122

85-
static u8 const m[140];
123+
static const daNpc_Kkri_HIOParam m;
86124
};
87125

88126

‎src/d/actor/d_a_npc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ fopAc_ac_c* daNpcT_c::mFindActorPtrs[50];
11401140
s16 daNpcT_c::mSrchName;
11411141

11421142
/* 80450FDC-80450FE0 0004DC 0004+00 4/4 0/0 42/42 .sbss mFindCount__8daNpcT_c */
1143-
s32 daNpcT_c::mFindCount;
1143+
int daNpcT_c::mFindCount;
11441144

11451145
/* 80147FD4-80148058 142914 0084+00 3/3 0/0 2/2 .text srchActor__8daNpcT_cFPvPv */
11461146
void* daNpcT_c::srchActor(void* actor, void* param_1) {

0 commit comments

Comments
 (0)