minor bk, damagereaction, mozo work

This commit is contained in:
LagoLunatic
2024-07-20 19:31:55 -04:00
parent 00d047c497
commit 9f647b6b14
7 changed files with 87 additions and 42 deletions
+11 -6
View File
@@ -87,9 +87,11 @@ public:
/* 0x100 */ cXyz m100[20];
/* 0x1F0 */ cXyz m1F0[20];
/* 0x2E0 */ cXyz m2E0[20];
/* 0x3D0 */ u8 m3D0[0x410 - 0x3D0];
/* 0x3D0 */ int m3D0[14];
/* 0x408 */ int m408;
/* 0x40C */ int m40C;
/* 0x410 */ int m410;
/* 0x414 */ u8 m414[0x418 - 0x414];
/* 0x414 */ int m414;
/* 0x418 */ int m418;
/* 0x41C */ u8 m41C[0x420 - 0x41C];
/* 0x420 */ int m420;
@@ -101,7 +103,7 @@ public:
/* 0x440 */ s16 m440;
/* 0x442 */ s16 m442;
/* 0x444 */ s16 m444;
/* 0x446 */ u8 m446[0x448 - 0x446];
/* 0x446 */ s16 m446;
/* 0x448 */ s16 m448;
/* 0x44A */ u8 m44A[0x44C - 0x44A];
/* 0x44C */ cXyz m44C;
@@ -161,7 +163,7 @@ public:
/* 0x70E */ u8 m70E;
/* 0x70F */ u8 m70F[0x710 - 0x70F];
/* 0x710 */ u8 m710;
/* 0x711 */ u8 m711[0x712 - 0x711];
/* 0x711 */ u8 m711;
/* 0x712 */ u8 m712;
/* 0x713 */ u8 m713;
/* 0x714 */ fopAc_ac_c* m714;
@@ -182,9 +184,12 @@ public:
/* 0x7AE */ s16 m7AE;
/* 0x7B0 */ u8 m7B0[0x7B2 - 0x7B0];
/* 0x7B2 */ s16 m7B2;
/* 0x7B4 */ u8 m7B4[0x7B8 - 0x7B4];
/* 0x7B4 */ u8 m7B4[0x7B6 - 0x7B4];
/* 0x7B6 */ u8 m7B6;
/* 0x7B7 */ u8 m7B7[0x7B8 - 0x7B7];
/* 0x7B8 */ int m7B8;
};
}; // Size: 0x7BC
// STATIC_ASSERT(sizeof(damagereaction) == 0x7BC);
BOOL ice_bg_check(enemyice*);
+9 -4
View File
@@ -26,7 +26,8 @@ public:
/* 0x02C8 */ s16 m02C8;
/* 0x02CA */ s16 m02CA;
/* 0x02CC */ s16 m02CC;
/* 0x02CE */ u8 m02CE[0x02D0 - 0x02CE];
/* 0x02CE */ s8 m02CE;
/* 0x02CF */ u8 m02CF[0x02D0 - 0x02CF];
/* 0x02D0 */ J3DModel* m02D0;
/* 0x02D4 */ u8 m02D4;
/* 0x02D5 */ u8 m02D5;
@@ -126,14 +127,18 @@ public:
/* 0x1226 */ u8 m1226[0x1228 - 0x1226];
/* 0x1228 */ s16 m1228;
/* 0x122A */ s16 m122A;
/* 0x122C */ u8 m122C[0x1230 - 0x122C];
/* 0x122C */ s8 m122C;
/* 0x1230 */ J3DMaterialTable* m1230;
/* 0x1234 */ s8 m1234;
/* 0x1235 */ u8 m1235[0x1264 - 0x1235];
/* 0x1236 */ s16 m1236;
/* 0x1238 */ cXyz m1238;
/* 0x1244 */ cXyz m1244;
/* 0x1250 */ u8 m1250[0x1260 - 0x1250];
/* 0x1260 */ f32 m1260;
/* 0x1264 */ enemyice mEnemyIce;
/* 0x161C */ enemyfire mEnemyFire;
/* 0x1844 */ JntHit_c* mpJntHit;
};
}; // Size: 0x1848
class bkHIO_c : public JORReflexible {
public:
+31 -12
View File
@@ -5,6 +5,7 @@
#include "SSystem/SComponent/c_phase.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_cc_d.h"
#include "m_Do/m_Do_hostIO.h"
class daMozo_c : public fopAc_ac_c {
public:
@@ -50,25 +51,43 @@ public:
/* 0x3BC */ dCcD_Cps mCps;
};
class daMozo_HIO_c {
public:
daMozo_HIO_c();
~daMozo_HIO_c() {}
};
class daMozo_childHIO_c {
public:
~daMozo_childHIO_c() {}
virtual ~daMozo_childHIO_c() {}
/* 0x04 */ f32 m04;
/* 0x08 */ f32 m08;
/* 0x0C */ s16 m0C;
/* 0x0E */ s16 m0E;
/* 0x10 */ u8 m10;
/* 0x11 */ u8 m11[0x14 - 0x11];
}; // Size: 0x14
class daMozo_BeamChildHIO_c : public daMozo_childHIO_c {
public:
virtual ~daMozo_BeamChildHIO_c() {}
};
class daMozo_FireChildHIO_c {
class daMozo_FireChildHIO_c : public daMozo_childHIO_c {
public:
~daMozo_FireChildHIO_c() {}
virtual ~daMozo_FireChildHIO_c() {}
};
class daMozo_BeamChildHIO_c {
class daMozo_HIO_c : public JORReflexible {
public:
~daMozo_BeamChildHIO_c() {}
};
daMozo_HIO_c();
virtual ~daMozo_HIO_c() {}
/* 0x04 */ s8 mChildID;
/* 0x05 */ u8 m05[0x08 - 0x05];
/* 0x08 */ int m08;
/* 0x0C */ daMozo_BeamChildHIO_c* mpBeamChild;
/* 0x10 */ daMozo_FireChildHIO_c* mpFireChild;
/* 0x14 */ daMozo_BeamChildHIO_c mBeamChild;
/* 0x28 */ daMozo_FireChildHIO_c mFireChild;
/* 0x3C */ f32 m3C;
/* 0x40 */ f32 m40;
/* 0x44 */ f32 m44;
}; // Size: 0x48
#endif /* D_A_MOZO_H */