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

Clean up HIO for TUs using HIOParam/Param_c/HIO_c pattern (#3043)

Browse Source
This commit is contained in:
Max Roncace
2026-01-13 14:58:15 -08:00
committed by GitHub
parent 235cb9a9ad
commit c0e0bbaaf3
143 changed files with 6215 additions and 4094 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_bullet.h
+34 -18
View File
@@ -5,6 +5,39 @@
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
struct daBullet_HIOParam {
/* 0x00 */ f32 gravity;
/* 0x04 */ f32 weight;
/* 0x08 */ f32 height;
/* 0x0C */ f32 knee_height;
/* 0x10 */ f32 width;
/* 0x14 */ s16 lifetime;
};
class daBullet_Param_c {
public:
virtual ~daBullet_Param_c() {}
static daBullet_HIOParam const m;
};
#if DEBUG
class daBullet_HIO_c : public mDoHIO_entry_c {
public:
daBullet_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daBullet_HIOParam m;
};
#define BULLET_HIO_CLASS daBullet_HIO_c
#else
#define BULLET_HIO_CLASS daBullet_Param_c
#endif
/**
* @ingroup actors-unsorted
* @class daBullet_c
@@ -24,7 +57,7 @@ public:
/* 0x788 */ dBgS_AcchCir mAcchCir;
/* 0x7C8 */ dCcD_Sph mCcSph;
/* 0x900 */ cBgS_GndChk mGndChk;
/* 0x93C */ u8 field_0x93C[0x940 - 0x93C];
/* 0x93C */ BULLET_HIO_CLASS* mpHIO;
/* 0x940 */ f32 mGroundY;
/* 0x944 */ processFn mProcess;
/* 0x950 */ int mLifetime;
@@ -53,21 +86,4 @@ public:
STATIC_ASSERT(sizeof(daBullet_c) == 0x95c);
struct daBullet_HIOParam {
/* 0x00 */ f32 gravity;
/* 0x04 */ f32 weight;
/* 0x08 */ f32 height;
/* 0x0C */ f32 knee_height;
/* 0x10 */ f32 width;
/* 0x14 */ s16 lifetime;
};
class daBullet_Param_c {
public:
virtual ~daBullet_Param_c() {}
static daBullet_HIOParam const m;
};
#endif /* D_A_BULLET_H */
include/d/actor/d_a_npc_aru.h
+25 -15
View File
@@ -3,15 +3,6 @@
#include "d/actor/d_a_npc.h"
/**
* @ingroup actors-npcs
* @class daNpc_Aru_c
* @brief Fado
*
* @details
*
*/
struct daNpc_Aru_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 warning_range; // 警戒範囲 - Warning Range
@@ -22,11 +13,6 @@ struct daNpc_Aru_HIOParam {
/* 0x9C */ f32 forward_visibility; // 前方視界 - Forward Visibility
};
class daNpc_Aru_HIO_c : public mDoHIO_entry_c {
public:
/* 0x8 */ daNpc_Aru_HIOParam param;
};
class daNpc_Aru_Param_c {
public:
virtual ~daNpc_Aru_Param_c() {}
@@ -34,6 +20,30 @@ public:
static daNpc_Aru_HIOParam const m;
};
#if DEBUG
class daNpc_Aru_HIO_c : public mDoHIO_entry_c {
public:
daNpc_Aru_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
/* 0x8 */ daNpc_Aru_HIOParam m;
};
#define NPC_ARU_HIO_CLASS daNpc_Aru_HIO_c
#else
#define NPC_ARU_HIO_CLASS daNpc_Aru_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_Aru_c
* @brief Fado
*
* @details
*
*/
class daNpc_Aru_c : public daNpcT_c {
public:
enum Joint {
@@ -168,7 +178,7 @@ public:
static cutFunc mCutList[7];
private:
/* 0xE40 */ daNpc_Aru_HIO_c* mHIO;
/* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO;
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 mType;
/* 0xF84 */ daNpcT_ActorMngr_c mActorMngrs[4];
include/d/actor/d_a_npc_besu.h
+30 -13
View File
@@ -6,6 +6,35 @@
#endif
#include "d/actor/d_a_npc.h"
struct daNpc_Besu_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
};
class daNpc_Besu_Param_c {
public:
virtual ~daNpc_Besu_Param_c() {}
static const daNpc_Besu_HIOParam m;
};
#if DEBUG
class daNpc_Besu_HIO_c : public mDoHIO_entry_c {
public:
daNpc_Besu_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daNpc_Besu_HIOParam m;
};
#define NPC_BESU_HIO_CLASS daNpc_Besu_HIO_c
#else
#define NPC_BESU_HIO_CLASS daNpc_Besu_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_Besu_c
@@ -116,7 +145,7 @@ public:
private:
/* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf;
/* 0x0E44 */ u8 field_0xe44[0x0E48 - 0xE44];
/* 0x0E44 */ NPC_BESU_HIO_CLASS* mpHIO;
/* 0x0E48 */ J3DModel* mpClothModel[1];
/* 0x0E4C */ dCcD_Cyl mCyl1;
/* 0x0F88 */ dCcD_Cyl mCyl2;
@@ -140,16 +169,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_Besu_c) == 0x1138);
struct daNpc_Besu_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
};
class daNpc_Besu_Param_c {
public:
virtual ~daNpc_Besu_Param_c() {}
static const daNpc_Besu_HIOParam m;
};
#endif /* D_A_NPC_BESU_H */
include/d/actor/d_a_npc_blue_ns.h
+28 -13
View File
@@ -5,6 +5,33 @@
#include "d/actor/d_a_tag_yami.h"
#include "d/actor/d_a_obj_carry.h"
struct daNpcBlueNS_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
/* 0x6C */ f32 field_0x6c;
};
class daNpcBlueNS_Param_c {
public:
virtual ~daNpcBlueNS_Param_c() {}
static const daNpcBlueNS_HIOParam m;
};
#if DEBUG
class daNpcBlueNS_HIO_c : public mDoHIO_entry_c {
public:
daNpcBlueNS_HIO_c();
void genMessage(JORMContext*);
daNpcBlueNS_HIOParam m;
};
#define NPC_BLUE_NS_HIO_CLASS daNpcBlueNS_HIO_c
#else
#define NPC_BLUE_NS_HIO_CLASS daNpcBlueNS_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpcBlueNS_c
@@ -103,7 +130,7 @@ public:
/* 0xBD8 */ u8 field_0xBD8[0xBDC - 0xBD8];
/* 0xBDC */ daNpcF_Lookat_c mLookat;
/* 0xC78 */ daNpcF_ActorMngr_c mActorMngr[1];
/* 0xC80 */ u8 field_0xC80[0xC84 - 0xC80];
/* 0xC80 */ NPC_BLUE_NS_HIO_CLASS* mpHIO;
/* 0xC84 */ dCcD_Cyl mCyl;
/* 0xDC0 */ u16 field_0xdc0;
/* 0xDC4 */ int (daNpcBlueNS_c::*mAction)(int);
@@ -130,17 +157,5 @@ public:
STATIC_ASSERT(sizeof(daNpcBlueNS_c) == 0xe14);
struct daNpcBlueNS_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
/* 0x6C */ f32 field_0x6c;
};
class daNpcBlueNS_Param_c {
public:
virtual ~daNpcBlueNS_Param_c() {}
static const daNpcBlueNS_HIOParam m;
};
#endif /* D_A_NPC_BLUE_NS_H */
include/d/actor/d_a_npc_bou.h
+36 -55
View File
@@ -3,6 +3,38 @@
#include "d/actor/d_a_npc.h"
struct daNpc_Bou_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c; // 16.0f
/* 0x90 */ f32 field_0x90; // 1000.0f
/* 0x94 */ f32 field_0x94; // 500.0f
/* 0x98 */ f32 field_0x98; // -500.0f
};
class daNpc_Bou_Param_c {
public:
virtual ~daNpc_Bou_Param_c() {}
static const daNpc_Bou_HIOParam m;
};
#if DEBUG
class daNpc_Bou_HIO_c : public mDoHIO_entry_c {
public:
daNpc_Bou_HIO_c();
virtual ~daNpc_Bou_HIO_c() {}
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daNpc_Bou_HIOParam m;
};
#define NPC_BOU_HIO_CLASS daNpc_Bou_HIO_c
#else
#define NPC_BOU_HIO_CLASS daNpc_Bou_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_Bou_c
@@ -11,58 +43,6 @@
* @details
*
*/
class daNpc_Bou_Param_c {
public:
virtual ~daNpc_Bou_Param_c() {}
struct Data {
/* 0x00 */ f32 field_0x00; // 255.0f
/* 0x04 */ f32 field_0x04; // 3.0f
/* 0x08 */ f32 field_0x08; // 1.0f
/* 0x0C */ f32 field_0x0c; // 600.0f
/* 0x10 */ f32 field_0x10; // 255.0f
/* 0x14 */ f32 field_0x14; // 200.0f
/* 0x18 */ f32 field_0x18; // 35.0f
/* 0x1C */ f32 field_0x1c; // 40.0f
/* 0x20 */ f32 field_0x20; // 0.0f
/* 0x24 */ f32 field_0x24; // 0.0f
/* 0x28 */ f32 field_0x28; // 10.0f
/* 0x2C */ f32 field_0x2c; // -10.0f
/* 0x30 */ f32 field_0x30; // 30.0f
/* 0x34 */ f32 field_0x34; // -10.0f
/* 0x38 */ f32 field_0x38; // 45.0f
/* 0x3C */ f32 field_0x3c; // -45.0f
/* 0x40 */ f32 field_0x40; // 0.6f
/* 0x44 */ f32 field_0x44; // 12.0f
/* 0x48 */ s16 field_0x48; // 3
/* 0x4a */ s16 field_0x4a; // 6
/* 0x4c */ s16 field_0x4c; // 5
/* 0x4e */ s16 field_0x4e; // 6
/* 0x50 */ f32 field_0x50; // 110.0f
/* 0x54 */ f32 field_0x54; // 500.0f
/* 0x58 */ f32 field_0x58; // 300.0f
/* 0x5c */ f32 field_0x5c; // -300.0f
/* 0x60 */ s16 field_0x60; // 60
/* 0x62 */ s16 field_0x62; // 8
/* 0x64 */ f32 field_0x64; // 0.0f
/* 0x68 */ f32 field_0x68; // 0.0f
/* 0x6c */ f32 field_0x6c; // 4.0f
/* 0x70 */ f32 field_0x70; // 0.0f
/* 0x74 */ f32 field_0x74; // 0.0f
/* 0x78 */ f32 field_0x78; // 0.0f
/* 0x7c */ f32 field_0x7c; // 0.0f
/* 0x80 */ f32 field_0x80; // 0.0f
/* 0x84 */ f32 field_0x84; // 0.0f
/* 0x88 */ f32 field_0x88; // 0.0f
/* 0x8c */ f32 field_0x8c; // 16.0f
/* 0x90 */ f32 field_0x90; // 1000.0f
/* 0x94 */ f32 field_0x94; // 500.0f
/* 0x98 */ f32 field_0x98; // -500.0f
};
static const Data m;
};
class daNpc_Bou_c : public daNpcT_c {
public:
typedef int (daNpc_Bou_c::*cutFunc)(int);
@@ -145,8 +125,9 @@ public:
BOOL chkFindWolf() {
int iVar1 = daNpcT_getDistTableIdx(field_0xfe0, field_0xfe4);
return daNpcT_c::chkFindWolf(mCurAngle.y, iVar1, field_0xfdc, daNpc_Bou_Param_c::m.field_0x54,
daNpc_Bou_Param_c::m.field_0x50, daNpc_Bou_Param_c::m.field_0x58, daNpc_Bou_Param_c::m.field_0x5c, 1);
return daNpcT_c::chkFindWolf(mCurAngle.y, iVar1, field_0xfdc,
mpHIO->m.common.search_distance, mpHIO->m.common.fov,
mpHIO->m.common.search_height, mpHIO->m.common.search_depth, 1);
}
int chkCondition(int i_val) {
@@ -187,7 +168,7 @@ public:
}
private:
/* 0xE40 */ int field_0xe40;
/* 0xE40 */ NPC_BOU_HIO_CLASS* mpHIO;
/* 0xE44 */ dCcD_Cyl mCyl1;
/* 0xF80 */ u8 mType;
/* 0xF84 */ daNpcT_ActorMngr_c mActorMngr[3];
include/d/actor/d_a_npc_chat.h
+24 -16
View File
@@ -3,25 +3,10 @@
#include "d/actor/d_a_npc4.h"
/**
* @ingroup actors-npcs
* @class daNpcChat_c
* @brief NPC Chat
*
* @details
*
*/
struct daNpcChat_HIOParam {
/* 0x0 */ daNpcF_HIOParam common;
};
class daNpcChat_HIO_c : public mDoHIO_entry_c {
void genMessage(JORMContext*);
/* 0x8 */ daNpcChat_HIOParam param;
};
class daNpcChat_Param_c {
public:
virtual ~daNpcChat_Param_c() {}
@@ -29,6 +14,29 @@ public:
static daNpcChat_HIOParam const m;
};
#if DEBUG
class daNpcChat_HIO_c : public mDoHIO_entry_c {
public:
daNpcChat_HIO_c();
void genMessage(JORMContext*);
/* 0x8 */ daNpcChat_HIOParam m;
};
#define NPC_CHAT_HIO_CLASS daNpcChat_HIO_c
#else
#define NPC_CHAT_HIO_CLASS daNpcChat_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpcChat_c
* @brief NPC Chat
*
* @details
*
*/
class daNpcChat_c : public daNpcF_c {
public:
typedef bool (daNpcChat_c::*actionFunc)(void*);
@@ -102,7 +110,7 @@ private:
/* 0xBF0 */ J3DModel* mObjModel;
/* 0xBF4 */ daNpcF_Lookat_c mLookat;
/* 0xC90 */ daNpcF_ActorMngr_c mActorMngr[1];
/* 0xC98 */ daNpcChat_HIO_c* mHIO;
/* 0xC98 */ NPC_CHAT_HIO_CLASS* mpHIO;
/* 0xC9C */ dCcD_Cyl mCyl;
/* 0xDD8 */ actionFunc mAction;
/* 0xDE4 */ request_of_phase_process_class mPhase1;
include/d/actor/d_a_npc_doorboy.h
+27 -13
View File
@@ -4,6 +4,32 @@
#include "d/actor/d_a_npc4.h"
#include "d/d_msg_object.h"
struct daNpcDoorBoy_HIOParam {
/* 0x0 */ daNpcF_HIOParam common;
};
class daNpcDoorBoy_Param_c {
public:
virtual ~daNpcDoorBoy_Param_c() {}
static daNpcDoorBoy_HIOParam const m;
};
#if DEBUG
class daNpcDoorBoy_HIO_c : public mDoHIO_entry_c {
public:
daNpcDoorBoy_HIO_c();
void genMessage(JORMContext*);
daNpcDoorBoy_HIOParam m;
};
#define NPC_DOORBOY_HIO_CLASS daNpcDoorBoy_HIO_c
#else
#define NPC_DOORBOY_HIO_CLASS daNpcDoorBoy_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpcDoorBoy_c
@@ -12,11 +38,6 @@
* @details
*
*/
struct daNpcDoorBoy_HIOParam {
/* 0x0 */ daNpcF_HIOParam common;
};
class daNpcDoorBoy_c : public daNpcF_c {
public:
typedef bool (daNpcDoorBoy_c::*actionFunc)(void*);
@@ -64,7 +85,7 @@ private:
/* 0xBEC */ u8 field_0xbec[0xbf0 - 0xbec];
/* 0xBF0 */ daNpcF_Lookat_c mLookat;
/* 0xC8C */ daNpcF_ActorMngr_c mActorMngr[1];
/* 0xC95 */ u8 field_0xc94[0xc98 - 0xc94];
/* 0xC95 */ NPC_DOORBOY_HIO_CLASS* mpHIO;
/* 0xC98 */ dCcD_Cyl field_0xc98;
/* 0xDD4 */ actionFunc mAction;
/* 0xDE0 */ request_of_phase_process_class mPhases[2];
@@ -80,12 +101,5 @@ private:
STATIC_ASSERT(sizeof(daNpcDoorBoy_c) == 0xe08);
class daNpcDoorBoy_Param_c {
public:
virtual ~daNpcDoorBoy_Param_c() {}
static daNpcDoorBoy_HIOParam const m;
};
#endif /* D_A_NPC_DOORBOY_H */
include/d/actor/d_a_npc_drainSol.h
+27 -12
View File
@@ -3,6 +3,32 @@
#include "d/actor/d_a_npc4.h"
struct daNpcDrSol_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
};
class daNpcDrSol_Param_c {
public:
virtual ~daNpcDrSol_Param_c() {}
static const daNpcDrSol_HIOParam m;
};
#if DEBUG
class daNpcDrSol_HIO_c : public mDoHIO_entry_c {
public:
daNpcDrSol_HIO_c();
void genMessage(JORMContext*);
daNpcDrSol_HIOParam m;
};
#define NPC_DRSOL_HIO_CLASS daNpcDrSol_HIO_c
#else
#define NPC_DRSOL_HIO_CLASS daNpcDrSol_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpcDrSol_c
@@ -44,7 +70,7 @@ public:
/* 0xB48 */ Z2Creature mSound;
/* 0xBD8 */ J3DModel* field_0xbd8;
/* 0xBDC */ u8 field_0xBDC[0xBE0 - 0xBDC];
/* 0xBDC */ NPC_DRSOL_HIO_CLASS* mpHIO;
/* 0xBE0 */ dCcD_Cyl mCyl;
/* 0xD1C */ bool (daNpcDrSol_c::*mAction)(void*);
/* 0xD28 */ request_of_phase_process_class mPhase;
@@ -57,16 +83,5 @@ public:
STATIC_ASSERT(sizeof(daNpcDrSol_c) == 0xd3c);
struct daNpcDrSol_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
};
class daNpcDrSol_Param_c {
public:
virtual ~daNpcDrSol_Param_c() {}
static const daNpcDrSol_HIOParam m;
};
#endif /* D_A_NPC_DRAINSOL_H */
include/d/actor/d_a_npc_fairy_seirei.h
+29 -8
View File
@@ -3,6 +3,34 @@
#include "d/actor/d_a_npc.h"
struct daNpc_FairySeirei_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
};
class daNpc_FairySeirei_Param_c {
public:
virtual ~daNpc_FairySeirei_Param_c() {}
static daNpc_FairySeirei_HIOParam const m;
};
#if DEBUG
class daNpc_FairySeirei_HIO_c : public mDoHIO_entry_c {
public:
daNpc_FairySeirei_HIO_c();
void genMessage(JORMContext*);
daNpc_FairySeirei_HIOParam m;
};
#define NPC_FAIRY_SEIREI_HIO_CLASS daNpc_FairySeirei_HIO_c
#else
#define NPC_FAIRY_SEIREI_HIO_CLASS daNpc_FairySeirei_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_FairySeirei_c
@@ -66,7 +94,7 @@ public:
static cutFunc mCutList[1];
private:
/* 0xE40 */ u8 field_0xE40[4];
/* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO;
/* 0xE44 */ u8 mType;
/* 0xE48 */ dCcD_Cyl mCyl;
/* 0xF84 */ actionFunc mInitFunc;
@@ -79,11 +107,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_FairySeirei_c) == 0xfb0);
class daNpc_FairySeirei_Param_c {
public:
virtual ~daNpc_FairySeirei_Param_c() {}
static f32 const m[37];
};
#endif /* D_A_NPC_FAIRY_SEIREI_H */
include/d/actor/d_a_npc_gra.h
+4 -9
View File
@@ -7,7 +7,7 @@
class daNpc_grA_HIOParam {
public:
/* 0x00 */ daNpcF_HIOParam mNpcFParams;
/* 0x00 */ daNpcF_HIOParam common;
/* 0x6C */ s16 mBowTimer;
/* 0x70 */ f32 mRotationalSpeed;
/* 0x74 */ f32 mWalkingSpeed;
@@ -19,7 +19,7 @@ public:
class daNpc_grA_Param_c {
public:
virtual ~daNpc_grA_Param_c(){};
virtual ~daNpc_grA_Param_c() {}
static daNpc_grA_HIOParam const m;
};
@@ -28,19 +28,14 @@ public:
class daNpc_grA_HIO_c : public mDoHIO_entry_c {
public:
daNpc_grA_HIO_c();
#if DEBUG
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
#endif
daNpc_grA_HIOParam mHioParams;
daNpc_grA_HIOParam m;
};
#define NPC_GRA_HIO_CLASS daNpc_grA_HIO_c
#else
#define NPC_GRA_HIO_CLASS daNpc_grA_Param_c
#endif
/**
@@ -155,7 +150,7 @@ private:
/* 0x0BDC */ int field_0xBDC;
/* 0x0BE0 */ daNpcF_Lookat_c mNpcfLookAt;
/* 0x0C7C */ daNpcF_ActorMngr_c mNpcfActorManager[3];
/* 0x0C94 */ NPC_GRA_HIO_CLASS* mpHio;
/* 0x0C94 */ NPC_GRA_HIO_CLASS* mpHIO;
/* 0x0C98 */ dCcD_Cyl field_0xC98;
/* 0x0DD4 */ daNpcF_Path_c field_0xDD4;
/* 0x1404 */ daNpc_grA_c_Action mAction2;
include/d/actor/d_a_npc_grc.h
+29 -18
View File
@@ -4,6 +4,34 @@
#include "d/actor/d_a_npc4.h"
#include "d/d_particle_copoly.h"
struct daNpc_grC_HIOParam {
/* 0x0 */ daNpcF_HIOParam common;
};
class daNpc_grC_Param_c {
public:
virtual ~daNpc_grC_Param_c() {}
static daNpc_grC_HIOParam const m;
};
#if DEBUG
class daNpc_grC_HIO_c : public mDoHIO_entry_c {
public:
daNpc_grC_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
/* 0x8 */ daNpc_grC_HIOParam m;
};
#define NPC_GRC_HIO_CLASS daNpc_grC_HIO_c
#else
#define NPC_GRC_HIO_CLASS daNpc_grC_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_grC_c
@@ -12,8 +40,6 @@
* @details
*
*/
class daNpc_grC_c : public daNpcF_c {
public:
typedef BOOL (daNpc_grC_c::*ActionFn)(void*);
@@ -72,7 +98,7 @@ private:
/* 0xBDC */ daNpcF_Lookat_c mLookat;
/* 0xC78 */ dPaPo_c mPaPo;
/* 0xCB0 */ daNpcF_ActorMngr_c mActorMngr[2];
/* 0xCC0 */ u8 field_0xcc0[0xcc4 - 0xcc0];
/* 0xCC0 */ NPC_GRC_HIO_CLASS* mpHIO;
/* 0xCC4 */ dCcD_Cyl mCyl;
/* 0xE00 */ ActionFn mNextAction;
/* 0xE0C */ ActionFn mAction;
@@ -92,20 +118,5 @@ private:
STATIC_ASSERT(sizeof(daNpc_grC_c) == 0xe54);
struct daNpc_grC_HIOParam {
/* 0x0 */ daNpcF_HIOParam common;
};
class daNpc_grC_HIO_c : public mDoHIO_entry_c {
/* 0x8 */ daNpc_grC_HIOParam field_0x8;
};
class daNpc_grC_Param_c {
public:
virtual ~daNpc_grC_Param_c() {}
static daNpc_grC_HIOParam const m;
};
#endif /* D_A_NPC_GRC_H */
include/d/actor/d_a_npc_grm.h
+28 -17
View File
@@ -4,6 +4,33 @@
#include "d/actor/d_a_npc.h"
#include "d/d_shop_system.h"
struct daNpc_grM_HIOParam {
/* 0x0 */ daNpcT_HIOParam common;
};
class daNpc_grM_Param_c {
public:
virtual ~daNpc_grM_Param_c() {}
static daNpc_grM_HIOParam const m;
};
#if DEBUG
class daNpc_grM_HIO_c : public mDoHIO_entry_c {
public:
daNpc_grM_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
/* 0x8 */ daNpc_grM_HIOParam m;
};
#define NPC_GRM_HIO_CLASS daNpc_grM_HIO_c
#else
#define NPC_GRM_HIO_CLASS daNpc_grM_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_grM_c
@@ -108,7 +135,7 @@ public:
static cutFunc mCutList[2];
private:
/* 0x0F7C */ u8 field_0xf7c[0xf80 - 0xf7c];
/* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO;
/* 0x0F80 */ dCcD_Cyl mCyl;
/* 0x10BC */ u8 mType;
/* 0x10C0 */ actionFunc mNextAction;
@@ -122,20 +149,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_grM_c) == 0x10e4);
struct daNpc_grM_HIOParam {
/* 0x0 */ daNpcT_HIOParam common;
};
class daNpc_grM_HIO_c : public mDoHIO_entry_c {
public:
/* 0x8 */ daNpc_grM_HIOParam param;
};
class daNpc_grM_Param_c {
public:
virtual ~daNpc_grM_Param_c() {}
static daNpc_grM_HIOParam const m;
};
#endif /* D_A_NPC_GRM_H */
include/d/actor/d_a_npc_grmc.h
+7 -1
View File
@@ -26,6 +26,12 @@ struct daNpc_grMC_HIOParam {
class daNpc_grMC_HIO_c : public mDoHIO_entry_c {
public:
/* 0x8 */ daNpc_grMC_HIOParam m;
daNpc_grMC_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
};
class daNpc_grMC_Param_c {
@@ -122,7 +128,7 @@ public:
static cutFunc mCutList[1];
private:
/* 0x0F7C */ NPC_GRMC_HIO_CLASS* mHIO;
/* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO;
/* 0x0F80 */ dCcD_Cyl mCyl;
/* 0x10BC */ u8 mType;
/* 0x10C0 */ actionFunc mNextAction;
include/d/actor/d_a_npc_grr.h
+26 -18
View File
@@ -3,27 +3,10 @@
#include "d/actor/d_a_npc4.h"
/**
* @ingroup actors-npcs
* @class daNpc_grR_c
* @brief Gor Liggs
*
* @details
*
*/
struct daNpc_grR_HIOParam {
/* 0x0 */ daNpcF_HIOParam common;
};
class daNpc_grR_HIO_c
#if DEBUG
: public mDoHIO_entry_c
#endif
{
/* 0x8 */ daNpc_grR_HIOParam param;
};
class daNpc_grR_Param_c {
public:
virtual ~daNpc_grR_Param_c() {}
@@ -31,6 +14,31 @@ public:
static daNpc_grR_HIOParam const m;
};
#if DEBUG
class daNpc_grR_HIO_c : public mDoHIO_entry_c {
public:
/* 0x8 */ daNpc_grR_HIOParam m;
daNpc_grR_HIO_c();
void listenPropertyEvent(const JORPropertyEvent* event);
void genMessage(JORMContext* ctx);
};
#define NPC_GRR_HIO_CLASS daNpc_grR_HIO_c
#else
#define NPC_GRR_HIO_CLASS daNpc_grR_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_grR_c
* @brief Gor Liggs
*
* @details
*
*/
class daNpc_grR_c : public daNpcF_c {
public:
typedef int (daNpc_grR_c::*cutFunc)(int);
@@ -83,7 +91,7 @@ private:
/* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBDC */ daNpcF_Lookat_c mLookat;
/* 0xC78 */ daNpcF_ActorMngr_c mActorMngr[2];
/* 0xC88 */ daNpc_grR_HIO_c* mHIO;
/* 0xC88 */ NPC_GRR_HIO_CLASS* mpHIO;
/* 0xC8C */ dCcD_Cyl mCyl;
/* 0xDC8 */ actionFunc mNextAction;
/* 0xDD4 */ actionFunc mAction;
include/d/actor/d_a_npc_grz.h
+23 -10
View File
@@ -24,10 +24,30 @@ struct daNpc_Grz_HIOParam {
/* 0x7C */ f32 demo_start_distance; // デモ開始距離 - Demo Start Distance
};
class daNpc_Grz_HIO_c : public mDoHIO_entry_c {
/* 0x8 */ daNpc_Grz_HIOParam param;
class daNpc_Grz_Param_c {
public:
virtual ~daNpc_Grz_Param_c() {}
static daNpc_Grz_HIOParam const m;
};
#if DEBUG
class daNpc_Grz_HIO_c : public mDoHIO_entry_c {
public:
daNpc_Grz_HIO_c();
void listenPropertyEvent(const JORPropertyEvent* event);
void genMessage(JORMContext* ctx);
/* 0x8 */ daNpc_Grz_HIOParam m;
};
#define NPC_GRZ_HIO_CLASS daNpc_Grz_HIO_c
#else
#define NPC_GRZ_HIO_CLASS daNpc_Grz_Param_c
#endif
class daNpc_Grz_c : public daNpcF_c {
public:
typedef int (daNpc_Grz_c::*actionFunc)(void*);
@@ -105,7 +125,7 @@ private:
/* 0x0BDC */ daNpcF_Lookat_c mLookat;
/* 0x0C78 */ daNpcF_Path_c mPath;
/* 0x12A8 */ daNpcF_ActorMngr_c mActorMngrs[4];
/* 0x12C8 */ daNpc_Grz_HIO_c* mHIO;
/* 0x12C8 */ NPC_GRZ_HIO_CLASS* mpHIO;
/* 0x12CC */ dCcD_Cyl mCyl1;
/* 0x1408 */ dCcD_Cyl mCyl2;
/* 0x1544 */ dCcD_Sph mSphs[4];
@@ -133,11 +153,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_Grz_c) == 0x1b08);
class daNpc_Grz_Param_c {
public:
virtual ~daNpc_Grz_Param_c() {}
static daNpc_Grz_HIOParam const m;
};
#endif /* D_A_NPC_GRZ_H */
include/d/actor/d_a_npc_gwolf.h
+26 -14
View File
@@ -3,15 +3,6 @@
#include "d/actor/d_a_npc4.h"
/**
* @ingroup actors-npcs
* @class daNpc_GWolf_c
* @brief Golden Wolf
*
* @details
*
*/
struct daNpc_GWolf_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
/* 0x6C */ f32 attack_spd_horizontal; // 攻撃速度横 - Attack Speed Horizontal
@@ -24,10 +15,6 @@ struct daNpc_GWolf_HIOParam {
/* 0x88 */ f32 warp_start_dist; // ワープ開始距離 - Warp Start Distance
};
class daNpc_GWolf_HIO_c : public mDoHIO_entry_c {
/* 0x8 */ daNpc_GWolf_HIOParam param;
};
class daNpc_GWolf_Param_c {
public:
virtual ~daNpc_GWolf_Param_c() {}
@@ -35,6 +22,31 @@ public:
static daNpc_GWolf_HIOParam const m;
};
#if DEBUG
class daNpc_GWolf_HIO_c : public mDoHIO_entry_c {
public:
daNpc_GWolf_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
/* 0x8 */ daNpc_GWolf_HIOParam m;
};
#define NPC_GWOLF_HIO_CLASS daNpc_GWolf_HIO_c
#else
#define NPC_GWOLF_HIO_CLASS daNpc_GWolf_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_GWolf_c
* @brief Golden Wolf
*
* @details
*
*/
class daNpc_GWolf_c : public daNpcF_c {
public:
typedef BOOL (daNpc_GWolf_c::*actionFunc)(void*);
@@ -100,7 +112,7 @@ private:
/* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBDC */ daNpcF_Lookat_c mLookat;
/* 0xC78 */ daNpcF_ActorMngr_c mActorMngrs[2];
/* 0xC88 */ daNpc_GWolf_HIO_c* mHIO;
/* 0xC88 */ NPC_GWOLF_HIO_CLASS* mpHIO;
/* 0xC8C */ dCcD_Cyl mCyl;
/* 0xDC8 */ actionFunc mNextAction;
/* 0xDD4 */ actionFunc mAction;
include/d/actor/d_a_npc_hanjo.h
+41 -61
View File
@@ -3,6 +3,46 @@
#include "d/actor/d_a_npc.h"
struct daNpc_Hanjo_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ f32 field_0x98;
/* 0x9C */ f32 field_0x9c;
/* 0xA0 */ f32 field_0xa0;
/* 0xA4 */ f32 field_0xa4;
/* 0xA8 */ f32 field_0xa8;
/* 0xAC */ s16 field_0xac;
/* 0xAE */ s16 field_0xae;
/* 0xB0 */ s16 field_0xb0;
/* 0xB2 */ s16 field_0xb2;
};
class daNpc_Hanjo_Param_c {
public:
virtual ~daNpc_Hanjo_Param_c() {}
static const daNpc_Hanjo_HIOParam m;
};
#if DEBUG
class daNpc_Hanjo_HIO_c : public mDoHIO_entry_c {
public:
daNpc_Hanjo_HIO_c();
void listenPropertyEvent(const JORPropertyEvent* event);
void genMessage(JORMContext*);
daNpc_Hanjo_HIOParam m;
};
#define NPC_HANJO_HIO_CLASS daNpc_Hanjo_HIO_c
#else
#define NPC_HANJO_HIO_CLASS daNpc_Hanjo_Param_c
#endif
class daNpc_HanjoStone_c {
public:
~daNpc_HanjoStone_c() {}
@@ -182,7 +222,7 @@ public:
static cutFunc mCutList[6];
static dCcD_SrcSph mStoneCcDSph;
private:
/* 0x0E40 */ int field_0x0E40;
/* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO;
/* 0x0E44 */ J3DModel* mModel1;
/* 0x0E48 */ J3DModel* mModel2;
/* 0x0E4C */ dCcD_Cyl mCyl1;
@@ -213,64 +253,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_Hanjo_c) == 0x172c);
class daNpc_Hanjo_Param_c {
public:
virtual ~daNpc_Hanjo_Param_c() {}
struct Data {
/* 0x00 */ f32 field_0x00;
/* 0x04 */ f32 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 field_0x44;
/* 0x48 */ s16 field_0x48;
/* 0x4A */ s16 field_0x4a;
/* 0x4C */ s16 field_0x4c;
/* 0x4E */ s16 field_0x4e;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ s16 field_0x60;
/* 0x62 */ s16 field_0x62;
/* 0x64 */ int field_0x64;
/* 0x68 */ int field_0x68;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ f32 field_0x70;
/* 0x74 */ f32 field_0x74;
/* 0x78 */ f32 field_0x78;
/* 0x7C */ f32 field_0x7c;
/* 0x80 */ f32 field_0x80;
/* 0x84 */ f32 field_0x84;
/* 0x88 */ f32 field_0x88;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ f32 field_0x98;
/* 0x9C */ f32 field_0x9c;
/* 0xA0 */ f32 field_0xa0;
/* 0xA4 */ f32 field_0xa4;
/* 0xA8 */ f32 field_0xa8;
/* 0xAC */ s16 field_0xac;
/* 0xAE */ s16 field_0xae;
/* 0xB0 */ s16 field_0xb0;
/* 0xB2 */ s16 field_0xb2;
};
static const Data m;
};
#endif /* D_A_NPC_HANJO_H */
include/d/actor/d_a_npc_hoz.h
+30 -13
View File
@@ -4,6 +4,35 @@
#include "d/actor/d_a_npc.h"
#include "d/actor/d_a_startAndGoal.h"
struct daNpc_Hoz_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
};
class daNpc_Hoz_Param_c {
public:
virtual ~daNpc_Hoz_Param_c() {}
static const daNpc_Hoz_HIOParam m;
};
#if DEBUG
class daNpc_Hoz_HIO_c : public mDoHIO_entry_c {
public:
daNpc_Hoz_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daNpc_Hoz_HIOParam m;
};
#define NPC_HOZ_HIO_CLASS daNpc_Hoz_HIO_c
#else
#define NPC_HOZ_HIO_CLASS daNpc_Hoz_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_Hoz_c
@@ -100,7 +129,7 @@ public:
static cutFunc mCutList[];
private:
/* 0xE40 */ int field_0xE40;
/* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO;
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 mType;
/* 0xF84 */ daStartAndGoal_c* field_0xf84;
@@ -122,16 +151,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_Hoz_c) == 0xFC8);
struct daNpc_Hoz_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
};
class daNpc_Hoz_Param_c {
public:
virtual ~daNpc_Hoz_Param_c() {}
static const daNpc_Hoz_HIOParam m;
};
#endif /* D_A_NPC_HOZ_H */
include/d/actor/d_a_npc_ins.h
+24 -14
View File
@@ -3,24 +3,11 @@
#include "d/actor/d_a_npc4.h"
/**
* @ingroup actors-npcs
* @class daNpcIns_c
* @brief Agitha
*
* @details
*
*/
struct daNpcIns_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
/* 0x70 */ f32 walk_speed; // 歩行速度 - Walking Speed
};
class daNpcIns_HIO_c : public mDoHIO_entry_c {
/* 0x8 */ daNpcIns_HIOParam param;
};
class daNpcIns_Param_c {
public:
virtual ~daNpcIns_Param_c() {}
@@ -28,6 +15,21 @@ public:
static daNpcIns_HIOParam const m;
};
#if DEBUG
class daNpcIns_HIO_c : public mDoHIO_entry_c {
public:
daNpcIns_HIO_c();
void genMessage(JORMContext*);
/* 0x8 */ daNpcIns_HIOParam m;
};
#define NPC_INS_HIO_CLASS daNpcIns_HIO_c
#else
#define NPC_INS_HIO_CLASS daNpcIns_Param_c
#endif
struct insect_param_data {
int evt_bit_no;
s16 msg_no;
@@ -35,6 +37,14 @@ struct insect_param_data {
u8 field_0x7;
};
/**
* @ingroup actors-npcs
* @class daNpcIns_c
* @brief Agitha
*
* @details
*
*/
class daNpcIns_c : public daNpcF_c {
public:
typedef int (daNpcIns_c::*actionFunc)(void*);
@@ -118,7 +128,7 @@ private:
/* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBE4 */ daNpcF_Lookat_c mLookat;
/* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[1];
/* 0xC88 */ daNpcIns_HIO_c* mHIO;
/* 0xC88 */ NPC_INS_HIO_CLASS* mpHIO;
/* 0xC8C */ dCcD_Cyl mCyl;
/* 0xDC8 */ actionFunc mAction;
/* 0xDD4 */ actionFunc mPrevAction;
include/d/actor/d_a_npc_kakashi.h
+32 -16
View File
@@ -3,6 +3,37 @@
#include "d/actor/d_a_npc.h"
struct daNpc_Kakashi_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
};
class daNpc_Kakashi_Param_c {
public:
virtual ~daNpc_Kakashi_Param_c() {}
static const daNpc_Kakashi_HIOParam m;
};
#if DEBUG
class daNpc_Kakashi_HIO_c : public mDoHIO_entry_c {
public:
daNpc_Kakashi_HIO_c();
void listenPropertyEvent(const JORPropertyEvent*);
void genMessage(JORMContext*);
daNpc_Kakashi_HIOParam m;
};
#define NPC_KAKASHI_HIO_CLASS daNpc_Kakashi_HIO_c
#else
#define NPC_KAKASHI_HIO_CLASS daNpc_Kakashi_Param_c
#endif
/**
* @ingroup actors-npcs
* @class daNpc_Kakashi_c
@@ -86,7 +117,7 @@ public:
static int (daNpc_Kakashi_c::*mCutList[])(int);
private:
/* 0x0E40 */ u8 field_0xE40[0xE44 - 0xE40];
/* 0x0E40 */ NPC_KAKASHI_HIO_CLASS* mpHIO;
/* 0x0E44 */ Z2SoundObjSimple mSound;
/* 0x0E64 */ dCcD_Cyl mCcCyl;
/* 0x0FA0 */ dCcD_Sph mCcSph[3];
@@ -109,19 +140,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_Kakashi_c) == 0x1398);
struct daNpc_Kakashi_HIOParam {
/* 0x00 */ daNpcT_HIOParam common;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ f32 field_0x94;
};
class daNpc_Kakashi_Param_c {
public:
virtual ~daNpc_Kakashi_Param_c() {}
static const daNpc_Kakashi_HIOParam m;
};
#endif /* D_A_NPC_KAKASHI_H */

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