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

Several more TUs matching (#2601)

Browse Source
This commit is contained in:
Max Roncace
2025-08-24 13:56:20 -04:00
committed by GitHub
parent 0abe859c28
commit 46a11f2cd7
17 changed files with 202 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc_bou.h
+6 -39
View File
@@ -112,12 +112,12 @@ public:
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
{}
/* 809727D4 */ virtual int checkChangeJoint(int);
/* 809727E4 */ virtual int checkRemoveJoint(int);
/* 809727CC */ virtual s32 getBackboneJointNo();
/* 809727C4 */ virtual s32 getNeckJointNo();
/* 809727BC */ virtual s32 getHeadJointNo();
/* 809727B4 */ virtual u16 getEyeballMaterialNo();
/* 809727D4 */ virtual int checkChangeJoint(int param_0) { return param_0 == 4; }
/* 809727E4 */ virtual int checkRemoveJoint(int param_0) { return param_0 == 8; }
/* 809727CC */ virtual s32 getBackboneJointNo() { return 1; }
/* 809727C4 */ virtual s32 getNeckJointNo() { return 3; }
/* 809727BC */ virtual s32 getHeadJointNo() { return 4; }
/* 809727B4 */ virtual u16 getEyeballMaterialNo() { return 1; }
/* 8096DD44 */ virtual void afterJntAnm(int);
/* 8096DDC8 */ virtual void setParam();
/* 8096DF9C */ virtual BOOL checkChangeEvt();
@@ -205,38 +205,5 @@ private:
STATIC_ASSERT(sizeof(daNpc_Bou_c) == 0xffc);
/* 809727B4-809727BC 005914 0008+00 1/0 0/0 0/0 .text getEyeballMaterialNo__11daNpc_Bou_cFv */
u16 daNpc_Bou_c::getEyeballMaterialNo() {
return 1;
}
/* 809727BC-809727C4 00591C 0008+00 1/0 0/0 0/0 .text getHeadJointNo__11daNpc_Bou_cFv */
s32 daNpc_Bou_c::getHeadJointNo() {
return 4;
}
/* 809727C4-809727CC 005924 0008+00 1/0 0/0 0/0 .text getNeckJointNo__11daNpc_Bou_cFv */
s32 daNpc_Bou_c::getNeckJointNo() {
return 3;
}
/* 809727CC-809727D4 00592C 0008+00 1/0 0/0 0/0 .text getBackboneJointNo__11daNpc_Bou_cFv
*/
s32 daNpc_Bou_c::getBackboneJointNo() {
return 1;
}
/* 809727D4-809727E4 005934 0010+00 1/0 0/0 0/0 .text checkChangeJoint__11daNpc_Bou_cFi
*/
int daNpc_Bou_c::checkChangeJoint(int param_0) {
return param_0 == 4;
}
/* 809727E4-809727F4 005944 0010+00 1/0 0/0 0/0 .text checkRemoveJoint__11daNpc_Bou_cFi
*/
int daNpc_Bou_c::checkRemoveJoint(int param_0) {
return param_0 == 8;
}
#endif /* D_A_NPC_BOU_H */
include/d/actor/d_a_npc_shad.h
+26 -10
View File
@@ -10,7 +10,23 @@
*
* @details
*
*/
*/
struct daNpcShad_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
/* 0x6C */ f32 traveling_speed; // 走行速度 (Traveling Speed)
};
class daNpcShad_Param_c: public JORReflexible {
public:
/* 80AE1F70 */ virtual ~daNpcShad_Param_c() {}
#ifdef DEBUG
void genMessage(JORMContext*);
#endif
static const daNpcShad_HIOParam m;
};
class daNpcShad_c : public daNpcF_c {
public:
@@ -113,7 +129,7 @@ public:
};
/* 80AD820C */ daNpcShad_c();
/* 80AD8420 */ ~daNpcShad_c();
/* 80AD8420 */ virtual ~daNpcShad_c();
/* 80AD8620 */ cPhs__Step Create();
/* 80AD8B60 */ int CreateHeap();
/* 80AD90E0 */ int Delete();
@@ -163,7 +179,7 @@ public:
u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
s16 getMessageNo() { return shape_angle.x; }
inline void setAction(ActionFn action) {
void setAction(ActionFn action) {
field_0xe1a = 3;
if (mActionFn) {
@@ -178,14 +194,14 @@ public:
}
}
inline csXyz* unk_inline();
inline BOOL chkFindPlayer();
inline void setLookMode(int, fopAc_ac_c*, cXyz*);
inline BOOL step(s16, int, f32);
inline void setExpressionTalkAfter();
inline void setLookObliquenessUp();
csXyz* unk_inline();
BOOL chkFindPlayer();
void setLookMode(int, fopAc_ac_c*, cXyz*);
BOOL step(s16, int, f32);
void setExpressionTalkAfter();
void setLookObliquenessUp();
inline void searchActors() {
void searchActors() {
if (mMode == 0) {
if (mActorMngr[1].getActorP() == NULL) {
mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH));
include/d/actor/d_a_npc_zelda.h
+50 -44
View File
@@ -3,41 +3,9 @@
#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_HIO_c;
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
@@ -48,6 +16,9 @@ typedef int (daNpc_Zelda_c::*actionFunc)(void*);
*/
class daNpc_Zelda_c : public daNpcT_c {
public:
typedef int (daNpc_Zelda_c::*cutFunc)(int);
typedef int (daNpc_Zelda_c::*actionFunc)(void*);
/* 80B7512C */ virtual ~daNpc_Zelda_c();
u8 getPathID() {
return (fopAcM_GetParam(this) & 0xff00) >> 8;
@@ -84,17 +55,22 @@ public:
/* 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 */ u16 getEyeballRMaterialNo();
/* 80B77F1C */ u16 getEyeballLMaterialNo();
/* 80B77F24 */ s32 getHeadJointNo();
/* 80B77F2C */ s32 getNeckJointNo();
/* 80B77F34 */ s32 getBackboneJointNo();
/* 80B77F3C */ int checkChangeJoint(int);
/* 80B77F4C */ int checkRemoveJoint(int);
/* 80B77DD8 */ daNpc_Zelda_c(daNpcT_faceMotionAnmData_c const* param_0,
daNpcT_motionAnmData_c const* param_1,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2,
int param_3,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_4,
int param_5, daNpcT_evtData_c const* param_6, char** param_7) :
daNpcT_c(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7) {
OS_REPORT("|%06d:%x|daNpc_Zelda_c -> コンストラクト\n", g_Counter.mCounter0, this);
}
/* 80B77F14 */ u16 getEyeballRMaterialNo() { return 5; }
/* 80B77F1C */ u16 getEyeballLMaterialNo() { return 4; }
/* 80B77F24 */ s32 getHeadJointNo() { return 4; }
/* 80B77F2C */ s32 getNeckJointNo() { return 3; }
/* 80B77F34 */ s32 getBackboneJointNo() { return 1; }
/* 80B77F3C */ int checkChangeJoint(int param_0) { return param_0 == 4; }
/* 80B77F4C */ int checkRemoveJoint(int param_0) { return param_0 == 17; }
static const char* mCutNameList;
static cutFunc mCutList[1];
@@ -110,4 +86,34 @@ private:
STATIC_ASSERT(sizeof(daNpc_Zelda_c) == 0xfa0);
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
};
#endif /* D_A_NPC_ZELDA_H */
include/d/dolzel_base.pch
+2
View File
@@ -10,9 +10,11 @@
#include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export
// Fixes weak function ordering
#include "cmath.h"
#include "string.h"
#include "d/d_com_inf_game.h" // IWYU pragma: export
#include "d/d_bg_w.h" // IWYU pragma: export
#include "m_Do/m_Do_graphic.h" // IWYU pragma: export
#include "JSystem/J2DGraph/J2DOrthograph.h" // IWYU pragma: export
#include "JSystem/J2DGraph/J2DPane.h" // IWYU pragma: export
#include "JSystem/J2DGraph/J2DPictureEx.h" // IWYU pragma: export
include/d/dolzel_rel.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define DOLZEL_REL_H
// PCH breaks debug build for RELs right now
#if __MWERKS__ && !DEBUG
#if __MWERKS__
#include "d/dolzel_rel.mch"
#else
#include "d/dolzel_rel.pch"