mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-03 10:09:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on daNpc_Hanjo_c (#2225)

Browse Source
This commit is contained in:
hatal175
2024-10-26 09:44:26 +03: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();
include/d/actor/d_a_npc_grz.h
+1 -1
View File
@@ -37,7 +37,7 @@ public:
/* 809EA734 */ void setExpressionAnm(int, bool);
/* 809EAA08 */ void setExpressionBtp(int);
/* 809EAB34 */ void setExpression(int, f32);
/* 809EAB60 */ void setMotionAnm(int, f32);
/* 809EAB60 */ bool setMotionAnm(int, f32);
/* 809EAD4C */ void setMotion(int, f32, int);
/* 809EAD90 */ bool drawDbgInfo();
/* 809EAD98 */ void drawOtherMdls();
include/d/actor/d_a_npc_gwolf.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
/* 809F4698 */ void setAttnPos();
/* 809F4BB0 */ bool setExpressionAnm(int, bool);
/* 809F4BB8 */ void setExpression(int, f32);
/* 809F4BBC */ void setMotionAnm(int, f32);
/* 809F4BBC */ bool setMotionAnm(int, f32);
/* 809F4DE8 */ void setMotion(int, f32, int);
/* 809F4E2C */ BOOL drawDbgInfo();
/* 809F4E34 */ void drawOtherMdls();
include/d/actor/d_a_npc_hanjo.h
+232 -57
View File
@@ -3,6 +3,90 @@
#include "d/actor/d_a_npc.h"
class daNpc_HanjoStone_c {
public:
/* 809FFFD4 */ ~daNpc_HanjoStone_c() {}
/* 80A001FC */ daNpc_HanjoStone_c() {
initialize();
}
/* 80A0033C */ cXyz getPos() { return mPos; }
/* 80A00358 */ cXyz getOld() { return mOld; }
/* 80A00374 */ void posMoveF(fopAc_ac_c* param_1) {
cXyz cStack_48;
mOld = mPos;
if (mTmr != 0) {
cStack_48 = field_0x1c;
f32 dVar9 = mSpeedF * cM_ssin(mAngle.y);
f32 dVar10 = cStack_48.y + field_0x16c;
f32 dVar8 = mSpeedF * cM_scos(mAngle.y);
if (dVar10 < fopAcM_GetMaxFallSpeed(param_1)) {
dVar10 = fopAcM_GetMaxFallSpeed(param_1);
}
field_0x1c.set(dVar9, dVar10, dVar8);
mPos += field_0x1c;
mTmr--;
if (mTmr == 0) {
initialize();
}
}
}
/* 80A004A8 */ void setPos(cXyz pos) {
mPos = pos;
mOld = pos;
}
/* 80A004E8 */ void setAngle(csXyz angle) { mAngle = angle; }
dCcD_Sph* getSphP() { return &mSphere; }
f32 getSpeedF() { return mSpeedF; }
void setModel(J3DModel* model) { mModel = model; }
J3DModel* getModelP() { return mModel; }
int chkActive() {
if (mModel != NULL) {
return mTmr != 0;
}
return FALSE;
}
void initialize() {
mPos.setall(0.0f);
mOld = mPos;
field_0x1c.setall(0.0f);
mAngle.setall(0);
mSpeedF = 0;
field_0x16c = -3.0f;
mTmr = 0;
}
void setMtx(Mtx mtx) {
if (chkActive()) {
if (cM3d_IsZero(mSpeedF)) {
mModel->setBaseTRMtx(mtx);
} else {
mDoMtx_stack_c::transS(mPos);
mDoMtx_stack_c::ZXYrotM(mAngle);
mModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
}
}
void setTmr(int tmr) { mTmr = tmr; }
void setVSpeed(f32 speed) { field_0x1c.y = speed; }
void setSpeedF(f32 speed) { mSpeedF = speed; }
/* 0x000 */ J3DModel* mModel;
/* 0x004 */ cXyz mOld;
/* 0x010 */ cXyz mPos;
/* 0x01C */ cXyz field_0x1c;
/* 0x028 */ csXyz mAngle;
/* 0x030 */ dCcD_Sph mSphere;
/* 0x168 */ f32 mSpeedF;
/* 0x16C */ f32 field_0x16c;
/* 0x170 */ int mTmr;
};
/**
* @ingroup actors-npcs
* @class daNpc_Hanjo_c
@@ -11,90 +95,181 @@
* @details
*
*/
class daNpc_Hanjo_c : public fopAc_ac_c {
class daNpc_Hanjo_c : public daNpcT_c {
public:
typedef int (daNpc_Hanjo_c::*cutFunc)(int);
typedef int (daNpc_Hanjo_c::*actionFunc)(void*);
enum Type {
TYPE_0,
TYPE_1,
TYPE_2,
TYPE_3,
TYPE_4,
};
/* 809F908C */ ~daNpc_Hanjo_c();
/* 809F9278 */ void create();
/* 809F9578 */ void CreateHeap();
/* 809F9B38 */ void Delete();
/* 809F9B6C */ void Execute();
/* 809F9B8C */ void Draw();
/* 809F9C20 */ void createHeapCallBack(fopAc_ac_c*);
/* 809F9C40 */ void ctrlJointCallBack(J3DJoint*, int);
/* 809F9C98 */ void getType();
/* 809F9CF0 */ void isDelete();
/* 809F9278 */ int create();
/* 809F9578 */ int CreateHeap();
/* 809F9B38 */ int Delete();
/* 809F9B6C */ int Execute();
/* 809F9B8C */ int Draw();
/* 809F9C20 */ static int createHeapCallBack(fopAc_ac_c*);
/* 809F9C40 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 809F9C98 */ u8 getType();
/* 809F9CF0 */ int isDelete();
/* 809F9D9C */ void reset();
/* 809F9FCC */ void afterJntAnm(int);
/* 809FA050 */ void setParam();
/* 809FA1C4 */ void checkChangeEvt();
/* 809FA1C4 */ bool checkChangeEvt();
/* 809FA3B8 */ void setAfterTalkMotion();
/* 809FA45C */ void srchActors();
/* 809FA55C */ void evtTalk();
/* 809FA5FC */ void evtCutProc();
/* 809FA55C */ bool evtTalk();
/* 809FA5FC */ bool evtCutProc();
/* 809FA6C4 */ void action();
/* 809FA88C */ void beforeMove();
/* 809FAABC */ void afterMoved();
/* 809FABB8 */ void setAttnPos();
/* 809FAF90 */ void setCollision();
/* 809FB2C4 */ bool drawDbgInfo();
/* 809FB2C4 */ int drawDbgInfo();
/* 809FB2CC */ void drawOtherMdl();
/* 809FB59C */ void selectAction();
/* 809FB6CC */ void chkAction(int (daNpc_Hanjo_c::*)(void*));
/* 809FB6F8 */ void setAction(int (daNpc_Hanjo_c::*)(void*));
/* 809FB59C */ int selectAction();
/* 809FB6CC */ int chkAction(int (daNpc_Hanjo_c::*)(void*));
/* 809FB6F8 */ int setAction(int (daNpc_Hanjo_c::*)(void*));
/* 809FB7A0 */ void initShoot(int);
/* 809FB90C */ void shoot(int);
/* 809FB90C */ int shoot(int);
/* 809FBB94 */ void initDive();
/* 809FBC3C */ void dive();
/* 809FC06C */ void lookround(s16);
/* 809FC1BC */ void commandToHawk();
/* 809FC2E4 */ void cutConversationAboutSaru(int);
/* 809FC438 */ void cutConversation(int);
/* 809FC80C */ void cutPursuitBee(int);
/* 809FCDC4 */ void cutAppearHawker(int);
/* 809FD3C0 */ void cutDive(int);
/* 809FD86C */ void wait(void*);
/* 809FDEFC */ void throwStone(void*);
/* 809FE2E0 */ void takayose(void*);
/* 809FEAEC */ void talk(void*);
/* 80A000A8 */ daNpc_Hanjo_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**);
/* 80A00334 */ s32 getEyeballMaterialNo();
/* 80A004D0 */ s32 getHeadJointNo();
/* 80A004D8 */ s32 getNeckJointNo();
/* 80A004E0 */ bool getBackboneJointNo();
/* 80A00504 */ void checkChangeJoint(int);
/* 80A00514 */ void checkRemoveJoint(int);
/* 80A00524 */ s32 getFootLJointNo();
/* 80A0052C */ s32 getFootRJointNo();
/* 809FC06C */ int lookround(s16);
/* 809FC1BC */ int commandToHawk();
/* 809FC2E4 */ int cutConversationAboutSaru(int);
/* 809FC438 */ int cutConversation(int);
/* 809FC80C */ int cutPursuitBee(int);
/* 809FCDC4 */ int cutAppearHawker(int);
/* 809FD3C0 */ int cutDive(int);
/* 809FD86C */ int wait(void*);
/* 809FDEFC */ int throwStone(void*);
/* 809FE2E0 */ int takayose(void*);
/* 809FEAEC */ int talk(void*);
/* 80A000A8 */ daNpc_Hanjo_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)
{}
/* 80A00334 */ s32 getEyeballMaterialNo() { return 2; }
/* 80A004D0 */ s32 getHeadJointNo() { return 4; }
/* 80A004D8 */ s32 getNeckJointNo() { return 3; }
/* 80A004E0 */ s32 getBackboneJointNo() { return 1; }
/* 80A00504 */ int checkChangeJoint(int param_1) { return param_1 == 4; }
/* 80A00514 */ int checkRemoveJoint(int param_1) { return param_1 == 8; }
/* 80A00524 */ s32 getFootLJointNo() { return 22; }
/* 80A0052C */ s32 getFootRJointNo() { return 26; }
static u8 const mStoneCcDObjInfo[48];
static void* mCutNameList[6];
static u8 mCutList[72];
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
if (nodeNo == 0xffff) {
return -1;
}
return nodeNo;
}
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static dCcD_SrcGObjInf const mStoneCcDObjInfo;
static char* mCutNameList[6];
static cutFunc mCutList[6];
static u8 mStoneCcDSph[64];
private:
/* 0x568 */ u8 field_0x568[0x172c - 0x568];
/* 0x0E40 */ int field_0x0E40;
/* 0x0E44 */ J3DModel* mModel1;
/* 0x0E48 */ J3DModel* mModel2;
/* 0x0E4C */ dCcD_Cyl mCyl1;
/* 0x0F88 */ dCcD_Cyl mCyl2;
/* 0x10C4 */ u8 mType;
/* 0x10C8 */ daNpcT_ActorMngr_c field_0x10c8[4];
/* 0x10E8 */ daNpcT_Path_c field_0x10e8;
/* 0x1110 */ daNpc_HanjoStone_c mStones[4];
/* 0x16E0 */ actionFunc field_0x16e0;
/* 0x16EC */ actionFunc field_0x16ec;
/* 0x16F8 */ cXyz field_0x16f8;
/* 0x1704 */ int field_0x1704;
/* 0x1708 */ int field_0x1708;
/* 0x170C */ int field_0x170c;
/* 0x1710 */ int field_0x1710;
/* 0x1714 */ int field_0x1714;
/* 0x1718 */ f32 field_0x1718;
/* 0x171C */ s16 field_0x171c;
/* 0x171E */ u8 field_0x171e;
/* 0x171F */ u8 field_0x171f;
/* 0x1720 */ u8 field_0x1720;
/* 0x1721 */ u8 field_0x1721;
/* 0x1722 */ u8 field_0x1722;
/* 0x1723 */ u8 field_0x1723;
/* 0x1724 */ u8 field_0x1724;
/* 0x1728 */ int field_0x1728;
};
STATIC_ASSERT(sizeof(daNpc_Hanjo_c) == 0x172c);
class daNpc_Hanjo_Param_c {
public:
/* 80A00534 */ ~daNpc_Hanjo_Param_c();
/* 80A00534 */ virtual ~daNpc_Hanjo_Param_c() {}
static u8 const m[180];
};
struct Data {
/* 0x00 */ f32 field_0x00;
/* 0x04 */ f32 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 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 field_0x44;
/* 0x48 */ s16 field_0x48;
/* 0x4A */ s16 field_0x4a;
/* 0x4C */ s16 field_0x4c;
/* 0x4E */ s16 field_0x4e;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ s16 field_0x60;
/* 0x62 */ s16 field_0x62;
/* 0x64 */ int field_0x64;
/* 0x68 */ int 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;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ f32 field_0x98;
/* 0x9C */ f32 field_0x9c;
/* 0xA0 */ f32 field_0xa0;
/* 0xA4 */ f32 field_0xa4;
/* 0xA8 */ f32 field_0xa8;
/* 0xAC */ s16 field_0xac;
/* 0xAE */ s16 field_0xae;
/* 0xB0 */ s16 field_0xb0;
/* 0xB2 */ s16 field_0xb2;
};
class daNpc_HanjoStone_c {
public:
/* 809FFFD4 */ ~daNpc_HanjoStone_c();
/* 80A001FC */ daNpc_HanjoStone_c();
/* 80A0033C */ void getPos();
/* 80A00358 */ void getOld();
/* 80A00374 */ void posMoveF(fopAc_ac_c*);
/* 80A004A8 */ void setPos(cXyz);
/* 80A004E8 */ void setAngle(csXyz);
static const Data m;
};
#endif /* D_A_NPC_HANJO_H */
include/d/actor/d_a_npc_hoz.h
+3 -3
View File
@@ -71,12 +71,12 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A065A4 */ bool getEyeballMaterialNo();
/* 80A065A4 */ s32 getEyeballMaterialNo();
/* 80A065AC */ s32 getHeadJointNo();
/* 80A065B4 */ s32 getNeckJointNo();
/* 80A065BC */ s32 getBackboneJointNo();
/* 80A065C4 */ bool checkChangeJoint(int);
/* 80A065D4 */ bool checkRemoveJoint(int);
/* 80A065C4 */ int checkChangeJoint(int);
/* 80A065D4 */ int checkRemoveJoint(int);
bool getGameStartFlag() { return mGameStartFlag; }
void setPotBreakFlag() { mPotBreakFlag = true; }
include/d/actor/d_a_npc_impal.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 80A087DC */ void ctrlJointCallBack(J3DJoint*, int);
/* 80A08828 */ void setExpressionAnm(int, bool);
/* 80A08A68 */ void setExpressionBtp(int);
/* 80A08B48 */ void setMotionAnm(int, f32);
/* 80A08B48 */ bool setMotionAnm(int, f32);
/* 80A08CBC */ void reset();
/* 80A08EB8 */ void setAction(bool (daNpcImpal_c::*)(void*));
/* 80A090E8 */ void wait(void*);
include/d/actor/d_a_npc_ins.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 80A0F2AC */ void ctrlJointCallBack(J3DJoint*, int);
/* 80A0F2F8 */ void setExpressionAnm(int, bool);
/* 80A0F538 */ void setExpressionBtp(int);
/* 80A0F618 */ void setMotionAnm(int, f32);
/* 80A0F618 */ bool setMotionAnm(int, f32);
/* 80A0F78C */ void reset();
/* 80A0F984 */ void waitShop(void*);
/* 80A0FF40 */ void setMotion(int, f32, int);
include/d/actor/d_a_npc_jagar.h
+1 -1
View File
@@ -57,7 +57,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A1A274 */ bool getEyeballMaterialNo();
/* 80A1A274 */ s32 getEyeballMaterialNo();
/* 80A1A27C */ s32 getHeadJointNo();
/* 80A1A284 */ s32 getNeckJointNo();
/* 80A1A28C */ bool getBackboneJointNo();
include/d/actor/d_a_npc_kasi_hana.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
/* 80A1C9D0 */ void setParam();
/* 80A1CA60 */ void main();
/* 80A1CD28 */ void setAttnPos();
/* 80A1CED0 */ void setMotionAnm(int, f32);
/* 80A1CED0 */ bool setMotionAnm(int, f32);
/* 80A1CFA0 */ void setMotion(int, f32, int);
/* 80A1CFE8 */ bool drawDbgInfo();
/* 80A1CFF0 */ void reset();
include/d/actor/d_a_npc_kasi_kyu.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
/* 80A224C8 */ void setParam();
/* 80A22534 */ void main();
/* 80A227DC */ void setAttnPos();
/* 80A22984 */ void setMotionAnm(int, f32);
/* 80A22984 */ bool setMotionAnm(int, f32);
/* 80A22A54 */ void setMotion(int, f32, int);
/* 80A22A9C */ bool drawDbgInfo();
/* 80A22AA4 */ void reset();
include/d/actor/d_a_npc_kasi_mich.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
/* 80A26CC8 */ void setParam();
/* 80A26D34 */ void main();
/* 80A26FDC */ void setAttnPos();
/* 80A27184 */ void setMotionAnm(int, f32);
/* 80A27184 */ bool setMotionAnm(int, f32);
/* 80A27254 */ void setMotion(int, f32, int);
/* 80A2729C */ bool drawDbgInfo();
/* 80A272A4 */ void reset();
include/d/actor/d_a_npc_kn.h
+3 -3
View File
@@ -145,8 +145,8 @@ public:
/* 80A3A2A8 */ void evtOrder();
/* 80A3A404 */ void evtChange();
/* 80A3A504 */ void clrParam();
/* 80A3A568 */ void setFaceMotionAnm(int, bool);
/* 80A3A7C0 */ void setMotionAnm(int, f32, int);
/* 80A3A568 */ bool setFaceMotionAnm(int, bool);
/* 80A3A7C0 */ bool setMotionAnm(int, f32, int);
/* 80A3AA58 */ void setPos(cXyz);
/* 80A3AAF0 */ void setAngle(s16);
/* 80A3AB18 */ void chkActorInSight(fopAc_ac_c*, f32, s16);
@@ -174,7 +174,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A3BD14 */ bool getEyeballMaterialNo();
/* 80A3BD14 */ s32 getEyeballMaterialNo();
/* 80A3BD1C */ bool getEyeballLMaterialNo();
/* 80A3BD24 */ bool getEyeballRMaterialNo();
/* 80A3C998 */ void setParamTeach01();
include/d/actor/d_a_npc_len.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**);
/* 80A68DE0 */ bool getEyeballMaterialNo();
/* 80A68DE0 */ s32 getEyeballMaterialNo();
/* 80A68DE8 */ s32 getHeadJointNo();
/* 80A68DF0 */ s32 getNeckJointNo();
/* 80A68DF8 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_lud.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**);
/* 80A6FCD0 */ bool getEyeballMaterialNo();
/* 80A6FCD0 */ s32 getEyeballMaterialNo();
/* 80A6FCD8 */ s32 getHeadJointNo();
/* 80A6FCE0 */ s32 getNeckJointNo();
/* 80A6FCE8 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_maro.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80564970 */ bool getEyeballMaterialNo();
/* 80564970 */ s32 getEyeballMaterialNo();
/* 80564978 */ s32 getHeadJointNo();
/* 80564980 */ s32 getNeckJointNo();
/* 80564988 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_moir.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 80A7D0EC */ void ctrlJointCallBack(J3DJoint*, int);
/* 80A7D138 */ void setExpressionAnm(int, bool);
/* 80A7D394 */ void setExpressionBtp(int);
/* 80A7D474 */ void setMotionAnm(int, f32);
/* 80A7D474 */ bool setMotionAnm(int, f32);
/* 80A7D5C4 */ void reset();
/* 80A7D73C */ void setWaitAction();
/* 80A7D934 */ void wait_type0(void*);
include/d/actor/d_a_npc_myna2.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 80A848B4 */ void main();
/* 80A84B64 */ void setAttnPos();
/* 80A84DAC */ void setExpressionBtp(int);
/* 80A84EAC */ void setMotionAnm(int, f32);
/* 80A84EAC */ bool setMotionAnm(int, f32);
/* 80A84FEC */ void setMotion(int, f32, int);
/* 80A85030 */ bool drawDbgInfo();
/* 80A85038 */ void drawOtherMdls();
include/d/actor/d_a_npc_pachi_maro.h
+1 -1
View File
@@ -82,7 +82,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A9B7E0 */ bool getEyeballMaterialNo();
/* 80A9B7E0 */ s32 getEyeballMaterialNo();
/* 80A9B7E8 */ s32 getHeadJointNo();
/* 80A9B7F0 */ s32 getNeckJointNo();
/* 80A9B7F8 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_post.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AAD0D0 */ bool getEyeballMaterialNo();
/* 80AAD0D0 */ s32 getEyeballMaterialNo();
/* 80AAD0D8 */ s32 getHeadJointNo();
/* 80AAD0E0 */ s32 getNeckJointNo();
/* 80AAD0E8 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_pouya.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**);
/* 80AB1F54 */ bool getEyeballMaterialNo();
/* 80AB1F54 */ s32 getEyeballMaterialNo();
/* 80AB1F5C */ s32 getHeadJointNo();
/* 80AB1F64 */ s32 getNeckJointNo();
/* 80AB1F6C */ bool getBackboneJointNo();
include/d/actor/d_a_npc_prayer.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
/* 80AB38A0 */ void setParam();
/* 80AB390C */ void main();
/* 80AB3964 */ void setAttnPos();
/* 80AB3B0C */ void setMotionAnm(int, f32);
/* 80AB3B0C */ bool setMotionAnm(int, f32);
/* 80AB3BDC */ void setMotion(int, f32, int);
/* 80AB3C24 */ bool drawDbgInfo();
/* 80AB3C2C */ void reset();
include/d/actor/d_a_npc_rafrel.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 80ABA698 */ void ctrlJointCallBack(J3DJoint*, int);
/* 80ABA6E4 */ void setExpressionAnm(int, bool);
/* 80ABA8EC */ void setExpressionBtp(int);
/* 80ABA9CC */ void setMotionAnm(int, f32);
/* 80ABA9CC */ bool setMotionAnm(int, f32);
/* 80ABAB88 */ void reset();
/* 80ABADC4 */ void setWaitAction();
/* 80ABAFBC */ void isSneaking();
include/d/actor/d_a_npc_shad.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
/* 80AD946C */ void ctrlJointCallBack(J3DJoint*, int);
/* 80AD94B8 */ void setExpressionAnm(int, bool);
/* 80AD974C */ void setExpressionBtp(int);
/* 80AD982C */ void setMotionAnm(int, f32);
/* 80AD982C */ bool setMotionAnm(int, f32);
/* 80AD99B4 */ void reset();
/* 80AD9C0C */ void setWaitAction();
/* 80AD9E04 */ void getPathPoint(u8, int, Vec*);
include/d/actor/d_a_npc_shaman.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AE6B1C */ bool getEyeballMaterialNo();
/* 80AE6B1C */ s32 getEyeballMaterialNo();
/* 80AE6B24 */ s32 getHeadJointNo();
/* 80AE6B2C */ s32 getNeckJointNo();
/* 80AE6B34 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_shoe.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
/* 80AE93A0 */ void main();
/* 80AE9624 */ void setAttnPos();
/* 80AE9820 */ void lookat();
/* 80AE9A00 */ void setMotionAnm(int, f32);
/* 80AE9A00 */ bool setMotionAnm(int, f32);
/* 80AE9AD0 */ bool drawDbgInfo();
/* 80AEA340 */ void adjustShapeAngle();
include/d/actor/d_a_npc_soldierA.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
/* 80AF02B0 */ void main();
/* 80AF0428 */ bool ctrlBtk();
/* 80AF0430 */ void setAttnPos();
/* 80AF0928 */ void setMotionAnm(int, f32);
/* 80AF0928 */ bool setMotionAnm(int, f32);
/* 80AF0A38 */ void setMotion(int, f32, int);
/* 80AF0A7C */ bool drawDbgInfo();
/* 80AF0A84 */ void drawOtherMdls();
include/d/actor/d_a_npc_soldierB.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
/* 80AF39B8 */ void main();
/* 80AF3B30 */ bool ctrlBtk();
/* 80AF3B38 */ void setAttnPos();
/* 80AF4030 */ void setMotionAnm(int, f32);
/* 80AF4030 */ bool setMotionAnm(int, f32);
/* 80AF4130 */ void setMotion(int, f32, int);
/* 80AF4174 */ bool drawDbgInfo();
/* 80AF417C */ void drawOtherMdls();
include/d/actor/d_a_npc_the.h
+1 -1
View File
@@ -91,7 +91,7 @@ public:
/* 80AF8114 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
/* 80AF8160 */ bool setExpressionAnm(int, bool);
/* 80AF841C */ bool setExpressionBtp(int);
/* 80AF8564 */ void setMotionAnm(int, f32);
/* 80AF8564 */ bool setMotionAnm(int, f32);
/* 80AF8744 */ BOOL wait(void*);
/* 80AF8B0C */ void setMotion(int, f32, int);
/* 80AF8B50 */ void setExpression(int, f32);
include/d/actor/d_a_npc_theB.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
/* 80AFDB70 */ void setAttnPos();
/* 80AFDEC0 */ void setExpressionAnm(int, bool);
/* 80AFE0BC */ void setExpressionBtp(int);
/* 80AFE1BC */ void setMotionAnm(int, f32);
/* 80AFE1BC */ bool setMotionAnm(int, f32);
/* 80AFE398 */ bool drawDbgInfo();
/* 80AFE3A0 */ void reset();
/* 80AFE574 */ void playExpression();
include/d/actor/d_a_npc_tk.h
+13 -2
View File
@@ -81,12 +81,23 @@ public:
}
}
BOOL isAttackLink() { return field_0x71a != 0; }
void setAttackLink() { mFlags |= 0x10; }
void setBackHanjo() { mFlags |= 0x20; }
void setHanjoHand() { mFlags |= 0x40; }
void setQuickHanjoHand() { mFlags |= 0x200; }
BOOL isHanjoHand() { return field_0x6ad != 0; }
private:
/* 0x568 */ u8 field_0x568[0x6BE - 0x568];
/* 0x568 */ u8 field_0x568[0x6ad - 0x568];
/* 0x6AD */ u8 field_0x6ad;
/* 0x568 */ u8 field_0x6ae[0x6BE - 0x6ae];
/* 0x6BE */ u16 mFlags;
/* 0x6C0 */ u8 field_0x6c0[0x6C8 - 0x6C0];
/* 0x6C8 */ dPath* field_0x6c8;
/* 0x6CC */ u8 field_0x6cc[0xB44 - 0x6CC];
/* 0x6CC */ u8 field_0x6cc[0x71a - 0x6CC];
/* 0x71A */ u8 field_0x71a;
/* 0x6CC */ u8 field_0x71b[0xB44 - 0x71b];
};
STATIC_ASSERT(sizeof(daNPC_TK_c) == 0xB44);
include/d/actor/d_a_npc_tkc.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
/* 80B0D458 */ void setExpressionAnm(int, bool);
/* 80B0D5A4 */ void setExpressionBtp(int);
/* 80B0D678 */ void reset();
/* 80B0DA94 */ void setMotionAnm(int, f32);
/* 80B0DA94 */ bool setMotionAnm(int, f32);
/* 80B0DBC8 */ void setAction(void (daNpcTkc_c::*)());
/* 80B0DC68 */ void wait();
/* 80B0DEF8 */ void calcFly();
include/d/actor/d_a_npc_tks.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 80B15A24 */ void reset();
/* 80B160A8 */ void setAction(void (daNpcTks_c::*)());
/* 80B16148 */ void wait();
/* 80B16344 */ void setMotionAnm(int, f32);
/* 80B16344 */ bool setMotionAnm(int, f32);
/* 80B16634 */ void waitNude();
/* 80B1682C */ void waitLv6();
/* 80B16B74 */ void talk();
include/d/actor/d_a_npc_wrestler.h
+1 -1
View File
@@ -81,7 +81,7 @@ public:
/* 80B3023C */ bool setExpressionAnm(int, bool);
/* 80B30654 */ bool setExpressionBtp(int);
/* 80B316C8 */ void setExpression(int, f32);
/* 80B3074C */ void setMotionAnm(int, f32);
/* 80B3074C */ bool setMotionAnm(int, f32);
/* 80B31680 */ void setMotion(int, f32, int);
/* 80B40D1C */ BOOL drawDbgInfo();
/* 80B40D24 */ void drawOtherMdls();
include/d/actor/d_a_npc_yamid.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B45F34 */ bool getEyeballMaterialNo();
/* 80B45F34 */ s32 getEyeballMaterialNo();
/* 80B45F3C */ s32 getHeadJointNo();
/* 80B45F44 */ s32 getNeckJointNo();
/* 80B45F4C */ bool getBackboneJointNo();
include/d/actor/d_a_npc_yamis.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B49598 */ bool getEyeballMaterialNo();
/* 80B49598 */ s32 getEyeballMaterialNo();
/* 80B495A0 */ s32 getHeadJointNo();
/* 80B495A8 */ s32 getNeckJointNo();
/* 80B495B0 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_yamit.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B4CCF8 */ bool getEyeballMaterialNo();
/* 80B4CCF8 */ s32 getEyeballMaterialNo();
/* 80B4CD00 */ s32 getHeadJointNo();
/* 80B4CD08 */ s32 getNeckJointNo();
/* 80B4CD10 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_yelia.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B521E4 */ bool getEyeballMaterialNo();
/* 80B521E4 */ s32 getEyeballMaterialNo();
/* 80B521EC */ s32 getHeadJointNo();
/* 80B521F4 */ s32 getNeckJointNo();
/* 80B521FC */ bool getBackboneJointNo();
include/d/actor/d_a_npc_zra.h
+1 -1
View File
@@ -233,7 +233,7 @@ public:
/* 80B7B9D4 */ bool setExpressionAnm(int, bool);
/* 80B7BD60 */ bool setExpressionBtp(int);
/* 80B7BE74 */ void setExpression(int, f32);
/* 80B7BEA0 */ void setMotionAnm(int, f32);
/* 80B7BEA0 */ bool setMotionAnm(int, f32);
/* 80B7C070 */ void setMotionWaterAnm(int);
/* 80B7C308 */ void setMotion(int, f32, BOOL);
/* 80B7C34C */ BOOL drawDbgInfo();
include/d/actor/d_a_npc_zrc.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 80B8F56C */ void setExpressionAnm(int, bool);
/* 80B8F898 */ void setExpressionBtp(int);
/* 80B8F9CC */ void setExpression(int, f32);
/* 80B8F9F8 */ void setMotionAnm(int, f32);
/* 80B8F9F8 */ bool setMotionAnm(int, f32);
/* 80B8FBE4 */ void setMotion(int, f32, int);
/* 80B8FC28 */ bool drawDbgInfo();
/* 80B8FC30 */ void drawOtherMdls();
include/d/actor/d_a_npc_zrz.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
/* 80B95C6C */ bool setExpressionAnm(int, bool);
/* 80B95DD0 */ bool setExpressionBtp(int);
/* 80B95F10 */ void setExpression(int, f32);
/* 80B95F3C */ void setMotionAnm(int, f32);
/* 80B95F3C */ bool setMotionAnm(int, f32);
/* 80B9612C */ void setMotion(int, f32, int);
/* 80B96170 */ BOOL drawDbgInfo();
/* 80B96178 */ void drawOtherMdls();
include/d/actor/d_a_obj_tks.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
/* 80D106C8 */ void setExpression(int, f32);
/* 80D106F4 */ void talk();
/* 80D10A80 */ void demo();
/* 80D11104 */ void setMotionAnm(int, f32);
/* 80D11104 */ bool setMotionAnm(int, f32);
/* 80D11228 */ void warp();
/* 80D11670 */ void setParam();
/* 80D116C8 */ void main();
include/d/actor/d_a_peru.h
+1 -1
View File
@@ -59,7 +59,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80D4BEC4 */ bool getEyeballMaterialNo();
/* 80D4BEC4 */ s32 getEyeballMaterialNo();
/* 80D4BECC */ s32 getHeadJointNo();
/* 80D4BED4 */ s32 getNeckJointNo();
/* 80D4BEDC */ bool getBackboneJointNo();
include/d/actor/d_a_tag_push.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
/* 0x568 */ daNpcT_ActorMngr_c mActorMngr;
/* 804908CC */ virtual ~daTag_Push_c();
/* 804908CC */ virtual ~daTag_Push_c() {}
};
STATIC_ASSERT(sizeof(daTag_Push_c) == 0x574);
include/d/actor/d_a_tag_theB_hint.h
+1 -1
View File
@@ -26,7 +26,7 @@ struct daNpcTheB_c {
/* 80AFDB70 */ void setAttnPos();
/* 80AFDEC0 */ void setExpressionAnm(int, bool);
/* 80AFE0BC */ void setExpressionBtp(int);
/* 80AFE1BC */ void setMotionAnm(int, f32);
/* 80AFE1BC */ bool setMotionAnm(int, f32);
/* 80AFE398 */ bool drawDbgInfo();
/* 80AFE3A0 */ void reset();
/* 80AFE574 */ void playExpression();
include/d/d_com_inf_game.h
+4
View File
@@ -1583,6 +1583,10 @@ inline bool dComIfGs_isCollectCrystal(u8 i_item) {
return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollectCrystal(i_item);
}
inline bool dComIfGs_isCollectShield(u8 i_item) {
return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(2, i_item);
}
inline void dComIfGs_onCollectMirror(u8 i_item) {
g_dComIfG_gameInfo.info.getPlayer().getCollect().onCollectMirror(i_item);
}
include/f_op/f_op_actor_mng.h
+6
View File
@@ -17,6 +17,12 @@
fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \
}
#define fopAcM_SetupActor2(ptr,ClassName, ...) \
if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \
new (ptr) ClassName(__VA_ARGS__); \
fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \
}
class J3DModelData; // placeholder
class JKRHeap;
class cM3dGPla;
include/m_Do/m_Do_ext.h
+1
View File
@@ -293,6 +293,7 @@ public:
void setFrame(f32 frame) { mFrameCtrl.setFrame((s16)frame); }
void setFrameF(f32 frame) { mFrameCtrl.setFrame(frame); }
BOOL checkFrame(f32 frame) { return mFrameCtrl.checkPass(frame); }
f32 getMorfRatio() { return mCurMorf; }
/* 0x04 */ J3DModel* mpModel;
/* 0x08 */ J3DAnmTransform* mpAnm;