mirror/BFM-decomp
1
0
Fork 0
mirror of https://github.com/Druthulu/BFM-decomp synced 2026-10-05 08:57:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

T5.1.c5: fold H16 class (Bidx/RD16 macro bodies respelled); R22 green

Browse Source
This commit is contained in:
Drew T
2026-09-30 14:31:12 -06:00
parent 1c842e2563
commit f7fde90cc2
28 changed files with 89 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/struct-map.md
+1 -1
View File
@@ -1,6 +1,6 @@
# The struct map — the types the fleet's cast sites need (Phase 37 T1)
> **Generated by `tools/type_census.py` at `ead6a3f0ee` (2026-09-30T20:21:22Z); never typed (R75).** Every raw pointer-cast dereference in `src/` was assigned to a base (a parameter, a local, a global by value or by address, an absolute address) and the bases were clustered by EVIDENCE only — the same global symbol, an argument passed to a callee's parameter, an assignment or return, a pointer field read, a shared body's fleet-wide identity — never by a similar offset signature. Each cluster is one type the tree needs. Names are placeholders (`Unkstruct_<addr>`: the lowest global instance's address, else the lowest member function's); fields are placeholders (`unk<HEX>`) until Phase 38 cites evidence.
> **Generated by `tools/type_census.py` at `1c842e2563` (2026-09-30T20:31:08Z); never typed (R75).** Every raw pointer-cast dereference in `src/` was assigned to a base (a parameter, a local, a global by value or by address, an absolute address) and the bases were clustered by EVIDENCE only — the same global symbol, an argument passed to a callee's parameter, an assignment or return, a pointer field read, a shared body's fleet-wide identity — never by a similar offset signature. Each cluster is one type the tree needs. Names are placeholders (`Unkstruct_<addr>`: the lowest global instance's address, else the lowest member function's); fields are placeholders (`unk<HEX>`) until Phase 38 cites evidence.
**19124 types explain 498868 of 502988 dereference sites (99.2 %); 4120 sites have a base the census could not classify; 857 types carry a width conflict.** Merges by evidence: param 38876, assign 16783, arg 10825, field 9904, ret-of 4335, return 1524, assign& 1184, arg& 270.
include/struct_types.h
+4 -3
View File
@@ -1090,7 +1090,8 @@ typedef struct {
} S1254;
typedef struct { s32 f10, f14, f18; } S12_801AD700;
typedef struct { s32 f10, f14, f18; } S12_801AD914;
typedef struct { u16 v; } S16_800CF3E8;
typedef struct { u16 h; } H16;
typedef H16 S16_800CF3E8;
typedef struct { s32 w[4]; } S16_md_MAIN_014_800CB254;
typedef struct {
s8 pad00[4];
@@ -1382,7 +1383,7 @@ typedef struct {
typedef struct { u32 a; u32 b; } U8x __attribute__((packed, aligned(1)));
struct UnkS1 { s32 pad0; s32 f4; s32 pad8; s32 fC; s32 pad10; s32 pad14; s32 f18; u32 f1C; };
typedef struct {char c [ 4 ] ;} Unkstruct_801A01E8;
typedef struct { u16 v; } Unkstruct_801AF368;
typedef H16 Unkstruct_801AF368;
typedef struct { u32 v; } Unkstruct_801AF368_2;
typedef struct { s16 h; } Unkstruct_8017D2A4;
typedef Unkstruct_8017D2A4 Unkstruct_801E3C1C;
@@ -2757,7 +2758,7 @@ typedef struct Ent30D80 {
/* 0x51 */ u8 unk51;
} Ent30D80;
typedef struct { u8 _0[0x12]; u16 f12; } F20T;
typedef struct { u16 f0; } H2;
typedef H16 H2;
typedef struct { /* func_801457A4 buffer (hdr) */
s16 f0, f2, f4, f6, f8, fA;
u8 fC, fD, fE, _F;
src/800_b_2.c
+1 -1
View File
@@ -1039,7 +1039,7 @@ void func_8002D904(s32 arg0) {
}
pa2 = &D_800A4EA2;
q = D_800652F0[D_80065438[*(s16 *)(D_80068B60 + i * 0x10)].f0];
q = D_800652F0[D_80065438[*(s16 *)(D_80068B60 + i * 0x10)].h];
if ((*pa2 & 4) != 0 && D_800A4EA0 == i) {
D_800A4EA0 = 0;
D_800A4E8E = *pa2;
src/800_c.c
+3 -3
View File
@@ -1763,12 +1763,12 @@ void func_80037144(s32 idx) {
D_80076244[i].unk0D = one;
D_80076244[i].unk04 = idx | 0x2000;
D_80076244[i].unk0E = 4;
v = D_800652F0[D_80065438[idx].f0];
v = D_800652F0[D_80065438[idx].h];
D_800A469C = v;
D_80076244[i].unk08 = v;
k = 4;
if (D_800A46B0 == 0) {
if (D_800A46A0 == (D_80065438[idx].f0 | 0x4000)) {
if (D_800A46A0 == (D_80065438[idx].h | 0x4000)) {
D_80076244[i].unk04 |= 0x1000;
goto after;
}
@@ -1866,7 +1866,7 @@ void func_800373D0(void) {
sp2->unk06 |= 0x20;
func_8002D7FC((s32) sp3);
if (!(p->unk00 & 0x1000)) {
func_8002FDE8(D_80065438[sp2->unk00].f0, sp3 + 0x7000);
func_8002FDE8(D_80065438[sp2->unk00].h, sp3 + 0x7000);
}
}
}
src/md_MAIN_003/md_MAIN_003.c
+1 -1
View File
@@ -255,7 +255,7 @@ extern u8 D_800AA60C[];
#define ADDPRIMB(ot, p) setaddr_((p), getaddr_(ot)); setaddr_((ot), (p));
extern S16_800CF3E8 sD800B9A02 __asm__("D_800B9A02");
#define OTIDX ((fr = sD800B9A02), fr.v)
#define OTIDX ((fr = sD800B9A02), fr.h)
extern Sprt24 D_800EC7C8[];
extern Sprt24 D_800EC7F8[];
extern Sprt24 D_800EC828[];
src/md_SC07_004/md_SC07_004.c
+1 -1
View File
@@ -10404,7 +10404,7 @@ void func_801AF2EC(void *a0) {
#define RD16(p) (((Unkstruct_801AF368 *)(p))->v)
#define RD16(p) (((Unkstruct_801AF368 *)(p))->h)
#define RW32(p) (((Unkstruct_801AF368_2 *)(p))->v)
void func_801AF368(void *a0)
src/ov_SC02_005/ov_SC02_005_jr_80181D30.c
+1 -1
View File
@@ -4837,7 +4837,7 @@ void func_80184A8C(void *a0) {
s32 tmp[3];
timer -= 1;
((struct S34_80184A8C *)(s0 + 0x34))->v = timer;
((S34_80184A8C *)(s0 + 0x34))->h = timer;
tmp[0] = (*(s16 *)(s0 + 0xDC) - *(s32 *)(*(s32 *)(s0 + 0x20) + 0x48)) >> 2;
src/ov_SC02_011/ov_SC02_011_jr_80183178.c
+1 -1
View File
@@ -2586,7 +2586,7 @@ void func_80186868(s32 a0)
}
if ((*(s32 *)(self + 0x1C) & 0x1F) >= 8) {
if (func_80186B1C((void *)self, D_80195D30) != 0) {
((Unkstruct_80126B96 *)&D_80126B96)->w |= 0x4000;
((Unkstruct_80126B96 *)&D_80126B96)->h |= 0x4000;
D_80126B98 = 0xC;
}
}
src/ov_SC02_011/ov_SC02_011_jr_80188E3C.c
+3 -3
View File
@@ -2000,9 +2000,9 @@ void func_8018B2C4(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_8018B2C4 *)q)->addr =
((PTag_8018B23C_8018B2C4 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_8018B2C4 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_8018B2C4 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_8018B2C4 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC02_028/ov_SC02_028_jr_8017D898.c
+3 -3
View File
@@ -7434,9 +7434,9 @@ void func_801844D4(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_801844D4 *)q)->addr =
((PTag_8018B23C_801844D4 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_801844D4 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_801844D4 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_801844D4 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC03_014/ov_SC03_014_jr_801848E4.c
+3 -3
View File
@@ -7239,9 +7239,9 @@ void func_8018B23C(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C *)q)->addr =
((PTag_8018B23C *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC03_024/ov_SC03_024_jr_80183BF8.c
+3 -3
View File
@@ -5129,9 +5129,9 @@ void func_801865DC(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_801865DC *)q)->addr =
((PTag_8018B23C_801865DC *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_801865DC *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_801865DC *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_801865DC *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC03_097/ov_SC03_097_jr_8017D898.c
+3 -3
View File
@@ -5786,9 +5786,9 @@ void func_80182498(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_80182498 *)q)->addr =
((PTag_8018B23C_80182498 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_80182498 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_80182498 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_80182498 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC03_101/ov_SC03_101_jr_8017CA80.c
+3 -3
View File
@@ -6342,9 +6342,9 @@ void func_801829F8(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_801829F8 *)q)->addr =
((PTag_8018B23C_801829F8 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_801829F8 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_801829F8 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_801829F8 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC03_104/ov_SC03_104_jr_80182038.c
+3 -3
View File
@@ -5818,9 +5818,9 @@ void func_80185E34(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_80185E34 *)q)->addr =
((PTag_8018B23C_80185E34 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_80185E34 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_80185E34 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_80185E34 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC03_105/ov_SC03_105_jr_8018624C.c
+1 -1
View File
@@ -285,7 +285,7 @@ void func_801867D0(s32 a0)
if (func_8012E544(0x222) == 0) {
func_8012A828(s0, D_801B2E28);
func_8012A828(*(s32 *)(s0 + 0x6C), D_801B2FC0);
((struct Ctr34 *)(s0 + 0x34))->h = ((struct Ctr34 *)(s0 + 0x34))->h + 1;
((Ctr34 *)(s0 + 0x34))->h = ((Ctr34 *)(s0 + 0x34))->h + 1;
D_801BCBBC = D_801BCBBC + 1;
return;
}
src/ov_SC03_114/ov_SC03_114_jr_8017BEBC.c
+1 -1
View File
@@ -3625,7 +3625,7 @@ void func_8017E270(void *a0) {
#define RD16(p) (((Unkstruct_8017E2EC *)(p))->v)
#define RD16(p) (((Unkstruct_8017E2EC *)(p))->h)
#define RW32(p) (((Unkstruct_8017E2EC_2 *)(p))->v)
void func_8017E2EC(void *a0)
src/ov_SC03_118/ov_SC03_118_jr_80183830.c
+3 -3
View File
@@ -4928,9 +4928,9 @@ void func_801860E8(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_801860E8 *)q)->addr =
((PTag_8018B23C_801860E8 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_801860E8 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_801860E8 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_801860E8 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC04_011/ov_SC04_011_jr_8017D494.c
+4 -4
View File
@@ -15693,9 +15693,9 @@ void func_8018EBCC(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_8018EBCC *)q)->addr =
((PTag_8018B23C_8018EBCC *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_8018EBCC *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_8018EBCC *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_8018EBCC *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
@@ -15778,7 +15778,7 @@ void func_8018EFB0(void *a0) {
}
#define RD16(p) (((Unkstruct_8018F02C *)(p))->v)
#define RD16(p) (((Unkstruct_8018F02C *)(p))->h)
#define RW32(p) (((Unkstruct_8018F02C_2 *)(p))->v)
void func_8018F02C(void *a0)
src/ov_SC04_016/ov_SC04_016_jr_8017F03C.c
+1 -1
View File
@@ -3077,7 +3077,7 @@ void func_8017F82C(void *a0) {
}
#define RD16(p) (((Unkstruct_8017F8A8 *)(p))->v)
#define RD16(p) (((Unkstruct_8017F8A8 *)(p))->h)
#define RW32(p) (((Unkstruct_8017F8A8_2 *)(p))->v)
void func_8017F8A8(void *a0)
src/ov_SC06_000/ov_SC06_000_jr_8017AE2C.c
+4 -4
View File
@@ -11012,9 +11012,9 @@ void func_80187314(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_80187314 *)q)->addr =
((PTag_8018B23C_80187314 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_80187314 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_80187314 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_80187314 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
@@ -11283,7 +11283,7 @@ void func_80187AB8(void *a0) {
}
#define RD16(p) (((Unkstruct_80187B34 *)(p))->v)
#define RD16(p) (((Unkstruct_80187B34 *)(p))->h)
#define RW32(p) (((Unkstruct_80187B34_2 *)(p))->v)
void func_80187B34(void *a0)
src/ov_SC06_006/ov_SC06_006_jr_8017DB90.c
+1 -1
View File
@@ -5220,7 +5220,7 @@ void func_801815DC(void *a0) {
}
#define RD16(p) (((Unkstruct_80181658 *)(p))->v)
#define RD16(p) (((Unkstruct_80181658 *)(p))->h)
#define RW32(p) (((Unkstruct_80181658_2 *)(p))->v)
void func_80181658(void *a0)
src/ov_SC06_016/ov_SC06_016_jr_801839D0.c
+3 -3
View File
@@ -3847,9 +3847,9 @@ void func_80184918(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_80184918 *)q)->addr =
((PTag_8018B23C_80184918 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_80184918 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_80184918 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_80184918 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC06_018/ov_SC06_018_jr_80187AEC.c
+1 -1
View File
@@ -6555,7 +6555,7 @@ void func_8018CC88(void *a0) {
}
#define RD16(p) (((Unkstruct_8018CD04 *)(p))->v)
#define RD16(p) (((Unkstruct_8018CD04 *)(p))->h)
#define RW32(p) (((Unkstruct_8018CD04_2 *)(p))->v)
void func_8018CD04(void *a0)
src/ov_SC06_032/ov_SC06_032_jr_80182890.c
+1 -1
View File
@@ -6457,7 +6457,7 @@ void func_80187E60(void *a0) {
}
#define RD16(p) (((Unkstruct_80187EDC *)(p))->v)
#define RD16(p) (((Unkstruct_80187EDC *)(p))->h)
#define RW32(p) (((Unkstruct_80187EDC_2 *)(p))->v)
void func_80187EDC(void *a0)
src/ov_SC07_000/ov_SC07_000_jr_8017F8B8.c
+3 -3
View File
@@ -4845,9 +4845,9 @@ void func_8018234C(s32 a0) {
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
((PTag_8018B23C_8018234C *)q)->addr =
((PTag_8018B23C_8018234C *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_8018234C *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_8018234C *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_8018234C *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/ov_SC07_002/ov_SC07_002_jr_8017C8D0.c
+4 -4
View File
@@ -7939,11 +7939,11 @@ void func_80185150(s32 a0) {
{
Bidx_8018B23C_80185150 *bp = (Bidx_8018B23C_80185150 *)&D_800B9A02;
/* addPrim(&D_800A651C[bp->f].a[0x10], q) */
/* addPrim(&D_800A651C[bp->h].a[0x10], q) */
((PTag_8018B23C_80185150 *)q)->addr =
((PTag_8018B23C_80185150 *)(D_800A651C[bp->f].a + 0x40))->addr;
((PTag_8018B23C_80185150 *)(D_800A651C[bp->f].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->f * 20], 0x10, 1);
((PTag_8018B23C_80185150 *)(D_800A651C[bp->h].a + 0x40))->addr;
((PTag_8018B23C_80185150 *)(D_800A651C[bp->h].a + 0x40))->addr = (u32)q;
func_80016638(&D_800A6518[bp->h * 20], 0x10, 1);
}
}
src/shared/engine_types.h
+28 -31
View File
@@ -731,7 +731,6 @@ typedef struct {
int tag; /* 0x30 -> struct size 0x34; tag lands at sp+0x40 */
} Frame_80166690_80166690;
typedef Frame_80166690_80166690 Frame_80166690;
typedef struct { u16 h; } H16;
typedef struct { s16 x, y; } Pair_8013AD38;
typedef Pair_8013AD38 Hw4;
typedef struct { char _b[8]; } M8;
@@ -1181,19 +1180,19 @@ typedef struct { u8 d[4]; } __attribute__((packed, aligned(1))) B4_8018EDB0;
typedef struct { u8 d[4]; } __attribute__((packed, aligned(1))) B4_8018F060;
typedef struct { u8 d[8]; } __attribute__((packed, aligned(1))) B8_8018EDB0;
typedef struct { u8 d[8]; } __attribute__((packed, aligned(1))) B8_8018F060;
typedef struct { u16 f; } Bidx_8018B23C;
typedef struct { u16 f; } Bidx_8018B23C_8018234C;
typedef struct { u16 f; } Bidx_8018B23C_80182498;
typedef struct { u16 f; } Bidx_8018B23C_801829F8;
typedef struct { u16 f; } Bidx_8018B23C_801844D4;
typedef struct { u16 f; } Bidx_8018B23C_80184918;
typedef struct { u16 f; } Bidx_8018B23C_80185150;
typedef struct { u16 f; } Bidx_8018B23C_80185E34;
typedef struct { u16 f; } Bidx_8018B23C_801860E8;
typedef struct { u16 f; } Bidx_8018B23C_801865DC;
typedef struct { u16 f; } Bidx_8018B23C_80187314;
typedef struct { u16 f; } Bidx_8018B23C_8018B2C4;
typedef struct { u16 f; } Bidx_8018B23C_8018EBCC;
typedef H16 Bidx_8018B23C;
typedef H16 Bidx_8018B23C_8018234C;
typedef H16 Bidx_8018B23C_80182498;
typedef H16 Bidx_8018B23C_801829F8;
typedef H16 Bidx_8018B23C_801844D4;
typedef H16 Bidx_8018B23C_80184918;
typedef H16 Bidx_8018B23C_80185150;
typedef H16 Bidx_8018B23C_80185E34;
typedef H16 Bidx_8018B23C_801860E8;
typedef H16 Bidx_8018B23C_801865DC;
typedef H16 Bidx_8018B23C_80187314;
typedef H16 Bidx_8018B23C_8018B2C4;
typedef H16 Bidx_8018B23C_8018EBCC;
typedef struct { u8 b[12]; } Blk12_801854C4;
typedef struct { u8 b[12]; } Blk12_801854C4_80181830;
typedef struct { u8 b[12]; } Blk12_801854C4_80181CA0;
@@ -3337,9 +3336,7 @@ typedef struct Rec80182744_s Rec80182744;
/* --- lift_types.py fleet lift --- */
struct B16_8017CDE4 { s32 w[4]; };
struct B16_8018FC38 { s32 w[4]; };
struct Ctr34 {
u16 h;
};
typedef H16 Ctr34;
struct D_801D0630_s { u16 f0; u16 f2; u16 pad[2]; };
struct D_801D0660_s { u16 f0; u16 f2; };
struct EntF2_80181F0C {
@@ -3435,7 +3432,7 @@ struct Rec80182744_s {
s32 f2;
} __attribute__((packed, aligned(1)));
typedef Unkstruct_8017D2A4 S0E_80184828;
struct S34_80184A8C { u16 v; };
typedef H16 S34_80184A8C;
struct S6C { u8 pad[8]; };
struct S72 { s16 unk0; u8 pad[6]; };
struct S80190C84_846B4 {
@@ -5821,19 +5818,19 @@ typedef struct {
u8 pad_D8[0x10];
s32 f_E8;
} MainStruct;
typedef struct { u16 v; } Unkstruct_8017E2EC;
typedef H16 Unkstruct_8017E2EC;
typedef struct { u32 v; } Unkstruct_8017E2EC_2;
typedef struct { u16 v; } Unkstruct_8017F8A8;
typedef H16 Unkstruct_8017F8A8;
typedef struct { u32 v; } Unkstruct_8017F8A8_2;
typedef struct { u16 v; } Unkstruct_80181658;
typedef H16 Unkstruct_80181658;
typedef struct { u32 v; } Unkstruct_80181658_2;
typedef struct { u16 v; } Unkstruct_80187B34;
typedef H16 Unkstruct_80187B34;
typedef struct { u32 v; } Unkstruct_80187B34_2;
typedef struct { u16 v; } Unkstruct_80187EDC;
typedef H16 Unkstruct_80187EDC;
typedef struct { u32 v; } Unkstruct_80187EDC_2;
typedef struct { u16 v; } Unkstruct_8018CD04;
typedef H16 Unkstruct_8018CD04;
typedef struct { u32 v; } Unkstruct_8018CD04_2;
typedef struct { u16 v; } Unkstruct_8018F02C;
typedef H16 Unkstruct_8018F02C;
typedef struct { u32 v; } Unkstruct_8018F02C_2;
typedef struct { u16 a, b, c, d; } V8_SC07_002_8017C8D0;
@@ -6520,13 +6517,13 @@ typedef struct {
typedef SVECTOR_8017E6D8 UV8;
typedef SVECTOR_8017E6D8 UV_85810;
typedef SVECTOR_8017E6D8 UVec8;
typedef struct { u16 w; } Unkstruct_80126B96;
typedef H16 Unkstruct_80126B96;
typedef struct { s32 f; } Unkstruct_801270C8;
typedef struct { s32 w; } Unkstruct_801270D8;
typedef struct { s32 w; } Unkstruct_80133CD4;
typedef struct { u8 pad[2]; u16 f; } Unkstruct_801824D4;
typedef struct { u8 pad[2]; u16 f; } Unkstruct_80182560;
typedef struct { unsigned short h; } Unkstruct_8018528C;
typedef H16 Unkstruct_8018528C;
typedef struct { s32 f; } Unkstruct_8018528C_2;
typedef struct { s32 a, b, c, d, e, f, g, h, f20; } Unkstruct_8018637C;
typedef struct { s32 f; } Unkstruct_80188988;
@@ -6775,10 +6772,10 @@ typedef struct { u32 w0, w1, w2; } Prim_8017C8D0_t67f11bf2;
typedef struct { u32 w0, w1, w2; } Prim_8017CA80_t67f11bf2;
typedef struct { u32 w0, w1, w2; } Prim_8017D5C0_e98d5a37;
typedef struct { u32 w0, w1, w2; } Prim_8017D898_t67f11bf2;
typedef struct { u16 h; } Unkstruct_8011F82A;
typedef struct { u16 h; } Unkstruct_8011F82C;
typedef struct { u16 h; } Unkstruct_8011F82E;
typedef struct { u16 h; } Unkstruct_8011F830;
typedef H16 Unkstruct_8011F82A;
typedef H16 Unkstruct_8011F82C;
typedef H16 Unkstruct_8011F82E;
typedef H16 Unkstruct_8011F830;
typedef struct { s32 w; } Unkstruct_8014EA4C;
typedef struct { s32 w; } Unkstruct_8014EE14;
typedef struct { s32 field; } Unkstruct_8014F2E0;