From 67e4a484e4b45c161de4854eed1ea9a6be9b53b8 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Wed, 30 Sep 2026 16:07:49 -0600 Subject: [PATCH] T5.1.c7: fold 19-name SHARED component of b53d46e36006:opaque onto Blk8_801867AC (u8 c[8]); R22 green --- include/struct_types.h | 9 ++++-- src/md_MAIN_025/md_MAIN_025.c | 2 +- src/md_MAIN_039/md_MAIN_039.c | 2 +- src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c | 4 +-- src/shared/engine_types.h | 35 ++++++++++------------- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/include/struct_types.h b/include/struct_types.h index 6f1eba21ac..a601bcf2c4 100644 --- a/include/struct_types.h +++ b/include/struct_types.h @@ -371,7 +371,10 @@ typedef struct { /* --- lift_types.py --census (P38 T5.1.c2, batch ov-file) --- */ typedef struct { s32 w[8]; } Blk20_8016DF5C; typedef Blk20_8016DF5C Blk20; -typedef struct { u8 b[8]; } Blk8; +typedef struct { + u8 c[8]; +} Blk8_801867AC; +typedef Blk8_801867AC Blk8; typedef struct { u32 tag; u32 w1; u32 w2; u32 w3; } Prim_1412A8; typedef Prim_1412A8 Blk16; typedef struct { s32 vpx, vpy, vpz, vrx, vry, vrz, rz, super; } RView; @@ -512,7 +515,7 @@ typedef B4_8017F154 Blk4_md_SC07_003; typedef SVECTOR SVECTOR_800; /* --- lift_types.py --census (P38 T5.1.c2, batch ov-block) --- */ -typedef struct { u8 c[8]; } Blk8_md_SC03_076; +typedef Blk8_801867AC Blk8_md_SC03_076; typedef struct { unsigned int addr : 24; unsigned int len : 8; @@ -1411,7 +1414,7 @@ typedef struct { } Vec8_801A1924; typedef struct { u16 a, b, c, d; } Vec8_md_SC07_003_801A3334; typedef struct { s32 w0, w1, w2, w3, w4, w5, w6, w7; } W8__md_MAIN_044; -typedef struct { u8 b[8]; } W8_md_MAIN_025_800CB300; +typedef Blk8_801867AC W8_md_MAIN_025_800CB300; typedef struct Work_md_MAIN_046 { /* 0x00 */ s32 unk00; /* 0x04 */ s32 pad04[3]; diff --git a/src/md_MAIN_025/md_MAIN_025.c b/src/md_MAIN_025/md_MAIN_025.c index cef1c6e9d0..7033576ed6 100644 --- a/src/md_MAIN_025/md_MAIN_025.c +++ b/src/md_MAIN_025/md_MAIN_025.c @@ -315,7 +315,7 @@ void func_800CB300(s32 arg0) { if (!(flags & 0x2000)) { return; } - st = work[1].b[6]; + st = work[1].c[6]; if (st == 0x19) { if (D_801151D8 != 0) { if (func_800CB7B0(s1) == 0) { diff --git a/src/md_MAIN_039/md_MAIN_039.c b/src/md_MAIN_039/md_MAIN_039.c index 1a0dd0e628..9cad4a8107 100644 --- a/src/md_MAIN_039/md_MAIN_039.c +++ b/src/md_MAIN_039/md_MAIN_039.c @@ -323,7 +323,7 @@ s32 func_800CB61C(s32 a0, s32 a1) buf = *(Blk8 *)D_800CAE0C; if (*(u16 *)a1 == 0x2CE) { - *(s16 *)&buf.b[2] = -0x1AB; + *(s16 *)&buf.c[2] = -0x1AB; } r1 = func_8014C59C((void *)a0, (void *)a1); x = func_80012DBC(*(s16 *)(s2 + 0x12), (s16)r1, 0x10, 1); diff --git a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c index b68ef447dc..179cdd3369 100644 --- a/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c +++ b/src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c @@ -6913,7 +6913,7 @@ void func_80181BA4(s32 param_1) Sp10_80181BA4 sp10; s32 ang; - sp10 = *(Sp10_80181BA4 *)D_801274E8.b; + sp10 = *(Sp10_80181BA4 *)D_801274E8.c; ang = ratan2(sp10.v[0], sp10.v[2]) & 0xFFF; func_80181CCC(param_1, (s32)&sp10, ang); func_80181F14(param_1, (s32)&sp10, ang); @@ -6928,7 +6928,7 @@ void func_80181C38(s32 param_1) Sp10_80181C38 sp10; s32 ang; - sp10 = *(Sp10_80181C38 *)D_801274E8.b; + sp10 = *(Sp10_80181C38 *)D_801274E8.c; ang = ratan2(sp10.v[0], sp10.v[2]) & 0xFFF; func_80181CCC(param_1, (s32)&sp10, ang); func_80181EA0(param_1, (s32)&sp10, ang); diff --git a/src/shared/engine_types.h b/src/shared/engine_types.h index e23310ddfa..4e24a51a48 100644 --- a/src/shared/engine_types.h +++ b/src/shared/engine_types.h @@ -1216,13 +1216,13 @@ typedef Blk8_80126940 Blk8_80126940_8017FC98; typedef Blk8_80126940 Blk8_80126940_80180D08; typedef Blk8_80126940 Blk8_80126940_80180D40; typedef struct { char _b[8]; } Blk8_801463A0; -typedef struct { u8 b[8]; } Blk8_80182BDC; -typedef struct { u8 b[8]; } Blk8_80183084; -typedef struct { u8 b[8]; } Blk8_801838C8; -typedef struct { u8 b[8]; } Blk8_801838EC; -typedef struct { u8 b[8]; } Blk8_80185E28; -typedef struct { u8 b[8]; } Blk8_80189FF0; -typedef struct { u8 b[8]; } Blk8_8018AC00; +typedef Blk8_801867AC Blk8_80182BDC; +typedef Blk8_801867AC Blk8_80183084; +typedef Blk8_801867AC Blk8_801838C8; +typedef Blk8_801867AC Blk8_801838EC; +typedef Blk8_801867AC Blk8_80185E28; +typedef Blk8_801867AC Blk8_80189FF0; +typedef Blk8_801867AC Blk8_8018AC00; typedef struct { char b[8]; } Blob8_8018A47C; @@ -2581,12 +2581,12 @@ typedef Blk8_80126940 Blk8_80126940_8017EE38; typedef Blk8_80126940 Blk8_80126940_8017F608; typedef Blk8_80126940 Blk8_80126940_80180A10; typedef Blk8_80126940 Blk8_80126940_80181B44; -typedef struct { u8 b[8]; } Blk8_8017CF48; +typedef Blk8_801867AC Blk8_8017CF48; typedef struct { u8 b[8]; } Blk8_8017DAFC; typedef Blob8_8018A47C_8017DEA4 Blk8_8017DCF4; typedef struct { u8 c[8]; } Blk8_8017E224; typedef struct { u8 b[8]; } Blk8_8017E6A4; -typedef struct { u8 b[8]; } Blk8_8017EBCC; +typedef Blk8_801867AC Blk8_8017EBCC; typedef struct { char c[8]; } Blk8_8017FF80; typedef BlockData Blk8_801800F8; typedef struct { char c[8]; } Blk8_8018048C; @@ -2594,7 +2594,7 @@ typedef V Blk8_801807DC; typedef struct { u8 b[8]; } Blk8_801812AC; typedef struct { u8 b[8]; } Blk8_80181324; typedef struct { u8 c[8]; } Blk8_801813B0; -typedef struct { u8 b[8]; } Blk8_80181774; +typedef Blk8_801867AC Blk8_80181774; typedef struct { u8 b[8]; } Blk8_801827C4; typedef struct { u8 b[8]; } Blk8_80182844; typedef struct { char c[8]; } Blk8_801828E4; @@ -4578,24 +4578,19 @@ typedef Blk8_80126940 Blk8_80126940_8017D6D0_801826C8; typedef Blk8_80126940 Blk8_80126940_80181440; typedef struct { s8 c[8]; } Blk8_80133CD4; typedef Blob8_8018A47C_8017DEA4 Blk8_8017DC54; -typedef struct { u8 b[8]; } Blk8_80180450; +typedef Blk8_801867AC Blk8_80180450; typedef struct { u8 b[8]; } Blk8_801809B0; typedef struct { s16 v[4]; } Blk8_80180A38; -typedef struct { u8 b[8]; } Blk8_80181940; -typedef struct { u8 b[8]; } Blk8_80183DEC; +typedef Blk8_801867AC Blk8_80181940; +typedef Blk8_801867AC Blk8_80183DEC; typedef struct { u8 c[8]; } Blk8_80186594; -typedef struct { - u8 c[8]; -} Blk8_801867AC; typedef Blk8_80186594 Blk8_80186F78; typedef struct { u8 c[8]; } Blk8_801870AC; -typedef struct { - u8 c[8]; -} Blk8_80187190; +typedef Blk8_801867AC Blk8_80187190; typedef struct { u8 d[8]; } Blk8_8018B1B4; typedef struct { u8 b[8]; } Blk8_FE08; typedef Blk8_80133CD4 Blk8_MAIN_012_80135A4C; @@ -4950,7 +4945,7 @@ typedef struct { typedef struct { Blk8L_SC06_027_8017D104 pad; Blk8L_SC06_027_8017D104 a; Blk8L_SC06_027_8017D104 b; } Locs; typedef MATRIX M32_8017F154; typedef MATRIX M32_80188094; -typedef struct { u8 b[8]; } M8_SC02_005_8017F7CC; +typedef Blk8_801867AC M8_SC02_005_8017F7CC; typedef MATRIX MTX_8017FE38; typedef MATRIX MTX_8017FE38_80183FE0; typedef MATRIX MTX_80183940;