mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 22:22:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_zelda equivalent (#2528)

Browse Source
This commit is contained in:
Max Roncace
2025-07-11 19:00:18 +00:00
committed by GitHub
parent b83ff69589
commit 92e14253ca
114 changed files with 1165 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2AudioCS.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
static void extensionProcess(s32, s32);
u32 getHandleSoundID(s32);
void start(s32, s32);
static void startLevel(s32, s32);
static int startLevel(s32, s32);
};
#endif /* Z2AUDIOCS_H */
include/d/actor/d_a_npc.h
+18 -11
View File
@@ -2,6 +2,7 @@
#define D_A_D_A_NPC_H
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include "SSystem/SComponent/c_counter.h"
#include "SSystem/SComponent/c_math.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/actor/d_a_player.h"
@@ -55,8 +56,8 @@ public:
void setNowOffsetX(f32 i_value) { mNowOffsetX = i_value; }
void setNowOffsetY(f32 i_value) { mNowOffsetY = i_value; }
void onEyeMoveFlg() { mEyeMoveFlg = 1; }
void offEyeMoveFlg() { mEyeMoveFlg = 0; }
void onEyeMoveFlag() { mEyeMoveFlg = 1; }
void offEyeMoveFlag() { mEyeMoveFlg = 0; }
void setMorfFrm(u8 i_value) { mMorfFrm = i_value; }
};
@@ -157,7 +158,7 @@ public:
mEyeAngle.x = field_0x132.x * (1.0f - 1.0f / param_2) +
sVar3 * (1.0f / param_2);
}
void setEyeAngleY(cXyz param_1, s16 param_2, BOOL param_3, f32 param_4, s16 param_5) {
cXyz cStack_50;
s16 sVar3 = 0;
@@ -266,7 +267,7 @@ public:
setMode(LOOK_PLAYER, FALSE);
setDirect(isDirect);
}
void lookCamera(u8 isDirect) {
setMode(LOOK_CAMERA, FALSE);
setDirect(isDirect);
@@ -313,8 +314,9 @@ public:
/* 80147E3C */ void calc(BOOL);
void initialize() {
u8 zero = 0;
for (int i = 0; i < 2; i++) {
mAngle[i].setall(0);
mAngle[i].setall(zero);
mPower[i] = 0.0f;
}
mStagger = 0;
@@ -481,7 +483,7 @@ public:
/* 0x9C0 */ dPaPoT_c field_0x9c0;
/* 0xA40 */ dCcD_Stts field_0xa40;
/* 0xA7C */ u32 mFlowNodeNo;
/* 0xA80 */ f32 field_0xa80;
/* 0xA80 */ f32 mExpressionMorfFrame;
/* 0xA84 */ f32 mMorfFrames;
/* 0xA88 */ bool mCreating;
/* 0xA89 */ bool mTwilight;
@@ -530,7 +532,7 @@ public:
/* 0xDDC */ f32 mTurnCount;
/* 0xDE0 */ f32 field_0xde0;
/* 0xDE4 */ f32 field_0xde4;
/* 0xDE8 */ f32 field_0xde8;
/* 0xDE8 */ f32 mRealShadowSize;
/* 0xDEC */ f32 mCylH;
/* 0xDF0 */ f32 mWallR;
/* 0xDF4 */ f32 mGroundH;
@@ -578,6 +580,7 @@ public:
mpArcNames(i_arcNames),
mFaceMotionSeqMngr(i_faceMotionSequenceData, i_faceMotionStepNum),
mMotionSeqMngr(i_motionSequenceData, i_motionStepNum) {
OS_REPORT("|%06d:%x|daNpcT_c -> コンストラクト\n", g_Counter.mCounter0, this);
initialize();
}
@@ -644,9 +647,9 @@ public:
/* 8014CC4C */ virtual s32 getHeadJointNo() { return -1; }
/* 8014CC90 */ virtual s32 getFootLJointNo() { return -1; }
/* 8014CC88 */ virtual s32 getFootRJointNo() { return -1; }
/* 8014D0A8 */ virtual s32 getEyeballLMaterialNo() { return 0; }
/* 8014D0B0 */ virtual s32 getEyeballRMaterialNo() { return 0; }
/* 8014D0B8 */ virtual s32 getEyeballMaterialNo() { return 0; }
/* 8014D0A8 */ virtual u16 getEyeballLMaterialNo() { return 0; }
/* 8014D0B0 */ virtual u16 getEyeballRMaterialNo() { return 0; }
/* 8014D0B8 */ virtual u16 getEyeballMaterialNo() { return 0; }
/* 8014951C */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
/* 8014CC48 */ virtual void afterJntAnm(int) {}
/* 8014CC24 */ virtual void setParam() {}
@@ -1222,7 +1225,7 @@ private:
/* 0x00 */ u16 mNurbs;
/* 0x02 */ u16 field_0x02;
/* 0x04 */ u8 mIsReversed;
/* 0x05 */ bool mIsClosed;
/* 0x05 */ u8 mIsClosed;
/* 0x08 */ dPnt mPoints[96];
public:
@@ -1368,6 +1371,10 @@ struct daNpcT_HIOParam {
/* 0x88 */ f32 box_offset;
};
void daNpcT_cmnGenMessage(JORMContext*, daNpcT_HIOParam* param_1);
void daNpcT_cmnListenPropertyEvent(char*, int*, daNpcT_HIOParam*);
struct daNpcF_HIOParam {
/* 0x00 */ f32 attention_offset;
/* 0x04 */ f32 gravity;
include/d/actor/d_a_npc_aru.h
+1 -1
View File
@@ -65,7 +65,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809575B4 */ s32 getEyeballMaterialNo();
/* 809575B4 */ u16 getEyeballMaterialNo();
/* 809575BC */ s32 getHeadJointNo();
/* 809575C4 */ s32 getNeckJointNo();
/* 809575CC */ bool getBackboneJointNo();
include/d/actor/d_a_npc_bans.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80967BE4 */ s32 getEyeballMaterialNo();
/* 80967BE4 */ u16 getEyeballMaterialNo();
/* 80967BEC */ s32 getHeadJointNo();
/* 80967BF4 */ s32 getNeckJointNo();
/* 80967BFC */ bool getBackboneJointNo();
include/d/actor/d_a_npc_besu.h
+1 -1
View File
@@ -90,7 +90,7 @@ public:
// "construct"
OS_REPORT("|%06d:%x|daNpc_Besu_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 8053E6A8 */ s32 getEyeballMaterialNo() { return 2; }
/* 8053E6A8 */ u16 getEyeballMaterialNo() { return 2; }
/* 8053E6B0 */ s32 getHeadJointNo() { return 4; }
/* 8053E6B8 */ s32 getNeckJointNo() { return 3; }
/* 8053E6C0 */ s32 getBackboneJointNo() { return true; }
include/d/actor/d_a_npc_bou.h
+2 -2
View File
@@ -117,7 +117,7 @@ public:
/* 809727CC */ virtual s32 getBackboneJointNo();
/* 809727C4 */ virtual s32 getNeckJointNo();
/* 809727BC */ virtual s32 getHeadJointNo();
/* 809727B4 */ virtual s32 getEyeballMaterialNo();
/* 809727B4 */ virtual u16 getEyeballMaterialNo();
/* 8096DD44 */ virtual void afterJntAnm(int);
/* 8096DDC8 */ virtual void setParam();
/* 8096DF9C */ virtual BOOL checkChangeEvt();
@@ -206,7 +206,7 @@ private:
STATIC_ASSERT(sizeof(daNpc_Bou_c) == 0xffc);
/* 809727B4-809727BC 005914 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Bou_cFv */
s32 daNpc_Bou_c::getEyeballMaterialNo() {
u16 daNpc_Bou_c::getEyeballMaterialNo() {
return 1;
}
include/d/actor/d_a_npc_clerka.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80995694 */ s32 getEyeballMaterialNo();
/* 80995694 */ u16 getEyeballMaterialNo();
/* 8099569C */ s32 getHeadJointNo();
/* 809956A4 */ s32 getNeckJointNo();
/* 809956AC */ bool getBackboneJointNo();
include/d/actor/d_a_npc_clerkb.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809997AC */ s32 getEyeballMaterialNo();
/* 809997AC */ u16 getEyeballMaterialNo();
/* 809997B4 */ s32 getHeadJointNo();
/* 809997BC */ s32 getNeckJointNo();
/* 809997C4 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_clerkt.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 8099D068 */ s32 getEyeballMaterialNo();
/* 8099D068 */ u16 getEyeballMaterialNo();
/* 8099D070 */ void checkChangeJoint(int);
/* 8099D080 */ void checkRemoveJoint(int);
/* 8099D090 */ s32 getBackboneJointNo();
include/d/actor/d_a_npc_doc.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 809AA24C */ s32 getEyeballMaterialNo();
/* 809AA24C */ u16 getEyeballMaterialNo();
/* 809AA254 */ s32 getHeadJointNo();
/* 809AA25C */ s32 getNeckJointNo();
/* 809AA264 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_fairy.h
+1 -1
View File
@@ -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 */ s32 getEyeballMaterialNo();
/* 809B9238 */ u16 getEyeballMaterialNo();
/* 809B9240 */ s32 getHeadJointNo();
/* 809B9248 */ s32 getNeckJointNo();
/* 809B9250 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_gnd.h
+2 -2
View File
@@ -56,8 +56,8 @@ public:
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)
{}
/* 809BE40C */ s32 getEyeballRMaterialNo();
/* 809BE414 */ s32 getEyeballLMaterialNo();
/* 809BE40C */ u16 getEyeballRMaterialNo();
/* 809BE414 */ u16 getEyeballLMaterialNo();
/* 809BE41C */ s32 getHeadJointNo();
/* 809BE424 */ s32 getNeckJointNo();
/* 809BE42C */ s32 getBackboneJointNo();
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 */ s32 getEyeballMaterialNo();
/* 809D5F98 */ u16 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 */ s32 getEyeballMaterialNo();
/* 809D900C */ u16 getEyeballMaterialNo();
static void* mCutNameList;
static u8 mCutList[12];
include/d/actor/d_a_npc_hanjo.h
+1 -1
View File
@@ -157,7 +157,7 @@ public:
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; }
/* 80A00334 */ u16 getEyeballMaterialNo() { return 2; }
/* 80A004D0 */ s32 getHeadJointNo() { return 4; }
/* 80A004D8 */ s32 getNeckJointNo() { return 3; }
/* 80A004E0 */ s32 getBackboneJointNo() { return 1; }
include/d/actor/d_a_npc_hoz.h
+1 -1
View File
@@ -71,7 +71,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A065A4 */ s32 getEyeballMaterialNo();
/* 80A065A4 */ u16 getEyeballMaterialNo();
/* 80A065AC */ s32 getHeadJointNo();
/* 80A065B4 */ s32 getNeckJointNo();
/* 80A065BC */ s32 getBackboneJointNo();
include/d/actor/d_a_npc_jagar.h
+1 -1
View File
@@ -146,7 +146,7 @@ public:
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)
{}
/* 80A1A274 */ s32 getEyeballMaterialNo() { return 1; }
/* 80A1A274 */ u16 getEyeballMaterialNo() { return 1; }
/* 80A1A27C */ s32 getHeadJointNo() { return 4; }
/* 80A1A284 */ s32 getNeckJointNo() { return 3; }
/* 80A1A28C */ s32 getBackboneJointNo() { return 1; }
include/d/actor/d_a_npc_kkri.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**);
/* 805533E4 */ s32 getEyeballMaterialNo();
/* 805533E4 */ u16 getEyeballMaterialNo();
/* 805533EC */ s32 getHeadJointNo();
/* 805533F4 */ s32 getNeckJointNo();
/* 805533FC */ bool getBackboneJointNo();
include/d/actor/d_a_npc_kn.h
+3 -3
View File
@@ -317,9 +317,9 @@ public:
/* 80A3949C */ virtual int ctrlBtk();
/* 80A3B7B4 */ virtual s32 getFootLJointNo();
/* 80A3B7AC */ virtual s32 getFootRJointNo();
/* 80A3BD1C */ virtual int getEyeballLMaterialNo();
/* 80A3BD24 */ virtual s32 getEyeballRMaterialNo();
/* 80A3BD14 */ virtual s32 getEyeballMaterialNo();
/* 80A3BD1C */ virtual u16 getEyeballLMaterialNo();
/* 80A3BD24 */ virtual u16 getEyeballRMaterialNo();
/* 80A3BD14 */ virtual u16 getEyeballMaterialNo();
/* 80A3989C */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
/* 80A3B720 */ virtual void afterJntAnm(int);
/* 80A3B7A4 */ virtual BOOL checkChangeEvt();
include/d/actor/d_a_npc_kolin.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
/* 8055A4A0 */ virtual s32 getHeadJointNo();
/* 8055A4D8 */ virtual s32 getFootLJointNo();
/* 8055A4E0 */ virtual s32 getFootRJointNo();
/* 8055A498 */ virtual s32 getEyeballMaterialNo();
/* 8055A498 */ virtual u16 getEyeballMaterialNo();
/* 80554EBC */ virtual void afterJntAnm(int);
/* 80554F48 */ virtual void setParam();
/* 80555118 */ virtual BOOL checkChangeEvt();
include/d/actor/d_a_npc_kyury.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A63800 */ s32 getEyeballMaterialNo();
/* 80A63800 */ u16 getEyeballMaterialNo();
/* 80A63808 */ s32 getHeadJointNo();
/* 80A63810 */ s32 getNeckJointNo();
/* 80A63818 */ bool getBackboneJointNo();
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 */ s32 getEyeballMaterialNo();
/* 80A68DE0 */ u16 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 */ s32 getEyeballMaterialNo();
/* 80A6FCD0 */ u16 getEyeballMaterialNo();
/* 80A6FCD8 */ s32 getHeadJointNo();
/* 80A6FCE0 */ s32 getNeckJointNo();
/* 80A6FCE8 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_maro.h
+1 -1
View File
@@ -108,7 +108,7 @@ public:
i_arcNames) {
OS_REPORT("|%06d:%x|daNpc_Maro_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 80564970 */ s32 getEyeballMaterialNo();
/* 80564970 */ u16 getEyeballMaterialNo();
/* 80564978 */ s32 getHeadJointNo();
/* 80564980 */ s32 getNeckJointNo();
/* 80564988 */ s32 getBackboneJointNo();
include/d/actor/d_a_npc_midp.h
+2 -2
View File
@@ -55,8 +55,8 @@ public:
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) {}
/* 80A7390C */ s32 getEyeballRMaterialNo();
/* 80A73914 */ s32 getEyeballLMaterialNo();
/* 80A7390C */ u16 getEyeballRMaterialNo();
/* 80A73914 */ u16 getEyeballLMaterialNo();
/* 80A7391C */ s32 getHeadJointNo();
/* 80A73924 */ s32 getNeckJointNo();
/* 80A7392C */ s32 getBackboneJointNo();
include/d/actor/d_a_npc_moi.h
+1 -1
View File
@@ -146,7 +146,7 @@ public:
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
/* 80A7AE0C */ s32 getEyeballMaterialNo() { return chkMoiN() ? 4 : 2; }
/* 80A7AE0C */ u16 getEyeballMaterialNo() { if (chkMoiN()) { return 4; } else { return 2; } }
/* 80A7AE3C */ s32 getHeadJointNo() { return 4; }
/* 80A7AE44 */ s32 getNeckJointNo() { return 3; }
/* 80A7AE4C */ s32 getBackboneJointNo() { return 1; }
include/d/actor/d_a_npc_pachi_besu.h
+1 -1
View File
@@ -80,7 +80,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80A969C0 */ s32 getEyeballMaterialNo();
/* 80A969C0 */ u16 getEyeballMaterialNo();
/* 80A969C8 */ s32 getHeadJointNo();
/* 80A969D0 */ s32 getNeckJointNo();
/* 80A969D8 */ bool getBackboneJointNo();
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 */ s32 getEyeballMaterialNo();
/* 80A9B7E0 */ u16 getEyeballMaterialNo();
/* 80A9B7E8 */ s32 getHeadJointNo();
/* 80A9B7F0 */ s32 getNeckJointNo();
/* 80A9B7F8 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_pachi_taro.h
+1 -1
View File
@@ -98,7 +98,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AA1558 */ s32 getEyeballMaterialNo();
/* 80AA1558 */ u16 getEyeballMaterialNo();
/* 80AA1560 */ s32 getHeadJointNo();
/* 80AA1568 */ s32 getNeckJointNo();
/* 80AA1570 */ 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 */ s32 getEyeballMaterialNo();
/* 80AAD0D0 */ u16 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 */ s32 getEyeballMaterialNo();
/* 80AB1F54 */ u16 getEyeballMaterialNo();
/* 80AB1F5C */ s32 getHeadJointNo();
/* 80AB1F64 */ s32 getNeckJointNo();
/* 80AB1F6C */ bool getBackboneJointNo();
include/d/actor/d_a_npc_raca.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80AB8DAC */ s32 getEyeballMaterialNo();
/* 80AB8DAC */ u16 getEyeballMaterialNo();
/* 80AB8DB4 */ s32 getHeadJointNo();
/* 80AB8DBC */ s32 getNeckJointNo();
/* 80AB8DC4 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_seira.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80ACFC14 */ s32 getEyeballMaterialNo();
/* 80ACFC14 */ u16 getEyeballMaterialNo();
/* 80ACFC1C */ s32 getHeadJointNo();
/* 80ACFC24 */ s32 getNeckJointNo();
/* 80ACFC2C */ bool getBackboneJointNo();
include/d/actor/d_a_npc_seira2.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**);
/* 80AD4884 */ s32 getEyeballMaterialNo();
/* 80AD4884 */ u16 getEyeballMaterialNo();
/* 80AD488C */ s32 getHeadJointNo();
/* 80AD4894 */ s32 getNeckJointNo();
/* 80AD489C */ bool getBackboneJointNo();
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 */ s32 getEyeballMaterialNo();
/* 80AE6B1C */ u16 getEyeballMaterialNo();
/* 80AE6B24 */ s32 getHeadJointNo();
/* 80AE6B2C */ s32 getNeckJointNo();
/* 80AE6B34 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_taro.h
+1 -1
View File
@@ -163,7 +163,7 @@ public:
i_arcNames) {
OS_REPORT("|%06d:%x|daNpc_Taro_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 805715AC */ s32 getEyeballMaterialNo() { return 2; }
/* 805715AC */ u16 getEyeballMaterialNo() { return 2; }
/* 805715B4 */ s32 getHeadJointNo() { return 4; }
/* 805715BC */ s32 getNeckJointNo() { return 3; }
/* 805715C4 */ s32 getBackboneJointNo() { return 1; }
include/d/actor/d_a_npc_tkj.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 805764EC */ s32 getEyeballMaterialNo();
/* 805764EC */ u16 getEyeballMaterialNo();
/* 805764F4 */ s32 getHeadJointNo();
/* 805764FC */ s32 getNeckJointNo();
/* 80576504 */ s32 getBackboneJointNo();
include/d/actor/d_a_npc_toby.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B24920 */ s32 getEyeballMaterialNo();
/* 80B24920 */ u16 getEyeballMaterialNo();
/* 80B24928 */ s32 getHeadJointNo();
/* 80B24930 */ s32 getNeckJointNo();
/* 80B24938 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_uri.h
+1 -1
View File
@@ -139,7 +139,7 @@ public:
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) {}
/* 80B2CD44 */ s32 getEyeballMaterialNo() { return 2; }
/* 80B2CD44 */ u16 getEyeballMaterialNo() { return 2; }
/* 80B2CD4C */ s32 getHeadJointNo() { return 4; }
/* 80B2CD54 */ s32 getNeckJointNo() { return 3; }
/* 80B2CD5C */ s32 getBackboneJointNo() { return 1; }
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 */ s32 getEyeballMaterialNo();
/* 80B45F34 */ u16 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 */ s32 getEyeballMaterialNo();
/* 80B49598 */ u16 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 */ s32 getEyeballMaterialNo();
/* 80B4CCF8 */ u16 getEyeballMaterialNo();
/* 80B4CD00 */ s32 getHeadJointNo();
/* 80B4CD08 */ s32 getNeckJointNo();
/* 80B4CD10 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_yelia.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
: daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
i_arcNames) {}
/* 80B521E4 */ s32 getEyeballMaterialNo() { return 1; }
/* 80B521E4 */ u16 getEyeballMaterialNo() { return 1; }
/* 80B521EC */ s32 getHeadJointNo() { return 4; }
/* 80B521F4 */ s32 getNeckJointNo() { return 3; }
/* 80B521FC */ s32 getBackboneJointNo() { return 1; }
include/d/actor/d_a_npc_ykm.h
+1 -1
View File
@@ -73,7 +73,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B5D688 */ s32 getEyeballMaterialNo();
/* 80B5D688 */ u16 getEyeballMaterialNo();
/* 80B5D690 */ s32 getHeadJointNo();
/* 80B5D698 */ s32 getNeckJointNo();
/* 80B5D6A0 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_ykw.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B67B1C */ s32 getEyeballMaterialNo();
/* 80B67B1C */ u16 getEyeballMaterialNo();
/* 80B67B24 */ s32 getHeadJointNo();
/* 80B67B2C */ s32 getNeckJointNo();
/* 80B67B34 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_zanb.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B6BC18 */ s32 getEyeballMaterialNo();
/* 80B6BC18 */ u16 getEyeballMaterialNo();
/* 80B6BC20 */ s32 getHeadJointNo();
/* 80B6BC28 */ s32 getNeckJointNo();
/* 80B6BC30 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_zelR.h
+2 -2
View File
@@ -57,8 +57,8 @@ public:
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)
{}
/* 80B71A34 */ s32 getEyeballRMaterialNo();
/* 80B71A3C */ s32 getEyeballLMaterialNo();
/* 80B71A34 */ u16 getEyeballRMaterialNo();
/* 80B71A3C */ u16 getEyeballLMaterialNo();
/* 80B71A44 */ s32 getHeadJointNo();
/* 80B71A4C */ s32 getBackboneJointNo();
/* 80B71A54 */ BOOL checkChangeJoint(int param_1) { return param_1 == 3; };
include/d/actor/d_a_npc_zelRo.h
+2 -2
View File
@@ -47,8 +47,8 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
daNpcT_evtData_c const*, char**);
/* 80B74BA8 */ s32 getEyeballRMaterialNo();
/* 80B74BB0 */ s32 getEyeballLMaterialNo();
/* 80B74BA8 */ u16 getEyeballRMaterialNo();
/* 80B74BB0 */ u16 getEyeballLMaterialNo();
/* 80B74BB8 */ s32 getHeadJointNo();
/* 80B74BC0 */ s32 getNeckJointNo();
/* 80B74BC8 */ bool getBackboneJointNo();
include/d/actor/d_a_npc_zelda.h
+76 -37
View File
@@ -3,6 +3,41 @@
#include "d/actor/d_a_npc.h"
class daNpc_Zelda_HIOParam {
public:
/* 0x00 */ daNpcT_HIOParam common;
};
STATIC_ASSERT(sizeof(daNpc_Zelda_HIOParam) == 0x8c);
class daNpc_Zelda_Param_c {
public:
/* 80B77F5C */ virtual ~daNpc_Zelda_Param_c();
static const daNpc_Zelda_HIOParam m;
};
class daNpc_Zelda_HIO_c
#if DEBUG
: public mDoHIO_entry_c
#endif
{
public:
daNpc_Zelda_HIO_c();
void genMessage(JORMContext* ctx);
void listenPropertyEvent(const JORPropertyEvent*);
#if DEBUG
daNpc_Zelda_HIOParam param;
#endif
};
class daNpc_Zelda_c;
typedef int (daNpc_Zelda_c::*cutFunc)(int);
typedef int (daNpc_Zelda_c::*actionFunc)(void*);
/**
* @ingroup actors-npcs
* @class daNpc_Zelda_c
@@ -11,64 +46,68 @@
* @details
*
*/
class daNpc_Zelda_c : public fopAc_ac_c {
class daNpc_Zelda_c : public daNpcT_c {
public:
/* 80B7512C */ ~daNpc_Zelda_c();
/* 80B7524C */ void create();
/* 80B75530 */ void CreateHeap();
/* 80B75978 */ void Delete();
/* 80B759AC */ void Execute();
/* 80B759CC */ void Draw();
/* 80B75A90 */ void createHeapCallBack(fopAc_ac_c*);
/* 80B75AB0 */ void ctrlJointCallBack(J3DJoint*, int);
/* 80B75B08 */ void getType();
/* 80B75B28 */ bool isDelete();
/* 80B7512C */ virtual ~daNpc_Zelda_c();
u8 getPathID() {
return (fopAcM_GetParam(this) & 0xff00) >> 8;
}
int getFlowNodeNo() {
u16 pitch = home.angle.x;
return pitch == 0xffff ? -1 : pitch;
}
/* 80B7524C */ int create();
/* 80B75530 */ int CreateHeap();
/* 80B75978 */ int Delete();
/* 80B759AC */ int Execute();
/* 80B759CC */ int Draw();
/* 80B75A90 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80B75AB0 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80B75B08 */ u8 getType();
/* 80B75B28 */ int isDelete();
/* 80B75B30 */ void reset();
/* 80B75C9C */ void afterJntAnm(int);
/* 80B75D28 */ void ctrlBtk();
/* 80B75E34 */ void checkChangeEvt();
/* 80B75D28 */ int ctrlBtk();
/* 80B75E34 */ int checkChangeEvt();
/* 80B75EE8 */ void setParam();
/* 80B76014 */ void setAfterTalkMotion();
/* 80B76074 */ void srchActors();
/* 80B76078 */ void evtTalk();
/* 80B76118 */ void evtCutProc();
/* 80B76078 */ int evtTalk();
/* 80B76118 */ int evtCutProc();
/* 80B761E0 */ void action();
/* 80B762CC */ void beforeMove();
/* 80B76344 */ void setAttnPos();
/* 80B765D4 */ void setCollision();
/* 80B76774 */ bool drawDbgInfo();
/* 80B7677C */ void selectAction();
/* 80B767C4 */ void chkAction(int (daNpc_Zelda_c::*)(void*));
/* 80B767F0 */ void setAction(int (daNpc_Zelda_c::*)(void*));
/* 80B76898 */ void wait(void*);
/* 80B76B74 */ void talk(void*);
/* 80B76774 */ int drawDbgInfo();
/* 80B7677C */ int selectAction();
/* 80B767C4 */ BOOL chkAction(actionFunc);
/* 80B767F0 */ BOOL setAction(actionFunc);
/* 80B76898 */ int wait(void*);
/* 80B76B74 */ int talk(void*);
/* 80B77DD8 */ daNpc_Zelda_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**);
/* 80B77F14 */ s32 getEyeballRMaterialNo();
/* 80B77F1C */ s32 getEyeballLMaterialNo();
/* 80B77F14 */ u16 getEyeballRMaterialNo();
/* 80B77F1C */ u16 getEyeballLMaterialNo();
/* 80B77F24 */ s32 getHeadJointNo();
/* 80B77F2C */ s32 getNeckJointNo();
/* 80B77F34 */ bool getBackboneJointNo();
/* 80B77F3C */ void checkChangeJoint(int);
/* 80B77F4C */ void checkRemoveJoint(int);
/* 80B77F34 */ s32 getBackboneJointNo();
/* 80B77F3C */ int checkChangeJoint(int);
/* 80B77F4C */ int checkRemoveJoint(int);
static void* mCutNameList;
static u8 mCutList[12];
static const char* mCutNameList;
static cutFunc mCutList[1];
private:
/* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
/* 0xE40 */ daNpc_Zelda_HIO_c* mHIO;
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 field_0xf80;
/* 0xF84 */ actionFunc mAction1;
/* 0xF90 */ actionFunc mAction2;
/* 0xF9C */ u8 field_0xf9c[0xfa0 - 0xf9c];
};
STATIC_ASSERT(sizeof(daNpc_Zelda_c) == 0xfa0);
class daNpc_Zelda_Param_c {
public:
/* 80B77F5C */ ~daNpc_Zelda_Param_c();
static u8 const m[140];
};
#endif /* D_A_NPC_ZELDA_H */
include/d/actor/d_a_peru.h
+1 -1
View File
@@ -68,7 +68,7 @@ public:
: daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {
OS_REPORT("|%06d:%x|daPeru_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 80D4BEC4 */ s32 getEyeballMaterialNo() { return 1; }
/* 80D4BEC4 */ u16 getEyeballMaterialNo() { return 1; }
/* 80D4BECC */ s32 getHeadJointNo() { return 4; }
/* 80D4BED4 */ s32 getNeckJointNo() { return 3; }
/* 80D4BEDC */ s32 getBackboneJointNo() { return 1; }
include/d/d_path.h
+1 -1
View File
@@ -25,7 +25,7 @@ struct dPath {
/* 0x8 */ dPnt* m_points;
};
inline BOOL dPath_ChkClose(dPath* i_path) { return i_path->m_closed & 1; }
inline BOOL dPath_ChkClose(const dPath* i_path) { return i_path->m_closed & 1; }
dPath* dPath_GetRoomPath(int path_index, int room_no);
dPath* dPath_GetNextRoomPath(dPath const* i_path, int room_no);