revert some redundant struct changes

This commit is contained in:
Fazana
2022-04-28 15:51:08 +01:00
parent 0f000cc71b
commit 08c9e784f8
4 changed files with 92 additions and 95 deletions
+40 -48
View File
@@ -1213,54 +1213,46 @@ typedef struct ObjectTransform {
/* Size: 0x44 bytes */
typedef struct ObjectSegment {
/* 0x0000 */ ObjectTransform trans;
union {
struct {
/* 0x0018 */ s16 upper;
/* 0x0020 */ s16 lower;
} half;
/* 0x0018 */ f32 word;
} unk18;
/* 0x001C */ f32 x_velocity;
/* 0x0020 */ f32 y_velocity;
/* 0x0024 */ f32 z_velocity;
/* 0x0028 */ f32 unk28;
union {
struct {
/* 0x002C */ s16 upper;
/* 0x002E */ s16 lower;
} half;
/* 0x002C */ f32 word;
} unk2C;
/* 0x0030 */ f32 unk30;
union {
/* 0x0034 */ f32 unk34;
/* 0x0034 */ s16 levelSegmentIndex;
struct h {
/* 0x0034 */ s16 h0;
/* 0x0036 */ s16 h1;
} h;
} unk34_a;
union {
struct {
/* 0x0038 */ u8 upper;
/* 0x0039 */ u8 lower;
} half;
/* 0x0038 */ s16 word;
} unk38;
/* 0x003A */ s8 unk3A;
/* 0x003B */ s8 unk3B;
union {
/* 0x003C */ Object_3C* unk3C;
/* 0x003C */ f32 unk3C_f;
struct {
/* 0x003C */ u8 b0;
/* 0x003D */ u8 b1;
/* 0x003E */ u8 b2;
/* 0x003F */ u8 b3;
} byte;
} unk3C_a;
/* 0x0040 */ ObjectHeader *header;
/* 0x0000 */ ObjectTransform trans;
/* 0x0018 */ s16 unk18;
/* 0x001A */ s16 unk1A;
/* 0x001C */ f32 x_velocity;
/* 0x0020 */ f32 y_velocity;
/* 0x0024 */ f32 z_velocity;
/* 0x0028 */ f32 unk28;
union {
struct {
/* 0x002C */ s16 upper;
/* 0x002E */ s16 lower;
} half;
/* 0x002C */ f32 word;
} unk2C;
/* 0x0030 */ f32 unk30;
union {
/* 0x0034 */ f32 unk34;
/* 0x0034 */ s16 levelSegmentIndex;
} unk34_a;
union {
struct {
/* 0x0038 */ u8 upper;
/* 0x0039 */ u8 lower;
} half;
/* 0x0038 */ s16 word;
} unk38;
/* 0x003A */ s8 unk3A;
/* 0x003B */ s8 unk3B;
union {
/* 0x003C */ Object_3C* unk3C;
/* 0x003C */ f32 unk3C_f;
} unk3C_a;
/* 0x0040 */ ObjectHeader *header;
} ObjectSegment;
/* Size: 0x0630 bytes */