diff --git a/src/shared/engine_types.h b/src/shared/engine_types.h index fe1b354a25..427227603e 100644 --- a/src/shared/engine_types.h +++ b/src/shared/engine_types.h @@ -1881,25 +1881,15 @@ typedef Quad_801EA880_8017D900 Quad_801EA880; typedef Quad_801EA880_8017D900 Quad_801EA880_8017FD9C; typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027; typedef struct { Rec027 r[9]; } Blk027; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017BFEC; typedef Blk027 Blk027_8017BFEC; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017C2B0; typedef Blk027 Blk027_8017C2B0; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017C3C4; typedef Blk027 Blk027_8017C3C4; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017C688; typedef Blk027 Blk027_8017C688; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017CBB0; typedef Blk027 Blk027_8017CBB0; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017CECC; typedef Blk027 Blk027_8017CECC; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017D1E8; typedef Blk027 Blk027_8017D1E8; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017D3AC; typedef Blk027 Blk027_8017D3AC; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_8017DA90; typedef Blk027 Blk027_8017DA90; -typedef struct { u16 f0; s16 f2; u16 f4; u16 f6; u16 f8; u16 fA; } Rec027_80181304; typedef Blk027 Blk027_80181304; typedef Rec20 Rec20_8017DF18; typedef Rec20 Rec20_8017DF18_8017DEF0; @@ -2658,8 +2648,8 @@ typedef struct { u8 b[4]; } Blk4_8018CC28; typedef struct { u8 d[4]; } Blk4_8018FF98; typedef struct { u8 b[4]; } Blk4_80191320_80191070; typedef Blk4_80191320_80191070 Blk4_8018FF98_8018FCE8; -typedef struct { u8 b[4]; } Blk4_80191320; -typedef struct { u8 b[4]; } Blk4_80191320_8018D05C; +typedef Blk4_8018FF98 Blk4_80191320; +typedef Blk4_8018FF98 Blk4_80191320_8018D05C; typedef struct { u8 d[4]; } Blk4_801EC660; typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Blk4_9B4; typedef Blk4_8018048C Blk4_fc; @@ -4656,7 +4646,7 @@ typedef struct { u8 pad_D8[0x10]; s32 f_E8; } MainStruct_SC02_005_8017CF90; -typedef struct Obj8017EBC4 { +typedef struct { /* 0x000 */ u8 pad000[0x02]; /* 0x002 */ s16 unk_002; /* 0x004 */ u8 pad004[0x06];