T5.1.c7: fold MainStruct pair (7e5cdb66875c) onto MainStruct; SubStruct moved first; R22 green

This commit is contained in:
Drew T
2026-09-30 16:15:14 -06:00
parent 67e4a484e4
commit 7a54682a25
+7 -16
View File
@@ -4475,16 +4475,21 @@ typedef struct {
} D_80195AF6_t;
struct Ent_SC07_010_8017AE2C { u8 pad[0xDC]; s32 unkDC; u8 pad_E0[0x1C]; u16 unkFC; };
typedef MATRIX MTX_CF90;
typedef struct {
u8 pad[4];
s32 field_4;
} SubStruct;
typedef struct {
u8 pad_00[0x20];
void *f_20;
SubStruct *f_20;
u8 pad_24[0xA8];
void *f_CC;
void *f_D0;
void *f_D4;
u8 pad_D8[0x10];
s32 f_E8;
} MainStruct_SC02_005_8017CF90;
} MainStruct;
typedef MainStruct MainStruct_SC02_005_8017CF90;
typedef struct {
/* 0x000 */ u8 pad000[0x02];
/* 0x002 */ s16 unk_002;
@@ -4513,20 +4518,6 @@ typedef struct {
u8 tail[12];
} Stk;
typedef struct { u8 b[20]; } Stk_SC03_105_80181C84;
typedef struct {
u8 pad[4];
s32 field_4;
} SubStruct;
typedef struct {
u8 pad_00[0x20];
SubStruct *f_20;
u8 pad_24[0xA8];
void *f_CC;
void *f_D0;
void *f_D4;
u8 pad_D8[0x10];
s32 f_E8;
} MainStruct;
typedef H16 Unkstruct_8017E2EC;
typedef struct { u32 v; } Unkstruct_8017E2EC_2;
typedef H16 Unkstruct_8017F8A8;