mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

more misc. cleanup (#2232)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-31 20:36:11 -04:00
committed by GitHub
parent 30777a85b5
commit 09423b6fa0
121 changed files with 2254 additions and 17343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_do.h
+1 -1
View File
@@ -63,7 +63,7 @@ struct daDo_HIO_tmp {
class daDo_HIO_c {
public:
/* 80667D4C */ daDo_HIO_c();
/* 8066ED40 */ virtual ~daDo_HIO_c(); // should be inlined
/* 8066ED40 */ virtual ~daDo_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mBaseSize;
include/d/actor/d_a_dshutter.h
+11 -11
View File
@@ -18,10 +18,10 @@ public:
public:
typedef int (daDsh_c::*actionFunc)();
/* action_c(actionFunc i_initFunc, actionFunc i_execFunc) {
action_c(actionFunc i_initFunc, actionFunc i_execFunc) {
mInitFunc = i_initFunc;
mExecuteFunc = i_execFunc;
} */
}
actionFunc& getInit() { return mInitFunc; }
actionFunc& getExecute() { return mExecuteFunc; }
@@ -65,15 +65,15 @@ public:
f32 getCloseBoundSpeed() { return CLOSE_BOUND_SPEED; }
f32 getCloseBoundRatio() { return CLOSE_BOUND_RATIO; }
static f32 OPEN_SIZE;
static f32 OPEN_ACCEL;
static f32 OPEN_SPEED;
static f32 OPEN_BOUND_SPEED;
static f32 OPEN_BOUND_RATIO;
static f32 CLOSE_ACCEL;
static f32 CLOSE_SPEED;
static f32 CLOSE_BOUND_SPEED;
static f32 CLOSE_BOUND_RATIO;
static f32 const OPEN_SIZE;
static f32 const OPEN_ACCEL;
static f32 const OPEN_SPEED;
static f32 const OPEN_BOUND_SPEED;
static f32 const OPEN_BOUND_RATIO;
static f32 const CLOSE_ACCEL;
static f32 const CLOSE_SPEED;
static f32 const CLOSE_BOUND_SPEED;
static f32 const CLOSE_BOUND_RATIO;
/* 0x5A0 */ dComIfG_resLoader_c mResLoader;
/* 0x5B0 */ J3DModel* mpModel;
include/d/actor/d_a_e_ba.h
+1 -1
View File
@@ -79,7 +79,7 @@ public:
/* 0x698 */ f32 mKnockbackSpeed;
/* 0x69C */ s16 mKnockbackAngle;
/* 0x69E */ csXyz mChanceAngle;
/* 0x6A4 */ bool mIsDying;
/* 0x6A4 */ s8 mIsDying;
/* 0x6A6 */ s16 mTimer[4];
/* 0x6AE */ s16 mIFrames;
/* 0x6B0 */ cXyz field_0x6b0;
include/d/actor/d_a_nbomb.h
+6 -3
View File
@@ -76,9 +76,12 @@ public:
/* 804CAEE8 */ int execute();
/* 804CBC60 */ int draw();
virtual BOOL checkExplodeNow();
virtual void deleteBombAndEffect();
virtual void setCargoBombExplode();
virtual BOOL checkExplodeNow() { return field_0xb51 != 0; }
virtual void deleteBombAndEffect() {
fopAcM_delete(this);
onStateFlg0(FLG0_UNK_40);
}
virtual void setCargoBombExplode() { onStateFlg0(FLG0_BOMB_HIT); }
void onStateFlg0(daNbomb_FLG0 i_flag) { mStateFlg0 |= i_flag; }
void offStateFlg0(daNbomb_FLG0 i_flag) { mStateFlg0 &= ~i_flag; }
include/d/actor/d_a_obj_carry.h
+1 -1
View File
@@ -208,7 +208,7 @@ public:
}
static u8 const mData[2072];
static Vec mPos[5];
static cXyz mPos[5];
static u8 mSttsFlag[5];
static s8 mRoomNo[5];
static bool mSaveFlag;
include/d/actor/d_a_obj_movebox.h
+1 -1
View File
@@ -191,7 +191,7 @@ namespace daObjMovebox {
void off_switch1() const { fopAcM_offSwitch(this, prm_get_swSave1()); }
void off_switch2() const { fopAcM_offSwitch(this, prmZ_get_swSave2()); }
static s16 M_dir_base[4];
static const s16 M_dir_base[4];
static const char* const M_arcname[8];
static const dCcD_SrcCyl M_cyl_src;
static const daObjMovebox::Hio_c::Attr_c M_attr[8];
include/d/actor/d_a_player.h
+1 -1
View File
@@ -945,7 +945,7 @@ public:
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static u32 i_checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); }
inline static u32 i_checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
include/d/actor/d_a_suspend.h
+5 -5
View File
@@ -21,8 +21,8 @@ public:
/* 800310C8 */ u8 check(fopAc_ac_c*);
/* 80031038 */ bool check(cXyz const&);
/* 80031150 */ void execute();
/* 80031F28 */ ~data_c();
/* 80031F64 */ data_c();
/* 80031F28 */ ~data_c() {}
/* 80031F64 */ data_c() { reset(); }
void setNext(data_c* i_next) { mpNext = i_next; }
data_c* getNext() { return mpNext; }
@@ -44,7 +44,7 @@ public:
public:
/* 80031190 */ void add(daSus_c::data_c*);
/* 800311FC */ void reset();
/* 80031EE4 */ room_c();
/* 80031EE4 */ room_c() { init(); }
void init() { mpData = NULL; }
/* 0x0 */ data_c* mpData;
@@ -68,8 +68,8 @@ public:
u8 getSw() { return fopAcM_GetParam(this) & 0xFF; }
u8 getRoom() { return fopAcM_GetParam(this) >> 10; }
static u8 mData[1152];
static u8 mRoom[256];
static data_c mData[0x20];
static room_c mRoom[0x40];
static s16 mSetTop;
};
include/d/actor/d_a_ykgr.h
+20 -18
View File
@@ -8,21 +8,27 @@
#include "d/d_com_inf_game.h"
#include "d/d_particle.h"
struct daYkgr_HIO_c {
/* 805A8D98 */ ~daYkgr_HIO_c();
struct daYkgr_HIO_c : mDoHIO_entry_c {
daYkgr_HIO_c();
/* 805A8D98 */ virtual ~daYkgr_HIO_c();
u32 vtable;
u8 field_0x4[0x20 - 0x4];
f32 field_0x20;
f32 field_0x24;
/* 0x04 */ u8 field_0x4;
/* 0x08 */ s32 field_0x8;
/* 0x0C */ s32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
};
struct dPa_YkgrPcallBack /*: public JPAParticleCallBack */ {
/* 805A8E3C */ ~dPa_YkgrPcallBack();
struct dPa_YkgrPcallBack : public JPAParticleCallBack {
dPa_YkgrPcallBack();
/* 805A8E3C */ ~dPa_YkgrPcallBack() {}
/* 805A848C */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 805A84D4 */ void setParam(f32);
u32 vtable;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
@@ -32,10 +38,6 @@ struct dPa_YkgrPcallBack /*: public JPAParticleCallBack */ {
/* 0x1C */ s8 field_0x1c;
};
extern "C" u8 m_flag__8daYkgr_c;
extern "C" u8 m_alpha_flag__8daYkgr_c;
extern "C" u8 m_alpha__8daYkgr_c;
/**
* @ingroup actors-unsorted
* @class daYkgr_c
@@ -94,11 +96,11 @@ public:
static f32 m_aim_rate;
static dPath* m_path;
u8 field_0x568[0x570 - 0x568];
Mtx field_0x570;
u32 field_0x5a0;
f32 field_0x5a4;
f32 field_0x5a8;
/* 0x568 */ u8 field_0x568[0x570 - 0x568];
/* 0x570 */ Mtx field_0x570;
/* 0x5A0 */ u32 field_0x5a0;
/* 0x5A4 */ f32 field_0x5a4;
/* 0x5A8 */ f32 field_0x5a8;
};
STATIC_ASSERT(sizeof(daYkgr_c) == 0x5AC);
include/d/d_bg_w_kcol.h
+1 -1
View File
@@ -45,7 +45,7 @@ struct KCol_Header {
class dBgWKCol : public dBgW_Base {
public:
/* 8007E6F4 */ dBgWKCol();
/* 8007E7D0 */ static void initKCollision(void*);
/* 8007E7D0 */ static void* initKCollision(void*);
/* 8007E804 */ void create(void* pprism, void* plc);
/* 8007E850 */ void getTriNrm(KC_PrismData*, Vec**) const;
/* 8007E8C0 */ cM3dGPla GetTriPla(int) const;
include/d/d_bomb.h
+3 -3
View File
@@ -32,9 +32,9 @@ public:
static bool checkWaterBomb(fopAc_ac_c*);
static bool checkInsectBombMove(fopAc_ac_c*);
virtual BOOL checkExplodeNow();
virtual void deleteBombAndEffect();
virtual void setCargoBombExplode();
virtual BOOL checkExplodeNow() { return FALSE; }
virtual void deleteBombAndEffect() {}
virtual void setCargoBombExplode() {}
bool checkStateExplode() { return fopAcM_GetParam(this) == 0; }
include/d/d_cam_param.h
+28 -25
View File
@@ -21,7 +21,7 @@ public:
/* 0x8 */ int mInputSpeed;
/* 0xC */ u8 field_0xc[4];
/* 800889B0 */ virtual ~dCstick_c();
/* 800889B0 */ virtual ~dCstick_c() {}
f32 SwTHH() { return mThresholdHigh; }
};
@@ -64,7 +64,7 @@ struct dCamStyleData {
/* 0x0 */ u32 field_0x0;
/* 0x4 */ u16 field_0x4;
/* 0x6 */ u16 field_0x6;
/* 0x8 */ u8 field_0x8[0x78 - 0x8];
/* 0x8 */ f32 field_0x8[28];
}; // Size: 0x78
/* 0x0 */ u8 field_0x0[4];
@@ -77,16 +77,19 @@ public:
/* 800884F0 */ dCamParam_c(s32);
/* 800885D4 */ int Change(s32);
/* 80088620 */ int SearchStyle(u32);
/* 80182C60 */ void Arg2(s16);
/* 80182C3C */ void Arg2();
/* 80182C48 */ void Arg1();
/* 80182C6C */ void Arg1(u8);
/* 80182C50 */ void Arg0();
/* 80182C74 */ void Arg0(u8);
/* 80182C7C */ void Fovy(u8);
/* 80182C58 */ void Fovy();
/* 80182C60 */ void Arg2(s16 val) { mMapToolArg2 = val; }
/* 80182C3C */ int Arg2() { return mMapToolArg2; }
/* 80182C48 */ u8 Arg1() { return mMapToolArg1; }
/* 80182C6C */ void Arg1(u8 val) { mMapToolArg1 = val; }
/* 80182C50 */ u8 Arg0() { return mMapToolArg0; }
/* 80182C74 */ void Arg0(u8 val) { mMapToolArg0 = val; }
/* 80182C7C */ void Fovy(u8 val) { mMapToolFovy = val; }
/* 80182C58 */ u8 Fovy() { return mMapToolFovy; }
/* 80182CB4 */ bool CheckFlag(u16 flag) { return mCurrentStyle->field_0x6 & flag; }
/* 80182CD0 */ void Val(s32, int);
/* 80182CD0 */ f32 Val(s32 param_0, int param_1) {
return mCamStyleData[param_0].field_0x8[param_1];
}
/* 0x00 */ u8 mMapToolFovy;
/* 0x01 */ u8 mMapToolArg0;
@@ -103,7 +106,7 @@ public:
int Algorythmn() { return mCurrentStyle->field_0x4; }
bool Flag(s32 param_0, u16 param_1) { return mCamStyleData[param_0].field_0x6 & param_1; }
/* 8008858C */ virtual ~dCamParam_c();
/* 8008858C */ virtual ~dCamParam_c() {}
};
class dCamSetup_c {
@@ -111,16 +114,17 @@ public:
/* 80088668 */ dCamSetup_c();
/* 80088918 */ bool CheckLatitudeRange(s16*);
/* 80088988 */ f32 PlayerHideDist();
/* 80182BB8 */ void CheckFlag2(u16);
/* 80182BE8 */ void WaitRollSpeed();
/* 80182BF0 */ void WaitRollTimer();
/* 80182C1C */ // void ThrowTimer();
/* 80182C24 */ void ThrowCushion();
/* 80182C2C */ void ThrowVAngle();
/* 80182C34 */ void ThrowCtrAdjust();
/* 80182CEC */ void ChargeBRatio();
/* 80182CF4 */ void ChargeTimer();
/* 80182CFC */ void ChargeLatitude();
/* 80182BB8 */ bool CheckFlag2(u16 i_flag) { return mFlags2 & i_flag; }
/* 80182BE8 */ f32 WaitRollSpeed() { return mWaitRollSpeed; }
/* 80182BF0 */ int WaitRollTimer() { return mWaitRollTimer; }
/* 80182C1C */ int ThrowTimer() { return mThrowTimer; }
/* 80182C24 */ f32 ThrowCushion() { return mThrowCushion; }
/* 80182C2C */ f32 ThrowVAngle() { return mThrowVAngle; }
/* 80182C34 */ f32 ThrowCtrAdjust() { return mThrowCtrOffset; }
/* 80182CEC */ f32 ChargeBRatio() { return mChargeBRatio; }
/* 80182CF4 */ int ChargeTimer() { return mChargeTimer; }
/* 80182CFC */ f32 ChargeLatitude() { return mChargeLatitude; }
bool CheckFlag(u16 i_flag) { return mDebugFlags & i_flag; }
f32 ManualEndVal() { return mManualEndVal; }
@@ -128,14 +132,13 @@ public:
f32 VistaTrimHeight() { return mTrimVistaHeight; }
f32 ForceLockOffTimer() { return mForceLockOffTimer; }
f32 ForceLockOffDist() { return mForceLockOffDist; }
int ThrowTimer() { return mThrowTimer; }
f32 USOValue() { return mFalseValue; }
f32 USOAngle() { return mFalseAngle; }
/* 0x000 */ f32 mDrawNear;
/* 0x004 */ f32 mDrawFar;
/* 0x008 */ u16 mDebugFlags;
/* 0x00A */ u16 field_0xa;
/* 0x00A */ u16 mFlags2;
/* 0x00C */ int field_0xc;
/* 0x010 */ int mModeSwitchType;
/* 0x014 */ void* mTypeTable;
@@ -199,7 +202,7 @@ public:
/* 0x0F8 */ f32 field_0xf8;
/* 0x0FC vtable */
/* 800888B8 */ virtual ~dCamSetup_c();
/* 800888B8 */ virtual ~dCamSetup_c() {}
/* 0x100 */ dCstick_c mCStick;
/* 0x114 */ dCamBGChk_c mBGChk;
include/d/d_drawlist.h
+1 -5
View File
@@ -345,16 +345,12 @@ public:
void setXluListZxlu() { setXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); }
void setOpaListFilter() { setOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); }
void setXluListFilter() { setXluDrawList(mDrawBuffers[DB_LIST_FILTER]); }
void set3DlineMat(mDoExt_3DlineMat_c *param_1) {
#ifndef NON_VIRTUAL_3DLINEMAT
void set3DlineMat(mDoExt_3DlineMat_c *param_1) {
m3DLineMatSortPacket[param_1->getMaterialID()].setMat(param_1);
#endif
}
void set3DlineMatDark(mDoExt_3DlineMat_c *param_1) {
#ifndef NON_VIRTUAL_3DLINEMAT
m3DLineMatSortPacket[param_1->getMaterialID()].setMatDark(param_1);
#endif
}
void peekZdata() { mPeekZ.peekData(); }
include/d/d_file_select.h
+43 -66
View File
@@ -3,25 +3,36 @@
#include "d/d_com_inf_game.h"
#include "d/d_file_sel_warning.h"
#include "d/d_msg_string.h"
#include "d/d_name.h"
#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
class dFile_info_c;
class dDlst_FileSel_c {
class dDlst_FileSel_c : public dDlst_base_c {
public:
/* 8018DEBC */ void draw();
/* 8019135C */ ~dDlst_FileSel_c();
/* 8019135C */ ~dDlst_FileSel_c() {
delete Scr;
delete mpMessageString;
}
dDlst_FileSel_c() {
mpMessageFont[0] = mDoExt_getMesgFont();
mpMessageFont[1] = mDoExt_getSubFont();
mpMessageString = new dMsgString_c();
}
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* Scr;
/* 0x08 */ JUTFont* mpMessageFont[2];
/* 0x0C */ dMsgString_c* mpMessageString;
};
class dFile_select3D_c {
public:
/* 801902F0 */ dFile_select3D_c();
/* 80190380 */ /* virtual */ ~dFile_select3D_c();
/* 80190380 */ virtual ~dFile_select3D_c();
/* 801903DC */ void _create(u8, u8);
/* 8019049C */ void _delete();
/* 801904A0 */ void freeHeap();
@@ -40,7 +51,6 @@ public:
void setBasePane(CPaneMgr* paneMgr) { mPaneMgr = paneMgr; }
void setBase2Pane(J2DPane* pane) { mPane = pane; }
/* 0x0000 */ void* vtable;
/* 0x0004 */ JKRSolidHeap* mpHeap;
/* 0x0008 */ J3DModel* mpModel;
/* 0x000C */ mDoExt_bckAnm* mBckAnm;
@@ -59,78 +69,48 @@ public:
/* 0x03CF */ u8 mMaskIdx;
};
class dDlst_FileSelYn_c {
class dDlst_FileSelYn_c : public dDlst_base_c {
public:
/* 8018E0C0 */ void draw();
/* 801911F4 */ ~dDlst_FileSelYn_c();
/* 801911F4 */ virtual ~dDlst_FileSelYn_c() { delete ScrYn; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* ScrYn;
/* 0x08 */ u8 field_0x08[4];
};
class dDlst_FileSelDt_c {
class dDlst_FileSelDt_c : public dDlst_base_c {
public:
/* 8018DEF4 */ void draw();
/* 801912E4 */ ~dDlst_FileSelDt_c();
/* 801912E4 */ virtual ~dDlst_FileSelDt_c() { delete ScrDt; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* ScrDt;
/* 0x08 */ J2DPane* mpPane;
/* 0x0C */ J2DPane* mpPane2;
};
class dDlst_FileSelCp_c {
class dDlst_FileSelCp_c : public dDlst_base_c {
public:
/* 8018DFFC */ void draw();
/* 8019126C */ ~dDlst_FileSelCp_c();
/* 8019126C */ virtual ~dDlst_FileSelCp_c() { delete Scr; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* Scr;
/* 0x08 */ bool field_0x08;
/* 0x0C */ J2DPane* mpPane1;
/* 0x10 */ J2DPane* mpPane2;
};
class dDlst_FileSel3m_c {
class dDlst_FileSel3m_c : public dDlst_base_c {
public:
/* 8018E0F8 */ void draw();
/* 8019117C */ ~dDlst_FileSel3m_c();
/* 8019117C */ virtual ~dDlst_FileSel3m_c() { delete Scr3m; }
/* 0x00 */ void* vtable;
/* 0x04 */ J2DScreen* Scr3m;
};
// temp struct in order to get matches
class dFs_HIO_c_tmp {
public:
/* 0x0000 */ void* vtable;
/* 0x0004 */ s8 field_0x0004;
/* 0x0005 */ u8 field_0x0005;
/* 0x0006 */ u8 field_0x0006;
/* 0x0007 */ u8 field_0x0007;
/* 0x0008 */ u8 field_0x0008;
/* 0x0009 */ u8 field_0x0009;
/* 0x000A */ u8 field_0x000a;
/* 0x000B */ u8 field_0x000b;
/* 0x000C */ u8 field_0x000c;
/* 0x000D */ u8 field_0x000d;
/* 0x000E */ u8 field_0x000e[2];
/* 0x0010 */ float field_0x0010[3];
/* 0x001C */ u8 field_0x001c;
/* 0x001D */ u8 field_0x001d;
/* 0x001E */ u8 field_0x001e;
/* 0x001F */ u8 field_0x001f;
/* 0x0020 */ u8 field_0x0020;
/* 0x0021 */ u8 field_0x0021;
/* 0x0022 */ u8 field_0x0022;
/* 0x0023 */ u8 field_0x0023;
};
class dFs_HIO_c {
public:
/* 801835F8 */ dFs_HIO_c();
/* 801913E0 */ virtual ~dFs_HIO_c();
/* 801913E0 */ virtual ~dFs_HIO_c() {}
/* 0x0000 */ // void* vtable;
/* 0x0004 */ s8 field_0x0004;
@@ -163,7 +143,7 @@ public:
typedef void (dFile_select_c::*DispFunc)();
/* 8018366C */ dFile_select_c(JKRArchive*);
/* 8018375C */ ~dFile_select_c();
/* 8018375C */ virtual ~dFile_select_c();
/* 801843CC */ void _create();
/* 801844FC */ void _move();
/* 80184664 */ void selFileWakuAnm();
@@ -326,24 +306,21 @@ public:
u8 getSelectNum() { return mSelectNum; }
void setUseType(u8 type) { mUseType = type; }
/* 0x0000 */ void* vtable;
/* 0x0004 */ u8 field_0x04[4];
/* 0x0008 */ JKRArchive* mpArchive;
/* 0x000C */ dFile_select3D_c* mpFileSelect3d;
/* 0x0010 */ dDlst_FileSel_c fileSel;
/* 0x0018 */ JUTFont* mpMessageFont[2];
/* 0x0020 */ dMsgString_c* mpMessageString;
/* 0x0024 */ dDlst_FileSelDt_c mSelDt;
/* 0x0034 */ dDlst_FileSelCp_c mCpSel;
/* 0x0048 */ dDlst_FileSelYn_c mYnSel;
/* 0x0054 */ dDlst_FileSel3m_c m3mSel;
/* 0x0004 */ u8 field_0x04[4];
/* 0x0008 */ JKRArchive* mpArchive;
/* 0x000C */ dFile_select3D_c* mpFileSelect3d;
/* 0x0010 */ dDlst_FileSel_c fileSel;
/* 0x0024 */ dDlst_FileSelDt_c mSelDt;
/* 0x0034 */ dDlst_FileSelCp_c mCpSel;
/* 0x0048 */ dDlst_FileSelYn_c mYnSel;
/* 0x0054 */ dDlst_FileSel3m_c m3mSel;
/* 0x005C */ u8 field_0x005c[4];
/* 0x0060 */ dSelect_cursor_c* mSelIcon;
/* 0x0064 */ dSelect_cursor_c* mSelIcon2;
/* 0x0060 */ dSelect_cursor_c* mSelIcon;
/* 0x0064 */ dSelect_cursor_c* mSelIcon2;
/* 0x0068 */ dName_c* mpName;
/* 0x006C */ dFile_warning_c* mpFileWarning;
/* 0x006C */ dFile_warning_c* mpFileWarning;
/* 0x0070 */ dFile_info_c* field_0x0070[3];
/* 0x007C */ dFile_info_c* mpFileInfo[2];
/* 0x007C */ dFile_info_c* mpFileInfo[2];
/* 0x0084 */ J2DAnmTransform* field_0x0084;
/* 0x0088 */ J2DAnmTransform* field_0x0088;
/* 0x008C */ J2DAnmTransform* field_0x008c;
@@ -352,8 +329,8 @@ public:
/* 0x0098 */ J2DAnmTransform* field_0x0098;
/* 0x009C */ J2DAnmTransform* field_0x009c;
/* 0x00A0 */ s32 field_0x00a0;
/* 0x00A4 */ CPaneMgr* field_0x00a4;
/* 0x00A8 */ u8 field_0x00a8[0xb0-0xa8];
/* 0x00A4 */ CPaneMgr* field_0x00a4;
/* 0x00A8 */ u8 field_0x00a8[0xb0-0xa8];
/* 0x00B0 */ s32 field_0x00b0;
/* 0x00B4 */ s32 field_0x00b4;
/* 0x00B8 */ u8 field_0x00b8;
@@ -369,10 +346,10 @@ public:
/* 0x00F8 */ s32 field_0x00f8[2];
/* 0x0100 */ s32 field_0x0100;
/* 0x0104 */ s32 field_0x0104;
/* 0x0108 */ bool field_0x0108;
/* 0x0109 */ bool field_0x0109;
/* 0x010A */ u8 field_0x10a[2];
/* 0x010C */ J2DPane* mpPane;
/* 0x0108 */ bool field_0x0108;
/* 0x0109 */ bool field_0x0109;
/* 0x010A */ u8 field_0x10a[2];
/* 0x010C */ J2DPane* mpPane;
/* 0x0110 */ int field_0x0110;
/* 0x0114 */ int field_0x0114;
/* 0x0118 */ J2DPane* field_0x0118;
include/d/d_gameover.h
+1 -1
View File
@@ -10,7 +10,7 @@
class dDlst_Gameover_CAPTURE_c : public dDlst_base_c {
public:
/* 8019ACF8 */ virtual void draw();
/* 8019C2CC */ virtual ~dDlst_Gameover_CAPTURE_c(); // supposed to be inlined
/* 8019C2CC */ virtual ~dDlst_Gameover_CAPTURE_c() {}
};
class dMsgScrnLight_c;
include/d/d_menu_collect.h
+2 -2
View File
@@ -21,7 +21,7 @@ class dMenu_Collect2DTop_c : public dDlst_base_c {
public:
dMenu_Collect2DTop_c(dMenu_Collect2D_c* param_0) { mpCollect2D = param_0; }
/* 801B77A4 */ virtual void draw();
/* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c();
/* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c() {}
/* 0x4 */ dMenu_Collect2D_c* mpCollect2D;
};
@@ -102,7 +102,7 @@ public:
/* 801B61BC */ void setItemNameString(u8, u8);
/* 801B6344 */ void setItemNameStringNull();
/* 801B7F00 */ virtual void draw();
/* 801B7F00 */ virtual void draw() { _draw(); }
/* 801AFE34 */ virtual ~dMenu_Collect2D_c();
u8 getCursorX() { return mCursorX; }
include/d/d_menu_save.h
+1 -1
View File
@@ -265,7 +265,7 @@ public:
/* 801F69B8 */ void _draw();
/* 801F69FC */ void _draw2();
/* 802844D0 */ virtual ~dMenu_save_c();
/* 802844D0 */ virtual ~dMenu_save_c() {}
u8 getSaveStatus() { return mSaveStatus; }
u8 getEndStatus() { return mEndStatus; }
include/d/d_meter2.h
+5 -13
View File
@@ -19,20 +19,12 @@ class dMeterHaihai_c;
class dMeterSub_c : public dDlst_base_c {
public:
// these seem to be inlined, but generates in the wrong order in d_scope.cpp
/* 8019412C */ //virtual void draw() {}
/* 801940D4 */ //virtual ~dMeterSub_c() {}
/* 8019411C */ //virtual int _create() { return 0; }
/* 80194130 */ //virtual int _execute(u32) { return 0; }
/* 80194124 */ //virtual int _delete() { return 0; }
/* 80194138 */ //virtual int isDead() { return 0; }
/* 8019412C */ virtual void draw();
/* 8019412C */ virtual void draw() {}
/* 801940D4 */ virtual ~dMeterSub_c() {}
/* 8019411C */ virtual int _create();
/* 80194130 */ virtual int _execute(u32);
/* 80194124 */ virtual int _delete();
/* 80194138 */ virtual bool isDead();
/* 8019411C */ virtual int _create() { return 0; }
/* 80194130 */ virtual int _execute(u32) { return 0; }
/* 80194124 */ virtual int _delete() { return 0; }
/* 80194138 */ virtual bool isDead() { return false; }
};
class dMeter2_c : public msg_class {
include/d/d_meter2_draw.h
+2 -2
View File
@@ -354,8 +354,8 @@ private:
/* 0x518 */ J2DPicture* mpItemXYPane[3];
/* 0x524 */ int field_0x524[2][2];
/* 0x534 */ J2DAnmTransformKey* mPikariBck;
/* 0x538 */ J2DAnmColorKey* mPikariBpk;
/* 0x53C */ J2DAnmColorKey* mpOxygenBpk[3];
/* 0x538 */ J2DAnmColor* mPikariBpk;
/* 0x53C */ J2DAnmColor* mpOxygenBpk[3];
/* 0x548 */ JUtility::TColor mPikariBlack;
/* 0x54C */ JUtility::TColor mPikariWhite;
/* 0x550 */ f32 field_0x550;
include/d/d_msg_scrn_3select.h
+2 -2
View File
@@ -5,7 +5,7 @@
class J2DScreen;
class J2DAnmTransform;
class J2DAnmColor;
class J2DAnmColorKey;
class J2DAnmTextureSRTKey;
class dSelect_cursor_c;
class CPaneMgr;
@@ -58,7 +58,7 @@ public:
private:
/* 0x004 */ J2DScreen* mpScreen;
/* 0x008 */ J2DAnmTransform* mpAnmBck;
/* 0x00C */ J2DAnmColor* mpAnmBpk;
/* 0x00C */ J2DAnmColorKey* mpAnmBpk;
/* 0x010 */ J2DAnmTextureSRTKey* mpAnmBtk;
/* 0x014 */ dSelect_cursor_c* mpSelectCursor;
/* 0x018 */ CPaneMgr* mpParent;
include/d/d_msg_string.h
+8 -1
View File
@@ -12,7 +12,14 @@ public:
/* 80249CA0 */ dMsgString_c(u8);
/* 80249D28 */ ~dMsgString_c();
/* 80191B6C */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 80191B6C */ virtual f32 getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
JUTFont* param_3, COutFont_c* param_4, u8 param_5) {
if (param_4 == NULL && mpOutFont != NULL) {
return getStringLocal(param_0, param_1, param_2, param_3, mpOutFont, param_5);
} else {
return getStringLocal(param_0, param_1, param_2, param_3, param_4, param_5);
}
}
/* 801E1D10 */ virtual void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
u8);
/* 80249DB4 */ virtual void resetStringLocal(J2DTextBox*);
include/d/d_particle.h
+14 -14
View File
@@ -193,10 +193,10 @@ public:
setModel(param_0, param_1, param_2, param_3, param_4, param_5);
}
static dPa_modelEcallBack& getEcallback() { return (dPa_modelEcallBack&)mEcallback; }
static dPa_modelEcallBack* mEcallback; // Should be dPa_modelEcallBack
static dPa_modelEcallBack& getEcallback() { return mEcallback; }
static dPa_modelEcallBack mEcallback;
static u8 mPcallback[4];
static dPa_modelPcallBack mPcallback;
static model_c* mModel;
};
@@ -415,15 +415,15 @@ public:
static JPAEmitterManager* getEmitterManager() { return mEmitterMng; }
static JPAParticleCallBack* getLight8PcallBack() {
static dPa_light8PcallBack* getLight8PcallBack() {
return &mLight8PcallBack;
}
static JPAParticleCallBack* getGen_b_Light8PcallBack() {
static dPa_gen_b_light8PcallBack* getGen_b_Light8PcallBack() {
return &m_b_Light8PcallBack;
}
static JPAParticleCallBack* getGen_d_Light8PcallBack() {
static dPa_gen_d_light8PcallBack* getGen_d_Light8PcallBack() {
return &m_d_Light8PcallBack;
}
@@ -439,11 +439,11 @@ public:
return &mLight8EcallBack;
}
static JPAParticleCallBack* getParticleTracePCB() {
static dPa_particleTracePcallBack_c* getParticleTracePCB() {
return &mParticleTracePCB;
}
static JPAParticleCallBack* getFsenthPcallBack() {
static dPa_fsenthPcallBack* getFsenthPcallBack() {
return &mFsenthPcallBack;
}
@@ -455,15 +455,15 @@ public:
static u8 mLifeBall[24];
static Mtx mWindViewMatrix;
static JPAEmitterManager* mEmitterMng;
static JPAParticleCallBack mWaterBubblePcallBack;
static JPAParticleCallBack mFsenthPcallBack;
static dPa_wbPcallBack_c mWaterBubblePcallBack;
static dPa_fsenthPcallBack mFsenthPcallBack;
static dPa_light8EcallBack mLight8EcallBack;
static JPAParticleCallBack mLight8PcallBack;
static dPa_light8PcallBack mLight8PcallBack;
static dPa_gen_b_light8EcallBack m_b_Light8EcallBack;
static JPAParticleCallBack m_b_Light8PcallBack;
static dPa_gen_b_light8PcallBack m_b_Light8PcallBack;
static dPa_gen_d_light8EcallBack m_d_Light8EcallBack;
static JPAParticleCallBack m_d_Light8PcallBack;
static JPAParticleCallBack mParticleTracePCB;
static dPa_gen_d_light8PcallBack m_d_Light8PcallBack;
static dPa_particleTracePcallBack_c mParticleTracePCB;
static u8 mStatus;
private:
include/d/d_select_cursor.h
+1 -1
View File
@@ -10,7 +10,7 @@ class dSelect_cursorHIO_c {
public:
/* 801941E4 */ dSelect_cursorHIO_c();
/* 80195978 */ virtual ~dSelect_cursorHIO_c();
/* 80195978 */ virtual ~dSelect_cursorHIO_c() {}
/* 0x04 */ s8 field_0x4;
/* 0x08 */ f32 field_0x8;
include/d/d_select_icon.h
+4 -3
View File
@@ -2,11 +2,12 @@
#define D_D_SELECT_ICON_H
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/d_drawlist.h"
#include "d/d_pane_class.h"
class dSi_HIO_c {
public:
virtual ~dSi_HIO_c();
virtual ~dSi_HIO_c() {}
dSi_HIO_c();
u8 field_0x4[4];
@@ -20,10 +21,10 @@ public:
virtual ~dSelect_icon_c() {}
void drawSelf() {
// Not sure what field_0x4 is
field_0x4.draw();
}
/* 0x04 */ u8 field_0x4[4];
/* 0x04 */ dDlst_base_c field_0x4; // type is a guess
/* 0x08 */ J2DScreen* field_0x8;
/* 0x0C */ CPaneMgrAlpha* field_0xc;
/* 0x10 */ CPaneMgr* field_0x10;