Skip to content

Commit e682f65

Browse files
carter-ktb21carter-ktb21
authored
d_a_npc_seic almost equivalent (#2432)
* Data work and fopacmsetup * d_a_npc_seic almost equivalent * Now equivalent and configure.py updated
1 parent 8f97cd9 commit e682f65

File tree

5 files changed

+549
-832
lines changed

5 files changed

+549
-832
lines changed

‎configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,7 @@ def MatchingFor(*versions) -> bool:
18171817
ActorRel(NonMatching, "d_a_npc_rafrel"),
18181818
ActorRel(NonMatching, "d_a_npc_saru"),
18191819
ActorRel(Equivalent, "d_a_npc_seib"), # weak func order
1820-
ActorRel(NonMatching, "d_a_npc_seic"),
1820+
ActorRel(Equivalent, "d_a_npc_seic"), # weak func order
18211821
ActorRel(NonMatching, "d_a_npc_seid"),
18221822
ActorRel(NonMatching, "d_a_npc_seira"),
18231823
ActorRel(NonMatching, "d_a_npc_seira2"),

‎include/d/actor/d_a_npc_seib.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class daNpc_seiB_Param_c {
1616
public:
1717
/* 80AC6FB8 */ virtual ~daNpc_seiB_Param_c() {};
1818
struct Data {
19-
/* 0x00 */ u32 field_0x00;
19+
/* 0x00 */ f32 field_0x00;
2020
/* 0x04 */ f32 mGravity;
2121
/* 0x08 */ f32 mScale;
2222
/* 0x0C */ f32 field_0xc;

‎include/d/actor/d_a_npc_seic.h‎

Lines changed: 106 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,126 @@
1111
* @details
1212
*
1313
*/
14-
class daNpc_seiC_c : public fopAc_ac_c {
14+
15+
struct daNpc_seiC_HIOParam {
16+
/* 0x00 */ f32 field_0x00;
17+
/* 0x04 */ f32 mGravity;
18+
/* 0x08 */ f32 mScale;
19+
/* 0x0C */ f32 field_0x0c;
20+
/* 0x10 */ f32 mSttsWeight;
21+
/* 0x14 */ f32 mCylH;
22+
/* 0x18 */ f32 mWallH;
23+
/* 0x1C */ f32 mWallR;
24+
/* 0x20 */ f32 field_0x20;
25+
/* 0x24 */ f32 field_0x24;
26+
/* 0x28 */ f32 field_0x28;
27+
/* 0x2C */ f32 field_0x2c;
28+
/* 0x30 */ f32 field_0x30;
29+
/* 0x34 */ f32 field_0x34;
30+
/* 0x38 */ f32 field_0x38;
31+
/* 0x3C */ f32 field_0x3c;
32+
/* 0x40 */ f32 field_0x40;
33+
/* 0x44 */ f32 mMorfFrames;
34+
/* 0x48 */ f32 field_0x48;
35+
/* 0x4C */ f32 field_0x4c;
36+
/* 0x50 */ f32 field_0x50;
37+
/* 0x54 */ f32 field_0x54;
38+
/* 0x58 */ f32 field_0x58;
39+
/* 0x5C */ f32 field_0x5c;
40+
/* 0x60 */ f32 field_0x60;
41+
/* 0x64 */ f32 field_0x64;
42+
/* 0x68 */ f32 field_0x68;
43+
/* 0x6C */ f32 field_0x6c;
44+
/* 0x70 */ f32 field_0x70;
45+
/* 0x74 */ f32 field_0x74;
46+
/* 0x78 */ f32 field_0x78;
47+
/* 0x7C */ f32 field_0x7c;
48+
/* 0x80 */ f32 field_0x80;
49+
/* 0x84 */ f32 field_0x84;
50+
/* 0x88 */ f32 field_0x88;
51+
/* 0x8C */ f32 field_0x8c;
52+
/* 0x90 */ f32 field_0x90;
53+
};
54+
55+
class daNpc_seiC_Param_c {
56+
public:
57+
/* 80AC91B0 */ virtual ~daNpc_seiC_Param_c() {};
58+
59+
static const daNpc_seiC_HIOParam m;
60+
};
61+
62+
class daNpc_seiC_HIO_c
63+
#ifdef DEBUG
64+
: public mDoHIO_entry_c
65+
#endif
66+
{
1567
public:
68+
void genMessage(JORMContext*);
69+
70+
#ifdef DEBUG
71+
/* 0x08 */ daNpc_seiC_HIOParam field_0x8;
72+
/* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider
73+
/* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider
74+
#endif
75+
};
76+
77+
class daNpc_seiC_c : public daNpcT_c {
78+
public:
79+
typedef int (daNpc_seiC_c::*cutFunc)(int);
80+
typedef int (daNpc_seiC_c::*actionFunc)(void*);
81+
82+
83+
enum Type {
84+
TYPE_0,
85+
TYPE_1,
86+
};
87+
1688
/* 80AC754C */ ~daNpc_seiC_c();
17-
/* 80AC75E8 */ void create();
18-
/* 80AC7828 */ void CreateHeap();
19-
/* 80AC7980 */ void Delete();
20-
/* 80AC79B4 */ void Execute();
21-
/* 80AC79D4 */ void Draw();
22-
/* 80AC7A68 */ void createHeapCallBack(fopAc_ac_c*);
23-
/* 80AC7A88 */ void getType();
24-
/* 80AC7AA8 */ void getFlowNodeNo();
25-
/* 80AC7AC4 */ bool isDelete();
89+
/* 80AC75E8 */ int create();
90+
/* 80AC7828 */ int CreateHeap();
91+
/* 80AC7980 */ int Delete();
92+
/* 80AC79B4 */ int Execute();
93+
/* 80AC79D4 */ int Draw();
94+
/* 80AC7A68 */ static int createHeapCallBack(fopAc_ac_c*);
95+
/* 80AC7A88 */ u8 getType();
96+
/* 80AC7AA8 */ u32 getFlowNodeNo();
97+
/* 80AC7AC4 */ int isDelete();
2698
/* 80AC7ACC */ void reset();
2799
/* 80AC7C1C */ void setParam();
28100
/* 80AC7D48 */ void srchActors();
29-
/* 80AC7D4C */ void evtTalk();
30-
/* 80AC7E4C */ void evtCutProc();
101+
/* 80AC7D4C */ BOOL evtTalk();
102+
/* 80AC7E4C */ BOOL evtCutProc();
31103
/* 80AC7F14 */ void action();
32104
/* 80AC7F9C */ void beforeMove();
33105
/* 80AC801C */ void setAttnPos();
34-
/* 80AC8078 */ bool drawDbgInfo();
35-
/* 80AC8080 */ void afterSetMotionAnm(int, int, f32, int);
36-
/* 80AC8218 */ void selectAction();
37-
/* 80AC8260 */ void chkAction(int (daNpc_seiC_c::*)(void*));
38-
/* 80AC828C */ void setAction(int (daNpc_seiC_c::*)(void*));
106+
/* 80AC8078 */ int drawDbgInfo();
107+
/* 80AC8080 */ bool afterSetMotionAnm(int, int, f32, int);
108+
/* 80AC8218 */ int selectAction();
109+
/* 80AC8260 */ int chkAction(int (daNpc_seiC_c::*)(void*));
110+
/* 80AC828C */ int setAction(int (daNpc_seiC_c::*)(void*));
39111
/* 80AC8334 */ void ctrlWaitAnm();
40-
/* 80AC8338 */ void wait(void*);
41-
/* 80AC8364 */ void talk(void*);
42-
/* 80AC916C */ daNpc_seiC_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
43-
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
44-
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
45-
daNpcT_evtData_c const*, char**);
112+
/* 80AC8338 */ int wait(void*);
113+
/* 80AC8364 */ int talk(void*);
114+
/* 80AC916C */ daNpc_seiC_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData,
115+
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum,
116+
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
117+
daNpcT_evtData_c const* i_evtData, char** i_arcNames)
118+
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
119+
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
120+
i_arcNames) {};
46121

47-
static void* mCutNameList;
48-
static u8 mCutList[12];
122+
static char* mCutNameList;
123+
static cutFunc mCutList[1];
49124

50125
private:
51-
/* 0x568 */ u8 field_0x568[0xe64 - 0x568];
126+
/* 0xE40 */ daNpc_seiC_HIO_c* field_0xe40;
127+
/* 0xE44 */ u8 mType;
128+
/* 0xE45 */ u8 field_0xe45[0xe48 - 0xe45];
129+
/* 0xE48 */ actionFunc mAction;
130+
/* 0xE54 */ actionFunc mAction2;
131+
/* 0xE60 */ int field_0xe60;
52132
};
53133

54134
STATIC_ASSERT(sizeof(daNpc_seiC_c) == 0xe64);
55135

56-
class daNpc_seiC_Param_c {
57-
public:
58-
/* 80AC91B0 */ ~daNpc_seiC_Param_c();
59-
60-
static u8 const m[148];
61-
};
62-
63-
64136
#endif /* D_A_NPC_SEIC_H */

‎src/d/actor/d_a_npc_seib.cpp‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,44 @@ daNpc_seiB_c::~daNpc_seiB_c() {
7373

7474
/* 80AC7024-80AC70B8 000000 0094+00 4/4 0/0 0/0 .rodata m__18daNpc_seiB_Param_c */
7575
daNpc_seiB_Param_c::Data const daNpc_seiB_Param_c::m = {
76-
0, 0, 1.0f, 4000.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
77-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1200.0f};
76+
0.0f,
77+
0.0f,
78+
1.0f,
79+
4000.0f,
80+
0.0f,
81+
0.0f,
82+
0.0f,
83+
0.0f,
84+
0.0f,
85+
0.0f,
86+
0.0f,
87+
0.0f,
88+
0.0f,
89+
0.0f,
90+
0.0f,
91+
0.0f,
92+
0.0f,
93+
0.0f,
94+
0.0f,
95+
0.0f,
96+
0.0f,
97+
0.0f,
98+
0.0f,
99+
0.0f,
100+
0.0f,
101+
0.0f,
102+
0.0f,
103+
0.0f,
104+
0.0f,
105+
0.0f,
106+
0.0f,
107+
0.0f,
108+
0.0f,
109+
0.0f,
110+
0.0f,
111+
0.0f,
112+
1200.0f,
113+
};
78114

79115
/* 80AC5188-80AC53C8 000188 0240+00 1/1 0/0 0/0 .text create__12daNpc_seiB_cFv */
80116
int daNpc_seiB_c::create() {

0 commit comments

Comments
 (0)