falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_np_seid equivalent (minus rodata oddity) (#2435) 

* d_a_np_seid equivalent (minus rodata oddity)

* Updated configure.py

---------

Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
This commit is contained in:
Carco_21 2025-05-13 21:03:42 -04:00 committed by GitHub
parent e682f6597b
commit c7e1b04bc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 589 additions and 911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1818,7 +1818,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_saru"),
ActorRel(Equivalent, "d_a_npc_seib"), # weak func order
ActorRel(Equivalent, "d_a_npc_seic"), # weak func order
ActorRel(NonMatching, "d_a_npc_seid"),
ActorRel(Equivalent, "d_a_npc_seid"), # Rodata oddity
ActorRel(NonMatching, "d_a_npc_seira"),
ActorRel(NonMatching, "d_a_npc_seira2"),
ActorRel(NonMatching, "d_a_npc_seirei"),

139
include/d/actor/d_a_npc_seid.h
View File

@ -11,54 +11,125 @@
* @details
*
*/
class daNpc_seiD_c : public fopAc_ac_c {
struct daNpc_seiD_HIOParam {
/* 0x00 */ f32 field_0x00;
/* 0x04 */ f32 mGravity;
/* 0x08 */ f32 mScale;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 mSttsWeight;
/* 0x14 */ f32 mCylH;
/* 0x18 */ f32 mWallH;
/* 0x1C */ f32 mWallR;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 mMorfFrames;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4c;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
/* 0x64 */ f32 field_0x64;
/* 0x68 */ f32 field_0x68;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ f32 field_0x70;
/* 0x74 */ f32 field_0x74;
/* 0x78 */ f32 field_0x78;
/* 0x7C */ f32 field_0x7c;
/* 0x80 */ f32 field_0x80;
/* 0x84 */ f32 field_0x84;
/* 0x88 */ f32 field_0x88;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
};
class daNpc_seiD_Param_c {
public:
/* 80AC91B0 */ virtual ~daNpc_seiD_Param_c() {};
static const daNpc_seiD_HIOParam m;
};
class daNpc_seiD_HIO_c
#ifdef DEBUG
: public mDoHIO_entry_c
#endif
{
public:
void genMessage(JORMContext*);
#ifdef DEBUG
/* 0x08 */ daNpc_seiD_HIOParam field_0x8;
// /* 0x94 */ f32 field_0x94; // "強制会話距離" "Forced conversation distance" | Slider
// /* 0x98 */ f32 field_0x98; // "会話距離" "Conversation distance" | Slider
#endif
};
class daNpc_seiD_c : public daNpcT_c {
public:
typedef int (daNpc_seiD_c::*cutFunc)(int);
typedef int (daNpc_seiD_c::*actionFunc)(void*);
enum Type {
TYPE_0,
TYPE_1,
};
/* 80AC968C */ ~daNpc_seiD_c();
/* 80AC9728 */ void create();
/* 80AC9968 */ void CreateHeap();
/* 80AC9AC0 */ void Delete();
/* 80AC9AF4 */ void Execute();
/* 80AC9B14 */ void Draw();
/* 80AC9BA8 */ void createHeapCallBack(fopAc_ac_c*);
/* 80AC9BC8 */ void getType();
/* 80AC9BE8 */ void getFlowNodeNo();
/* 80AC9C04 */ bool isDelete();
/* 80AC9728 */ int create();
/* 80AC9968 */ int CreateHeap();
/* 80AC9AC0 */ int Delete();
/* 80AC9AF4 */ int Execute();
/* 80AC9B14 */ int Draw();
/* 80AC9BA8 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80AC9BC8 */ u8 getType();
/* 80AC9BE8 */ u32 getFlowNodeNo();
/* 80AC9C04 */ int isDelete();
/* 80AC9C0C */ void reset();
/* 80AC9D5C */ void setParam();
/* 80AC9E88 */ void srchActors();
/* 80AC9E8C */ void evtTalk();
/* 80AC9F8C */ void evtCutProc();
/* 80AC9E8C */ BOOL evtTalk();
/* 80AC9F8C */ BOOL evtCutProc();
/* 80ACA054 */ void action();
/* 80ACA0DC */ void beforeMove();
/* 80ACA15C */ void setAttnPos();
/* 80ACA1B8 */ bool drawDbgInfo();
/* 80ACA1C0 */ void afterSetMotionAnm(int, int, f32, int);
/* 80ACA358 */ void selectAction();
/* 80ACA3A0 */ void chkAction(int (daNpc_seiD_c::*)(void*));
/* 80ACA3CC */ void setAction(int (daNpc_seiD_c::*)(void*));
/* 80ACA1B8 */ int drawDbgInfo();
/* 80ACA1C0 */ bool afterSetMotionAnm(int, int, f32, int);
/* 80ACA358 */ int selectAction();
/* 80ACA3A0 */ int chkAction(int (daNpc_seiD_c::*)(void*));
/* 80ACA3CC */ int setAction(int (daNpc_seiD_c::*)(void*));
/* 80ACA474 */ void ctrlWaitAnm();
/* 80ACA478 */ void wait(void*);
/* 80ACA4A4 */ void talk(void*);
/* 80ACB2AC */ daNpc_seiD_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**);
/* 80ACA478 */ int wait(void*);
/* 80ACA4A4 */ int talk(void*);
/* 80ACB2AC */ daNpc_seiD_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)
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {};
static void* mCutNameList;
static u8 mCutList[12];
static char* mCutNameList;
static cutFunc mCutList[1];
private:
/* 0x568 */ u8 field_0x568[0xe64 - 0x568];
/* 0xE40 */ daNpc_seiD_HIO_c* field_0xe40;
/* 0xE44 */ u8 mType;
/* 0xE45 */ u8 field_0xe45[0xe48 - 0xe45];
/* 0xE48 */ actionFunc mAction;
/* 0xE54 */ actionFunc mAction2;
/* 0xE60 */ int field_0xe60;
};
STATIC_ASSERT(sizeof(daNpc_seiD_c) == 0xe64);
class daNpc_seiD_Param_c {
public:
/* 80ACB2F0 */ ~daNpc_seiD_Param_c();
static u8 const m[148];
};
#endif /* D_A_NPC_SEID_H */

1359
src/d/actor/d_a_npc_seid.cpp
View File

File diff suppressed because it is too large Load Diff