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

cleanup (#2216)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-17 14:24:29 -07:00
committed by GitHub
parent 38445f4d51
commit abc4c6659a
56 changed files with 6446 additions and 30124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JParticle/JPAEmitter.h
+4 -4
View File
@@ -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();
};
include/d/actor/d_a_b_ds.h
-7
View File
@@ -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;
include/d/actor/d_a_e_vt.h
+1 -1
View File
@@ -285,7 +285,7 @@ private:
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;
include/d/actor/d_a_e_yk.h
+1 -16
View File
@@ -34,21 +34,6 @@ 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
*
@@ -56,7 +41,7 @@ struct daE_YK_HIO_c_tmp {
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
include/d/actor/d_a_myna.h
-5
View File
@@ -129,12 +129,7 @@ public:
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;
include/d/actor/d_a_npc.h
+44 -46
View File
@@ -492,8 +492,40 @@ public:
};
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];
@@ -527,40 +559,6 @@ private:
/* 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 {
@@ -603,7 +601,7 @@ public:
/* 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 {
@@ -793,7 +791,7 @@ public:
/* 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();
@@ -961,18 +959,18 @@ public:
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 */
include/d/actor/d_a_npc_ash.h
+1 -14
View File
@@ -103,13 +103,8 @@ public:
/* 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);
@@ -123,11 +118,7 @@ public:
/* 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();
@@ -142,18 +133,14 @@ public:
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;
include/d/actor/d_a_npc_henna.h
+10 -3
View File
@@ -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
@@ -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);
include/d/actor/d_a_npc_ne.h
-5
View File
@@ -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;
include/d/actor/d_a_npc_the.h
+1 -5
View File
@@ -203,11 +203,7 @@ private:
/* 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);
@@ -249,7 +245,7 @@ public:
/* 0x6A */ bool mTest;
};
/* 80AFBDA0 */ virtual ~daNpcThe_Param_c();
/* 80AFBDA0 */ virtual ~daNpcThe_Param_c() {}
static daNpcThe_Param_c::param const m;
};
include/d/actor/d_a_npc_zra.h
+2 -7
View File
@@ -316,7 +316,7 @@ public:
/* 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; }
@@ -393,13 +393,8 @@ public:
/* 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);
@@ -459,7 +454,7 @@ public:
/* 0xAC */ f32 field_0xac;
};
/* 80B8C3EC */ virtual ~daNpc_zrA_Param_c();
/* 80B8C3EC */ virtual ~daNpc_zrA_Param_c() {}
static param const m;
};
include/d/actor/d_a_npc_zrz.h
+1 -1
View File
@@ -76,7 +76,7 @@ public:
/* 80B9A0EC */ BOOL talk(void*);
/* 80B9A29C */ BOOL test(void*);
/* 80B9A380 */ void himoCalc();
/* 80B9AF7C */ void adjustShapeAngle();
/* 80B9AF7C */ void adjustShapeAngle() {}
private:
/* 0x0B48 */ Z2Creature mCreatureSound;
include/d/actor/d_a_obj_kantera.h
-23
View File
@@ -3,7 +3,6 @@
#include "d/actor/d_a_itembase.h"
#ifdef NONMATCHING
/**
* @ingroup actors-objects
* @class daItemKantera_c
@@ -45,27 +44,5 @@ private:
};
STATIC_ASSERT(sizeof(daItemKantera_c) == 0x948);
#else
struct daItemKantera_c {
/* 80C389BC */ void initBaseMtx();
/* 80C389F8 */ void setBaseMtx();
/* 80C38A64 */ int Create();
/* 80C38BA8 */ int __CreateHeap();
/* 80C38BB0 */ int create();
/* 80C38F78 */ void bg_check();
/* 80C39068 */ int actionInit();
/* 80C390A0 */ int actionWaitInit();
/* 80C3911C */ int actionWait();
/* 80C39234 */ int initActionOrderGetDemo();
/* 80C392D0 */ int actionOrderGetDemo();
/* 80C3934C */ int actionGetDemo();
/* 80C393B0 */ int execute();
/* 80C394DC */ int draw();
/* 80C39530 */ int _delete();
private:
/* 0x000 */ u8 field_0x0[0x948];
};
#endif
#endif /* D_A_OBJ_KANTERA_H */
include/d/actor/d_a_obj_mirror_table.h
+1 -1
View File
@@ -15,7 +15,7 @@
class daObjMirrorTable_c : public fopAc_ac_c {
public:
/* 80C99938 */ int createHeap();
/* 80C99F7C */ /* inline */ bool isSwitch(); // should be inlined once createHeap matches
/* 80C99F7C */ inline bool isSwitch();
inline void checkOnPanel();
/* 80C9A298 */ int draw();
inline void setBaseMtx();
include/d/actor/d_a_obj_volcball.h
+3 -3
View File
@@ -27,8 +27,8 @@ public:
};
struct vball_s {
/* 80D21FA8 */ ~vball_s();
/* 80D2214C */ vball_s();
/* 80D21FA8 */ ~vball_s() {}
/* 80D2214C */ vball_s() {}
/* 0x000 */ J3DModel* mpModel;
/* 0x004 */ cXyz field_0x4;
@@ -107,7 +107,7 @@ public:
/* 80D23904 */ int draw();
/* 80D23A0C */ int _delete();
/* 80D23B24 */ virtual ~daObjVolcBall_c();
/* 80D23B24 */ virtual ~daObjVolcBall_c() {}
/* 80D22DDC */ virtual BOOL eventStart();
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
include/d/actor/d_a_obj_zraMark.h
+2 -5
View File
@@ -10,10 +10,7 @@ class daNpc_Hoz_c;
class _ZraMark_Hahen_c {
public:
_ZraMark_Hahen_c() {
mpModel = NULL;
setColor(0);
}
inline _ZraMark_Hahen_c();
/* 80D4347C */ int create(cXyz const&, s8, s8, s8, s8);
/* 80D434F8 */ BOOL loadModel();
@@ -22,7 +19,7 @@ public:
/* 80D43864 */ void setMtx();
/* 80D438C8 */ void draw();
void setColor(const s8& i_color) { mColor = i_color; }
inline void setColor(const s8& i_color) { mColor = i_color; }
s8 getColor() { return mColor; }
void setPos(const cXyz& i_pos) { mPos = i_pos; }
void setSpeed(const cXyz& i_speed) { mSpeed = i_speed; }
include/d/actor/d_a_player.h
+1 -1
View File
@@ -565,7 +565,7 @@ public:
static BOOL checkShieldGet();
static BOOL checkSwordGet();
void changeDemoParam2(s16);
cXyz getHeadTopPos() const;
cXyz getHeadTopPos() const { return mHeadTopPos; }
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
cXyz* getRightFootPosP() { return &mRightFootPos; }
include/d/d_com_inf_game.h
+2 -2
View File
@@ -2606,8 +2606,8 @@ inline stage_pselect_info_class* dComIfGp_getStagePselectInfo() {
return g_dComIfG_gameInfo.play.getStage().getPselectInfo();
}
inline stage_vrbox_info_class* dComIfGp_getStageVrboxcolInfo() {
return g_dComIfG_gameInfo.play.getStage().getVrboxInfo();
inline stage_vrboxcol_info_class* dComIfGp_getStageVrboxcolInfo() {
return g_dComIfG_gameInfo.play.getStage().getVrboxcolInfo();
}
inline stage_plight_info_class* dComIfGp_getStagePlightInfo() {
include/d/d_drawlist.h
+2 -4
View File
@@ -167,8 +167,8 @@ public:
class dDlst_shadowRealPoly_c : public dDlst_shadowPoly_c {
public:
/* 800569A0 */ virtual dDlst_shadowTri_c* getTri();
/* 800569A8 */ virtual s32 getTriMax();
/* 800569A0 */ virtual dDlst_shadowTri_c* getTri() { return mShadowTri; }
/* 800569A8 */ virtual s32 getTriMax() { return ARRAY_SIZE(mShadowTri); }
/* 0x8 */ dDlst_shadowTri_c mShadowTri[256];
};
@@ -258,8 +258,6 @@ private:
STATIC_ASSERT(sizeof(dDlst_window_c) == 0x2C);
extern u8 mWipe__12dDlst_list_c; // Wipe
struct view_port_class;
struct view_class;
include/d/d_kankyo.h
+3 -3
View File
@@ -227,7 +227,7 @@ class dKyd_lightSchejule;
class stage_palette_info_class;
class stage_pselect_info_class;
class stage_envr_info_class;
class stage_vrbox_info_class;
class stage_vrboxcol_info_class;
class stage_plight_info_class;
class kytag08_class;
@@ -278,7 +278,7 @@ public:
/* 801A5288 */ void exeKankyo();
/* 801A56DC */ void drawKankyo();
/* 801ADBBC */ virtual ~dScnKy_env_light_c();
/* 801ADBBC */ virtual ~dScnKy_env_light_c() {}
void setLightTevColorType(J3DModel* i_model, dKy_tevstr_c* tevstr) {
setLightTevColorType(i_model->getModelData(), tevstr);
@@ -292,7 +292,7 @@ public:
/* 0x0004 */ stage_palette_info_class* mpDmPalet;
/* 0x0008 */ stage_pselect_info_class* mpDmPselect;
/* 0x000C */ stage_envr_info_class* mpDmEnvr;
/* 0x0010 */ stage_vrbox_info_class* mpDmVrbox;
/* 0x0010 */ stage_vrboxcol_info_class* mpDmVrbox;
/* 0x0014 */ dKyd_lightSchejule* mpSchedule;
/* 0x0018 */ LIGHT_INFLUENCE mBaseLightInfluence;
/* 0x0038 */ LIGHT_INFLUENCE mLightInfluence[30];

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