mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-07 03:17:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_passer and d_a_npc_passer2 matching (#2796)

Browse Source 
* passer matching and passer2 init work

* passer2 matching
This commit is contained in:
Carco_21
2025-11-11 22:58:27 -05:00
committed by GitHub
parent da4ce41092
commit 25e90cd458
9 changed files with 1674 additions and 2451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+2 -2
View File
@@ -1901,8 +1901,8 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_pachi_besu"),
ActorRel(NonMatching, "d_a_npc_pachi_maro"),
ActorRel(NonMatching, "d_a_npc_pachi_taro"),
ActorRel(NonMatching, "d_a_npc_passer"),
ActorRel(NonMatching, "d_a_npc_passer2"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_passer"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_passer2"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_post"),
ActorRel(NonMatching, "d_a_npc_pouya"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_prayer", extra_cflags=[DANPCF_C_HACK]),
include/d/actor/d_a_npc_cd.h
+32 -6
View File
@@ -23,7 +23,7 @@ public:
/* 8015736C */ void setHitodamaParticle();
/* 80157524 */ J3DModelData* getNpcMdlDataP(int);
/* 80157588 */ J3DModelData* getObjMdlDataP(int);
/* 80AA8694 */ virtual ~daNpcCd_c();
/* 80AA8694 */ virtual ~daNpcCd_c() {}
static dCcD_SrcCyl const m_cylDat;
@@ -37,14 +37,14 @@ public:
/* 0x80C */ dBgS_AcchCir mAcchCir;
/* 0x84C */ dCcD_Stts mStts;
/* 0x888 */ dCcD_Cyl mCyl;
/* 0x9C4 */ int field_0x9c4;
/* 0x9C4 */ int m_type;
/* 0x9C8 */ int field_0x9c8;
/* 0x9CC */ int mHitodamaEmitters[2];
/* 0x9D4 */ int field_0x9d4;
/* 0x9D8 */ cXyz field_0x9d8;
/* 0x9E4 */ s16 field_0x9e4;
/* 0x9E6 */ s16 field_0x9e6;
/* 0x9E8 */ bool mIsDarkWorld;
/* 0x9E8 */ u8 mIsDarkWorld;
};
STATIC_ASSERT(sizeof(daNpcCd_c) == 0x9EC);
@@ -71,9 +71,17 @@ struct daNpcCd_HIO_Child_c : public JORReflexible {
#endif
/* 0x004 */ daNpcCd_HIO_Jnt_c field_0x4[12];
/* 0x128 */ s16 field_0x128[0x0E];
/* 0x136 */ s16 mAtn;
/* 0x156 */ s16 field_0x146[0x10];
/* 0x124 */ s16 field_0x124[0x0C];
/* 0x13C */ f32 mObjScale;
/* 0x140 */ s16 mAtn;
/* 0x144 */ f32 mAnmPlaySpeed;
/* 0x148 */ f32 mWalkAnmPlaySpeed;
/* 0x14C */ f32 mMaxSpeed;
/* 0x150 */ f32 mWalkMaxSpeed;
/* 0x154 */ f32 mCylH;
/* 0x158 */ f32 mCylR;
/* 0x15C */ f32 mChkWallH;
/* 0x160 */ f32 mChkWallR;
};
STATIC_ASSERT(sizeof(daNpcCd_HIO_Child_c) == 0x164);
@@ -164,4 +172,22 @@ static inline f32 HIO_jntTZ(int param_1, int param_2) {
return 10.0f * rv;
}
static inline f32 HIO_maxSpeed(int param_1) { return (f32)(param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mMaxSpeed : l_Cd_HIO.field_0x0004[param_1].mMaxSpeed); }
static inline f32 HIO_anmPlaySpeed(int param_1) { return (f32)(param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mAnmPlaySpeed : l_Cd_HIO.field_0x0004[param_1].mAnmPlaySpeed); }
static inline f32 HIO_walkMaxSpeed(int param_1) { return (f32)(param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mWalkMaxSpeed : l_Cd_HIO.field_0x0004[param_1].mWalkMaxSpeed); }
static inline f32 HIO_walkAnmPlaySpeed(int param_1) { return (f32)(param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mWalkAnmPlaySpeed : l_Cd_HIO.field_0x0004[param_1].mWalkAnmPlaySpeed); }
static inline f32 HIO_chkWallR(int param_1) { return (param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mChkWallR : l_Cd_HIO.field_0x0004[param_1].mChkWallR); }
static inline f32 HIO_chkWallH(int param_1) { return (param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mChkWallH : l_Cd_HIO.field_0x0004[param_1].mChkWallH); }
static inline f32 HIO_cylR(int param_1) { return (param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mCylR : l_Cd_HIO.field_0x0004[param_1].mCylR); }
static inline f32 HIO_cylH(int param_1) { return (param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mCylH : l_Cd_HIO.field_0x0004[param_1].mCylH); }
static inline f32 HIO_objScale(int param_1) { return (f32)(param_1 < 16 ? l_Cd_HIO.field_0x0004[param_1].mObjScale : l_Cd_HIO.field_0x0004[param_1].mObjScale); }
#endif /* A_NPC_D_A_NPC_CD_H */
include/d/actor/d_a_npc_cd2.h
+3 -21
View File
@@ -116,33 +116,15 @@ inline f32 Cd2_HIO_objScale(int param_1) {
}
inline f32 Cd2_HIO_walkMaxSpeed(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mWalkMaxSpeed;
} else {
return l_Cd2_HIO.field_0x20c4[param_1 - 16].mWalkMaxSpeed;
}
return rv;
return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mWalkMaxSpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mWalkMaxSpeed);
}
inline f32 Cd2_HIO_walkAnmPlaySpeed(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mWalkAnmPlaySpeed;
} else {
return l_Cd2_HIO.field_0x20c4[param_1 - 16].mWalkAnmPlaySpeed;
}
return rv;
return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mWalkAnmPlaySpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mWalkAnmPlaySpeed);
}
inline f32 Cd2_HIO_maxSpeed(int param_1) {
f32 rv;
if (param_1 < 16) {
rv = l_Cd2_HIO.field_0x0004[param_1].mMaxSpeed;
} else {
return l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxSpeed;
}
return rv;
return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mMaxSpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxSpeed);
}
inline f32 Cd2_HIO_anmPlaySpeed(int param_1) {
include/d/actor/d_a_npc_passer.h
+107 -65
View File
@@ -2,24 +2,36 @@
#define D_A_NPC_PASSER_H
#include "d/actor/d_a_npc.h"
#include "d/actor/d_a_npc_cd2.h"
/**
* @ingroup actors-npcs
* @class daNpcPasser_c
* @brief Hylian Passerby (Castle Town NPC?)
* @brief Hylian Passerby
*
* @details
*
*/
class daNpcPasser_c : public fopAc_ac_c {
*/
class daNpcPasser_c : public daNpcCd2_c {
public:
struct Mode_e {};
typedef void (daNpcPasser_c::*actionFunc)();
typedef BOOL (daNpcPasser_c::*seqFunc)(void*);
enum Mode_e {
/* 0x0 */ MODE_0,
/* 0x1 */ MODE_1,
/* 0x2 */ MODE_2,
/* 0x3 */ MODE_3,
/* 0x4 */ MODE_4,
/* 0x5 */ MODE_MAX_e,
};
/* 80AA2C18 */ ~daNpcPasser_c();
/* 80AA2C9C */ void createHeap();
/* 80AA2D40 */ void create();
/* 80AA2FD4 */ void execute();
/* 80AA315C */ void draw();
/* 80AA2C9C */ int createHeap();
/* 80AA2D40 */ cPhs__Step create();
/* 80AA2FD4 */ int execute();
/* 80AA315C */ int draw();
/* 80AA31EC */ void setAction(daNpcPasser_c::Mode_e);
/* 80AA3230 */ void callInit();
/* 80AA3258 */ void callExecute();
@@ -40,66 +52,96 @@ public:
/* 80AA4780 */ void setBaseMtx();
/* 80AA47FC */ void initCollision();
/* 80AA48D8 */ void setCollision();
/* 80AA492C */ void waita(void*);
/* 80AA49D4 */ void talka(void*);
/* 80AA4A7C */ void waitwall(void*);
/* 80AA4B24 */ void talkwall(void*);
/* 80AA4BCC */ void talkbwall(void*);
/* 80AA4C74 */ void talkb(void*);
/* 80AA4D1C */ void talkc(void*);
/* 80AA4DC4 */ void waitb(void*);
/* 80AA4E6C */ void sitwaita(void*);
/* 80AA4F14 */ void sittalka(void*);
/* 80AA4FBC */ void sittalkab(void*);
/* 80AA5064 */ void sitwaitb(void*);
/* 80AA510C */ void sittalkb(void*);
/* 80AA51B4 */ void sittalkbb(void*);
/* 80AA525C */ void looka(void*);
/* 80AA5304 */ void lookb(void*);
/* 80AA53AC */ void playm(void*);
/* 80AA5454 */ void turnr(void*);
/* 80AA5510 */ void turnl(void*);
/* 80AA55CC */ void walka(void*);
/* 80AA5634 */ void runa(void*);
/* 80AA569C */ void runb(void*);
/* 80AA5704 */ void walkb(void*);
/* 80AA576C */ void browsea(void*);
/* 80AA5814 */ void browseb(void*);
/* 80AA58BC */ void waitTime(void*);
/* 80AA492C */ BOOL waita(void*);
/* 80AA49D4 */ BOOL talka(void*);
/* 80AA4A7C */ BOOL waitwall(void*);
/* 80AA4B24 */ BOOL talkwall(void*);
/* 80AA4BCC */ BOOL talkbwall(void*);
/* 80AA4C74 */ BOOL talkb(void*);
/* 80AA4D1C */ BOOL talkc(void*);
/* 80AA4DC4 */ BOOL waitb(void*);
/* 80AA4E6C */ BOOL sitwaita(void*);
/* 80AA4F14 */ BOOL sittalka(void*);
/* 80AA4FBC */ BOOL sittalkab(void*);
/* 80AA5064 */ BOOL sitwaitb(void*);
/* 80AA510C */ BOOL sittalkb(void*);
/* 80AA51B4 */ BOOL sittalkbb(void*);
/* 80AA525C */ BOOL looka(void*);
/* 80AA5304 */ BOOL lookb(void*);
/* 80AA53AC */ BOOL playm(void*);
/* 80AA5454 */ BOOL turnr(void*);
/* 80AA5510 */ BOOL turnl(void*);
/* 80AA55CC */ BOOL walka(void*);
/* 80AA5634 */ BOOL runa(void*);
/* 80AA569C */ BOOL runb(void*);
/* 80AA5704 */ BOOL walkb(void*);
/* 80AA576C */ BOOL browsea(void*);
/* 80AA5814 */ BOOL browseb(void*);
/* 80AA58BC */ BOOL waitTime(void*);
static u8 ActionTable[120];
static void* m_funcTbl[28];
static u8 m_seq00_funcTbl[24];
static u8 m_seq01_funcTbl[24];
static u8 m_seq02_funcTbl[24];
static u8 m_seq03_funcTbl[24];
static u8 m_seq04_funcTbl[24];
static u8 m_seq05_funcTbl[48];
static u8 m_seq06_funcTbl[48];
static u8 m_seq07_funcTbl[24];
static u8 m_seq08_funcTbl[84];
static u8 m_seq09_funcTbl[24];
static u8 m_seq10_funcTbl[24];
static u8 m_seq11_funcTbl[72];
static u8 m_seq12_funcTbl[24];
static u8 m_seq13_funcTbl[72];
static u8 m_seq14_funcTbl[24];
static u8 m_seq15_funcTbl[24];
static u8 m_seq16_funcTbl[84];
static u8 m_seq17_funcTbl[24];
static u8 m_seq18_funcTbl[24];
static u8 m_seq19_funcTbl[84];
static u8 m_seq20_funcTbl[24];
static u8 m_seq21_funcTbl[24];
static u8 m_seq22_funcTbl[48];
static u8 m_seq23_funcTbl[84];
static u8 m_seq24_funcTbl[60];
static u8 m_seq25_funcTbl[84];
static u8 m_seq26_funcTbl[36];
static u8 m_seq27_funcTbl[12];
int getObjNum() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
int getTimeHour() { return dKy_darkworld_check() ? dKy_getDarktime_hour() : dKy_getdaytime_hour(); }
int getTimeMinute() { return dKy_darkworld_check() ? dKy_getDarktime_minute() : dKy_getdaytime_minute(); }
int getTime() {return (getTimeHour() * 60) + getTimeMinute(); }
int getDayOfWeek() { return dKy_darkworld_check() ? dKy_getDarktime_week() : dKy_get_dayofweek(); }
int getEndTime() { return current.angle.x; }
int getType() { return fopAcM_GetParam(this) & 0xFF; }
u8 getMoveType() { return (fopAcM_GetParam(this) >> 24) & 0xF; }
u8 getWalkMotionType() { return (fopAcM_GetParam(this) >> 28) & 3; }
u8 getRunMotionType() { return fopAcM_GetParam(this) >> 30; }
u8 getPathID() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
BOOL isStop() { return TRUE; }
static actionFunc ActionTable[5][2];
static seqFunc* m_funcTbl[28];
static seqFunc m_seq00_funcTbl[2];
static seqFunc m_seq01_funcTbl[2];
static seqFunc m_seq02_funcTbl[2];
static seqFunc m_seq03_funcTbl[2];
static seqFunc m_seq04_funcTbl[2];
static seqFunc m_seq05_funcTbl[4];
static seqFunc m_seq06_funcTbl[4];
static seqFunc m_seq07_funcTbl[2];
static seqFunc m_seq08_funcTbl[7];
static seqFunc m_seq09_funcTbl[2];
static seqFunc m_seq10_funcTbl[2];
static seqFunc m_seq11_funcTbl[6];
static seqFunc m_seq12_funcTbl[2];
static seqFunc m_seq13_funcTbl[6];
static seqFunc m_seq14_funcTbl[2];
static seqFunc m_seq15_funcTbl[2];
static seqFunc m_seq16_funcTbl[7];
static seqFunc m_seq17_funcTbl[2];
static seqFunc m_seq18_funcTbl[2];
static seqFunc m_seq19_funcTbl[7];
static seqFunc m_seq20_funcTbl[2];
static seqFunc m_seq21_funcTbl[2];
static seqFunc m_seq22_funcTbl[4];
static seqFunc m_seq23_funcTbl[7];
static seqFunc m_seq24_funcTbl[5];
static seqFunc m_seq25_funcTbl[7];
static seqFunc m_seq26_funcTbl[3];
static seqFunc m_seq27_funcTbl[1];
private:
/* 0x568 */ u8 field_0x568[0xb28 - 0x568];
/* 0xAC8 */ J3DModel* mpModel;
/* 0xACC */ PathTrace_c m_path;
/* 0xAF4 */ daNpcPasser_c::actionFunc* mAction;
/* 0xAF8 */ int mActionIdx;
/* 0xAFC */ int mPrevActionIdx;
/* 0xB00 */ int m_objNum;
/* 0xB04 */ int arg0;
/* 0xB08 */ int m_dayOfWeek;
/* 0xB0C */ int m_endTime;
/* 0xB10 */ f32 field_0xb10;
/* 0xB14 */ f32 field_0xb14;
/* 0xB18 */ f32 mPosY;
/* 0xB1C */ u32 field_0xb1c;
/* 0xB20 */ s16 mTargetAngleY;
/* 0xB22 */ u8 field_0xb22;
/* 0xB23 */ u8 field_0xb23;
/* 0xB24 */ u8 mPathMode;
/* 0xB25 */ u8 field_0xb25;
};
STATIC_ASSERT(sizeof(daNpcPasser_c) == 0xb28);
include/d/actor/d_a_npc_passer2.h
+49 -9
View File
@@ -1,19 +1,25 @@
#ifndef D_A_NPC_PASSER2_H
#define D_A_NPC_PASSER2_H
#include "d/actor/d_a_npc.h"
#include "d/actor/d_a_npc_cd.h"
#include "d/actor/d_a_npc_cd2.h"
/**
* @ingroup actors-npcs
* @class daNpcPasser2_c
* @brief Hylian Passerby 2 (Castle Town NPC?)
* @brief Low-Poly Hylian Passerby
*
* @details
*
*/
class daNpcPasser2_c : public fopAc_ac_c {
*/
class daNpcPasser2_c : public daNpcCd_c {
public:
struct Mode_e {};
typedef void (daNpcPasser2_c::*actionFunc)();
enum Mode_e {
/* 0x0 */ MODE_MAX_e,
};
/* 80AA755C */ void setAction(daNpcPasser2_c::Mode_e);
/* 80AA75A0 */ void callInit();
@@ -22,14 +28,48 @@ public:
/* 80AA774C */ void executePath();
/* 80AA790C */ void setAngle();
/* 80AA7918 */ void pathMoveF();
/* 80AA7CD8 */ void create();
/* 80AA7CD8 */ cPhs__Step create();
/* 80AA7F78 */ void create_init();
/* 80AA8270 */ ~daNpcPasser2_c();
/* 80AA8270 */ inline ~daNpcPasser2_c();
static u8 ActionTable[24];
inline int createHeap();
inline void setSpeed(f32, f32, f32*, int);
inline void initCollision();
inline void setBaseMtx();
inline int execute();
inline void setCollision();
inline int draw();
int getObjNum() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
int getTimeHour() { return dKy_darkworld_check() ? dKy_getDarktime_hour() : dKy_getdaytime_hour(); }
int getTimeMinute() { return dKy_darkworld_check() ? dKy_getDarktime_minute() : dKy_getdaytime_minute(); }
int getTime() {return (getTimeHour() * 60) + getTimeMinute(); }
int getDayOfWeek() { return dKy_darkworld_check() ? dKy_getDarktime_week() : dKy_get_dayofweek(); }
int getEndTime() { return current.angle.x; }
int getType() { return fopAcM_GetParam(this) & 0xFF; }
u8 getMoveType() { return (fopAcM_GetParam(this) >> 24) & 0xF; }
u8 getWalkMotionType() { return (fopAcM_GetParam(this) >> 28) & 3; }
u8 getRunMotionType() { return fopAcM_GetParam(this) >> 30; }
u8 getPathID() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
static actionFunc ActionTable[1][2];
private:
/* 0x568 */ u8 field_0x568[0xa44 - 0x568];
/* 0x9EC */ J3DModel* mpModel;
/* 0x9F0 */ PathTrace_c m_path;
/* 0xA18 */ actionFunc* mAction;
/* 0xA1C */ Mode_e mActionIdx;
/* 0xA20 */ int mPrevActionIdx;
/* 0xA24 */ int m_objNum;
/* 0xA28 */ int m_dayOfWeek;
/* 0xA2C */ int m_endTime;
/* 0xA30 */ f32 field_0xa30;
/* 0xA34 */ f32 field_0xa34;
/* 0xA38 */ f32 mPosY;
/* 0xA3C */ u32 field_0xa3c;
/* 0xA40 */ u8 field_0xa40;
/* 0xA41 */ u8 field_0xa41;
/* 0xA42 */ u8 field_0xa42;
/* 0xA43 */ u8 field_0xa43;
};
STATIC_ASSERT(sizeof(daNpcPasser2_c) == 0xa44);
include/d/actor/d_a_tag_escape.h
+1 -1
View File
@@ -8,7 +8,7 @@ public:
daTagEscape_c() {}
~daTagEscape_c() {}
int getPathID() { return fopAcM_GetParam(this) & 0xff; }
u8 getPathID() { return fopAcM_GetParam(this) & 0xff; }
};
#endif /* D_A_TAG_ESCAPE_H */
src/d/actor/d_a_npc_cd.cpp
+8 -8
View File
@@ -280,7 +280,7 @@ J3DModel* daNpcCd_c::ObjCreate(int param_0) {
BOOL daNpcCd_c::isM_() {
// JUT_ASSERT(574, m_type < MdlNUM_e); // Not yet configured in DEBUG
return field_0x9c4 < 16;
return m_type < 16;
}
/* 80156248-801563C8 150B88 0180+00 0/0 0/0 1/1 .text getAnmP__9daNpcCd_cFii */
@@ -549,12 +549,12 @@ int daNpcCd_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
J3DJoint* i_jnt_ = i_jnt;
int jntNo = i_jnt_->getJntNo();
mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo));
mDoMtx_stack_c::ZXYrotM(HIO_jntRX(field_0x9c4, jntNo), HIO_jntRY(field_0x9c4, jntNo),
HIO_jntRZ(field_0x9c4, jntNo));
mDoMtx_stack_c::ZXYrotM(HIO_jntRX(m_type, jntNo), HIO_jntRY(m_type, jntNo),
HIO_jntRZ(m_type, jntNo));
f32 tmp_z = HIO_jntTZ(field_0x9c4, jntNo);
f32 tmp_y = HIO_jntTY(field_0x9c4, jntNo);
f32 tmp_x = HIO_jntTX(field_0x9c4, jntNo);
f32 tmp_z = HIO_jntTZ(m_type, jntNo);
f32 tmp_y = HIO_jntTY(m_type, jntNo);
f32 tmp_x = HIO_jntTX(m_type, jntNo);
mDoMtx_stack_c::transM(tmp_x, tmp_y, tmp_z); // Fake force eval order
i_model->setAnmMtx(jntNo, mDoMtx_stack_c::get());
cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
@@ -1255,13 +1255,13 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() {
for (int j = 0; j < 12; j++) {
memcpy((void*)&field_0x0004[i].field_0x4[j].jntT, a_jntTbl_M[i][j], 20);
}
memcpy(&field_0x0004[i].field_0x128, a_prmTbl_M + i * 0x40, 0x40);
memcpy(&field_0x0004[i].field_0x124, a_prmTbl_M + i * 0x40, 0x40);
}
for (int i = 0; i < 14; i++) {
for (int j = 0; j < 12; j++) {
memcpy((void*)&field_0x1648[i].field_0x4[j].jntT, a_jntTbl_W[i][j], 20);
}
memcpy(&field_0x1648[i].field_0x128, a_prmTbl_W + i * 0x40, 0x40);
memcpy(&field_0x1648[i].field_0x124, a_prmTbl_W + i * 0x40, 0x40);
}
}
src/d/actor/d_a_npc_passer.cpp
+1110 -1857
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_passer2.cpp
+362 -482
View File
@@ -6,199 +6,394 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_passer2.h"
#include "dol2asm.h"
#include "d/d_s_play.h"
//
// Forward References:
//
int daNpcPasser2_c::createHeap() {
int rv = NpcCreate(m_type);
extern "C" static void createHeapCallBack__FP10fopAc_ac_c();
extern "C" void setAction__14daNpcPasser2_cFQ214daNpcPasser2_c6Mode_e();
extern "C" void callInit__14daNpcPasser2_cFv();
extern "C" void callExecute__14daNpcPasser2_cFv();
extern "C" void initPath__14daNpcPasser2_cFv();
extern "C" void executePath__14daNpcPasser2_cFv();
extern "C" void __dt__8cM3dGPlaFv();
extern "C" void setAngle__14daNpcPasser2_cFv();
extern "C" void pathMoveF__14daNpcPasser2_cFv();
extern "C" static void daNpcPasser2_Create__FPv();
extern "C" void create__14daNpcPasser2_cFv();
extern "C" void create_init__14daNpcPasser2_cFv();
extern "C" static void daNpcPasser2_Delete__FPv();
extern "C" void __dt__14daNpcPasser2_cFv();
extern "C" static void daNpcPasser2_Execute__FPv();
extern "C" static void daNpcPasser2_Draw__FPv();
extern "C" static bool daNpcPasser2_IsDelete__FPv();
extern "C" void __dt__10cCcD_GSttsFv();
extern "C" void func_80AA85C8(void* _this, int, int);
extern "C" void __sinit_d_a_npc_passer2_cpp();
extern "C" static void func_80AA8684();
extern "C" static void func_80AA868C();
extern "C" void __dt__9daNpcCd_cFv();
extern "C" void __dt__8cM3dGCylFv();
extern "C" void __dt__8cM3dGAabFv();
extern "C" void __dt__10dCcD_GSttsFv();
extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" u8 ActionTable__14daNpcPasser2_c[24];
if (rv != 0) {
if (m_objNum != 0) {
rv = NULL != (mpModel = ObjCreate(m_objNum));
if (rv == 0) {
mpMorf->stopZelAnime();
}
} else {
mpModel = NULL;
rv = 1;
}
}
//
// External References:
//
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void setMorf__13mDoExt_morf_cFf();
extern "C" void modelCalc__16mDoExt_McaMorfSOFv();
extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz();
extern "C" void fopAcM_getPolygonAngle__FPC8cM3dGPlas();
extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void SetWallR__12dBgS_AcchCirFf();
extern "C" void SetWall__12dBgS_AcchCirFff();
extern "C" void __dt__9dBgS_AcchFv();
extern "C" void __ct__9dBgS_AcchFv();
extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz();
extern "C" void CrrPos__9dBgS_AcchFR4dBgS();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void __ct__10dCcD_GSttsFv();
extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
extern "C" void __ct__12dCcD_GObjInfFv();
extern "C" void __dt__12dCcD_GObjInfFv();
extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
extern "C" void NpcCreate__9daNpcCd_cFi();
extern "C" void ObjCreate__9daNpcCd_cFi();
extern "C" void getAnmP__9daNpcCd_cFii();
extern "C" void setAttention__9daNpcCd_cFi();
extern "C" void loadResrc__9daNpcCd_cFii();
extern "C" void removeResrc__9daNpcCd_cFii();
extern "C" void setEnvTevCol__9daNpcCd_cFv();
extern "C" void setRoomNo__9daNpcCd_cFv();
extern "C" void animation__9daNpcCd_cFv();
extern "C" void setAnm__9daNpcCd_cFP18J3DAnmTransformKeyffiii();
extern "C" void drawObj__9daNpcCd_cFiP8J3DModelf();
extern "C" void drawNpc__9daNpcCd_cFv();
extern "C" void setPath__11PathTrace_cFiiiP4cXyzb();
extern "C" void checkPoint__11PathTrace_cF4cXyzf();
extern "C" void checkPathEnd__11PathTrace_cF4cXyzf();
extern "C" void getTargetPoint__11PathTrace_cFP3Vec();
extern "C" void setNextPoint__11PathTrace_cFR4cXyz();
extern "C" void dKy_getdaytime_hour__Fv();
extern "C" void dKy_getdaytime_minute__Fv();
extern "C" void dKy_getDarktime_hour__Fv();
extern "C" void dKy_getDarktime_minute__Fv();
extern "C" void dKy_getDarktime_week__Fv();
extern "C" void dKy_get_dayofweek__Fv();
extern "C" void dKy_darkworld_check__Fv();
extern "C" void Set__4cCcSFP8cCcD_Obj();
extern "C" void cM_rndF__Ff();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void __dt__8cM3dGCirFv();
extern "C" void SetC__8cM3dGCylFRC4cXyz();
extern "C" void SetH__8cM3dGCylFf();
extern "C" void SetR__8cM3dGCylFf();
extern "C" void cLib_addCalc2__FPffff();
extern "C" void cLib_addCalcAngleS2__FPssss();
extern "C" void cLib_chaseF__FPfff();
extern "C" void cLib_targetAngleY__FPC3VecPC3Vec();
extern "C" void cLib_distanceAngleS__Fss();
extern "C" void __ct__17Z2CreatureCitizenFv();
extern "C" void __dt__17Z2CreatureCitizenFv();
extern "C" void __dl__FPv();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" u8 const m_cylDat__9daNpcCd_c[68];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 l_Cd_HIO[10684];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
//
/* 80AA74D8-80AA755C 000078 0084+00 1/1 0/0 0/0 .text createHeapCallBack__FP10fopAc_ac_c
*/
static void createHeapCallBack(fopAc_ac_c* param_0) {
// NONMATCHING
return rv;
}
/* 80AA8A88-80AA8A94 -00001 000C+00 0/1 0/0 0/0 .data @3845 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3845[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)initPath__14daNpcPasser2_cFv,
};
#pragma pop
/* 80AA8A94-80AA8AA0 -00001 000C+00 0/1 0/0 0/0 .data @3846 */
#pragma push
#pragma force_active on
SECTION_DATA static void* lit_3846[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)executePath__14daNpcPasser2_cFv,
};
#pragma pop
/* 80AA74D8-80AA755C 000078 0084+00 1/1 0/0 0/0 .text createHeapCallBack__FP10fopAc_ac_c */
static int createHeapCallBack(fopAc_ac_c* i_this) {
daNpcPasser2_c* actor = (daNpcPasser2_c*)i_this;
return actor->createHeap();
}
/* 80AA8AA0-80AA8AB8 000038 0018+00 1/2 0/0 0/0 .data ActionTable__14daNpcPasser2_c */
SECTION_DATA u8 daNpcPasser2_c::ActionTable[24] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
daNpcPasser2_c::actionFunc daNpcPasser2_c::ActionTable[1][2] = {
{&daNpcPasser2_c::initPath, &daNpcPasser2_c::executePath},
};
/* 80AA755C-80AA75A0 0000FC 0044+00 1/1 0/0 0/0 .text
* setAction__14daNpcPasser2_cFQ214daNpcPasser2_c6Mode_e */
void daNpcPasser2_c::setAction(daNpcPasser2_c::Mode_e param_0) {
// NONMATCHING
/* 80AA755C-80AA75A0 0000FC 0044+00 1/1 0/0 0/0 .text setAction__14daNpcPasser2_cFQ214daNpcPasser2_c6Mode_e */
void daNpcPasser2_c::setAction(daNpcPasser2_c::Mode_e i_action) {
JUT_ASSERT(302, i_action < MODE_MAX_e);
mPrevActionIdx = mActionIdx;
mActionIdx = i_action;
mAction = ActionTable[mActionIdx];
callInit();
}
/* 80AA75A0-80AA75C8 000140 0028+00 1/1 0/0 0/0 .text callInit__14daNpcPasser2_cFv */
void daNpcPasser2_c::callInit() {
// NONMATCHING
JUT_ASSERT(320, mAction != NULL);
(this->*mAction[0])();
}
/* 80AA75C8-80AA75F4 000168 002C+00 1/1 0/0 0/0 .text callExecute__14daNpcPasser2_cFv */
void daNpcPasser2_c::callExecute() {
// NONMATCHING
JUT_ASSERT(333, mAction != NULL);
(this->*mAction[1])();
}
/* ############################################################################################## */
/* 80AA8A18-80AA8A1C 000000 0004+00 3/3 0/0 0/0 .rodata @3963 */
SECTION_RODATA static f32 const lit_3963 = 1.0f;
COMPILER_STRIP_GATE(0x80AA8A18, &lit_3963);
/* 80AA8A1C-80AA8A20 000004 0004+00 1/1 0/0 0/0 .rodata @3964 */
SECTION_RODATA static f32 const lit_3964 = 12.0f;
COMPILER_STRIP_GATE(0x80AA8A1C, &lit_3964);
enum Rnd_Values {
/* 0x0 */ ZERO,
/* 0x1 */ ONE,
/* 0x2 */ TWO,
/* 0x3 */ THREE,
/* 0x4 */ FOUR,
/* 0x5 */ FIVE,
};
/* 80AA75F4-80AA774C 000194 0158+00 1/0 0/0 0/0 .text initPath__14daNpcPasser2_cFv */
void daNpcPasser2_c::initPath() {
// NONMATCHING
if (getMoveType() == 1) {
field_0xa3c = 1;
} else if (getMoveType() == 2) {
field_0xa3c = 0;
} else {
field_0xa3c = cLib_getRndValue(0, 2) != 0 ? 1 : 0;
}
int idx = 0;
if (field_0xa3c == 1) {
if (getWalkMotionType() == 1) {
idx = 0;
} else if (getWalkMotionType() == 2) {
idx = 1;
} else {
idx = cLib_getRndValue(0, 2) == 0 ? 1 : 0;
}
} else if (field_0xa3c == 0) {
if (getRunMotionType() == 1) {
idx = 2;
} else if (getRunMotionType() == 2) {
idx = 3;
} else {
idx = cLib_getRndValue(0, 2) != 0 ? TWO : THREE;
}
}
setAnm((J3DAnmTransformKey*)getAnmP(idx, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
field_0xa43 = 0;
field_0xa42 = 1;
}
/* 80AA774C-80AA78C4 0002EC 0178+00 1/0 0/0 0/0 .text executePath__14daNpcPasser2_cFv */
void daNpcPasser2_c::executePath() {
if (m_path.checkPoint(current.pos, speedF)) {
if (m_path.checkPathEnd(current.pos, speedF)) {
fopAcM_delete(this);
} else {
m_path.setNextPoint(current.pos);
}
}
if (field_0xa3c == 1 || field_0xa3c == 0) {
cXyz targetPnt;
m_path.getTargetPoint(&targetPnt);
cLib_addCalcAngleS2(&current.angle.y, cLib_targetAngleY(&current.pos, &targetPnt), MREG_S(0) + 3, MREG_S(1) + 0x600);
if (current.pos.y != old.pos.y) {
s16 sVar1 = 0;
cM3dGPla plane;
bool isTriPla = dComIfG_Bgsp().GetTriPla(mAcch.m_gnd, &plane);
if (isTriPla) {
sVar1 = fopAcM_getPolygonAngle(&plane, shape_angle.y);
}
if (sVar1 != 0) {
mPosY = current.pos.y;
}
}
}
setAngle();
pathMoveF();
mAcch.CrrPos(dComIfG_Bgsp());
}
/* 80AA790C-80AA7918 0004AC 000C+00 1/1 0/0 0/0 .text setAngle__14daNpcPasser2_cFv */
void daNpcPasser2_c::setAngle() {
shape_angle.y = current.angle.y;
}
void daNpcPasser2_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4) {
f32 target = field_0xa30 * (param_2 * field_0xa30);
f32 step = field_0xa30 * (param_1 * field_0xa30);
if (param_4 != 0 && mAcch.ChkWallHit()) {
s16 sVar1 = current.angle.y + 0x8000 - mAcchCir.GetWallAngleY();
if (abs(sVar1) < 0x4000) {
target *= 1.0f - cM_scos(sVar1);
}
}
if (param_2 < target) {
target = param_2;
}
cLib_chaseF(i_speed, target, step);
}
/* 80AA7918-80AA7CB8 0004B8 03A0+00 1/1 0/0 0/0 .text pathMoveF__14daNpcPasser2_cFv */
void daNpcPasser2_c::pathMoveF() {
f32 fVar1 = 0.0f;
f32 speed = 0.0f;
f32 fVar2 = 0.0f;
cXyz* ccMoveP = mStts.GetCCMoveP();
if (field_0xa3c == 1) {
fVar1 = HIO_walkMaxSpeed(m_type);
fVar2 = HIO_walkAnmPlaySpeed(m_type);
cLib_chaseF(&field_0xa30, 0.8f, 0.05f);
setSpeed(MREG_F(0) + 0.7f, fVar1, &field_0xa34, 0);
setSpeed(MREG_F(0) + 0.7f, fVar1, &speedF, 1);
} else if (field_0xa3c == 0) {
fVar1 = HIO_maxSpeed(m_type);
fVar2 = HIO_anmPlaySpeed(m_type);
cLib_chaseF(&field_0xa30, 1.0f, 0.05f);
setSpeed(MREG_F(0) + 0.7f, fVar1, &field_0xa34, 0);
setSpeed(MREG_F(0) + 0.7f, fVar1, &speedF, 1);
}
cXyz targetPnt;
m_path.getTargetPoint(&targetPnt);
s32 angleS = cLib_distanceAngleS(current.angle.y, cLib_targetAngleY(&current.pos, &targetPnt));
if (angleS >= 0x2000) {
cLib_chaseF(&field_0xa30, 0.0f, 0.05f);
cLib_chaseF(&field_0xa34, 0.0f, 1.2f);
cLib_chaseF(&speedF, 0.0f, 1.2f);
}
fopAcM_posMoveF(this, ccMoveP);
fVar1 = field_0xa34 / fVar1;
if (fVar1 > 1.0f) {
fVar1 = 1.0f;
}
speed = fVar2 * fVar1;
if (speed < 0.6f) {
speed = 0.6f;
}
mpMorf->setPlaySpeed(speed);
}
/* 80AA7CB8-80AA7CD8 000858 0020+00 1/0 0/0 0/0 .text daNpcPasser2_Create__FPv */
static int daNpcPasser2_Create(void* i_this) {
return static_cast<daNpcPasser2_c*>(i_this)->create();
}
/* 80AA7CD8-80AA7F78 000878 02A0+00 1/1 0/0 0/0 .text create__14daNpcPasser2_cFv */
cPhs__Step daNpcPasser2_c::create() {
fopAcM_ct(this, daNpcPasser2_c);
mIsDarkWorld = dKy_darkworld_check();
m_type = getType();
if (getEndTime() < 0xFF) {
m_endTime = getEndTime();
m_dayOfWeek = getDayOfWeek();
if (getTime() > m_endTime) {
m_dayOfWeek = (m_dayOfWeek + 1) % 7;
}
} else {
m_endTime = 0xFFFF;
}
if (m_type >= 30 || m_objNum >= 9) {
return cPhs_ERROR_e;
}
if (m_type < 0 || m_type > 30) {
// Failed to generate low-poly pedestrian actor! ---> m_type = %d
OS_REPORT("ローポリ通行人アクター生成失敗しました！---> m_type = %d\n", m_type);
return cPhs_ERROR_e;
}
m_objNum = getObjNum();
if (m_objNum < 0 || m_objNum > 13) {
// Failed to generate low-poly pedestrian actor! ---> m_objNum = %d
OS_REPORT("ローポリ通行人アクター生成失敗しました！---> m_objNum = %d\n", m_objNum);
return cPhs_ERROR_e;
}
cPhs__Step phase = (cPhs__Step)loadResrc(m_type, m_objNum);
if (phase == cPhs_COMPLEATE_e) {
u32 i_size = 0;
#if DEBUG
i_size = 0x15A0;
#else
i_size = 0x800015A0;
#endif
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, i_size)) {
// Failed to create actor!
OS_REPORT("アクター生成失敗しました！\n");
return cPhs_ERROR_e;
}
create_init();
}
return phase;
}
void daNpcPasser2_c::initCollision() {
mStts.Init(0xD9, 0xFF, this);
mStts.SetRoomId(fopAcM_GetRoomNo(this));
mCyl.SetStts(&mStts);
mCyl.Set(m_cylDat);
mCyl.SetR(HIO_cylR(m_type));
mCyl.SetH(HIO_cylH(m_type));
}
void daNpcPasser2_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, mPosY, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
mpMorf->modelCalc();
setAttention(m_type);
}
/* 80AA7F78-80AA823C 000B18 02C4+00 1/1 0/0 0/0 .text create_init__14daNpcPasser2_cFv */
void daNpcPasser2_c::create_init() {
#if DEBUG
// NPC (C-class, D-class) Pedestrian High
l_Cd_HIO.entryHIO("NPC(C級,D級)通行人 Low");
#endif
gravity = -3.0f;
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -40.0f, -10.0f, -30.0f, 30.0f, 190.0f, 40.0f);
mAcchCir.SetWall(HIO_chkWallH(m_type), HIO_chkWallR(m_type));
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this),
fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
mAcch.SetRoofNone();
mAcch.SetWaterNone();
mAcch.SetWallNone();
mAcch.CrrPos(dComIfG_Bgsp());
setEnvTevCol();
setRoomNo();
initCollision();
attention_info.flags = 0;
if (m_path.setPath(getPathID(), fopAcM_GetRoomNo(this), 1, &current.pos, true)) {
setAction(MODE_MAX_e);
}
mpMorf->setMorf(0.0f);
mAcch.CrrPos(dComIfG_Bgsp());
mPosY = current.pos.y = mAcch.GetGroundH();
setBaseMtx();
}
/* 80AA823C-80AA8270 000DDC 0034+00 1/0 0/0 0/0 .text daNpcPasser2_Delete__FPv */
static int daNpcPasser2_Delete(void* i_this) {
static_cast<daNpcPasser2_c*>(i_this)->~daNpcPasser2_c();
return 1;
}
/* 80AA8270-80AA8304 000E10 0094+00 1/0 0/0 0/0 .text __dt__14daNpcPasser2_cFv */
daNpcPasser2_c::~daNpcPasser2_c() {
if (m_type < 30 && m_objNum < 9) {
removeResrc(m_type, m_objNum);
}
if (heap != NULL) {
mpMorf->stopZelAnime();
}
}
int daNpcPasser2_c::execute() {
mAcchCir.SetWallH(HIO_chkWallH(m_type));
mAcchCir.SetWallR(HIO_chkWallR(m_type));
callExecute();
cLib_addCalc2(&mPosY, current.pos.y, 0.4f, 25.0f);
animation();
setCollision();
setBaseMtx();
if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e) && m_endTime != 0xFFFF && m_dayOfWeek == getDayOfWeek()) {
int time = getTime();
if (time >= m_endTime) {
fopAcM_delete(this);
}
}
return 1;
}
void daNpcPasser2_c::setCollision() {
#if DEBUG
mCyl.SetR(HIO_cylR(m_type));
mCyl.SetH(HIO_cylH(m_type));
#endif
mCyl.SetC(current.pos);
if (!fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) {
dComIfG_Ccsp()->Set(&mCyl);
}
}
/* 80AA8304-80AA8500 000EA4 01FC+00 1/0 0/0 0/0 .text daNpcPasser2_Execute__FPv */
static int daNpcPasser2_Execute(void* i_this) {
return static_cast<daNpcPasser2_c*>(i_this)->execute();
}
int daNpcPasser2_c::draw() {
drawNpc();
drawObj(m_objNum, mpModel, HIO_objScale(m_type));
return 1;
}
/* 80AA8500-80AA8578 0010A0 0078+00 1/0 0/0 0/0 .text daNpcPasser2_Draw__FPv */
static int daNpcPasser2_Draw(void* i_this) {
return static_cast<daNpcPasser2_c*>(i_this)->draw();
}
/* 80AA8578-80AA8580 001118 0008+00 1/0 0/0 0/0 .text daNpcPasser2_IsDelete__FPv */
static int daNpcPasser2_IsDelete(void* i_this) {
return 1;
}
/* ############################################################################################## */
/* 80AA8AB8-80AA8AD8 -00001 0020+00 1/0 0/0 0/0 .data daNpcPasser2_METHODS */
static actor_method_class daNpcPasser2_METHODS = {
(process_method_func)daNpcPasser2_Create__FPv,
(process_method_func)daNpcPasser2_Delete__FPv,
(process_method_func)daNpcPasser2_Execute__FPv,
(process_method_func)daNpcPasser2_IsDelete__FPv,
(process_method_func)daNpcPasser2_Draw__FPv,
(process_method_func)daNpcPasser2_Create,
(process_method_func)daNpcPasser2_Delete,
(process_method_func)daNpcPasser2_Execute,
(process_method_func)daNpcPasser2_IsDelete,
(process_method_func)daNpcPasser2_Draw,
};
/* 80AA8AD8-80AA8B08 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_PASSER2 */
@@ -218,318 +413,3 @@ extern actor_process_profile_definition g_profile_NPC_PASSER2 = {
fopAc_NPC_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80AA8B08-80AA8B14 0000A0 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */
SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_AcchCirFv,
};
/* 80AA8B14-80AA8B20 0000AC 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */
SECTION_DATA extern void* __vt__10cCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10cCcD_GSttsFv,
};
/* 80AA8B20-80AA8B2C 0000B8 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */
SECTION_DATA extern void* __vt__10dCcD_GStts[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__10dCcD_GSttsFv,
};
/* 80AA8B2C-80AA8B38 0000C4 000C+00 2/2 0/0 0/0 .data __vt__14daNpcPasser2_c */
SECTION_DATA extern void* __vt__14daNpcPasser2_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14daNpcPasser2_cFv,
};
/* 80AA8B38-80AA8B44 0000D0 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */
SECTION_DATA extern void* __vt__8cM3dGCyl[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGCylFv,
};
/* 80AA8B44-80AA8B50 0000DC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */
SECTION_DATA extern void* __vt__8cM3dGAab[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGAabFv,
};
/* 80AA8B50-80AA8B74 0000E8 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */
SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_ObjAcchFv,
(void*)NULL,
(void*)NULL,
(void*)func_80AA868C,
(void*)NULL,
(void*)NULL,
(void*)func_80AA8684,
};
/* 80AA8B74-80AA8B80 00010C 000C+00 2/2 0/0 0/0 .data __vt__9daNpcCd_c */
SECTION_DATA extern void* __vt__9daNpcCd_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__9daNpcCd_cFv,
};
/* 80AA8B80-80AA8B8C 000118 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */
SECTION_DATA extern void* __vt__8cM3dGPla[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__8cM3dGPlaFv,
};
/* 80AA774C-80AA78C4 0002EC 0178+00 1/0 0/0 0/0 .text executePath__14daNpcPasser2_cFv */
void daNpcPasser2_c::executePath() {
// NONMATCHING
}
/* 80AA78C4-80AA790C 000464 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGPlaFv */
// cM3dGPla::~cM3dGPla() {
extern "C" void __dt__8cM3dGPlaFv() {
// NONMATCHING
}
/* 80AA790C-80AA7918 0004AC 000C+00 1/1 0/0 0/0 .text setAngle__14daNpcPasser2_cFv */
void daNpcPasser2_c::setAngle() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80AA8A20-80AA8A24 000008 0004+00 0/2 0/0 0/0 .rodata @4127 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4127[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80AA8A20, &lit_4127);
#pragma pop
/* 80AA8A24-80AA8A28 00000C 0004+00 0/1 0/0 0/0 .rodata @4128 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4128 = 4.0f / 5.0f;
COMPILER_STRIP_GATE(0x80AA8A24, &lit_4128);
#pragma pop
/* 80AA8A28-80AA8A2C 000010 0004+00 0/1 0/0 0/0 .rodata @4129 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4129 = 1.0f / 20.0f;
COMPILER_STRIP_GATE(0x80AA8A28, &lit_4129);
#pragma pop
/* 80AA8A2C-80AA8A30 000014 0004+00 0/1 0/0 0/0 .rodata @4130 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4130 = 7.0f / 10.0f;
COMPILER_STRIP_GATE(0x80AA8A2C, &lit_4130);
#pragma pop
/* 80AA8A30-80AA8A34 000018 0004+00 0/1 0/0 0/0 .rodata @4131 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4131 = 6.0f / 5.0f;
COMPILER_STRIP_GATE(0x80AA8A30, &lit_4131);
#pragma pop
/* 80AA8A34-80AA8A38 00001C 0004+00 0/1 0/0 0/0 .rodata @4132 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4132 = 3.0f / 5.0f;
COMPILER_STRIP_GATE(0x80AA8A34, &lit_4132);
#pragma pop
/* 80AA7918-80AA7CB8 0004B8 03A0+00 1/1 0/0 0/0 .text pathMoveF__14daNpcPasser2_cFv */
void daNpcPasser2_c::pathMoveF() {
// NONMATCHING
}
/* 80AA7CB8-80AA7CD8 000858 0020+00 1/0 0/0 0/0 .text daNpcPasser2_Create__FPv */
static void daNpcPasser2_Create(void* param_0) {
// NONMATCHING
}
/* 80AA7CD8-80AA7F78 000878 02A0+00 1/1 0/0 0/0 .text create__14daNpcPasser2_cFv */
void daNpcPasser2_c::create() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80AA8A38-80AA8A3C 000020 0004+00 0/1 0/0 0/0 .rodata @4273 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4273 = -3.0f;
COMPILER_STRIP_GATE(0x80AA8A38, &lit_4273);
#pragma pop
/* 80AA8A3C-80AA8A40 000024 0004+00 0/1 0/0 0/0 .rodata @4274 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4274 = -40.0f;
COMPILER_STRIP_GATE(0x80AA8A3C, &lit_4274);
#pragma pop
/* 80AA8A40-80AA8A44 000028 0004+00 0/1 0/0 0/0 .rodata @4275 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4275 = -10.0f;
COMPILER_STRIP_GATE(0x80AA8A40, &lit_4275);
#pragma pop
/* 80AA8A44-80AA8A48 00002C 0004+00 0/1 0/0 0/0 .rodata @4276 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4276 = -30.0f;
COMPILER_STRIP_GATE(0x80AA8A44, &lit_4276);
#pragma pop
/* 80AA8A48-80AA8A4C 000030 0004+00 0/1 0/0 0/0 .rodata @4277 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4277 = 30.0f;
COMPILER_STRIP_GATE(0x80AA8A48, &lit_4277);
#pragma pop
/* 80AA8A4C-80AA8A50 000034 0004+00 0/1 0/0 0/0 .rodata @4278 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4278 = 190.0f;
COMPILER_STRIP_GATE(0x80AA8A4C, &lit_4278);
#pragma pop
/* 80AA8A50-80AA8A54 000038 0004+00 0/1 0/0 0/0 .rodata @4279 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4279 = 40.0f;
COMPILER_STRIP_GATE(0x80AA8A50, &lit_4279);
#pragma pop
/* 80AA7F78-80AA823C 000B18 02C4+00 1/1 0/0 0/0 .text create_init__14daNpcPasser2_cFv */
void daNpcPasser2_c::create_init() {
// NONMATCHING
}
/* 80AA823C-80AA8270 000DDC 0034+00 1/0 0/0 0/0 .text daNpcPasser2_Delete__FPv */
static void daNpcPasser2_Delete(void* param_0) {
// NONMATCHING
}
/* 80AA8270-80AA8304 000E10 0094+00 1/0 0/0 0/0 .text __dt__14daNpcPasser2_cFv */
daNpcPasser2_c::~daNpcPasser2_c() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80AA8A54-80AA8A58 00003C 0004+00 1/1 0/0 0/0 .rodata @4450 */
SECTION_RODATA static f32 const lit_4450 = 2.0f / 5.0f;
COMPILER_STRIP_GATE(0x80AA8A54, &lit_4450);
/* 80AA8A58-80AA8A60 000040 0004+04 1/1 0/0 0/0 .rodata @4451 */
SECTION_RODATA static f32 const lit_4451[1 + 1 /* padding */] = {
25.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80AA8A58, &lit_4451);
/* 80AA8304-80AA8500 000EA4 01FC+00 1/0 0/0 0/0 .text daNpcPasser2_Execute__FPv */
static void daNpcPasser2_Execute(void* param_0) {
// NONMATCHING
}
/* 80AA8500-80AA8578 0010A0 0078+00 1/0 0/0 0/0 .text daNpcPasser2_Draw__FPv */
static void daNpcPasser2_Draw(void* param_0) {
// NONMATCHING
}
/* 80AA8578-80AA8580 001118 0008+00 1/0 0/0 0/0 .text daNpcPasser2_IsDelete__FPv */
static bool daNpcPasser2_IsDelete(void* param_0) {
return true;
}
/* 80AA8580-80AA85C8 001120 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
// cCcD_GStts::~cCcD_GStts() {
extern "C" void __dt__10cCcD_GSttsFv() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80AA8A60-80AA8A68 000048 0008+00 1/1 0/0 0/0 .rodata @4481 */
SECTION_RODATA static u8 const lit_4481[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80AA8A60, &lit_4481);
/* 80AA85C8-80AA8644 001168 007C+00 1/1 0/0 0/0 .text cLib_getRndValue<i>__Fii */
extern "C" void func_80AA85C8(void* _this, int param_0, int param_1) {
// NONMATCHING
}
/* 80AA8644-80AA8684 0011E4 0040+00 0/0 1/0 0/0 .text __sinit_d_a_npc_passer2_cpp */
void __sinit_d_a_npc_passer2_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80AA8644, __sinit_d_a_npc_passer2_cpp);
#pragma pop
/* 80AA8684-80AA868C 001224 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
static void func_80AA8684() {
// NONMATCHING
}
/* 80AA868C-80AA8694 00122C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
static void func_80AA868C() {
// NONMATCHING
}
/* 80AA8694-80AA8840 001234 01AC+00 2/1 0/0 0/0 .text __dt__9daNpcCd_cFv */
// daNpcCd_c::~daNpcCd_c() {
extern "C" void __dt__9daNpcCd_cFv() {
// NONMATCHING
}
/* 80AA8840-80AA8888 0013E0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
// cM3dGCyl::~cM3dGCyl() {
extern "C" void __dt__8cM3dGCylFv() {
// NONMATCHING
}
/* 80AA8888-80AA88D0 001428 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
// cM3dGAab::~cM3dGAab() {
extern "C" void __dt__8cM3dGAabFv() {
// NONMATCHING
}
/* 80AA88D0-80AA892C 001470 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
// dCcD_GStts::~dCcD_GStts() {
extern "C" void __dt__10dCcD_GSttsFv() {
// NONMATCHING
}
/* 80AA892C-80AA899C 0014CC 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */
// dBgS_AcchCir::~dBgS_AcchCir() {
extern "C" void __dt__12dBgS_AcchCirFv() {
// NONMATCHING
}
/* 80AA899C-80AA8A0C 00153C 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
// dBgS_ObjAcch::~dBgS_ObjAcch() {
extern "C" void __dt__12dBgS_ObjAcchFv() {
// NONMATCHING
}