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

d_a_npc_zelda equivalent (#2528)

Browse Source
This commit is contained in:
Max Roncace
2025-07-11 22:00:18 +03: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
configure.py
+1 -1
View File
@@ -1861,7 +1861,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_zant"),
ActorRel(NonMatching, "d_a_npc_zelR"),
ActorRel(NonMatching, "d_a_npc_zelRo"),
ActorRel(NonMatching, "d_a_npc_zelda"),
ActorRel(Equivalent, "d_a_npc_zelda"), # weak function order
ActorRel(NonMatching, "d_a_npc_zra"),
ActorRel(NonMatching, "d_a_npc_zrc"),
ActorRel(NonMatching, "d_a_npc_zrz"),
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
+16 -9
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; }
};
@@ -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();

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