encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work on daNpc_Hanjo_c (#2225)

Browse Source
This commit is contained in:
hatal175
2024-10-25 23:44:26 -07:00
committed by GitHub
parent 8a0802554e
commit 606178dc88
148 changed files with 2720 additions and 2359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+2
View File
@@ -445,6 +445,7 @@ public:
u32 GetVsGrp() const { return MskSPrm(0x70); }
u32 GetIGrp() const { return MskSPrm(0xE); }
u32 ChkNoCrr() const { return MskSPrm(0x100); }
void OnNoCrrBit() { OnSPrmBit(0x100); }
u32 ChkSph3DCrr() const { return MskSPrm(0x80); }
void ClrSet() { OffSPrmBit(1); }
u32 ChkHit() { return MskRPrm(1); }
@@ -487,6 +488,7 @@ public:
void SetCoHit(cCcD_Obj* obj) { mObjCo.SetHit(obj); }
BOOL ChkAtType(u32 type) const { return mObjAt.MskType(type); }
u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); }
void OnCoNoCrrBit() { mObjCo.OnNoCrrBit(); }
u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); }
void OnAtSPrmBit(u32 flag) { mObjAt.OnSPrmBit(flag); }
void OffAtSPrmBit(u32 flag) { mObjAt.OffSPrmBit(flag); }
include/d/actor/d_a_npc.h
+202 -48
View File
@@ -2,6 +2,7 @@
#define D_A_D_A_NPC_H
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/actor/d_a_player.h"
#include "d/d_path.h"
@@ -34,7 +35,7 @@ public:
daNpcT_ActorMngr_c() { initialize(); };
/* 8014D108 */ virtual ~daNpcT_ActorMngr_c();
/* 8014D108 */ virtual ~daNpcT_ActorMngr_c() {}
};
class daNpcT_MatAnm_c : public J3DMaterialAnm {
@@ -47,6 +48,7 @@ private:
/* 0x105 */ u8 field_0x105;
public:
daNpcT_MatAnm_c() { initialize(); }
/* 80145764 */ void initialize();
/* 80145788 */ virtual void calc(J3DMaterial*) const;
/* 8014D24C */ ~daNpcT_MatAnm_c();
@@ -65,10 +67,27 @@ public:
/* 801458C0 */ int play(u16, int*, f32*);
/* 80145A24 */ s32 checkEndSequence();
daNpcT_MotionSeqMngr_c(sequenceStepData_c const* param_1,int param_2) :
mpSeqData(param_1), field_0x4(param_2) {
initialize();
}
bool checkEntryNewMotion() { return mStepNo == 0 && field_0x14 == -1; }
int getNo() { return mNo; }
int getStepNo() { return mStepNo; }
void setNo(int param_1, f32 param_2, int param_3, int param_4) {
int newNo = param_4 + param_1;
if (param_1 >= 0 && (param_3 != 0 || newNo != mNo)) {
int offset = mOffset;
initialize();
mOffset = offset;
mNo = newNo;
field_0x18 = param_2;
}
}
private:
/* 0x00 */ sequenceStepData_c* mpSeqData;
/* 0x00 */ sequenceStepData_c const* mpSeqData;
/* 0x04 */ int field_0x4;
/* 0x08 */ int mNo;
/* 0x0C */ int mOffset;
@@ -78,7 +97,7 @@ private:
/* 0x1C */ bool mEndSequence;
public:
/* 8014D0C0 */ virtual ~daNpcT_MotionSeqMngr_c();
/* 8014D0C0 */ virtual ~daNpcT_MotionSeqMngr_c() {}
};
class daNpcT_JntAnm_c {
@@ -116,10 +135,87 @@ public:
f32, f32, f32, f32, f32, f32, cXyz*);
/* 80147858 */ void calc(f32);
/* 80147C38 */ void calcJntRad(f32, f32, f32);
void setEyeAngleX(cXyz param_1, f32 param_2, s16 param_3) {
cXyz cStack_50;
s16 sVar3 = 0;
if (field_0x20 != NULL) {
cStack_50 = *field_0x20 - param_1;
sVar3 = -cM_atan2s(cStack_50.y, cStack_50.absXZ());
sVar3 += param_3;
}
sVar3 += field_0x150.x;
mEyeAngle.x = field_0x132.x * (1.0f - 1.0f / param_2) +
sVar3 * (1.0f / param_2);
}
void setEyeAngleY(cXyz param_1, s16 param_2, int param_3, f32 param_4, s16 param_5) {
cXyz cStack_50;
s16 sVar3 = 0;
if (field_0x20 != NULL) {
cStack_50 = *field_0x20 - param_1;
sVar3 = cM_atan2s(cStack_50.x, cStack_50.z);
sVar3 -= param_2;
s16 diff = field_0x150.y - param_2;
sVar3 -= diff;
sVar3 += param_5;
}
if (param_3 != 0) {
sVar3 = -sVar3;
}
mEyeAngle.y = field_0x132.y * (1.0f - 1.0f / param_4) +
sVar3 * (1.0f / param_4);
}
/* 8014D150 */ virtual ~daNpcT_JntAnm_c();
daNpcT_JntAnm_c() {
initialize();
}
/* 8014D150 */ virtual ~daNpcT_JntAnm_c() {}
void clrDirectFlag() { mDirectFlag = 0; }
int getMode() { return mMode; }
int setMode(int mode, int param_2) {
if (mode >= 0 && (param_2 != 0 || mode != mMode)) {
mActrMngr.remove();
field_0x20 = NULL;
field_0x14c = 0.0f;
mDirectFlag = 0;
mMode = mode;
return 1;
}
return 0;
}
void setDirect(u8 isDirect) {
if (isDirect != 0) {
mEyeAngle.x = 0;
mEyeAngle.y = 0;
}
mDirectFlag = isDirect;
}
void lookNone(u8 isDirect) {
setMode(0, 0);
setDirect(isDirect);
}
void lookPlayer(u8 isDirect) {
setMode(1, 0);
setDirect(isDirect);
}
void lookCamera(u8 isDirect) {
setMode(4, 0);
setDirect(isDirect);
}
void lookActor(fopAc_ac_c* param_1, f32 param_2, u8 isDirect) {
if (setMode(2, mActrMngr.getActorP() != param_1) && fopAcM_IsActor(param_1)) {
mActrMngr.entry(param_1);
field_0x14c = param_2;
}
setDirect(isDirect);
}
};
class daNpcT_DmgStagger_c {
@@ -127,16 +223,34 @@ public:
/* 80147DCC */ void setParam(fopAc_ac_c*, fopAc_ac_c*, s16);
/* 80147E3C */ void calc(int);
void initialize() {
for (int i = 0; i < 2; i++) {
field_0x0[i].setall(0);
field_0xc[i] = 0.0f;
}
mStagger = 0;
field_0x16 = 0;
mRebirth = 0;
}
int checkStagger() { return mStagger != 0; }
s16 getAngleX(int idx) { return field_0x0[idx].x; }
s16 getAngleZ(int idx) { return field_0x0[idx].z; }
int checkRebirth() { return mRebirth; }
private:
/* 0x00 */ csXyz field_0x0[2];
/* 0x0C */ f32 field_0xc;
/* 0x0C */ f32 field_0x10;
/* 0x0C */ f32 field_0xc[2];
/* 0x14 */ s16 mStagger;
/* 0x16 */ s16 field_0x16;
/* 0x18 */ u8 mRebirth;
/* 0x18 */ bool mRebirth;
};
struct daNpcT_evtData_c {};
struct daNpcT_evtData_c {
const char* eventName;
int num;
};
struct daNpcT_faceMotionAnmData_c {
u32 field_0x0[6];
@@ -160,7 +274,7 @@ public:
};
class daNpcT_Path_c {
private:
public:
/* 0x00 */ dPath* mpRoomPath;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ f32 field_0x10;
@@ -171,7 +285,6 @@ private:
/* 0x20 */ u8 mDirection;
/* 0x21 */ u8 mIsClosed;
public:
/* 80145B7C */ void hermite(cXyz&, cXyz&, cXyz&, cXyz&, daNpcT_Hermite_c&, cXyz&);
/* 80145C40 */ void initialize();
/* 80145C74 */ int setPathInfo(u8, s8, u8);
@@ -182,6 +295,10 @@ public:
/* 80145FB4 */ int getDstPosH(cXyz, cXyz*, int, int);
/* 80146188 */ int chkPassed1(cXyz, int);
/* 801464D8 */ int chkPassed2(cXyz, cXyz*, int, int);
daNpcT_Path_c() {
initialize();
}
virtual ~daNpcT_Path_c() {}
inline Vec getPntPos(int i_idx) { return mpRoomPath->m_points[i_idx].m_position; }
@@ -204,9 +321,9 @@ class mDoExt_McaMorfSO;
class daNpcT_c : public fopAc_ac_c {
public:
/* 0x568 */ daNpcT_faceMotionAnmData_c* field_0x568;
/* 0x56C */ daNpcT_motionAnmData_c* field_0x56c;
/* 0x570 */ daNpcT_evtData_c* field_0x570;
/* 0x568 */ daNpcT_faceMotionAnmData_c const* field_0x568;
/* 0x56C */ daNpcT_motionAnmData_c const* field_0x56c;
/* 0x570 */ daNpcT_evtData_c const* field_0x570;
/* 0x574 */ char** field_0x574;
/* 0x578 */ mDoExt_McaMorfSO* mpMorf[2];
/* 0x580 */ Z2Creature field_0x580;
@@ -220,14 +337,15 @@ public:
/* 0x8A0 */ dBgS_AcchCir field_0x8a0;
/* 0x8E0 */ request_of_phase_process_class field_0x8e0[10];
/* 0x930 */ cBgS_GndChk field_0x930;
/* 0x96C */ u8 field_0xa6c[8];
/* 0x96C */ daNpcT_MatAnm_c* field_0x96c;
/* 0x970 */ u8 field_0x970[4];
/* 0x974 */ dMsgFlow_c mFlow;
/* 0x9C0 */ dPaPoT_c field_0x9c0;
/* 0xA40 */ dCcD_Stts field_0xa40;
/* 0xA7C */ u8 field_0xa7c[4];
/* 0xA7C */ u32 field_0xa7c;
/* 0xA80 */ f32 field_0xa80;
/* 0xA84 */ f32 field_0xa84;
/* 0xA89 */ u8 field_0xa88;
/* 0xA88 */ u8 field_0xa88;
/* 0xA89 */ u8 field_0xa89;
/* 0xA8C */ dBgS_GndChk field_0xa8c;
/* 0xAE0 */ dBgS_LinChk field_0xae0;
@@ -260,7 +378,7 @@ public:
/* 0xDB8 */ int field_0xdb8;
/* 0xDBC */ int mTimer;
/* 0xDC0 */ int field_0xdc0;
/* 0xDC4 */ u8 field_0xdc4[4];
/* 0xDC4 */ int field_0xdc4;
/* 0xDC8 */ s16 field_0xdc8;
/* 0xDCA */ s16 field_0xdca;
/* 0xDCC */ u8 field_0xdcc[10];
@@ -270,9 +388,11 @@ public:
/* 0xDDC */ f32 field_0xddc;
/* 0xDE0 */ f32 field_0xde0;
/* 0xDE4 */ f32 field_0xde4;
/* 0xDE8 */ u8 field_0xde8[0xC];
/* 0xDE8 */ f32 field_0xde8;
/* 0xDEC */ f32 field_0xdec;
/* 0xDF0 */ f32 field_0xdf0;
/* 0xDF4 */ f32 field_0xdf4;
/* 0xDF8 */ u8 field_0xdf8[4];
/* 0xDF8 */ f32 field_0xdf8;
/* 0xDFC */ f32 field_0xdfc;
/* 0xE00 */ cXyz field_0xe00;
/* 0xE0C */ cXyz field_0xe0c;
@@ -304,7 +424,19 @@ public:
/* 0xE3C vtable */
public:
/* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
daNpcT_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) :
field_0x568(param_1),
field_0x56c(param_2),
field_0x570(param_7),
field_0x574(param_8),
field_0xb50(param_3, param_4),
field_0xb74(param_5, param_6) {
initialize();
}
/* 80147FA4 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
/* 80147FD4 */ static int srchActor(void*, void*);
/* 80148058 */ J3DAnmTransform* getTrnsfrmAnmP(char const*, int);
/* 80148094 */ J3DAnmTransformKey* getTrnsfrmKeyAnmP(char const*, int);
@@ -332,50 +464,50 @@ public:
/* 80149300 */ void ctrlMotion();
/* 801493B8 */ int ctrlMsgAnm(int*, int*, fopAc_ac_c*, int);
/* 8014A224 */ void evtChange();
/* 8014A388 */ void setFaceMotionAnm(int, bool);
/* 8014A388 */ bool setFaceMotionAnm(int, bool);
/* 8014A908 */ void setPos(cXyz);
/* 8014AA18 */ void setAngle(s16);
/* 8014A99C */ void setAngle(csXyz);
/* 8014AA40 */ fopAc_ac_c* hitChk(dCcD_GObjInf*, u32);
/* 8014AAD0 */ void setDamage(int, int, int);
/* 8014ABD0 */ void chkActorInSight(fopAc_ac_c*, f32, s16);
/* 8014ACF0 */ void chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
/* 8014ADA0 */ void chkPointInArea(cXyz, cXyz, cXyz, s16);
/* 8014ABD0 */ BOOL chkActorInSight(fopAc_ac_c*, f32, s16);
/* 8014ACF0 */ BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
/* 8014ADA0 */ BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
/* 8014AE1C */ void chkFindActor(fopAc_ac_c*, int, s16);
/* 8014B024 */ void chkWolfAction();
/* 8014B0C8 */ void chkFindWolf(s16, int, int, f32, f32, f32, f32, int);
/* 8014B338 */ void srchPlayerActor();
/* 8014B338 */ BOOL srchPlayerActor();
/* 8014B3EC */ void getAttnPos(fopAc_ac_c*);
/* 8014B4A4 */ void turn(s16, int, int);
/* 8014B648 */ void step(s16, int, int, int, int);
/* 8014B648 */ int step(s16, int, int, int, int);
/* 8014B808 */ void calcSpeedAndAngle(cXyz, int, s16, s16);
/* 8014BB00 */ void getActorDistance(fopAc_ac_c*, int, int);
/* 8014BBF0 */ int initTalk(int, fopAc_ac_c**);
/* 8014BC78 */ void talkProc(int*, int, fopAc_ac_c**, int);
/* 8014BC78 */ int talkProc(int*, int, fopAc_ac_c**, int);
/* 8014BE2C */ fopAc_ac_c* getNearestActorP(s16);
/* 8014BEE4 */ void getEvtAreaTagP(int, int);
/* 8014BEE4 */ fopAc_ac_c* getEvtAreaTagP(int, int);
/* 8014BFB0 */ fopAc_ac_c* getShopItemTagP();
/* 8014C030 */ void setHitodamaPrtcl();
/* 8014CD20 */ virtual ~daNpcT_c();
/* 801490D4 */ virtual void ctrlBtk();
/* 8014CC14 */ virtual void ctrlSubFaceMotion(int);
/* 8014CC40 */ virtual bool checkChangeJoint(int);
/* 8014CC38 */ virtual bool checkRemoveJoint(int);
/* 8014CC14 */ virtual void ctrlSubFaceMotion(int) {}
/* 8014CC40 */ virtual int checkChangeJoint(int);
/* 8014CC38 */ virtual int checkRemoveJoint(int);
/* 8014CC5C */ virtual s32 getBackboneJointNo();
/* 8014CC54 */ virtual s32 getNeckJointNo();
/* 8014CC4C */ virtual s32 getHeadJointNo();
/* 8014CC90 */ virtual s32 getFootLJointNo();
/* 8014CC88 */ virtual s32 getFootRJointNo();
/* 8014D0A8 */ virtual bool getEyeballLMaterialNo();
/* 8014D0B0 */ virtual bool getEyeballRMaterialNo();
/* 8014D0B8 */ virtual bool getEyeballMaterialNo();
/* 8014D0A8 */ virtual int getEyeballLMaterialNo() { return 0; }
/* 8014D0B0 */ virtual bool getEyeballRMaterialNo() { return 0; }
/* 8014D0B8 */ virtual s32 getEyeballMaterialNo() { return 0; }
/* 8014951C */ virtual void ctrlJoint(J3DJoint*, J3DModel*);
/* 8014CC48 */ virtual void afterJntAnm(int);
/* 8014CC24 */ virtual void setParam();
/* 8014CC80 */ virtual bool checkChangeEvt();
/* 8014CC78 */ virtual bool evtTalk();
/* 8014CC70 */ virtual bool evtEndProc();
/* 8014CC70 */ virtual bool evtEndProc() { return true; }
/* 8014CC68 */ virtual bool evtCutProc();
/* 8014CC64 */ virtual void setAfterTalkMotion();
/* 8014997C */ virtual int evtProc();
@@ -388,27 +520,46 @@ public:
/* 80149D7C */ virtual void setFootPrtcl(cXyz*, f32, f32);
/* 8014A05C */ virtual bool checkCullDraw();
/* 8014A064 */ virtual void twilight();
/* 8014CC98 */ virtual bool chkXYItems();
/* 8014CC98 */ virtual bool chkXYItems() { return false; }
/* 8014A0B0 */ virtual void evtOrder();
/* 8014CBF4 */ virtual void decTmr();
/* 8014CBF4 */ virtual void decTmr() {
if (mTimer != 0) {
mTimer--;
}
}
/* 8014A324 */ virtual void clrParam();
/* 8014CC30 */ virtual int drawDbgInfo();
/* 8014CC28 */ virtual void drawOtherMdl();
/* 8014CC2C */ virtual void drawGhost();
/* 8014CCA0 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int);
/* 8014CCE0 */ virtual bool afterSetMotionAnm(int, int, f32, int);
/* 8014CCB0 */ virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
/* 8014CCF0 */ virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c);
/* 8014CCEC */ virtual void changeAnm(int*, int*);
/* 8014CCAC */ virtual void changeBck(int*, int*);
/* 8014CCA8 */ virtual void changeBtp(int*, int*);
/* 8014CCE8 */ virtual void changeBtk(int*, int*);
/* 8014A628 */ virtual void setMotionAnm(int, f32, int);
/* 8014CC2C */ virtual void drawGhost() {}
/* 8014CCA0 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int) { return true; }
/* 8014CCE0 */ virtual bool afterSetMotionAnm(int, int, f32, int) { return true; }
/* 8014CCB0 */ virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_1) { return param_1; }
/* 8014CCF0 */ virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c param_1) { return param_1; }
/* 8014CCEC */ virtual void changeAnm(int*, int*) {}
/* 8014CCAC */ virtual void changeBck(int*, int*) {}
/* 8014CCA8 */ virtual void changeBtp(int*, int*) {}
/* 8014CCE8 */ virtual void changeBtk(int*, int*) {}
/* 8014A628 */ virtual bool setMotionAnm(int, f32, int);
bool checkHide() { return field_0xe25 || (!dComIfGs_wolfeye_effect_check() && field_0xa89); }
s16 checkStep() { return mStepNo == 1; }
void setCommander(fopAc_ac_c* param_0) { field_0xba0.entry(param_0); }
void initialize() {
memset(&field_0xd24, 0, (u8*)&field_0xe38 - (u8*)&field_0xd24);
field_0xb50.initialize();
field_0xb74.initialize();
field_0xb98.initialize();
field_0xba0.initialize();
field_0xba8.initialize();
field_0xd08.initialize();
field_0xd90 = 0xffffffff;
field_0xe26 = 1;
field_0xe1a = cM_rndF(65536.0f);
field_0xde0 = 0.2f;
field_0xde4 = 0.2f;
}
static u8 const mCcDObjData[48];
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
@@ -423,6 +574,9 @@ BOOL daNpcT_chkEvtBit(u32 i_idx);
BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, int param_4);
u8 daNpcT_getDistTableIdx(int param_0, int param_1);
BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_ActorP);
void daNpcT_offTmpBit(u32 i_idx);
void daNpcT_onTmpBit(u32 i_idx);
void daNpcT_onEvtBit(u32 i_idx);
struct daBaseNpc_matAnm_c {
/* 8014D884 */ void calc(J3DMaterial*) const;
@@ -803,7 +957,7 @@ public:
/* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify);
/* 80155EC8 */ virtual bool setExpressionBtp(int i_idx);
/* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf);
/* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf);
/* 80155BE8 */ virtual bool setMotionAnm(int i_idx, f32 i_morf);
/* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart);
/* 80155BD0 */ virtual BOOL drawDbgInfo();
/* 80155BCC */ virtual void drawOtherMdls();
include/d/actor/d_a_npc_ash.h
+1 -1
View File
@@ -101,7 +101,7 @@ public:
/* 80959478 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
/* 809594C4 */ bool setExpressionAnm(int, bool);
/* 809596E0 */ bool setExpressionBtp(int);
/* 809597C0 */ void setMotionAnm(int i_idx, f32 i_morf);
/* 809597C0 */ bool setMotionAnm(int i_idx, f32 i_morf);
/* 80959910 */ void reset();
/* 80959B28 */ inline bool setAction(ActionFn);
/* 80959BD0 */ inline bool isSneaking();
include/d/actor/d_a_npc_ashB.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 8095EBB4 */ void ctrlJointCallBack(J3DJoint*, int);
/* 8095EC00 */ void setExpressionAnm(int, bool);
/* 8095EE00 */ void setExpressionBtp(int);
/* 8095EEE0 */ void setMotionAnm(int, f32);
/* 8095EEE0 */ bool setMotionAnm(int, f32);
/* 8095F0A4 */ void reset();
/* 8095F21C */ void setAction(bool (daNpcAshB_c::*)(void*));
/* 8095F2C4 */ void wait(void*);
include/d/actor/d_a_npc_blue_ns.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
/* 80969E9C */ void _search_HollyBall_G(void*, void*);
/* 80969F54 */ void main();
/* 8096A090 */ void setAttnPos();
/* 8096A238 */ void setMotionAnm(int, f32);
/* 8096A238 */ bool setMotionAnm(int, f32);
/* 8096A308 */ void setMotion(int, f32, int);
/* 8096A350 */ bool drawDbgInfo();
/* 8096A358 */ void reset();
include/d/actor/d_a_npc_bou.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809727B4 */ bool getEyeballMaterialNo();
/* 809727B4 */ s32 getEyeballMaterialNo();
/* 809727BC */ s32 getHeadJointNo();
/* 809727C4 */ s32 getNeckJointNo();
/* 809727CC */ bool getBackboneJointNo();
include/d/actor/d_a_npc_bouS.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 809742DC */ void ctrlJointCallBack(J3DJoint*, int);
/* 80974328 */ void setExpressionAnm(int, bool);
/* 80974514 */ void setExpressionBtp(int);
/* 809745F4 */ void setMotionAnm(int, f32);
/* 809745F4 */ bool setMotionAnm(int, f32);
/* 80974730 */ void reset();
/* 809748F0 */ void setAction(bool (daNpcBouS_c::*)(void*));
/* 80974A04 */ void checkInstructionTag(fopAc_ac_c*);
include/d/actor/d_a_npc_chat.h
+1 -1
View File
@@ -42,7 +42,7 @@ public:
/* 80982F4C */ void main();
/* 80982FA4 */ void setAttnPos();
/* 809830EC */ void setExpressionBtp(int);
/* 80983168 */ void setMotionAnm(int, f32);
/* 80983168 */ bool setMotionAnm(int, f32);
/* 80983584 */ void setMotion(int, f32, int);
/* 809835C8 */ bool drawDbgInfo();
/* 809835D0 */ void drawOtherMdls();
include/d/actor/d_a_npc_chin.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
/* 8098D26C */ void setAttnPos();
/* 8098D58C */ void setExpressionAnm(int, bool);
/* 8098D848 */ void setExpressionBtp(int);
/* 8098D938 */ void setMotionAnm(int, f32);
/* 8098D938 */ bool setMotionAnm(int, f32);
/* 8098DB44 */ void setExpression(int, f32);
/* 8098DB70 */ void setMotion(int, f32, int);
/* 8098DBB4 */ bool drawDbgInfo();
include/d/actor/d_a_npc_doorboy.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
/* 809ACA58 */ void main();
/* 809ACC5C */ void setAttnPos();
/* 809ACE18 */ void lookat();
/* 809ACFF8 */ void setMotionAnm(int, f32);
/* 809ACFF8 */ bool setMotionAnm(int, f32);
/* 809AD0C8 */ bool drawDbgInfo();
/* 809AD938 */ void adjustShapeAngle();
include/d/actor/d_a_npc_drainSol.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
/* 809AEDA8 */ void setParam();
/* 809AEE24 */ void main();
/* 809AEFDC */ void setAttnPos();
/* 809AF12C */ void setMotionAnm(int, f32);
/* 809AF12C */ bool setMotionAnm(int, f32);
/* 809AF1FC */ bool drawDbgInfo();
/* 809AF934 */ void adjustShapeAngle();
include/d/actor/d_a_npc_fairy.h
+2 -2
View File
@@ -17,7 +17,7 @@ public:
/* 809B2430 */ void Create();
/* 809B26E8 */ void CreateHeap();
/* 809B2B44 */ void setAnmData();
/* 809B2C20 */ void setMotionAnm(int, f32, int);
/* 809B2C20 */ bool setMotionAnm(int, f32, int);
/* 809B2E78 */ void afterSetMotionAnm(int, int, f32, int);
/* 809B2EFC */ void Delete();
/* 809B2F30 */ void Execute();
@@ -107,7 +107,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809B9238 */ bool getEyeballMaterialNo();
/* 809B9238 */ s32 getEyeballMaterialNo();
/* 809B9240 */ s32 getHeadJointNo();
/* 809B9248 */ s32 getNeckJointNo();
/* 809B9250 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_gra.h
+1 -1
View File
@@ -42,7 +42,7 @@ public:
/* 809C0948 */ void setExpressionAnm(int, bool);
/* 809C0CE4 */ void setExpressionBtp(int);
/* 809C0E18 */ void setExpression(int, f32);
/* 809C0E44 */ void setMotionAnm(int, f32);
/* 809C0E44 */ bool setMotionAnm(int, f32);
/* 809C1018 */ void setMotion(int, f32, int);
/* 809C105C */ bool drawDbgInfo();
/* 809C1064 */ void drawOtherMdls();
include/d/actor/d_a_npc_grc.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 809CC930 */ void setExpressionAnm(int, bool);
/* 809CCB78 */ void setExpressionBtp(int);
/* 809CCCA4 */ void setExpression(int, f32);
/* 809CCCD0 */ void setMotionAnm(int, f32);
/* 809CCCD0 */ bool setMotionAnm(int, f32);
/* 809CCE70 */ void setMotion(int, f32, int);
/* 809CCEB4 */ bool drawDbgInfo();
/* 809CCEBC */ void drawOtherMdls();
include/d/actor/d_a_npc_grd.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 809D14BC */ void setExpressionAnm(int, bool);
/* 809D1670 */ void setExpressionBtp(int);
/* 809D1794 */ void setExpression(int, f32);
/* 809D17C0 */ void setMotionAnm(int, f32);
/* 809D17C0 */ bool setMotionAnm(int, f32);
/* 809D1940 */ void setMotion(int, f32, int);
/* 809D1984 */ bool drawDbgInfo();
/* 809D198C */ void drawOtherMdls();
include/d/actor/d_a_npc_grm.h
+1 -1
View File
@@ -50,7 +50,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809D5F98 */ bool getEyeballMaterialNo();
/* 809D5F98 */ s32 getEyeballMaterialNo();
/* 809D5FA0 */ s32 getHeadJointNo();
/* 809D5FA8 */ s32 getNeckJointNo();
/* 809D5FB0 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_grmc.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
/* 809D8FE4 */ bool getBackboneJointNo();
/* 809D8FEC */ void checkChangeJoint(int);
/* 809D8FFC */ void checkRemoveJoint(int);
/* 809D900C */ bool getEyeballMaterialNo();
/* 809D900C */ s32 getEyeballMaterialNo();
static void* mCutNameList;
static u8 mCutList[12];
include/d/actor/d_a_npc_gro.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 809DBD58 */ void setExpressionAnm(int, bool);
/* 809DBFF4 */ void setExpressionBtp(int);
/* 809DC118 */ void setExpression(int, f32);
/* 809DC144 */ void setMotionAnm(int, f32);
/* 809DC144 */ bool setMotionAnm(int, f32);
/* 809DC2E4 */ void setMotion(int, f32, int);
/* 809DC328 */ bool drawDbgInfo();
/* 809DC330 */ void drawOtherMdls();
include/d/actor/d_a_npc_grr.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 809E105C */ void setExpressionAnm(int, bool);
/* 809E1260 */ void setExpressionBtp(int);
/* 809E138C */ void setExpression(int, f32);
/* 809E13B8 */ void setMotionAnm(int, f32);
/* 809E13B8 */ bool setMotionAnm(int, f32);
/* 809E1548 */ void setMotion(int, f32, int);
/* 809E158C */ bool drawDbgInfo();
/* 809E1594 */ void drawOtherMdls();
include/d/actor/d_a_npc_grs.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 809E5874 */ void setExpressionAnm(int, bool);
/* 809E5A08 */ void setExpressionBtp(int);
/* 809E5B1C */ void setExpression(int, f32);
/* 809E5B48 */ void setMotionAnm(int, f32);
/* 809E5B48 */ bool setMotionAnm(int, f32);
/* 809E5CB8 */ void setMotion(int, f32, int);
/* 809E5CFC */ bool drawDbgInfo();
/* 809E5D04 */ void drawOtherMdls();

Some files were not shown because too many files have changed in this diff Show More