Skip to content

Commit

Permalink
cleanup (#2216)
Browse files Browse the repository at this point in the history
  • Loading branch information
@randomsalience
randomsalience authored Oct 17, 2024
1 parent 38445f4 commit abc4c66
Show file tree
Hide file tree
Showing 56 changed files with 7,682 additions and 31,360 deletions.
4 changes: 2 additions & 2 deletions configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,9 @@ def JSystemLib(lib_name, objects, progress_category="third_party"):
Object(NonMatching, "d/d_menu_dmap_map.cpp"),
Object(Matching, "d/d_menu_map_common.cpp"),
Object(Matching, "d/d_menu_fishing.cpp"),
Object(NonMatching, "d/d_menu_fmap.cpp"),
Object(Equivalent, "d/d_menu_fmap.cpp"),
Object(NonMatching, "d/d_menu_fmap_map.cpp"),
Object(NonMatching, "d/d_menu_fmap2D.cpp"),
Object(Matching, "d/d_menu_fmap2D.cpp"),
Object(Matching, "d/d_menu_insect.cpp"),
Object(Matching, "d/d_menu_item_explain.cpp"),
Object(NonMatching, "d/d_menu_letter.cpp"),
Expand Down
8 changes: 4 additions & 4 deletions include/JSystem/JParticle/JPAEmitter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ struct JPAEmitterWorkData {
class JPAEmitterCallBack {
public:
virtual ~JPAEmitterCallBack() = 0;
/* 80050368 */ virtual void execute(JPABaseEmitter*);
/* 80050374 */ virtual void executeAfter(JPABaseEmitter*);
/* 8005036C */ virtual void draw(JPABaseEmitter*);
/* 80050370 */ virtual void drawAfter(JPABaseEmitter*);
/* 80050368 */ virtual void execute(JPABaseEmitter*) {}
/* 80050374 */ virtual void executeAfter(JPABaseEmitter*) {}
/* 8005036C */ virtual void draw(JPABaseEmitter*) {}
/* 80050370 */ virtual void drawAfter(JPABaseEmitter*) {}

/* 8027E6A4 */ //~JPAEmitterCallBack();
};
Expand Down
7 changes: 0 additions & 7 deletions include/d/actor/d_a_b_ds.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,15 +326,8 @@ STATIC_ASSERT(sizeof(daB_DS_c) == 0x2F28);
class daB_DS_HIO_c {
public:
/* 805CB22C */ daB_DS_HIO_c();
#ifdef NONMATCHING
/* 805DC89C */ virtual ~daB_DS_HIO_c() {}
#else
/* 805DC89C */ ~daB_DS_HIO_c();
#endif

#ifndef NONMATCHING
/* 0x00 */ void* _vtable;
#endif
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mModelSize;
/* 0x0C */ f32 mHandRange;
Expand Down
2 changes: 1 addition & 1 deletion include/d/actor/d_a_e_vt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class daE_VA_c : public fopEn_enemy_c {
class daE_VA_HIO_c {
public:
/* 807C25EC */ daE_VA_HIO_c();
/* 807CE2AC */ virtual ~daE_VA_HIO_c();
/* 807CE2AC */ virtual ~daE_VA_HIO_c() {}

/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mModelSize;
Expand Down
17 changes: 1 addition & 16 deletions include/d/actor/d_a_e_yk.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,14 @@ enum daE_YK_Action {
ACT_WIND /**< Keese is in the gale boomerang. */
};

/**
* @brief Temporary HIO struct to get a match. Remove later.
*
*/
struct daE_YK_HIO_c_tmp {
void* vtable;
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
};


/**
* @brief Shadow Keese Host Input Output class
*
*/
class daE_YK_HIO_c {
public:
/* 8080482C */ daE_YK_HIO_c();
/* 808077E0 */ virtual ~daE_YK_HIO_c();
/* 808077E0 */ virtual ~daE_YK_HIO_c() {}

/* 0x00 */ // vtable
/* 0x04 */ s8 field_0x04; // padding after this
Expand Down
5 changes: 0 additions & 5 deletions include/d/actor/d_a_myna.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,7 @@ class daMyna_c : public fopAc_ac_c {
typedef int (daMyna_c::*BaseMotionFunc)(int);

static dCcD_SrcSph const mCcDSph;
// sinit matches, but with incorrect weak function ordering
#ifdef NONMATCHING
static daMyna_c::BaseMotionFunc mBaseMotionTBL[7];
#else
static u8 mBaseMotionTBL[84];
#endif

/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ mDoExt_McaMorfSO* mpMorf;
Expand Down
90 changes: 44 additions & 46 deletions include/d/actor/d_a_npc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,40 @@ class daBaseNpc_lookat_c {
};

class daBaseNpc_c : public fopAc_ac_c {
public:
/* 8014E6C8 */ daBaseNpc_c();
/* 8014EE44 */ J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
/* 8014EE80 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
/* 8014EEE4 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 8014EF28 */ J3DAnmTransform* getTexPtrnAnmP(char*, int);
/* 8014EF64 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
/* 8014EFF4 */ void orderEvent(int, char*);
/* 8014F0A0 */ void setEnvTevColor();
/* 8014F0FC */ void setRoomNo();
/* 8014F148 */ int checkEndAnm(f32);
/* 8014F1C8 */ int checkEndAnm(J3DFrameCtrl*);

/* 8014E89C */ virtual ~daBaseNpc_c();
/* 8014EAD0 */ virtual void execute();
/* 8014EC50 */ virtual void draw(f32);
/* 8014EE3C */ virtual bool getResName();
/* 8014EFA4 */ virtual void attnSttsOn(int, int);
/* 8014EFF0 */ virtual void setParam();
/* 8014F09C */ virtual void mainProc();
/* 8014F140 */ virtual bool btkCtrl();
/* 8014F228 */ virtual void allAnmPlay();
/* 8014F38C */ virtual void adjustShapeAngle();
/* 8014F390 */ virtual void setMtx(int);
/* 8014F4A0 */ virtual void setCollisions();
/* 8014F4A4 */ virtual void setAttnPos();
/* 8014F4A8 */ virtual void drawOtherMdls();
/* 8014F4AC */ virtual bool dbgDraw();

static u8 const mCcDObj[48];
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;

private:
/* 0x568 */ void* vtable;
/* 0x56C */ dBgS_Acch field_0x56c;
/* 0x744 */ u8 field_0x744[16];
/* 0x754 */ mDoExt_McaMorfSO* mpMorf[2];
Expand Down Expand Up @@ -527,40 +559,6 @@ class daBaseNpc_c : public fopAc_ac_c {
/* 0x9A2 */ u8 field_0x9a2[70];
/* 0x9E8 */ const cBgS_PolyInfo mBgSPolyInfo;
/* 0x9F9 */ u8 field_0x9f9[27];

public:
/* 8014E6C8 */ daBaseNpc_c();
/* 8014E89C */ ~daBaseNpc_c();
/* 8014EAD0 */ void execute();
/* 8014EC50 */ void draw(f32);
/* 8014EE3C */ bool getResName();
/* 8014EE44 */ J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
/* 8014EE80 */ void setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
/* 8014EEE4 */ void setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
/* 8014EF28 */ J3DAnmTransform* getTexPtrnAnmP(char*, int);
/* 8014EF64 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
/* 8014EFA4 */ void attnSttsOn(int, int);
/* 8014EFF0 */ void setParam();
/* 8014EFF4 */ void orderEvent(int, char*);
/* 8014F09C */ void mainProc();
/* 8014F0A0 */ void setEnvTevColor();
/* 8014F0FC */ void setRoomNo();
/* 8014F140 */ bool btkCtrl();
/* 8014F148 */ int checkEndAnm(f32);
/* 8014F1C8 */ int checkEndAnm(J3DFrameCtrl*);
/* 8014F228 */ void allAnmPlay();
/* 8014F38C */ void adjustShapeAngle();
/* 8014F390 */ void setMtx(int);
/* 8014F4A0 */ void setCollisions();
/* 8014F4A4 */ void setAttnPos();
/* 8014F4A8 */ void drawOtherMdls();
/* 8014F4AC */ bool dbgDraw();

void setVtable(void* table) { vtable = table; }

static u8 const mCcDObj[48];
static dCcD_SrcCyl mCcDCyl;
static dCcD_SrcSph mCcDSph;
};

class daBaseNpc_moveBgActor_c : public daBaseNpc_c {
Expand Down Expand Up @@ -603,7 +601,7 @@ class daNpcF_ActorMngr_c {
/* 801506E0 */ void remove();
/* 801506EC */ fopAc_ac_c* getActorP();

/* 80155E40 */ virtual ~daNpcF_ActorMngr_c();
/* 80155E40 */ virtual ~daNpcF_ActorMngr_c() {}
};

class daNpcF_c : public fopAc_ac_c {
Expand Down Expand Up @@ -793,7 +791,7 @@ class daNpcF_c : public fopAc_ac_c {
/* 801549E0 */ BOOL chkFindPlayer2(BOOL, s16);
/* 80154BD8 */ void setHitodamaPrtcl();

/* 80155BF4 */ virtual ~daNpcF_c();
/* 80155BF4 */ virtual ~daNpcF_c() {}
/* 80155BC8 */ virtual void setParam();
/* 80155BC0 */ virtual BOOL main();
/* 80155BD8 */ virtual BOOL ctrlBtk();
Expand Down Expand Up @@ -961,18 +959,18 @@ class daNpcF_Lookat_c {
void setAttnPos(cXyz* i_attnPos) { mAttnPos = i_attnPos; }
};

class daNpcF_MoveBgActor_c {
class daNpcF_MoveBgActor_c : public daNpcF_c {
private:
public:
/* 80155B54 */ ~daNpcF_MoveBgActor_c();
/* 80155E88 */ bool CreateHeap();
/* 80155E90 */ bool Create();
/* 80155E98 */ bool Delete();
/* 80155EA0 */ bool Execute(f32 (**)[3][4]);
/* 80155EA8 */ bool Draw();
/* 80155EB0 */ bool IsDelete();
/* 80155EB8 */ bool ToFore();
/* 80155EC0 */ bool ToBack();
/* 80155E88 */ virtual bool CreateHeap();
/* 80155E90 */ virtual bool Create();
/* 80155EA0 */ virtual bool Execute(f32 (**)[3][4]);
/* 80155EA8 */ virtual bool Draw();
/* 80155E98 */ virtual bool Delete();
/* 80155EB0 */ virtual bool IsDelete();
/* 80155EB8 */ virtual bool ToFore();
/* 80155EC0 */ virtual bool ToBack();
};

#endif /* D_A_D_A_NPC_H */
15 changes: 1 addition & 14 deletions include/d/actor/d_a_npc_ash.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,8 @@ class daNpcAsh_c : public daNpcF_c {
/* 809596E0 */ bool setExpressionBtp(int);
/* 809597C0 */ void setMotionAnm(int i_idx, f32 i_morf);
/* 80959910 */ void reset();
#ifdef NONMATCHING
/* 80959B28 */ inline bool setAction(ActionFn);
/* 80959BD0 */ inline bool isSneaking();
#else
/* 80959B28 */ bool setAction(ActionFn);
/* 80959BD0 */ bool isSneaking();
#endif
/* 80959C40 */ bool wait_type0(void*);
/* 8095A67C */ void setMotion(int, f32, int);
/* 8095A6C0 */ void setExpression(int, f32);
Expand All @@ -123,11 +118,7 @@ class daNpcAsh_c : public daNpcF_c {
/* 8095BA80 */ BOOL EvCut_WiretapEntrant(int i_staffID);
/* 8095BCF0 */ void setParam();
/* 8095BF6C */ BOOL main();
#ifdef NONMATCHING
/* 8095C200 */ inline void playMotion();
#else
/* 8095C200 */ void playMotion();
#endif
/* 8095C520 */ BOOL ctrlBtk();
/* 8095C5C4 */ void setAttnPos();
/* 8095C9BC */ void lookat();
Expand All @@ -142,18 +133,14 @@ class daNpcAsh_c : public daNpcF_c {
inline bool step(s16, bool);
inline void playExpression();

#ifdef NONMATCHING
static EventFn mEvtSeqList[6];
#else
static u8 mEvtSeqList[72];
#endif
};

STATIC_ASSERT(sizeof(daNpcAsh_c) == 0xF64);

class daNpcAsh_Param_c {
public:
/* 8095D5D4 */ virtual ~daNpcAsh_Param_c();
/* 8095D5D4 */ virtual ~daNpcAsh_Param_c() {}

struct param {
/* 0x00 */ f32 mAttnOffsetY;
Expand Down
13 changes: 10 additions & 3 deletions include/d/actor/d_a_npc_henna.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef D_A_NPC_HENNA_H
#define D_A_NPC_HENNA_H

#include "d/actor/d_a_npc.h"
#include "f_op/f_op_actor.h"

/**
* @ingroup actors-npcs
Expand All @@ -12,8 +12,15 @@
*
*/
class npc_henna_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x7fc - 0x568];
public:
/* 0x568 */ u8 field_0x568[0x752 - 0x568];
/* 0x752 */ u16 field_0x752;
/* 0x754 */ u16 field_0x754;
/* 0x756 */ u8 field_0x756[0x7b5 - 0x756];
/* 0x7B5 */ u8 field_0x7b5;
/* 0x7B6 */ u8 field_0x7b6[0x7b9 - 0x7b6];
/* 0x7B9 */ u8 field_0x7b9;
/* 0x7BA */ u8 field_0x7ba[0x7fc - 0x7ba];
};

STATIC_ASSERT(sizeof(npc_henna_class) == 0x7fc);
Expand Down
5 changes: 0 additions & 5 deletions include/d/actor/d_a_npc_ne.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,7 @@ STATIC_ASSERT(sizeof(npc_ne_class) == 0xCC4);
class daNpc_Ne_HIO_c {
public:
/* 80A88CCC */ daNpc_Ne_HIO_c();
#ifdef NONMATCHING
/* 80A92374 */ virtual ~daNpc_Ne_HIO_c() {}
#else
/* 80A92374 */ ~daNpc_Ne_HIO_c();
/* 0x00 */ void* vtable;
#endif

/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mScale;
Expand Down
6 changes: 1 addition & 5 deletions include/d/actor/d_a_npc_the.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,7 @@ class daNpcThe_c : public daNpcF_c {
/* 0xE1E */ u8 mType;

static char* mEvtCutNameList[4];
#ifdef NONMATCHING
static EventFn mEvtCutList[4];
#else
static u8 mEvtCutList[48];
#endif
};

STATIC_ASSERT(sizeof(daNpcThe_c) == 0xE20);
Expand Down Expand Up @@ -249,7 +245,7 @@ class daNpcThe_Param_c {
/* 0x6A */ bool mTest;
};

/* 80AFBDA0 */ virtual ~daNpcThe_Param_c();
/* 80AFBDA0 */ virtual ~daNpcThe_Param_c() {}

static daNpcThe_Param_c::param const m;
};
Expand Down
9 changes: 2 additions & 7 deletions include/d/actor/d_a_npc_zra.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ class daNpc_zrA_c : public daNpcF_c {
/* 80B8B420 */ BOOL waitSearch(void*);
/* 80B8B530 */ BOOL ECut_searchPrince1(int);
/* 80B8BCE8 */ BOOL ECut_searchPrince2(int);
/* 80B8C3E8 */ void adjustShapeAngle();
/* 80B8C3E8 */ void adjustShapeAngle() {}
int getType() { return mType; }
u32 getAngleNoFromParam() { return (u8)(fopAcM_GetParam(this) >> 8); }
void setBlastFlag(u8 i_flag) { mBlastFlag = i_flag; }
Expand Down Expand Up @@ -393,13 +393,8 @@ class daNpc_zrA_c : public daNpcF_c {
/* 0x15C0 */ u8 field_0x15c0;
/* 0x15C1 */ bool mBlastFlag;

#ifdef NONMATCHING
static char* mEvtCutNameList[11];
static EventFn mEvtCutList[11];
#else
static void* mEvtCutNameList[11];
static u8 mEvtCutList[132];
#endif
};

STATIC_ASSERT(sizeof(daNpc_zrA_c) == 0x15C4);
Expand Down Expand Up @@ -459,7 +454,7 @@ class daNpc_zrA_Param_c {
/* 0xAC */ f32 field_0xac;
};

/* 80B8C3EC */ virtual ~daNpc_zrA_Param_c();
/* 80B8C3EC */ virtual ~daNpc_zrA_Param_c() {}

static param const m;
};
Expand Down
2 changes: 1 addition & 1 deletion include/d/actor/d_a_npc_zrz.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class daNpc_zrZ_c : public daNpcF_c {
/* 80B9A0EC */ BOOL talk(void*);
/* 80B9A29C */ BOOL test(void*);
/* 80B9A380 */ void himoCalc();
/* 80B9AF7C */ void adjustShapeAngle();
/* 80B9AF7C */ void adjustShapeAngle() {}

private:
/* 0x0B48 */ Z2Creature mCreatureSound;
Expand Down
Loading

0 comments on commit abc4c66

Please sign in to comment.