mirror of https://github.com/zeldaret/tp.git
d_a_npc_ykw almost matching (#2613)
This commit is contained in:
Max Roncace
GitHub
parent
179189c758
commit
c1615cdfff
|
|
@ -77,6 +77,8 @@ public:
|
|||
f32 getPlayerXBuf(int param_0) { return mPlayerXBuf[param_0]; }
|
||||
f32 getPlayerZBuf(int param_0) { return mPlayerZBuf[param_0]; }
|
||||
void onIceStatus(u16 i_no) { mIceStatus |= (1 << i_no); }
|
||||
void setDrawOff() { mIsInactive = 1; }
|
||||
bool isEnemyDemoEnd() { return (u8)mIsEnemyDemoEnd != 0; }
|
||||
|
||||
private:
|
||||
/* 0x05AC */ request_of_phase_process_class mPhase1;
|
||||
|
|
@ -169,7 +171,7 @@ private:
|
|||
/* 0x0FCF */ u8 mIsInactive2;
|
||||
/* 0x0FD0 */ bool mReverted;
|
||||
/* 0x0FD1 */ bool field_0xfd1;
|
||||
/* 0x0FD2 */ bool unk_FD2;
|
||||
/* 0x0FD2 */ bool mIsEnemyDemoEnd;
|
||||
/* 0x0FD4 */ s32 mWarpHoleID;
|
||||
/* 0x0FD8 */ int mMsgIdx;
|
||||
/* 0x0FDC */ u32 mMsgPcID;
|
||||
|
|
|
|||
|
|
@ -431,10 +431,16 @@ public:
|
|||
/* 80145D2C */ int setNextPathInfo(s8, u8);
|
||||
/* 80145DA0 */ void reverse();
|
||||
/* 80145DD0 */ int setNextIdx(int);
|
||||
int getDstPos(cXyz i_pnt, cXyz* o_pos_p) {
|
||||
return getDstPos(i_pnt, o_pos_p, getNumPnts());
|
||||
}
|
||||
/* 80145E38 */ int getDstPos(cXyz, cXyz*, int);
|
||||
/* 80145FB4 */ int getDstPosH(cXyz, cXyz*, int, int);
|
||||
/* 80146188 */ int chkPassed1(cXyz, int);
|
||||
/* 801464D8 */ int chkPassed2(cXyz, cXyz*, int, int);
|
||||
#if DEBUG
|
||||
int drawDbgInfo(f32, int);
|
||||
#endif
|
||||
|
||||
daNpcT_Path_c() {
|
||||
initialize();
|
||||
|
|
@ -498,7 +504,7 @@ public:
|
|||
/* 0x974 */ dMsgFlow_c mFlow;
|
||||
/* 0x9C0 */ dPaPoT_c field_0x9c0;
|
||||
/* 0xA40 */ dCcD_Stts field_0xa40;
|
||||
/* 0xA7C */ u32 mFlowNodeNo;
|
||||
/* 0xA7C */ s32 mFlowNodeNo;
|
||||
/* 0xA80 */ f32 mExpressionMorfFrame;
|
||||
/* 0xA84 */ f32 mMorfFrames;
|
||||
/* 0xA88 */ bool mCreating;
|
||||
|
|
@ -537,9 +543,9 @@ public:
|
|||
/* 0xDC4 */ int mEventTimer;
|
||||
/* 0xDC8 */ s16 mPlayerAngle;
|
||||
/* 0xDCA */ s16 mGroundAngle;
|
||||
/* 0xDCC */ u8 field_0xdcc[2];
|
||||
/* 0xDCC */ s16 field_0xdcc;
|
||||
/* 0xDCE */ s16 mFootLPolyAngle;
|
||||
/* 0xDD0 */ u8 field_0xdd0[2];
|
||||
/* 0xDD0 */ s16 field_0xdd0;
|
||||
/* 0xDD2 */ s16 mFootRPolyAngle;
|
||||
/* 0xDD4 */ s16 mStartAngle;
|
||||
/* 0xDD6 */ s16 mTargetAngle;
|
||||
|
|
@ -596,6 +602,7 @@ public:
|
|||
mpArcNames(i_arcNames),
|
||||
mFaceMotionSeqMngr(i_faceMotionSequenceData, i_faceMotionStepNum),
|
||||
mMotionSeqMngr(i_motionSequenceData, i_motionStepNum) {
|
||||
// "daNpcT_c -> construct"
|
||||
OS_REPORT("|%06d:%x|daNpcT_c -> コンストラクト\n", g_Counter.mCounter0, this);
|
||||
initialize();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
#include "d/actor/d_a_npc.h"
|
||||
|
||||
class daNpc_ykW_HIO_c;
|
||||
|
||||
/**
|
||||
* @ingroup actors-npcs
|
||||
* @class daNpc_ykW_c
|
||||
|
|
@ -11,72 +13,121 @@
|
|||
* @details
|
||||
*
|
||||
*/
|
||||
class daNpc_ykW_c : public fopAc_ac_c {
|
||||
class daNpc_ykW_c : public daNpcT_c {
|
||||
public:
|
||||
typedef int (daNpc_ykW_c::*cutFunc)(int);
|
||||
typedef int (daNpc_ykW_c::*actionFunc)(void*);
|
||||
|
||||
/* 80B5EF0C */ ~daNpc_ykW_c();
|
||||
/* 80B5F084 */ void create();
|
||||
/* 80B5F34C */ void CreateHeap();
|
||||
/* 80B5F784 */ void Delete();
|
||||
/* 80B5F7B8 */ void Execute();
|
||||
/* 80B5F7D8 */ void Draw();
|
||||
/* 80B5F8AC */ void createHeapCallBack(fopAc_ac_c*);
|
||||
/* 80B5F8CC */ void ctrlJointCallBack(J3DJoint*, int);
|
||||
/* 80B5F924 */ void srchItemHeart(void*, void*);
|
||||
/* 80B5F9D8 */ void srchYkw(void*, void*);
|
||||
/* 80B5FA74 */ void getOtherYkwP(int);
|
||||
/* 80B5FB50 */ void srchYkm(void*, void*);
|
||||
/* 80B5FBEC */ void getOtherYkmP(int);
|
||||
/* 80B5F084 */ int create();
|
||||
/* 80B5F34C */ int CreateHeap();
|
||||
/* 80B5F784 */ int Delete();
|
||||
/* 80B5F7B8 */ int Execute();
|
||||
/* 80B5F7D8 */ int Draw();
|
||||
/* 80B5F8AC */ static int createHeapCallBack(fopAc_ac_c*);
|
||||
/* 80B5F8CC */ static int ctrlJointCallBack(J3DJoint*, int);
|
||||
/* 80B5F924 */ static void* srchItemHeart(void*, void*);
|
||||
/* 80B5F9D8 */ static void* srchYkw(void*, void*);
|
||||
u32 getType(daNpc_ykW_c* da_npc_yk_w_c);
|
||||
/* 80B5FA74 */ fopAc_ac_c* getOtherYkwP(int);
|
||||
/* 80B5FB50 */ static void* srchYkm(void*, void*);
|
||||
/* 80B5FBEC */ fopAc_ac_c* getOtherYkmP(int);
|
||||
/* 80B5FCC8 */ u8 getType();
|
||||
/* 80B5FD30 */ void isDelete();
|
||||
/* 80B5FD30 */ int isDelete();
|
||||
/* 80B5FE6C */ void reset();
|
||||
/* 80B601C8 */ void afterJntAnm(int);
|
||||
/* 80B60290 */ void setParam();
|
||||
/* 80B6042C */ void checkChangeEvt();
|
||||
/* 80B6042C */ int checkChangeEvt();
|
||||
/* 80B60520 */ void setAfterTalkMotion();
|
||||
/* 80B605C0 */ void srchActors();
|
||||
/* 80B60744 */ void evtTalk();
|
||||
/* 80B607E4 */ void evtCutProc();
|
||||
/* 80B60744 */ int evtTalk();
|
||||
/* 80B607E4 */ int evtCutProc();
|
||||
/* 80B608AC */ void action();
|
||||
/* 80B60AFC */ void beforeMove();
|
||||
/* 80B60BC0 */ void afterMoved();
|
||||
/* 80B60F08 */ void setAttnPos();
|
||||
/* 80B614D0 */ void setCollision();
|
||||
/* 80B61708 */ bool drawDbgInfo();
|
||||
/* 80B61710 */ void selectAction();
|
||||
/* 80B61828 */ void chkAction(int (daNpc_ykW_c::*)(void*));
|
||||
/* 80B61854 */ void setAction(int (daNpc_ykW_c::*)(void*));
|
||||
/* 80B618FC */ void getGoalPos();
|
||||
/* 80B61A0C */ void orderGoIntoBossRoomEvt();
|
||||
/* 80B61AA4 */ void putUtuwaHeart(cXyz*, f32, f32, s16, cXyz*);
|
||||
/* 80B61C8C */ void cutShowDoor(int);
|
||||
/* 80B61E74 */ void cutGoIntoBossRoom(int);
|
||||
/* 80B62AF8 */ void cutLv5DungeonClear(int);
|
||||
/* 80B63894 */ void cutFindWolf(int);
|
||||
/* 80B63AA0 */ void cutStartSnowboardRace(int);
|
||||
/* 80B63EE0 */ void cutEndSnowboardRace(int);
|
||||
/* 80B6450C */ void cutHug(int);
|
||||
/* 80B61708 */ int drawDbgInfo();
|
||||
/* 80B61710 */ int selectAction();
|
||||
/* 80B61828 */ BOOL chkAction(actionFunc param_0);
|
||||
/* 80B61854 */ BOOL setAction(int (daNpc_ykW_c::*)(void*));
|
||||
/* 80B618FC */ cXyz getGoalPos();
|
||||
/* 80B61A0C */ int orderGoIntoBossRoomEvt();
|
||||
/* 80B61AA4 */ fopAc_ac_c* putUtuwaHeart(cXyz*, f32, f32, s16, cXyz*);
|
||||
/* 80B61C8C */ int cutShowDoor(int);
|
||||
/* 80B61E74 */ int cutGoIntoBossRoom(int);
|
||||
/* 80B62AF8 */ int cutLv5DungeonClear(int);
|
||||
/* 80B63894 */ int cutFindWolf(int);
|
||||
/* 80B63AA0 */ int cutStartSnowboardRace(int);
|
||||
/* 80B63EE0 */ int cutEndSnowboardRace(int);
|
||||
/* 80B6450C */ int cutHug(int);
|
||||
/* 80B647E4 */ void setDialogueMotion();
|
||||
/* 80B6491C */ void dialogue();
|
||||
/* 80B649A8 */ void wait(void*);
|
||||
/* 80B65278 */ void sitWait(void*);
|
||||
/* 80B654CC */ void walk(void*);
|
||||
/* 80B6591C */ void race(void*);
|
||||
/* 80B6640C */ void talk(void*);
|
||||
/* 80B67A3C */ daNpc_ykW_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**);
|
||||
/* 80B67B1C */ u16 getEyeballMaterialNo();
|
||||
/* 80B67B24 */ s32 getHeadJointNo();
|
||||
/* 80B67B2C */ s32 getNeckJointNo();
|
||||
/* 80B67B34 */ bool getBackboneJointNo();
|
||||
/* 80B67B3C */ void checkChangeJoint(int);
|
||||
/* 80B67B4C */ void checkRemoveJoint(int);
|
||||
/* 80B67B5C */ s32 getFootLJointNo();
|
||||
/* 80B67B64 */ s32 getFootRJointNo();
|
||||
/* 80B6491C */ int dialogue();
|
||||
/* 80B649A8 */ int wait(void*);
|
||||
/* 80B65278 */ int sitWait(void*);
|
||||
/* 80B654CC */ int walk(void*);
|
||||
/* 80B6591C */ int race(void*);
|
||||
/* 80B6640C */ int talk(void*);
|
||||
#if DEBUG
|
||||
int test(void*);
|
||||
#endif
|
||||
/* 80B67A3C */ daNpc_ykW_c(const daNpcT_faceMotionAnmData_c * param_0,
|
||||
const daNpcT_motionAnmData_c* param_1,
|
||||
const daNpcT_MotionSeqMngr_c::sequenceStepData_c* param_2,
|
||||
int param_3,
|
||||
const daNpcT_MotionSeqMngr_c::sequenceStepData_c* param_4,
|
||||
int param_5,
|
||||
const daNpcT_evtData_c* param_6, char** param_7):
|
||||
daNpcT_c(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7) {
|
||||
// "daNpc_ykW_c -> construct"
|
||||
OS_REPORT("|%06d:%x|daNpc_ykW_c -> コンストラクト\n", g_Counter.mCounter0, this);
|
||||
}
|
||||
/* 80B67B1C */ u16 getEyeballMaterialNo() { return 2; }
|
||||
/* 80B67B24 */ s32 getHeadJointNo() { return 5; }
|
||||
/* 80B67B2C */ s32 getNeckJointNo() { return 4; }
|
||||
/* 80B67B34 */ s32 getBackboneJointNo() { return 1; }
|
||||
/* 80B67B3C */ int checkChangeJoint(int i_index) { return i_index == 5; }
|
||||
/* 80B67B4C */ int checkRemoveJoint(int i_index) { return i_index == 9; }
|
||||
/* 80B67B5C */ s32 getFootLJointNo() { return 13; }
|
||||
/* 80B67B64 */ s32 getFootRJointNo() { return 16; }
|
||||
|
||||
static void* mCutNameList[8];
|
||||
static u8 mCutList[96];
|
||||
s32 getFlowNodeNo() {
|
||||
u32 angleX = (u16)home.angle.x;
|
||||
s32 temp_r30;
|
||||
if (angleX == 0xffff) {
|
||||
temp_r30 = -1;
|
||||
} else {
|
||||
temp_r30 = (u16)angleX;
|
||||
}
|
||||
return temp_r30;
|
||||
}
|
||||
|
||||
u8 getBitTRB() {
|
||||
return home.angle.z & 0x3f;
|
||||
}
|
||||
|
||||
u8 getBitSW() {
|
||||
return (fopAcM_GetParam(this) & 0xff0000) >> 16;
|
||||
}
|
||||
|
||||
u8 getBitSW2() {
|
||||
return (fopAcM_GetParam(this) & 0xff000000) >> 24;
|
||||
}
|
||||
|
||||
u8 getBitSW3() {
|
||||
return (home.angle.z & 0xff00) >> 8;
|
||||
}
|
||||
|
||||
u8 getPathID() {
|
||||
return (fopAcM_GetParam(this) & 0xff00) >> 8;
|
||||
}
|
||||
|
||||
u8 getExitNo() {
|
||||
return (fopAcM_GetParam(this) & 0xf0) >> 4;
|
||||
}
|
||||
|
||||
static const char* mCutNameList[8];
|
||||
static cutFunc mCutList[8];
|
||||
|
||||
void setDialogueTmr1(int param_1) {
|
||||
field_0x1024 = param_1;
|
||||
|
|
@ -88,22 +139,79 @@ public:
|
|||
field_0x101c = 10;
|
||||
}
|
||||
|
||||
private:
|
||||
/* 0x0568 */ u8 field_0x568[0x1018 - 0x568];
|
||||
/* 0x0E40 */ daNpc_ykW_HIO_c* mpHIO;
|
||||
/* 0x0E44 */ dCcD_Cyl mCyl;
|
||||
/* 0x0F80 */ u8 field_0xf80;
|
||||
/* 0x0F84 */ daNpcT_ActorMngr_c mActorMngrs[5];
|
||||
/* 0x0FAC */ daNpcT_Path_c mPath;
|
||||
/* 0x0FD4 */ dPath* mpPath;
|
||||
/* 0x0FD8 */ actionFunc field_0xfd8;
|
||||
/* 0x0FE4 */ actionFunc field_0xfe4;
|
||||
/* 0x0FF0 */ cXyz field_0xff0;
|
||||
/* 0x0FFC */ cXyz field_0xffc;
|
||||
/* 0x1008 */ cXyz field_0x1008;
|
||||
/* 0x1014 */ u32 mTimer;
|
||||
/* 0x1018 */ int field_0x1018;
|
||||
/* 0x101C */ int field_0x101c;
|
||||
/* 0x1020 */ u8 field_0x1020[0x1024 - 0x1020];
|
||||
/* 0x1020 */ int field_0x1020;
|
||||
/* 0x1024 */ int field_0x1024;
|
||||
/* 0x1028 */ u8 field_0x1028[0x1078 - 0x1028];
|
||||
/* 0x1028 */ int field_0x1028;
|
||||
/* 0x102C */ int field_0x102c;
|
||||
/* 0x1030 */ int field_0x1030;
|
||||
/* 0x1034 */ int field_0x1034;
|
||||
/* 0x1038 */ int field_0x1038;
|
||||
/* 0x103C */ int field_0x103c;
|
||||
/* 0x1040 */ u8 field_0x1040[0x1044 - 0x1040];
|
||||
/* 0x1044 */ daNpcT_pntData_c field_0x1044;
|
||||
/* 0x104C */ int field_0x104c;
|
||||
/* 0x1050 */ u8 field_0x1050[0x1054 - 0x1050];
|
||||
/* 0x1054 */ f32 field_0x1054;
|
||||
/* 0x1058 */ s16 field_0x1058;
|
||||
/* 0x105C */ u32 field_0x105c;
|
||||
/* 0x1060 */ u8 field_0x1060;
|
||||
/* 0x1061 */ u8 field_0x1061;
|
||||
/* 0x1062 */ u8 field_0x1062;
|
||||
/* 0x1063 */ u8 field_0x1063;
|
||||
/* 0x1064 */ u8 field_0x1064;
|
||||
/* 0x1065 */ u8 field_0x1065;
|
||||
/* 0x1066 */ u8 field_0x1066;
|
||||
/* 0x1067 */ u8 field_0x1067;
|
||||
/* 0x1068 */ u8 field_0x1068;
|
||||
/* 0x1069 */ u8 field_0x1069;
|
||||
/* 0x106A */ u8 field_0x106a;
|
||||
/* 0x106B */ u8 field_0x106b;
|
||||
/* 0x106C */ u8 field_0x106c;
|
||||
/* 0x106D */ u8 field_0x106d[0x106e - 0x106d];
|
||||
/* 0x106E */ u8 field_0x106e;
|
||||
/* 0x106F */ u8 field_0x106f;
|
||||
/* 0x1070 */ u8 field_0x1070;
|
||||
/* 0x1071 */ u8 field_0x1071[0x1074 - 0x1071];
|
||||
/* 0x1070 */ u8 field_0x1074[0x1078 - 0x1074];
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daNpc_ykW_c) == 0x1078);
|
||||
|
||||
struct daNpc_ykW_HIOParam {
|
||||
/* 0x00 */ daNpcT_HIOParam common;
|
||||
/* 0x8C */ f32 mSkipFrame;
|
||||
/* 0x90 */ f32 mFlySpeed;
|
||||
/* 0x94 */ f32 mFlyAngle;
|
||||
/* 0x98 */ f32 mJumpInitialSpeed;
|
||||
/* 0x9C */ f32 mSlidingAccel;
|
||||
/* 0xA0 */ f32 mSlidingSpeed;
|
||||
/* 0xA4 */ s16 mCompetParamA;
|
||||
/* 0xA6 */ s16 mCompetParamB;
|
||||
/* 0xA8 */ f32 mCompetParamC;
|
||||
/* 0xAC */ s16 mWalkingTime;
|
||||
/* 0xAE */ s16 mDownTime;
|
||||
/* 0xB0 */ s16 mStepSpeed;
|
||||
};
|
||||
|
||||
class daNpc_ykW_Param_c {
|
||||
public:
|
||||
/* 80B67B6C */ ~daNpc_ykW_Param_c();
|
||||
/* 80B67B6C */ virtual ~daNpc_ykW_Param_c() {}
|
||||
|
||||
static u8 const m[180];
|
||||
static const daNpc_ykW_HIOParam m;
|
||||
};
|
||||
|
||||
#endif /* D_A_NPC_YKW_H */
|
||||
|
|
|
|||
|
|
@ -1753,6 +1753,10 @@ inline int dComIfGs_getRaceGameTime() {
|
|||
return g_dComIfG_gameInfo.info.getMiniGame().getRaceGameTime();
|
||||
}
|
||||
|
||||
inline void dComIfGs_setRaceGameTime(int i_time) {
|
||||
g_dComIfG_gameInfo.info.getMiniGame().setRaceGameTime(i_time);
|
||||
}
|
||||
|
||||
inline u32 dComIfGs_getBalloonScore() {
|
||||
return g_dComIfG_gameInfo.info.getMiniGame().getBalloonScore();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,6 +103,10 @@ public:
|
|||
setPosition(param_1, 13, param_2, -1);
|
||||
}
|
||||
|
||||
static void setNpcYkwPosition(int param_1, Vec* param_2) {
|
||||
setPosition(param_1, 14, param_2, -1);
|
||||
}
|
||||
|
||||
static void setCoachPosition(int param_1, Vec* param_2, int param_3) {
|
||||
setPosition(param_1, 10, param_2, param_3);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2704,7 +2704,7 @@ void daB_YO_c::executeDeath() {
|
|||
|
||||
case 15:
|
||||
if (strcmp(dComIfGp_getEventManager().getRunEventName(), "BOSSCLEAR05")) {
|
||||
unk_FD2 = true;
|
||||
mIsEnemyDemoEnd = true;
|
||||
mMode = 16;
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -699,6 +699,12 @@ static BOOL daNpcT_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, B
|
|||
return (u16)abs(angle_diff) > 0x4000;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
int daNpcT_Path_c::drawDbgInfo(f32 param_0, int param_1) {
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static f32 dummy_literal() {
|
||||
cXyz vec;
|
||||
return vec.abs();
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue