Several more TUs matching (#2601)

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
+24 -33
View File
@@ -11,22 +11,6 @@
#include "d/actor/d_a_tag_evtarea.h"
#include "d/d_msg_object.h"
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;
};
enum Shad_RES_File_ID {
/* BCK */
/* 0x07 */ BCK_SHAD_F_DISCOURAGED = 0x7,
@@ -308,19 +292,6 @@ daNpcShad_c::EventFn daNpcShad_c::mEvtSeqList[14] = {
&daNpcShad_c::EvCut_WiretapEntrant,
};
daNpcShad_c::daNpcShad_c() {}
/* 80AD8420-80AD8620 000300 0200+00 1/0 0/0 0/0 .text __dt__11daNpcShad_cFv */
daNpcShad_c::~daNpcShad_c() {
for (int i = 0; l_loadRes_list[mMode][i] >= 0; i++) {
dComIfG_resDelete(&mPhases[i], l_arcNames[l_loadRes_list[mMode][i]]);
}
if (heap != NULL) {
mpMorf->stopZelAnime();
}
}
/* 80AE1FDC-80AE204C 000000 0070+00 19/19 0/0 0/0 .rodata m__17daNpcShad_Param_c */
const daNpcShad_HIOParam daNpcShad_Param_c::m = {
35.0f,
@@ -359,6 +330,21 @@ const daNpcShad_HIOParam daNpcShad_Param_c::m = {
12.0f,
};
daNpcShad_c::daNpcShad_c() {
// empty function
}
/* 80AD8420-80AD8620 000300 0200+00 1/0 0/0 0/0 .text __dt__11daNpcShad_cFv */
daNpcShad_c::~daNpcShad_c() {
for (int i = 0; l_loadRes_list[mMode][i] >= 0; i++) {
dComIfG_resDelete(&mPhases[i], l_arcNames[l_loadRes_list[mMode][i]]);
}
if (heap != NULL) {
mpMorf->stopZelAnime();
}
}
/* 80AD8620-80AD8B60 000500 0540+00 1/1 0/0 0/0 .text Create__11daNpcShad_cFv */
cPhs__Step daNpcShad_c::Create() {
fopAcM_SetupActor(this, daNpcShad_c);
@@ -911,7 +897,7 @@ inline bool daNpcShad_c::isSneaking() {
}
/* 80AE0B58-80AE0ED0 008A38 0378+00 1/1 0/0 0/0 .text playExpression__11daNpcShad_cFv */
void daNpcShad_c::playExpression() {
inline void daNpcShad_c::playExpression() {
daNpcF_anmPlayData dat0 = {ANM_F_TALK_A, daNpcShad_Param_c::m.common.morf_frame, 0};
daNpcF_anmPlayData* pDat0[1] = {&dat0};
daNpcF_anmPlayData dat1a = {ANM_F_HAPPY, daNpcShad_Param_c::m.common.morf_frame, 1};
@@ -949,11 +935,11 @@ void daNpcShad_c::playExpression() {
if (mExpression >= 0 && mExpression < 0xD) {
playExpressionAnm(ppDat);
}
}
}
/* 80AE04D8-80AE0B58 0083B8 0680+00 1/1 0/0 0/0 .text playMotion__11daNpcShad_cFv */
void daNpcShad_c::playMotion() {
inline void daNpcShad_c::playMotion() {
daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpcShad_Param_c::m.common.morf_frame, 0};
daNpcF_anmPlayData* pDat0[1] = {&dat0};
daNpcF_anmPlayData dat1a = {ANM_BOOK_TALK_A, daNpcShad_Param_c::m.common.morf_frame, 1};
@@ -2576,6 +2562,11 @@ static int daNpcShad_IsDelete(void* a_this) {
return 1;
}
// force J3DTexNoAnm::calc to be emitted earlier than it otherwise would be
static void dummy() {
((J3DTexNoAnm*)NULL)->calc(NULL);
}
/* 80AE01BC-80AE0438 00809C 027C+00 1/0 0/0 0/0 .text setParam__11daNpcShad_cFv */
void daNpcShad_c::setParam() {
searchActors();
@@ -2690,7 +2681,7 @@ inline void daNpcShad_c::setAttnPos() {
}
/* 80AE153C-80AE1544 00941C 0008+00 1/0 0/0 0/0 .text drawDbgInfo__11daNpcShad_cFv */
BOOL daNpcShad_c::drawDbgInfo() {
inline BOOL daNpcShad_c::drawDbgInfo() {
return FALSE;
}