mirror of https://github.com/zeldaret/tp.git
d_a_npc_kyury matching (#2808)
This commit is contained in:
hev7
GitHub
parent
2387021347
commit
fad2f41e33
|
|
@ -133,7 +133,8 @@ jointNo$4851 = .rodata:0x000000FC; // type:object size:0x8 scope:local
|
|||
...data.0 = .data:0x00000000; // type:label scope:local
|
||||
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
|
||||
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
|
||||
lbl_331_data_10 = .data:0x00000010; // type:object size:0x10
|
||||
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
|
||||
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
|
||||
l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte
|
||||
l_evtList = .data:0x00000038; // type:object size:0x18 scope:global
|
||||
l_resNameList = .data:0x00000050; // type:object size:0xC scope:global
|
||||
|
|
|
|||
|
|
@ -132,7 +132,8 @@ jointNo$4851 = .rodata:0x000000FC; // type:object size:0x8 scope:local
|
|||
@stringBase0 = .rodata:0x00000118; // type:object size:0x50 scope:local data:string_table
|
||||
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
|
||||
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
|
||||
lbl_331_data_10 = .data:0x00000010; // type:object size:0x10
|
||||
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
|
||||
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
|
||||
l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte
|
||||
l_evtList = .data:0x00000038; // type:object size:0x18 scope:global
|
||||
l_resNameList = .data:0x00000050; // type:object size:0xC scope:global
|
||||
|
|
|
|||
|
|
@ -132,7 +132,8 @@ jointNo$4851 = .rodata:0x000000FC; // type:object size:0x8 scope:local
|
|||
@stringBase0 = .rodata:0x00000118; // type:object size:0x50 scope:local data:string_table
|
||||
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
|
||||
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
|
||||
lbl_331_data_10 = .data:0x00000010; // type:object size:0x10
|
||||
_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8
|
||||
_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8
|
||||
l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte
|
||||
l_evtList = .data:0x00000038; // type:object size:0x18 scope:global
|
||||
l_resNameList = .data:0x00000050; // type:object size:0xC scope:global
|
||||
|
|
|
|||
|
|
@ -1887,7 +1887,7 @@ config.libs = [
|
|||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_knj"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_kolinb"),
|
||||
ActorRel(Equivalent, "d_a_npc_ks"), # weak func order
|
||||
ActorRel(NonMatching, "d_a_npc_kyury"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_kyury"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_len"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_lf"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_lud"),
|
||||
|
|
@ -1916,7 +1916,7 @@ config.libs = [
|
|||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_seira2"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_seirei"),
|
||||
ActorRel(Equivalent, "d_a_npc_shad", extra_cflags=[DANPCF_C_HACK]), # weak func order
|
||||
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_shaman"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shaman"),
|
||||
ActorRel(NonMatching, "d_a_npc_shoe", extra_cflags=[DANPCF_C_HACK]),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shop0"),
|
||||
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shop_maro"),
|
||||
|
|
|
|||
|
|
@ -3,6 +3,33 @@
|
|||
|
||||
#include "d/actor/d_a_npc.h"
|
||||
|
||||
struct daNpc_Kyury_HIOParam {
|
||||
/* 0x00 */ daNpcT_HIOParam common;
|
||||
};
|
||||
|
||||
class daNpc_Kyury_Param_c {
|
||||
public:
|
||||
/* 80B2CD94 */ virtual ~daNpc_Kyury_Param_c() {}
|
||||
|
||||
static const daNpc_Kyury_HIOParam m;
|
||||
};
|
||||
|
||||
#if DEBUG
|
||||
class daNpc_Kyury_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
daNpc_Kyury_HIO_c();
|
||||
|
||||
void listenPropertyEvent(const JORPropertyEvent*);
|
||||
void genMessage(JORMContext*);
|
||||
|
||||
daNpc_Kyury_HIOParam m;
|
||||
};
|
||||
|
||||
#define NPC_KYURY_HIO_CLASS daNpc_Kyury_HIO_c
|
||||
#else
|
||||
#define NPC_KYURY_HIO_CLASS daNpc_Kyury_Param_c
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @ingroup actors-npcs
|
||||
* @class daNpc_Kyury_c
|
||||
|
|
@ -11,64 +38,107 @@
|
|||
* @details
|
||||
*
|
||||
*/
|
||||
class daNpc_Kyury_c : public fopAc_ac_c {
|
||||
class daNpc_Kyury_c : public daNpcT_c {
|
||||
public:
|
||||
typedef int (daNpc_Kyury_c::*cutFunc)(int);
|
||||
typedef int (daNpc_Kyury_c::*actionFunc)(void*);
|
||||
|
||||
enum Type {
|
||||
TYPE_0,
|
||||
TYPE_1,
|
||||
TYPE_2,
|
||||
TYPE_3,
|
||||
};
|
||||
|
||||
enum FaceMotion {
|
||||
/* 0x01 */ FACE_MOT_UNK_1 = 1,
|
||||
/* 0x05 */ FACE_MOT_UNK_5 = 5,
|
||||
/* 0x06 */ FACE_MOT_UNK_6 = 6,
|
||||
/* 0x07 */ FACE_MOT_UNK_7 = 7,
|
||||
/* 0x08 */ FACE_MOT_UNK_8 = 8,
|
||||
/* 0x09 */ FACE_MOT_UNK_9 = 9,
|
||||
/* 0x0A */ FACE_MOT_UNK_10 = 10,
|
||||
/* 0x0C */ FACE_MOT_UNK_12 = 12,
|
||||
/* 0x0D */ FACE_MOT_UNK_13 = 13,
|
||||
/* 0x0E */ FACE_MOT_UNK_14 = 14,
|
||||
/* 0x0F */ FACE_MOT_UNK_15 = 15,
|
||||
};
|
||||
|
||||
enum Motion {
|
||||
/* 0x00 */ MOT_UNK_0 = 0,
|
||||
/* 0x05 */ MOT_UNK_5 = 5,
|
||||
/* 0x08 */ MOT_UNK_8 = 8,
|
||||
/* 0x0C */ MOT_UNK_12 = 12,
|
||||
};
|
||||
|
||||
/* 80A600CC */ ~daNpc_Kyury_c();
|
||||
/* 80A60218 */ void create();
|
||||
/* 80A604E4 */ void CreateHeap();
|
||||
/* 80A609A8 */ void Delete();
|
||||
/* 80A609DC */ void Execute();
|
||||
/* 80A609FC */ void Draw();
|
||||
/* 80A60A90 */ void createHeapCallBack(fopAc_ac_c*);
|
||||
/* 80A60AB0 */ void ctrlJointCallBack(J3DJoint*, int);
|
||||
/* 80A60B08 */ void getType();
|
||||
/* 80A60B54 */ void isDelete();
|
||||
/* 80A60218 */ int create();
|
||||
/* 80A604E4 */ int CreateHeap();
|
||||
/* 80A609A8 */ int Delete();
|
||||
/* 80A609DC */ int Execute();
|
||||
/* 80A609FC */ int Draw();
|
||||
/* 80A60A90 */ static int createHeapCallBack(fopAc_ac_c*);
|
||||
/* 80A60AB0 */ static int ctrlJointCallBack(J3DJoint*, int);
|
||||
/* 80A60B08 */ u8 getType();
|
||||
/* 80A60B54 */ int isDelete();
|
||||
/* 80A60B9C */ void reset();
|
||||
/* 80A60CF8 */ void afterJntAnm(int);
|
||||
/* 80A60D84 */ void setParam();
|
||||
/* 80A60EB0 */ void checkChangeEvt();
|
||||
/* 80A60EB0 */ BOOL checkChangeEvt();
|
||||
/* 80A60FB0 */ void setAfterTalkMotion();
|
||||
/* 80A61060 */ void srchActors();
|
||||
/* 80A610C4 */ void evtTalk();
|
||||
/* 80A61164 */ void evtCutProc();
|
||||
/* 80A610C4 */ BOOL evtTalk();
|
||||
/* 80A61164 */ BOOL evtCutProc();
|
||||
/* 80A6122C */ void action();
|
||||
/* 80A61324 */ void beforeMove();
|
||||
/* 80A613E8 */ void setAttnPos();
|
||||
/* 80A61730 */ void setCollision();
|
||||
/* 80A618A8 */ bool drawDbgInfo();
|
||||
/* 80A618A8 */ int drawDbgInfo();
|
||||
/* 80A618B0 */ void drawOtherMdl();
|
||||
/* 80A619B8 */ void selectAction();
|
||||
/* 80A61A00 */ void chkAction(int (daNpc_Kyury_c::*)(void*));
|
||||
/* 80A61A2C */ void setAction(int (daNpc_Kyury_c::*)(void*));
|
||||
/* 80A61AD4 */ void cutConversation(int);
|
||||
/* 80A61ED0 */ void wait(void*);
|
||||
/* 80A62370 */ void talk(void*);
|
||||
/* 80A63720 */ daNpc_Kyury_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**);
|
||||
/* 80A63800 */ u16 getEyeballMaterialNo();
|
||||
/* 80A63808 */ s32 getHeadJointNo();
|
||||
/* 80A63810 */ s32 getNeckJointNo();
|
||||
/* 80A63818 */ bool getBackboneJointNo();
|
||||
/* 80A63820 */ void checkChangeJoint(int);
|
||||
/* 80A63830 */ void checkRemoveJoint(int);
|
||||
/* 80A619B8 */ int selectAction();
|
||||
/* 80A61A00 */ int chkAction(int (daNpc_Kyury_c::*)(void*));
|
||||
/* 80A61A2C */ int setAction(int (daNpc_Kyury_c::*)(void*));
|
||||
/* 80A61AD4 */ int cutConversation(int);
|
||||
/* 80A61ED0 */ int wait(void*);
|
||||
/* 80A62370 */ int talk(void*);
|
||||
/* 80A63720 */ daNpc_Kyury_c(daNpcT_faceMotionAnmData_c const* param_1,
|
||||
daNpcT_motionAnmData_c const* param_2,
|
||||
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
|
||||
int param_4,
|
||||
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
|
||||
int param_6, daNpcT_evtData_c const* param_7, char** param_8)
|
||||
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
|
||||
/* 80A63800 */ u16 getEyeballMaterialNo() { return 2; }
|
||||
/* 80A63808 */ s32 getHeadJointNo() { return 4; }
|
||||
/* 80A63810 */ s32 getNeckJointNo() { return 3; }
|
||||
/* 80A63818 */ s32 getBackboneJointNo() { return 1; }
|
||||
/* 80A63820 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
|
||||
/* 80A63830 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 10; }
|
||||
|
||||
int getFlowNodeNo() {
|
||||
u16 nodeNo = home.angle.x;
|
||||
if (nodeNo == 0xFFFF) {
|
||||
return -1;
|
||||
}
|
||||
return nodeNo;
|
||||
}
|
||||
|
||||
static char* mCutNameList[2];
|
||||
static u8 mCutList[24];
|
||||
static cutFunc mCutList[2];
|
||||
|
||||
private:
|
||||
/* 0x568 */ u8 field_0x568[0xfdc - 0x568];
|
||||
/* 0xE40 */ NPC_KYURY_HIO_CLASS* mpHIO;
|
||||
/* 0xE44 */ J3DModel* mpModel[2];
|
||||
/* 0xE4C */ dCcD_Cyl mCyl;
|
||||
/* 0xF88 */ u8 mType;
|
||||
/* 0xF8C */ daNpcT_ActorMngr_c mActorMngr[1];
|
||||
/* 0xF94 */ daNpcT_Path_c mPath;
|
||||
/* 0xFBC */ actionFunc field_0xfbc[2];
|
||||
/* 0xFD4 */ u8 field_0xfd4;
|
||||
/* 0xFD5 */ u8 field_0xfd5;
|
||||
/* 0xFD8 */ int field_0xfd8;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daNpc_Kyury_c) == 0xfdc);
|
||||
|
||||
class daNpc_Kyury_Param_c {
|
||||
public:
|
||||
/* 80A63840 */ ~daNpc_Kyury_Param_c();
|
||||
|
||||
static u8 const m[140];
|
||||
};
|
||||
|
||||
|
||||
#endif /* D_A_NPC_KYURY_H */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue