mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 02:38:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

More Matches

Browse Source 
- Match a few more functions
- Offset comments
This commit is contained in:
SuperDude88
2023-10-07 13:50:09 -04:00
parent 07a5a8cd18
commit c1cf48eca3
10 changed files with 407 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_bg_s_gnd_chk.h
+2 -1
View File
@@ -18,7 +18,8 @@ public:
f32 GetNowY() const { return mNowY; }
void SetNowY(f32 y) { mNowY = y; }
cXyz& GetPointP() { return m_pos; }
cXyz* GetPointP() { return &m_pos; }
void SetPos(cXyz* pos) { m_pos.set(*pos); }
u32 GetWallPrecheck() const { return mWallPrecheck; }
void OffWall() { mFlags &= ~2; }
include/SSystem/SComponent/c_lib.h
+2 -2
View File
@@ -37,12 +37,12 @@ void cLib_offsetPos(cXyz* pDest, cXyz* pSrc, s16 angle, cXyz* vec);
s32 cLib_distanceAngleS(s16 x, s16 y);
template <typename T>
inline void cLib_offBit(T& value, u8 bit) {
inline void cLib_offBit(T& value, T bit) {
value &= ~bit;
}
template <typename T>
inline void cLib_onBit(T& value, u8 bit) {
inline void cLib_onBit(T& value, T bit) {
value |= bit;
}
include/d/actor/d_a_bomb.h
+62 -62
View File
@@ -23,12 +23,12 @@ public:
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
s16 field_0x04;
const cXyz* mpPos;
cXyz* field_0x0C;
cXyz* field_0x10;
JPABaseEmitter* mpEmitter;
};
/* 0x04 */ s16 field_0x04;
/* 0x08 */ const cXyz* mpPos;
/* 0x0C */ cXyz* field_0x0C;
/* 0x10 */ cXyz* field_0x10;
/* 0x14 */ JPABaseEmitter* mpEmitter;
}; // Size 0x18
class daBomb_fuseSparksEcallBack : public dPa_levelEcallBack {
public:
@@ -42,14 +42,14 @@ public:
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
const cXyz* mpPos;
JPABaseEmitter* mpEmitter;
};
/* 0x04 */ const cXyz* mpPos;
/* 0x08 */ JPABaseEmitter* mpEmitter;
}; // Size 0x0C
class dBgS_BombAcch : public dBgS_Acch {
public:
dBgS_BombAcch() { mbBombThrough = true; }
};
}; // Size 0x1C4
class daBomb_c : public fopAc_ac_c {
@@ -159,63 +159,63 @@ public:
private:
typedef bool(daBomb_c::*procFunc)();
procFunc mFunc;
request_of_phase_process_class mPhs;
J3DModel* mpModel;
mDoExt_bckAnm mBck0;
mDoExt_bckAnm mBck1;
mDoExt_brkAnm mBrk0;
mDoExt_brkAnm mBrk1;
s32 mType;
dBgS_BombAcch mAcch;
dBgS_AcchCir mCir;
dBgS_ObjGndChk_Yogan mGndChk;
cXyz field_0x554;
bool field_0x560;
bool mbWaterIn;
u8 field_0x562;
dCcD_Stts mStts;
dCcD_Sph mSph;
daBomb_fuseSmokeEcallBack mSmoke;
daBomb_fuseSparksEcallBack mSparks;
u8 field_0x6F0;
u8 field_0x6F1;
u8 field_0x6F2;
u8 field_0x6F3;
u8 field_0x6F4;
u8 field_0x6F5;
u8 field_0x6F6;
u8 field_0x6F7;
s32 mInitialState;
s16 mRestTime;
s16 field_0x6FE;
s16 mNoGravityTime;
s16 field_0x702;
cXyz mFusePos;
cXyz mFusePos2;
cXyz mFusePos3;
LIGHT_INFLUENCE mPntLight;
WIND_INFLUENCE mPntWind;
u8 field_0x774;
f32 field_0x778;
u8 field_0x77C;
u8 field_0x77D;
u8 field_0x77E;
u8 field_0x77F;
u8 field_0x780;
u8 field_0x781;
u8 field_0x782;
int field_0x784;
cXyz mWindVec;
u8 field_0x794[0x7C4 - 0x794];
int mMassCounter;
int field_0x7C8;
/* 0x290 */ procFunc mFunc;
/* 0x29C */ request_of_phase_process_class mPhs;
/* 0x2A4 */ J3DModel* mpModel;
/* 0x2A8 */ mDoExt_bckAnm mBck0;
/* 0x2B8 */ mDoExt_bckAnm mBck1;
/* 0x2C8 */ mDoExt_brkAnm mBrk0;
/* 0x2E0 */ mDoExt_brkAnm mBrk1;
/* 0x2F8 */ s32 mType;
/* 0x2FC */ dBgS_BombAcch mAcch;
/* 0x4C0 */ dBgS_AcchCir mCir;
/* 0x500 */ dBgS_ObjGndChk_Yogan mGndChk;
/* 0x554 */ cXyz field_0x554;
/* 0x560 */ bool field_0x560;
/* 0x561 */ bool mbWaterIn;
/* 0x562 */ u8 field_0x562;
/* 0x564 */ dCcD_Stts mStts;
/* 0x5A0 */ dCcD_Sph mSph;
/* 0x6CC */ daBomb_fuseSmokeEcallBack mSmoke;
/* 0x6E4 */ daBomb_fuseSparksEcallBack mSparks;
/* 0x6F0 */ u8 field_0x6F0;
/* 0x6F1 */ u8 field_0x6F1;
/* 0x6F2 */ u8 field_0x6F2;
/* 0x6F3 */ u8 field_0x6F3;
/* 0x6F4 */ u8 field_0x6F4;
/* 0x6F5 */ u8 field_0x6F5;
/* 0x6F6 */ u8 field_0x6F6;
/* 0x6F7 */ u8 field_0x6F7;
/* 0x6F8 */ s32 mInitialState;
/* 0x6FC */ s16 mRestTime;
/* 0x6FE */ s16 field_0x6FE;
/* 0x700 */ s16 mNoGravityTime;
/* 0x702 */ s16 field_0x702;
/* 0x704 */ cXyz mFusePos; //should figure out what this 3 cXyz thing really is
/* 0x710 */ cXyz mFusePos2; //seems like several particle structures use it and a couple construct it as a TVec3<f32> array
/* 0x71C */ cXyz mFusePos3; //others have no special construction, and it gets passed to functions that take cXyz sometimes
/* 0x728 */ LIGHT_INFLUENCE mPntLight;
/* 0x748 */ WIND_INFLUENCE mPntWind;
/* 0x774 */ u8 field_0x774;
/* 0x778 */ f32 field_0x778;
/* 0x77C */ u8 field_0x77C;
/* 0x77D */ u8 field_0x77D;
/* 0x77E */ u8 field_0x77E;
/* 0x77F */ u8 field_0x77F;
/* 0x780 */ u8 field_0x780;
/* 0x781 */ u8 field_0x781;
/* 0x782 */ u8 field_0x782;
/* 0x784 */ int field_0x784;
/* 0x788 */ cXyz mWindVec;
/* 0x794 */ u8 field_0x794[0x7C4 - 0x794];
/* 0x7C4 */ int mMassCounter;
/* 0x7C8 */ int field_0x7C8;
struct AttrType {
const char* resName;
u32 heapSize;
};
static const AttrType m_attrType[];
};
}; // Size 0x7CC
#endif /* D_A_BOMB_H */
include/d/actor/d_a_bomb2.h
+62 -51
View File
@@ -27,12 +27,12 @@ namespace daBomb2 {
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
s16 field_0x04;
const cXyz* mpPos;
const cXyz* field_0x0C;
const cXyz* field_0x10;
JPABaseEmitter* mpEmitter;
};
/* 0x04 */ s16 field_0x04;
/* 0x08 */ const cXyz* mpPos;
/* 0x0C */ const cXyz* field_0x0C;
/* 0x10 */ const cXyz* field_0x10;
/* 0x14 */ JPABaseEmitter* mpEmitter;
}; // Size 0x18
class FuseSparksCB_c : public dPa_levelEcallBack {
public:
@@ -48,9 +48,9 @@ namespace daBomb2 {
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
const cXyz* mpPos;
JPABaseEmitter* mpEmitter;
};
/* 0x04 */ const cXyz* mpPos;
/* 0x08 */ JPABaseEmitter* mpEmitter;
}; // Size 0x0C
class Env_c {
public:
@@ -59,11 +59,12 @@ namespace daBomb2 {
bool is_end() const;
void proc(const cXyz&);
LIGHT_INFLUENCE mPntLight;
WIND_INFLUENCE mPntWind;
u8 field_0x4C;
f32 field_0x50;
};
private:
/* 0x00 */ LIGHT_INFLUENCE mPntLight;
/* 0x20 */ WIND_INFLUENCE mPntWind;
/* 0x4C */ u8 field_0x4C;
/* 0x50 */ f32 field_0x50;
}; // Size 0x54
class Act_c : public fopAc_ac_c {
public:
@@ -79,8 +80,8 @@ namespace daBomb2 {
bool chk_explode();
static int solidHeapCB(fopAc_ac_c*);
int create_heap_nut();
int create_heap();
bool create_heap_nut();
bool create_heap();
void crr_init();
void cc_init();
void start_explode_instant();
@@ -167,44 +168,54 @@ namespace daBomb2 {
};
private:
//some of these might be extra since i initially copied them from daBomb_c
request_of_phase_process_class mPhs;
J3DModel* mpModel;
mDoExt_bckAnm mBck0;
mDoExt_brkAnm mBrk0;
dBgS_BombAcch mAcch;
dBgS_AcchCir mCir;
dBgS_ObjGndChk_Yogan mGndChk;
f32 field_0x51C;
f32 field_0x520;
bool field_0x524;
bool mbWaterIn;
u8 field_0x526;
f32 field_0x528;
dCcD_Stts mStts;
dCcD_Sph mSph;
int field_0x694;
int field_0x698;
//some of these might need updating since i initially copied them from daBomb_c
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ J3DModel* mpModel;
/* 0x29C */ mDoExt_bckAnm mBck0;
/* 0x2AC */ mDoExt_brkAnm mBrk0;
/* 0x2C4 */ dBgS_BombAcch mAcch;
/* 0x488 */ dBgS_AcchCir mCir;
/* 0x4C8 */ dBgS_ObjGndChk_Yogan mGndChk;
/* 0x51C */ f32 field_0x51C;
/* 0x520 */ f32 field_0x520;
/* 0x524 */ bool field_0x524;
/* 0x525 */ bool mbWaterIn;
/* 0x526 */ u8 field_0x526;
/* 0x528 */ f32 field_0x528;
/* 0x52C */ dCcD_Stts mStts;
/* 0x568 */ dCcD_Sph mSph;
/* 0x694 */ int field_0x694;
/* 0x698 */ int field_0x698;
FuseSmokeCB_c mSmoke;
FuseSparksCB_c mSparks;
cXyz field_0x6C0;
cXyz field_0x6CC;
cXyz field_0x6D8;
Env_c mEnv;
int field_0x738;
int field_0x73C;
u8 field_0x740;
u8 field_0x741;
u8 field_0x742;
u8 field_0x743;
bool field_0x744;
bool field_0x745;
cXyz field_0x748;
Mtx field_0x754;
/* 0x69C */ FuseSmokeCB_c mSmoke;
/* 0x6B4 */ FuseSparksCB_c mSparks;
/* 0x6C0 */ cXyz field_0x6C0;
/* 0x6CC */ cXyz field_0x6CC;
/* 0x6D8 */ cXyz field_0x6D8;
/* 0x6E4 */ Env_c mEnv;
/* 0x738 */ int field_0x738;
/* 0x73C */ int field_0x73C;
/* 0x740 */ u8 field_0x740;
/* 0x741 */ u8 field_0x741;
/* 0x742 */ u8 field_0x742;
/* 0x743 */ u8 field_0x743;
/* 0x744 */ bool field_0x744;
/* 0x745 */ bool field_0x745;
/* 0x748 */ cXyz field_0x748;
/* 0x754 */ Mtx field_0x754;
/* 0x784 */ f32 field_0x784;
/* 0x788 */ f32 field_0x788;
/* 0x78C */ f32 field_0x78C;
/* 0x790 */ f32 field_0x790;
/* 0x794 */ f32 field_0x794;
/* 0x798 */ f32 field_0x798;
/* 0x79C */ f32 field_0x79C;
/* 0x7A0 */ f32 field_0x7A0;
/* 0x7A4 */ f32 field_0x7A4;
/* 0x7A8 */ s32 field_0x7A8;
static dCcD_SrcSph M_sph_src;
};
}; // Size 0x7AC
}
#endif /* D_A_BOMB_2_H */
include/d/d_bg_s_acch.h
+1
View File
@@ -40,6 +40,7 @@ public:
f32 GetWallH() { return m_wall_h; }
f32 GetWallR() { return m_wall_r; }
s16 GetWallAngleY() { return m_wall_angle_y; }
void SetWallH(f32 h) { m_wall_h = h; }
void ClrWallHDirect() { m_flags &= ~WALL_H_DIRECT; }
bool ChkWallHit() { return m_flags & WALL_HIT; }
include/d/d_bg_s_gnd_chk.h
+2 -2
View File
@@ -26,7 +26,7 @@ public:
dBgS_ObjGndChk() { SetObj(); }
virtual ~dBgS_ObjGndChk() {}
};
}; // Size: 0x54
class dBgS_ObjGndChk_Yogan : public dBgS_ObjGndChk {
public:
@@ -36,7 +36,7 @@ public:
}
/* 806bf53c */ virtual ~dBgS_ObjGndChk_Yogan();
};
}; // Size: 0x54
class dBgS_ObjGndChk_Wtr : public dBgS_ObjGndChk {
public:
include/d/d_com_inf_game.h
+10
View File
@@ -1596,6 +1596,16 @@ inline JPABaseEmitter* dComIfGp_particle_setToon(u16 particleID, const cXyz* pos
pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setToonP1(u16 particleID, const cXyz* pos,
const csXyz* angle, const cXyz* scale, u8 alpha,
dPa_levelEcallBack* pCallBack, s8 setupInfo,
const GXColor* pPrmColor, const GXColor* pEnvColor,
const cXyz* pScale2D) {
dPa_control_c* pParticle = g_dComIfG_gameInfo.play.getParticle();
return pParticle->setToonP1(particleID, pos, angle, scale, alpha, pCallBack, setupInfo,
pPrmColor, pEnvColor, pScale2D);
}
inline JPABaseEmitter* dComIfGp_particle_setProjection(u16 particleID, const cXyz* pos, const csXyz* angle,
const cXyz* scale, u8 alpha,
dPa_levelEcallBack* pCallBack, s8 setupInfo,