From 925dbfa14fb85633301c9b2f74f7d186f0d38c32 Mon Sep 17 00:00:00 2001 From: Drew T <50529377+Druthulu@users.noreply.github.com> Date: Sun, 19 Jul 2026 12:16:15 -0600 Subject: [PATCH] fix(phase-29 crack-wave3): rename Prim->Prim_B234 in func_8016B234 exemplar (collides with engine_types.h Prim in member TUs, byte-neutral) --- src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c b/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c index 6adbbba39..4b5259edb 100644 --- a/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c +++ b/src/ov_SC01_077/ov_SC01_077_jr_8016AB6C.c @@ -2272,11 +2272,11 @@ extern void func_800491AC(void *a0); extern s32 RotTransPers(s32 a0, s32 a1, s32 *a2, s32 *a3); extern void func_80016ED4(void *a0); -typedef struct { s16 ax, ay, a04, a06, bx, by, b0c, b0e, cx, cy, c14, c16, dx, dy, d1c, d1e, u0, v0, u1, v1, u2, v2, u3, v3; u8 r, g, b, pad33; s32 tag; u8 code, pad39, pad3a, pad3b; s32 pad3c; } Prim; +typedef struct { s16 ax, ay, a04, a06, bx, by, b0c, b0e, cx, cy, c14, c16, dx, dy, d1c, d1e, u0, v0, u1, v1, u2, v2, u3, v3; u8 r, g, b, pad33; s32 tag; u8 code, pad39, pad3a, pad3b; s32 pad3c; } Prim_B234; void func_8016B234(s32 param_1) { short input[3]; - Prim prim; + Prim_B234 prim; struct { s16 xy[2]; s32 sp1c; s32 flag; } out; void *dp; u32 uVar1;