T5.1.c2b: lift_types --census: batch ov-block moved (694 groups, 1044 defs)

include/struct_types.h

@@ -503,4 +503,11 @@ typedef struct {
     s16 vx, vy, vz, pad;
 } SVECTOR_800;
 
+/* --- lift_types.py --census (P38 T5.1.c2, batch ov-block) --- */
+typedef struct { u8 c[8]; } Blk8_md_SC03_076;
+typedef struct { u32 addr : 24; u32 len : 8; } PTag;
+typedef struct { u32 w[4]; } St801D9204;
+typedef struct { s32 f; } Unkstruct_801151D0;
+typedef struct { s32 vx, vy, vz, pad; } V32;
+
 #endif /* STRUCT_TYPES_H */

src/800.c

@@ -3562,7 +3562,7 @@ extern void *func_80010A08(s32 a0);
 
 void func_80016638(void *a0, s32 a1, s32 a2)
 {
-    typedef struct { u32 addr : 24; u32 len : 8; } PTag;             /* libgpu P_TAG: an OT link word */
+             /* libgpu P_TAG: an OT link word */
     typedef struct { u32 addr : 24; u32 len : 8; u32 code; } DrTpage; /* libgpu DR_TPAGE (8 bytes) */
     typedef struct { u8 pad[4]; PTag *ot; } Env;                    /* a0 + 4: the frame's ordering table */
     Env *env = a0;

src/md_MAIN_039/md_MAIN_039.c

@@ -395,7 +395,6 @@ void func_800CB804(void *arg0) {
 
 
 typedef struct { s16 m[3][3]; s32 t[3]; } MTX_md_MAIN_039;
-typedef struct { s32 vx, vy, vz, pad; } V32;
 
 extern void func_801465C0();
 extern s32 func_8001CC3C(s32, s32, s32, s32);

src/md_SC03_076/md_SC03_076.c

@@ -655,7 +655,7 @@ void func_801F0210(void) {
         (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF);
 
     ot += 0x28;
-    ((struct { s32 f; } *)&D_801151D0)->f = ot;
+    ((Unkstruct_801151D0 *)&D_801151D0)->f = ot;
 }
 
 
@@ -1548,7 +1548,6 @@ void func_801F1CB0(void) {
 
 #include "common.h"
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 const Blk8_md_SC03_076 D_801EF6C0 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 

src/md_SC03_076/md_SC03_076_jr_801F218C.c

@@ -3,7 +3,6 @@
 typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801F03C0;
 typedef struct { u32 w[38]; } Blk152_8017DF40_801F1738;
 typedef struct { u8 b[4]; } Blk4_8017DF40_801F1738;
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801F1F94;
 typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801F1F94;
 extern void func_801EF750(void);

src/md_SC03_077/md_SC03_077.c

@@ -109,7 +109,6 @@ INCLUDE_RODATA("asm/md_SC03_077/nonmatchings/md_SC03_077", D_801EF468);
 
 #include "common.h"
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 const Blk8_md_SC03_076 D_801EF46C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 

src/md_SC03_077/md_SC03_077_jr_801EFB58.c

@@ -2,7 +2,6 @@
 
 #include "common.h"
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 extern u8 D_801F00E8[];
 void func_800167B8(int);
 void func_80175414(s32 _arg0);

src/md_SC03_079/md_SC03_079.c

@@ -100,7 +100,6 @@ void func_801EF6B8(void) {
 
 INCLUDE_RODATA("asm/md_SC03_079/nonmatchings/md_SC03_079", D_801EF468);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801EF46C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC03_132/md_SC03_132.c

@@ -100,7 +100,6 @@ void func_801E2830(void) {
 }
 
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 extern const Blk8_md_SC03_076 D_801E25EC;
 extern int func_80171D78(u32, void *);

src/md_SC03_135/md_SC03_135.c

@@ -626,7 +626,7 @@ s32 func_801E3390(void) {
         (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF);
 
     ot += 0x28;
-    ((struct { s32 f; } *)&D_801151D0)->f = ot;
+    ((Unkstruct_801151D0 *)&D_801151D0)->f = ot;
 }
 
 
@@ -1567,7 +1567,6 @@ void func_801E4E40(void) {
 }
 
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E2840 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC03_135/md_SC03_135_jr_801E5358.c

@@ -3,7 +3,6 @@
 typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801E3540;
 typedef struct { u32 w[38]; } Blk152_8017DF40_801E48B8;
 typedef struct { u8 b[4]; } Blk4_8017DF40_801E48B8;
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801E5124;
 typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801E5124;
 extern s32 func_801E288C(void);

src/md_SC03_136/md_SC03_136.c

@@ -102,7 +102,6 @@ void func_801E284C(void) {
 
 INCLUDE_RODATA("asm/md_SC03_136/nonmatchings/md_SC03_136", D_801E25E8);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E25EC = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC03_136/md_SC03_136_jr_801E2CD0.c

@@ -1,6 +1,5 @@
 #include "common.h"
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 extern u8 *D_80126B10;
 extern u8 D_801E3230[];
 extern void func_80175414(s32 _arg0);

src/md_SC04_024/md_SC04_024.c

@@ -102,7 +102,6 @@ void func_801E7D70(void) {
 }
 
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 extern const Blk8_md_SC03_076 D_801E7B2C;
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC04_025/md_SC04_025.c

@@ -95,7 +95,6 @@ void func_801E7D78(void) {
 
 INCLUDE_RODATA("asm/md_SC04_025/nonmatchings/md_SC04_025", D_801E7B28);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC04_026/md_SC04_026.c

@@ -96,7 +96,6 @@ void func_801E7D78(void) {
 
 INCLUDE_RODATA("asm/md_SC04_026/nonmatchings/md_SC04_026", D_801E7B28);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC04_027/md_SC04_027.c

@@ -636,7 +636,7 @@ void func_801E88D0(void) {
         (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF);
 
     ot += 0x28;
-    ((struct { s32 f; } *)&D_801151D0)->f = ot;
+    ((Unkstruct_801151D0 *)&D_801151D0)->f = ot;
 }
 
 
@@ -1549,7 +1549,6 @@ void func_801EA380(void) {
 }
 
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E7D80 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC04_027/md_SC04_027_jr_801EA8C0.c

@@ -3,7 +3,6 @@
 typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801E8A80;
 typedef struct { u32 w[38]; } Blk152_8017DF40_801E9DF8;
 typedef struct { u8 b[4]; } Blk4_8017DF40_801E9DF8;
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801EA664;
 typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801EA664;
 extern void func_801E7DA4(void);

src/md_SC04_028/md_SC04_028.c

@@ -104,7 +104,6 @@ void func_801E7D8C(void) {
 
 INCLUDE_RODATA("asm/md_SC04_028/nonmatchings/md_SC04_028", D_801E7B28);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC04_028/md_SC04_028_jr_801E8238.c

@@ -2,7 +2,6 @@
 
 #include "common.h"
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 extern u8 D_801E8798[];
 void func_800167B8(int);
 void func_80175414(s32 _arg0);

src/md_SC04_029/md_SC04_029.c

@@ -97,7 +97,6 @@ void func_801E7D78(void) {
 
 INCLUDE_RODATA("asm/md_SC04_029/nonmatchings/md_SC04_029", D_801E7B28);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC04_030/md_SC04_030.c

@@ -97,7 +97,6 @@ void func_801E7D78(void) {
 
 INCLUDE_RODATA("asm/md_SC04_030/nonmatchings/md_SC04_030", D_801E7B28);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801E7B2C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC05_023/md_SC05_023.c

@@ -104,7 +104,6 @@ INCLUDE_RODATA("asm/md_SC05_023/nonmatchings/md_SC05_023", D_801ED988);
 
 
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 

src/md_SC05_024/md_SC05_024.c

@@ -98,7 +98,6 @@ void func_801EDBF0(void) {
 
 INCLUDE_RODATA("asm/md_SC05_024/nonmatchings/md_SC05_024", D_801ED988);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 

src/md_SC05_025/md_SC05_025.c

@@ -97,7 +97,6 @@ void func_801EDBF0(void) {
 
 INCLUDE_RODATA("asm/md_SC05_025/nonmatchings/md_SC05_025", D_801ED988);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 

src/md_SC05_026/md_SC05_026.c

@@ -638,7 +638,7 @@ void func_801EE730(void) {
         (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF);
 
     ot += 0x28;
-    ((struct { s32 f; } *)&D_801151D0)->f = ot;
+    ((Unkstruct_801151D0 *)&D_801151D0)->f = ot;
 }
 
 
@@ -1500,7 +1500,6 @@ void func_801F01F8(void) {
 }
 
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801EDBE0 = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC05_026/md_SC05_026_jr_801F0748.c

@@ -3,7 +3,6 @@
 typedef struct { s16 m[3][3]; s32 t[3]; } MTX_C974_801EE8E0;
 typedef struct { u32 w[38]; } Blk152_8017DF40_801EFC58;
 typedef struct { u8 b[4]; } Blk4_8017DF40_801EFC58;
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 typedef struct { short m[3][3]; long t[3]; } MATRIX_801EDED4_801F04DC;
 typedef struct { short vx, vy, vz, pad; } SVECTOR_801EDED4_801F04DC;
 extern void func_801EDC04(void);

src/md_SC05_027/md_SC05_027.c

@@ -103,7 +103,6 @@ void func_801EDC04(void) {
 
 INCLUDE_RODATA("asm/md_SC05_027/nonmatchings/md_SC05_027", D_801ED988);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 extern s32 func_80171D78(u32, void *);
 extern void func_80171A1C(void*);

src/md_SC05_027/md_SC05_027_jr_801EE0C0.c

@@ -1,6 +1,5 @@
 #include "common.h"
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 extern u8 *D_80126B10;
 extern u8 D_801EE620[];
 extern void func_80175414(s32 _arg0);

src/md_SC05_028/md_SC05_028.c

@@ -98,7 +98,6 @@ void func_801EDBF0(void) {
 
 INCLUDE_RODATA("asm/md_SC05_028/nonmatchings/md_SC05_028", D_801ED988);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 

src/md_SC05_029/md_SC05_029.c

@@ -98,7 +98,6 @@ void func_801EDBF0(void) {
 
 INCLUDE_RODATA("asm/md_SC05_029/nonmatchings/md_SC05_029", D_801ED988);
 
-typedef struct { u8 c[8]; } Blk8_md_SC03_076;
 
 const Blk8_md_SC03_076 D_801ED98C = {{0x00, 0x00, 0x7E, 0xFF, 0xB0, 0x00, 0x00, 0x00}};
 

src/ov_MAIN_012/ov_MAIN_012_jr_80131340.c

@@ -624,9 +624,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
      * with the stale 1-arg engine_core canonical. A file-scope `extern int
@@ -1640,7 +1637,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_8017E924;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -1706,7 +1703,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_8017E910[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_80133CD4;
             *(Blk8_80133CD4 *)&D_801152B0 = *(Blk8_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_MAIN_012/ov_MAIN_012_jr_80135A4C.c

@@ -600,7 +600,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_MAIN_012_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_MAIN_012/ov_MAIN_012_jr_801458E0.c

@@ -3015,13 +3015,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent_8014D820` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4_8014D820;
   typedef Unkstruct_800B5CB8 Ent_8014D820;
   int new_var2;
   s16 new_var3;

src/ov_MAIN_012/ov_MAIN_012_jr_8017CA18.c

@@ -3670,7 +3670,7 @@ void func_8017CA18(void) {
         (D_800AE7BC[*(u16 *)&D_800B9A02].ot[2] & 0xFF000000) | ((u32)ot & 0xFFFFFF);
 
     ot += 0x28;
-    ((struct { s32 f; } *)&D_801151D0)->f = ot;
+    ((Unkstruct_801151D0 *)&D_801151D0)->f = ot;
 }
 
 

src/ov_MAIN_012/ov_MAIN_012_jr_8017CF3C.c

@@ -3810,7 +3810,7 @@ void func_8017D2A4(void) {
     case 3: {
         s16 *q = &D_8011512C;
         D_801150D4 = 0;
-        if (((struct { s16 h; } *)q)->h != 0xC) {
+        if (((Unkstruct_8017D2A4 *)q)->h != 0xC) {
             ret = 0x11;
             *q = 5;
         }
@@ -4174,22 +4174,8 @@ void func_8017DCB0(s32 val, s32 n, void *dst, s32 flag) {
  */
 
 s32 *func_8017DD28(s32 *out) {
-    typedef struct { u32 addr : 24; u32 len : 8; } PTag_8017DD28;
-    typedef struct { u32 *ot; u32 pad[4]; } Env_8017DD28;   /* 0x14 stride */
-    typedef struct { u16 f0; u16 f2; } Prim4_8017DD28;
-    typedef struct {
-        s16 f0;                     /* 0x00 */
-        s16 f2;                     /* 0x02 */
-        void *f4;                   /* 0x04 */
-        void *f8;                   /* 0x08 */
-        s16 fC;                     /* 0x0C */
-        s16 fE;                     /* 0x0E */
-        s16 f10;                    /* 0x10 */
-        s16 f12;                    /* 0x12 */
-        void *f14;                  /* 0x14 */
-        Prim4_8017DD28 *f18;        /* 0x18 */
-        void *f1C;                  /* 0x1C */
-    } Panel_8017DD28;               /* 0x20 stride */
+   /* 0x14 stride */
+               /* 0x20 stride */
 
     extern Env_8017DD28 D_800AE7BC[];
     extern short D_800B9A02;

src/ov_SC01_000/ov_SC01_000_after.c

@@ -1552,13 +1552,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_000/ov_SC01_000_jr_8012ACE0.c

@@ -1434,9 +1434,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_000_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_000_80131340 D_8017F0C0;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2400,7 +2397,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_8017F1AC;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2459,7 +2456,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_8017F198[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_000_80133CD4;
             *(Blk8_SC01_000_80133CD4 *)&D_801152B0 = *(Blk8_SC01_000_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_000/ov_SC01_000_jr_80135A4C.c

@@ -619,7 +619,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_000_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_000/ov_SC01_000_jr_8017BEBC.c

@@ -3273,7 +3273,6 @@ void func_8017D490(void)
  */
 void func_8017DD04(s32 arg0, s32 arg1)
 {
-    typedef struct { u32 addr:24; u32 len:8; } P_TAG_SC01_000_8017DD04;
     extern void func_8017E1A8();
     extern u8 *D_800A5E60;
     extern u8 D_800AA60C[];

src/ov_SC01_001/ov_SC01_001_after.c

@@ -1552,13 +1552,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_001/ov_SC01_001_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_001_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_001_80131340 D_80183D10;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2400,7 +2397,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_80183DFC;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2459,7 +2456,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_80183DE8[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_001_80133CD4;
             *(Blk8_SC01_001_80133CD4 *)&D_801152B0 = *(Blk8_SC01_001_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_001/ov_SC01_001_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_001_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_004/ov_SC01_004_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_004/ov_SC01_004_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_004_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_004_80131340 D_8017F6D4;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_8017F7C0;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_8017F7AC[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_004_80133CD4;
             *(Blk8_SC01_004_80133CD4 *)&D_801152B0 = *(Blk8_SC01_004_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_004/ov_SC01_004_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_004_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_004/ov_SC01_004_jr_8017BE9C.c

@@ -2698,7 +2698,6 @@ extern void func_8017BE60(void *a0);
 
 void func_8017BE9C(s32 arg0)
 {
-    typedef struct { u32 w0, w1, w2; } Prim_SC01_004_8017BE9C;
 
     extern s32 func_800491EC(void);
     extern void func_800547D8(s32, MATRIX2 *);

src/ov_SC01_005/ov_SC01_005_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_005/ov_SC01_005_jr_8012ACE0.c

@@ -1419,9 +1419,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_005_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_005_80131340 D_80182868;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2393,7 +2390,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_80182954;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2452,7 +2449,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_80182940[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_005_80133CD4;
             *(Blk8_SC01_005_80133CD4 *)&D_801152B0 = *(Blk8_SC01_005_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_005/ov_SC01_005_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_005_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_005/ov_SC01_005_jr_8017C340.c

@@ -2707,7 +2707,6 @@ extern void func_8017C338(void *a0);
 
 void func_8017C340(s32 arg0)
 {
-    typedef struct { u32 w0, w1, w2; } Prim_SC01_005_8017C340;
 
     extern s32 func_800491EC(void);
     extern void func_800547D8(s32, MATRIX2 *);

src/ov_SC01_008/ov_SC01_008_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_008/ov_SC01_008_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_008_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_008_80131340 D_8017FC48;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_8017FD34;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_8017FD20[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_008_80133CD4;
             *(Blk8_SC01_008_80133CD4 *)&D_801152B0 = *(Blk8_SC01_008_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_008/ov_SC01_008_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_008_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_008/ov_SC01_008_jr_8017BE9C.c

@@ -2698,7 +2698,6 @@ extern void func_8017BE60(void *a0);
 
 void func_8017BE9C(s32 arg0)
 {
-    typedef struct { u32 w0, w1, w2; } Prim_SC01_008_8017BE9C;
 
     extern s32 func_800491EC(void);
     extern void func_800547D8(s32, MATRIX2 *);

src/ov_SC01_009/ov_SC01_009_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_009/ov_SC01_009_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_009_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_009_80131340 D_80182E30;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_80182F1C;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_80182F08[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_009_80133CD4;
             *(Blk8_SC01_009_80133CD4 *)&D_801152B0 = *(Blk8_SC01_009_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_009/ov_SC01_009_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_009_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_009/ov_SC01_009_jr_8017BE9C.c

@@ -2691,7 +2691,6 @@ extern void func_8017BE60(void *a0);
 
 void func_8017BE9C(s32 arg0)
 {
-    typedef struct { u32 w0, w1, w2; } Prim_SC01_009_8017BE9C;
 
     extern s32 func_800491EC(void);
     extern void func_800547D8(s32, MATRIX2 *);

src/ov_SC01_009/ov_SC01_009_jr_8018057C.c

@@ -3467,10 +3467,6 @@ extern void func_8012B200(u8 *param_1);
 extern s32 func_8012C51C(void *a0, void *a1);
 
 void func_801819B0(void *arg0) {
-    typedef struct {
-        s16 a, b, c, d, e, f, g, h;
-        s32 w;
-    } Blk801819B0;
     Blk801819B0 blk;
     s32 v0;
 
@@ -3492,10 +3488,6 @@ extern s32  func_8012C51C(void *a0, void *a1);
 extern u16  D_801F32D4;
 
 void func_80181A1C(void *arg0) {
-    typedef struct {
-        s16 a, b, c, d, e, f, g, h;
-        s32 w;
-    } Blk80181A1C;
     Blk80181A1C blk;
 
     blk.d = 0x1AB;
@@ -3742,10 +3734,6 @@ extern u8   D_801EB534;
 extern u16  D_801F32D4;
 
 void func_80182030(void *arg0) {
-    typedef struct {
-        s16 a, b, c, d, e, f, g, h;
-        s32 w;
-    } Blk80182030;
     Blk80182030 blk;
 
     if (--*(s32 *)((s32)arg0 + 0x1C) != -1) {
@@ -3780,10 +3768,6 @@ extern u8   D_801EB534;
 extern u16  D_801F32D4;
 
 void func_8018210C(void *arg0) {
-    typedef struct {
-        s16 a, b, c, d, e, f, g, h;
-        s32 w;
-    } Blk80182030;
     Blk80182030 blk;
 
     if (--*(s32 *)((s32)arg0 + 0x1C) != -1) {
@@ -3816,10 +3800,6 @@ extern u8   D_801EB534;
 extern u16  D_801F32D4;
 
 void func_801821E8(void *arg0) {
-    typedef struct {
-        s16 a, b, c, d, e, f, g, h;
-        s32 w;
-    } Blk801821E8;
     Blk801821E8 blk;
 
     if (--*(s32 *)((s32)arg0 + 0x1C) != -1) {
@@ -3983,10 +3963,6 @@ extern s16  D_801F32D8;
 extern u8   D_801ED1D4[];
 
 void func_80182634(void *arg0) {
-    typedef struct {
-        s16 a, b, c, d, e, f, g, h;
-        s32 w;
-    } Blk80182634;
     Blk80182634 blk;
     u16 w;
     u16 cnt;

src/ov_SC01_074/ov_SC01_074_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_074/ov_SC01_074_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_074_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_074_80131340 D_8017EAB0;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_8017EB9C;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_8017EB88[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_074_80133CD4;
             *(Blk8_SC01_074_80133CD4 *)&D_801152B0 = *(Blk8_SC01_074_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_074/ov_SC01_074_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_074_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_074/ov_SC01_074_jr_8017BE9C.c

@@ -2698,7 +2698,6 @@ extern void func_8017BE60(void *a0);
 
 void func_8017BE9C(s32 arg0)
 {
-    typedef struct { u32 w0, w1, w2; } Prim_SC01_074_8017BE9C;
 
     extern s32 func_800491EC(void);
     extern void func_800547D8(s32, MATRIX2 *);

src/ov_SC01_077/ov_SC01_077_after.c

@@ -1906,13 +1906,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2x)
 {
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_077/ov_SC01_077_jr_8012ACE0.c

@@ -1727,9 +1727,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_077_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_077_80131340 D_80186FD4;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2797,7 +2794,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_801870C0;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2856,7 +2853,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_801870AC[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_077_80133CD4;
             *(Blk8_SC01_077_80133CD4 *)&D_801152B0 = *(Blk8_SC01_077_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_077/ov_SC01_077_jr_80135A4C.c

@@ -667,7 +667,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_077_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_077/ov_SC01_077_jr_80181F08.c

@@ -3071,7 +3071,6 @@ extern void func_80181BE4(s32 p);
 
 void func_80181F08(s32 arg0)
 {
-    typedef struct { u32 w[4]; } St801D9204;
     extern void func_80019064(void *a0);
     extern void func_8012A828(s32 a0, void *a1);
     extern void func_8012B23C(s32 a0);

src/ov_SC01_077/ov_SC01_077_jr_80183CF4.c

@@ -3322,7 +3322,6 @@ void func_80184278(int param_1)
 #include "common.h"
 
 void func_801842C8(s32 a0) {
-    typedef struct { s8 c[8]; } Blk8_SC01_077_801842C8;
     extern void func_8012CBA4(s32 a0);
     extern s32 func_8012BEE8(s32);
     s32 a3;

src/ov_SC01_080/ov_SC01_080_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_080/ov_SC01_080_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_080_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_080_80131340 D_80183A10;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_80183AFC;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_80183AE8[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_080_80133CD4;
             *(Blk8_SC01_080_80133CD4 *)&D_801152B0 = *(Blk8_SC01_080_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_080/ov_SC01_080_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_080_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_080/ov_SC01_080_jr_8017AE2C.c

@@ -5905,7 +5905,6 @@ void func_80180728(s32 a0) {
        BLOCK-SCOPE redeclaration of the same externally-linked symbol is only
        a WARNING ("type mismatch with previous external decl") -- codegen is
        unaffected, confirmed byte-identical both standalone and spliced. */
-    typedef struct { s32 q[16]; } Str_801C5B00;
     extern Str_801C5B00 D_801C5B00[];
     /* `pad` is the 16 unused frame bytes at 0x10..0x20 the target reserves
        below the two vectors; locals are laid out in declaration order, so it
@@ -6377,7 +6376,6 @@ extern void func_801696D8(s32 a0, s32 a1);
 extern s32 func_80169A4C(s32 a0, s32 a1);
 
 void func_801810E4(void *a0) {
-    typedef struct { s16 vx, vy, vz, pad; } SVec8;
     extern Blk20 D_800AE620;
 
     Blk20 mtx;
@@ -6691,7 +6689,6 @@ void func_80181854(void *a0) {
        func_80180728): two file-scope anonymous-struct typedefs of one name are
        a hard cc1 error, block scope is not. Frame: v @ sp+0x10, v2 @ sp+0x18,
        mtx @ sp+0x20 -- declaration order IS slot order. */
-    typedef struct { u16 vx, vy, vz, pad; } UVec8;
 
     UVec8 v;
     UVec8 v2;
@@ -7661,14 +7658,7 @@ extern s32 func_8012AD50(void * arg0);
 
 void func_80183054(s32 arg0)
 {
-  typedef struct {
-    u8 raw[8];
-  } S8Blob;
 
-  typedef struct {
-    S8Blob a;
-    S8Blob b;
-  } Entry16;
 
   extern u16 D_8018A45C[];
   extern u32 D_801C7594;

src/ov_SC01_084/ov_SC01_084_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC01_084/ov_SC01_084_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC01_084_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC01_084_80131340 D_80186D04;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_80186DF0;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_80186DDC[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC01_084_80133CD4;
             *(Blk8_SC01_084_80133CD4 *)&D_801152B0 = *(Blk8_SC01_084_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC01_084/ov_SC01_084_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC01_084_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC01_084/ov_SC01_084_jr_8017CA80.c

@@ -2737,7 +2737,6 @@ void func_8017D960(void) {
 
 
 void func_8017DA00(void) {
-    typedef struct { s32 words[41]; } Blk164;
     extern u8 D_80126948[];
     extern u8 D_8011F920[];
     extern void func_8012A018(s32 a, s32 b);
@@ -2776,7 +2775,6 @@ void func_8017DA9C() {
 
 void func_8017DAF8(void)
 {
-    typedef struct { s32 w[4]; } Blk16_SC01_084_8017DAF8;
     extern u8 D_80126948[];
     extern u8 D_8011F920[];
     Blk16_SC01_084_8017DAF8 *src;
@@ -3382,7 +3380,6 @@ void func_8017E8E8(void *arg0) {
 
 
 void func_8017E94C(u8 *a0) {
-    typedef struct { s16 a, b, c, d; } SV4;
     extern s32 func_801399F0(s32 a0);
     extern void func_80139914(s32 a0);
     extern s32 func_8013767C(s32 a0);
@@ -3918,7 +3915,7 @@ void func_8017F378(s32 param_1)
 
 
 void func_8017F474(void *a0) {
-    extern struct B8_17F474 { u8 b[8]; } D_8018A790[];
+    extern struct B8_17F474 D_8018A790[];
     extern s32 D_801270D8;
     extern s32 func_8012BEE8(s32 a0);
     extern s32 func_8012BD14(s32 a0);

src/ov_SC01_084/ov_SC01_084_jr_8017F690.c

@@ -2753,9 +2753,9 @@ void func_8017F690(s32 param_1)
 {
     u8 *s0;
 
-    if (*(s32 *)(param_1 + 0xDC) != ((struct { s32 w; } *)&D_801270D8)->w) {
-        *(s32 *)(param_1 + 0xDC) = ((struct { s32 w; } *)&D_801270D8)->w;
-        switch (((struct { s32 w; } *)&D_801270D8)->w) {
+    if (*(s32 *)(param_1 + 0xDC) != ((Unkstruct_801270D8 *)&D_801270D8)->w) {
+        *(s32 *)(param_1 + 0xDC) = ((Unkstruct_801270D8 *)&D_801270D8)->w;
+        switch (((Unkstruct_801270D8 *)&D_801270D8)->w) {
         case 2:
         case 4:
         case 6:
@@ -3220,9 +3220,9 @@ void func_80180000(s32 param_1) {
             func_80028620(0, rec - 8);
             *(s32 *)(param_1 + 0xE4) = (rand() & 1) + 1;
         }
-        if (*(s32 *)(param_1 + 0xDC) != ((struct { s32 w; } *)&D_801270D8)->w) {
-            *(s32 *)(param_1 + 0xDC) = ((struct { s32 w; } *)&D_801270D8)->w;
-            switch (((struct { s32 w; } *)&D_801270D8)->w) {
+        if (*(s32 *)(param_1 + 0xDC) != ((Unkstruct_801270D8 *)&D_801270D8)->w) {
+            *(s32 *)(param_1 + 0xDC) = ((Unkstruct_801270D8 *)&D_801270D8)->w;
+            switch (((Unkstruct_801270D8 *)&D_801270D8)->w) {
             case 2:
             case 4:
             case 6:

src/ov_SC01_084/ov_SC01_084_jr_80182A00.c

@@ -2098,8 +2098,8 @@ void func_8018528C(void *a0) {
 
     switch (state) {
     case 0:
-        ((struct { unsigned short h; } *)((u8 *)s0 + 0x34))->h = state + 1;
-        ((struct { s32 f; } *)((u8 *)s0 + 0x1C))->f = 0;
+        ((Unkstruct_8018528C *)((u8 *)s0 + 0x34))->h = state + 1;
+        ((Unkstruct_8018528C_2 *)((u8 *)s0 + 0x1C))->f = 0;
         func_8002D4C8(0x4AA, 0);
         break;
     case 1:

src/ov_SC02_000/ov_SC02_000_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC02_000/ov_SC02_000_jr_8012ACE0.c

@@ -1424,9 +1424,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC02_000_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC02_000_80131340 D_8018B0B4;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2398,7 +2395,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_8018B1A0;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2457,7 +2454,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_8018B18C[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC02_000_80133CD4;
             *(Blk8_SC02_000_80133CD4 *)&D_801152B0 = *(Blk8_SC02_000_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC02_000/ov_SC02_000_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC02_000_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC02_000/ov_SC02_000_jr_8017F950.c

@@ -3,7 +3,6 @@
 
 void func_8017F950(s32 arg0)
 {
-    typedef struct { u32 w[4]; } St801D9204;
     extern void func_80019064(void *a0);
     extern void func_8012A828(s32 a0, void *a1);
     extern void func_8012B23C(s32 a0);

src/ov_SC02_000/ov_SC02_000_jr_8018173C.c

@@ -3383,7 +3383,6 @@ void func_80182BD0(u8 *a0) {
 
 void func_80182CB4(s32 _arg0)
 {
-    typedef struct { s32 w[4]; } Blk16_SC02_000_80182CB4;
     extern u8 D_80126948[];
     extern s32 D_80126E60[];
     Blk16_SC02_000_80182CB4 *src;

src/ov_SC02_000/ov_SC02_000_jr_80187B40.c

@@ -3908,18 +3908,7 @@ extern s32   AddPrim(s32 a0, void *a1);
 
 void func_80189340(s32 p)
 {
-    typedef struct { u8 pad0[3]; u8 len; u8 pad1[3]; u8 code; } PHdr_80189340;
-    typedef struct {
-        u32 tag;            /* 0x00 */
-        u32 c0;             /* 0x04 */
-        u16 x0, y0;         /* 0x08, 0x0A */
-        u32 c1;             /* 0x0C */
-        u16 x1, y1;         /* 0x10, 0x12 */
-        u32 c2;             /* 0x14 */
-        u16 x2, y2;         /* 0x18, 0x1A */
-        u32 c3;             /* 0x1C */
-        u16 x3, y3;         /* 0x20, 0x22 */
-    } PG4_80189340;         /* 0x24 */
+         /* 0x24 */
 
     s32 tags[28];           /* sp+0x18 */
     s16 sv[4];              /* sp+0x88 */

src/ov_SC02_004/ov_SC02_004_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC02_004/ov_SC02_004_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC02_004_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC02_004_80131340 D_8017E194;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_8017E280;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_8017E26C[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC02_004_80133CD4;
             *(Blk8_SC02_004_80133CD4 *)&D_801152B0 = *(Blk8_SC02_004_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC02_004/ov_SC02_004_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC02_004_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC02_005/ov_SC02_005_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC02_005/ov_SC02_005_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC02_005_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC02_005_80131340 D_80190D98;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_80190E84;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_80190E70[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC02_005_80133CD4;
             *(Blk8_SC02_005_80133CD4 *)&D_801152B0 = *(Blk8_SC02_005_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC02_005/ov_SC02_005_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC02_005_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC02_005/ov_SC02_005_jr_8017CF90.c

@@ -3562,12 +3562,10 @@ extern void func_8017E97C(void *a0);
 
 void func_8017E798(void *a0) {
 
-    typedef struct { s16 vx, vy, vz, pad; } Vec8_DB0;
     extern Vec8_DB0 D_801E2DB0;
     extern Vec8_DB0 D_801E2DB8;
     extern u8 D_80126948[];
     extern s32 D_80126E60[];
-    typedef struct { s32 w[41]; } Blk164_SC02_005_8017E798;
     u8 *base;
     Vec8_DB0 a;
     Vec8_DB0 b;
@@ -3591,7 +3589,6 @@ void func_8017E798(void *a0) {
 
 void func_8017E898(void)
 {
-    typedef struct { s32 w[4]; } Blk16_E898;
     extern u8 D_80126948[];
     extern s32 D_80126E60[];
     Blk16_E898 *src;
@@ -4222,7 +4219,6 @@ void func_8017F6E8(s32 param_1)
 #include "common.h"
 
 void func_8017F748(void *a0) {
-    typedef struct { u8 b[8]; } Blk8x;
     extern Blk8x D_801E2DD0;
     extern s32 func_80171D78(s32 a0, s32 a1);
     extern void func_80142454(s32 a0);
@@ -4241,8 +4237,6 @@ void func_8017F748(void *a0) {
 
 void func_8017F7CC(s32 param_1)
 {
-    typedef struct { u8 b[8]; } M8_SC02_005_8017F7CC;
-    typedef struct { u8 b[0x10]; } S16_SC02_005_8017F7CC;
     extern M8_SC02_005_8017F7CC D_801E2DD8;
     extern void func_8017E5CC(void);
     extern void func_8017E0B4(void);
@@ -4503,7 +4497,6 @@ void func_8017FDB4(void *arg0) {
 
 
 void func_8017FE08(void *a0) {
-    typedef struct { u8 b[8]; } Blk8_FE08;
     extern Blk8_FE08 D_801E2DE0;
     extern s32 func_80171D78(s32, s32);
     extern s32 func_801289F0();
@@ -4879,10 +4872,6 @@ extern s16 D_801E4C50;
  *    must therefore be 62 then 6A to emit 6A then 62.
  */
 void func_80180610(void *a0) {
-    typedef struct {
-        s16 f0; s16 f2; s16 f4; u16 f6; s16 f8;
-        s16 fA; s16 fC; s16 fE; s16 f10; s16 f12;
-    } Row_801944F4;
     extern Row_801944F4 D_801944F4[];
     s32 v1;
 

src/ov_SC02_005/ov_SC02_005_jr_80185060.c

@@ -368,7 +368,6 @@ void func_80185764(void *a0)
 extern s32 D_801E43C0;
 
 void func_80185858(s32 arg0, void *arg1, void *arg2) {
-    typedef struct { u8 pad[0x5C]; u16 f5C; } F5C_S;
     extern F5C_S *D_801E43CC[];
     s32 *p = &D_801E43C0;
 

src/ov_SC02_005/ov_SC02_005_jr_80185E80.c

@@ -687,10 +687,6 @@ void func_80186B08(s32 param_1)
 
 
 void func_80186BB8(void) {
-    typedef struct {
-        u8 pad[0x5C];
-        u16 f5C;
-    } F5C_S;
     extern F5C_S *D_801E43CC[];
     extern s8 D_80195ABC[];
     s32 i;
@@ -707,7 +703,6 @@ void func_80186BB8(void) {
 
 
 void func_80186C0C(void *a0) {
-    typedef struct { u8 pad[0x5C]; u16 f5C; } F5C_S;
     extern F5C_S *D_801E43CC[];
     extern s8 D_80195ABC[];
     s32 i;
@@ -2799,7 +2794,6 @@ extern u16 D_80126B94;
  * both declarations draft-local and is byte-neutral. */
 void func_80189B30(s32 arg0)
 {
-    typedef struct { char b[8]; } Blob8_80189B30;
     extern Blob8_80189B30 D_801E2F00;
     Blob8_80189B30 blob;
     s32 sub;
@@ -5973,7 +5967,6 @@ void func_8018DFC4(void *a0) {
        and carry an anonymous struct typedef that cannot be forward-referenced
        or re-spelled here.  At block scope gcc-2.7.2 downgrades the clash to a
        warning; at file scope it is a hard "conflicting types" error. */
-    typedef struct { u32 f0; u32 f4; } Pair8;
     extern Pair8 D_801E4998[];
     extern Pair8 D_801E499C[];
     struct { s16 f00, f02, f04, f06, f08, f0A, f0C, f0E; s32 f10; u8 pad14[0x14]; } sp18;

src/ov_SC02_011/ov_SC02_011_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;

src/ov_SC02_011/ov_SC02_011_jr_8012ACE0.c

@@ -1426,9 +1426,6 @@ void func_80131340(s32 a0)
     /* 8-byte, align-2 vector: align < 4 is what makes the assignments unaligned
      * (lwl/lwr + swl/swr) block moves. Block-scope so the body stays self-contained
      * for the dedup_propagate lift (§28-#1) and cannot collide with the TU's `M8`. */
-    struct V8_SC02_011_80131340 {
-        u16 vx, vy, vz, pad;
-    };
     extern struct V8_SC02_011_80131340 D_801911E8;
     /* BLOCK-scope, mirroring the already-matched func_801312D0's decl at TU L1619: the
      * later DEFINE_func_80131AC8() (TU L1964, AFTER this slot) redeclares func_80131CF4
@@ -2401,7 +2398,7 @@ s32 func_80133CD4(arg0, cmd, base, arr)
 
         {
             s32 *pw = D_801912D4;
-            ((struct { s32 w; } *)pw)->w = s3[0];
+            ((Unkstruct_80133CD4 *)pw)->w = s3[0];
             pw[1] = s3[1];
             pw[2] = s3[2];
         }
@@ -2460,7 +2457,6 @@ s32 func_80133CD4(arg0, cmd, base, arr)
     if (y >= -0xBCB) {
         D_801912C0[3] = y;
         {
-            typedef struct { s8 c[8]; } Blk8_SC02_011_80133CD4;
             *(Blk8_SC02_011_80133CD4 *)&D_801152B0 = *(Blk8_SC02_011_80133CD4 *)s3;
         }
         if (*(u8 *)cmd != 0)

src/ov_SC02_011/ov_SC02_011_jr_80135A4C.c

@@ -618,7 +618,6 @@ extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4)
 
 
 s32 func_80135A4C(s32 a0, s32 a1, s32 *a2, s32 a3) {
-    typedef struct { s8 c[8]; } Blk8_SC02_011_80135A4C;
     extern s16 func_80135480(void *param_1, s32 param_2, s16 *param_3, s16 *param_4);
     extern s32 func_80135EB0(void *arg0, s32 arg1_);
     extern s32 func_80136A94(s32 a0, s32 a1, s32 a2, s32 a3);

src/ov_SC02_011/ov_SC02_011_jr_8017AE2C.c

@@ -7098,7 +7098,6 @@ void func_80180E74(void *a0)
 
 void func_80180FE4(s32 arg0)
 {
-    typedef struct { u32 w0, w1, w2; } Prim_SC02_011_80180FE4;
 
     extern s32 func_800491EC(void);
     extern void func_800547D8(s32, MTX80180FE4 *);
@@ -7571,7 +7570,6 @@ void func_80181E40(s32 param_1) {
 
 
 void func_80181EF4(s32 param_1) {
-    typedef struct { u8 b[8]; } Blk8L;
     extern Blk8L D_801E9DA0;
     Blk8L buffer;
 
@@ -7971,7 +7969,6 @@ void func_801826D8(void *a0) {
 #include "common.h"
 
 void func_80182714(s32 param_1) {
-    typedef struct { s16 x0, x1, x2, x3; } Blk8S16;
     extern s32 D_801E9DA8;
     extern s32 D_80126B58;
     extern s16 D_80195058[];

src/ov_SC02_011/ov_SC02_011_jr_80183178.c

@@ -2454,7 +2454,6 @@ void func_80186734(void *a0) {
 
 s32 func_80186740(void)
 {
-    typedef struct { unsigned char b[4]; } __attribute__((packed, aligned(1))) Block4_SC02_011_80186740;
 
     extern Block4_SC02_011_80186740 D_801EB524;
     extern unsigned char D_801EB525;
@@ -2587,7 +2586,7 @@ void func_80186868(s32 a0)
         }
         if ((*(s32 *)(self + 0x1C) & 0x1F) >= 8) {
             if (func_80186B1C((void *)self, D_80195D30) != 0) {
-                ((struct { u16 w; } *)&D_80126B96)->w |= 0x4000;
+                ((Unkstruct_80126B96 *)&D_80126B96)->w |= 0x4000;
                 D_80126B98 = 0xC;
             }
         }

src/ov_SC02_015/ov_SC02_015_after.c

@@ -1554,13 +1554,6 @@ s32 func_8014D820(s32 a0, u16 *a1, u16 *a2)
     extern s16 D_801152AC;
   /* BLOCK-SCOPE types — see the header note. `Ent` at file scope collides with
      src/shared/engine_types.h:434 and kills the TU's cc1 stage (exit 33). */
-  typedef struct
-  {
-    u16 x;
-    u16 y;
-    u16 z;
-    u16 w;
-  } V4;
   typedef Unkstruct_800B5CB8 Ent;
   int new_var2;
   s16 new_var3;