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

T5.1.c7: fold 4 more SHARED components (78ca7, 06c78, 4cc70#0, b85ca#0); R22 green

Browse Source
This commit is contained in:
Drew T
2026-09-30 15:40:12 -06:00
parent c4168ef1db
commit 634dfd25ed
6 changed files with 120 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/engine_types.h
+90 -96
View File
@@ -70,7 +70,6 @@ struct V4s80147514;
struct Quad;
struct A;
struct B;
struct Bv;
struct packed_word;
union word_bytes;
struct up;
@@ -347,7 +346,7 @@ struct A {
};
struct Bv { s32 w[8]; };
typedef Blk20_8016DF5C Bv;
union word_bytes {
@@ -632,7 +631,6 @@ typedef struct {
u8 dr, dg, db, pad_7;
s16 vx, vy, vz, tm;
} Blip_8018F694;
typedef struct { s32 w[8]; } Blk20_8016DF5C;
typedef struct { s32 w[8]; } Blk32_998;
typedef struct { u8 d[0x60]; } Blk60;
typedef struct { u8 b[8]; } Blk8_8017B238_8017B238;
@@ -742,7 +740,7 @@ struct Entity_80167540 {
/* 0x34 */ struct Node_80167540 *unk34;
/* 0x38 */ Mat_80167540 mat;
};
typedef struct Mat_8016A73C { int w[8]; } Mat_8016A73C;
typedef Blk20_8016DF5C Mat_8016A73C;
typedef struct { u8 pad0[0x12]; u16 unk12; } Obj20_80178D40;
typedef struct Actor_80178D40 {
s16 unk0;
@@ -1001,10 +999,7 @@ typedef struct
CLR_8016CBC0 col[4];
s32 tag;
} Poly_8016CBC0;
typedef struct
{
s32 w[8];
} Mtx8_8016CBC0;
typedef Blk20_8016DF5C Mtx8_8016CBC0;
/* Phase-29 decl-normalize+lift (func_8013D53C family) */
typedef struct {
@@ -1141,22 +1136,22 @@ typedef Blk12_801854C4 Blk12_801854C4_80187F84;
typedef Blk16_8018A8B8 Blk16_80184328;
typedef Blk16_8018A8B8 Blk16_8018B13C;
typedef Blk16_8018A8B8 Blk16_8018B29C;
typedef struct { s32 w[8]; } Blk20_8018AF88;
typedef struct { s32 w[8]; } Blk20_8018AF88_80186160;
typedef Blk20_8016DF5C Blk20_8018AF88;
typedef Blk20_8016DF5C Blk20_8018AF88_80186160;
typedef struct { s32 w[8]; } Blk32L_80133298;
typedef struct { s32 w[8]; } Blk32_8018AA98;
typedef struct { s32 w[8]; } Blk32_8018AA98_80181BA8;
typedef struct { s32 w[8]; } Blk32_8018AA98_80181CF4;
typedef struct { s32 w[8]; } Blk32_8018AA98_80182254;
typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30;
typedef struct { s32 w[8]; } Blk32_8018AA98_80184174;
typedef struct { s32 w[8]; } Blk32_8018AA98_801849AC;
typedef struct { s32 w[8]; } Blk32_8018AA98_80185690;
typedef struct { s32 w[8]; } Blk32_8018AA98_80185944;
typedef struct { s32 w[8]; } Blk32_8018AA98_80185E38;
typedef struct { s32 w[8]; } Blk32_8018AA98_80186B70;
typedef struct { s32 w[8]; } Blk32_8018AA98_8018AB20;
typedef struct { s32 w[8]; } Blk32_8018AA98_8018E428;
typedef Blk20_8016DF5C Blk32_8018AA98;
typedef Blk20_8016DF5C Blk32_8018AA98_80181BA8;
typedef Blk20_8016DF5C Blk32_8018AA98_80181CF4;
typedef Blk20_8016DF5C Blk32_8018AA98_80182254;
typedef Blk20_8016DF5C Blk32_8018AA98_80183D30;
typedef Blk20_8016DF5C Blk32_8018AA98_80184174;
typedef Blk20_8016DF5C Blk32_8018AA98_801849AC;
typedef Blk20_8016DF5C Blk32_8018AA98_80185690;
typedef Blk20_8016DF5C Blk32_8018AA98_80185944;
typedef Blk20_8016DF5C Blk32_8018AA98_80185E38;
typedef Blk20_8016DF5C Blk32_8018AA98_80186B70;
typedef Blk20_8016DF5C Blk32_8018AA98_8018AB20;
typedef Blk20_8016DF5C Blk32_8018AA98_8018E428;
typedef struct { u8 b[4]; } Blk4_8018BDD0;
typedef Blk4_8018BDD0 Blk4_8018CE04;
typedef struct { u8 b[4]; } Blk4_8018CE04_80186D40;
@@ -1644,24 +1639,24 @@ typedef MATRIX MTX_L_8017D27C;
typedef MATRIX MTX_L_8017D960;
typedef MATRIX MTX_L_801811D4;
typedef MATRIX MTX_L_80184B80;
typedef struct { s32 w[8]; } Mat32_8018A390;
typedef struct { s32 w[8]; } Mat32_8018A390_8018523C;
typedef struct { s32 w[8]; } Mat32_8018A390_80185730;
typedef struct { s32 w[8]; } Mat32_8018A390_80186468;
typedef struct { s32 w[8]; } Mat32_8018A390_8018FE94;
typedef struct { s32 w[8]; } Mat32_8018B23C;
typedef struct { s32 w[8]; } Mat32_8018B23C_8018234C;
typedef struct { s32 w[8]; } Mat32_8018B23C_80182498;
typedef struct { s32 w[8]; } Mat32_8018B23C_801829F8;
typedef struct { s32 w[8]; } Mat32_8018B23C_801844D4;
typedef struct { s32 w[8]; } Mat32_8018B23C_80184918;
typedef struct { s32 w[8]; } Mat32_8018B23C_80185150;
typedef struct { s32 w[8]; } Mat32_8018B23C_80185E34;
typedef struct { s32 w[8]; } Mat32_8018B23C_801860E8;
typedef struct { s32 w[8]; } Mat32_8018B23C_801865DC;
typedef struct { s32 w[8]; } Mat32_8018B23C_80187314;
typedef struct { s32 w[8]; } Mat32_8018B23C_8018B2C4;
typedef struct { s32 w[8]; } Mat32_8018B23C_8018EBCC;
typedef Blk20_8016DF5C Mat32_8018A390;
typedef Blk20_8016DF5C Mat32_8018A390_8018523C;
typedef Blk20_8016DF5C Mat32_8018A390_80185730;
typedef Blk20_8016DF5C Mat32_8018A390_80186468;
typedef Blk20_8016DF5C Mat32_8018A390_8018FE94;
typedef Blk20_8016DF5C Mat32_8018B23C;
typedef Blk20_8016DF5C Mat32_8018B23C_8018234C;
typedef Blk20_8016DF5C Mat32_8018B23C_80182498;
typedef Blk20_8016DF5C Mat32_8018B23C_801829F8;
typedef Blk20_8016DF5C Mat32_8018B23C_801844D4;
typedef Blk20_8016DF5C Mat32_8018B23C_80184918;
typedef Blk20_8016DF5C Mat32_8018B23C_80185150;
typedef Blk20_8016DF5C Mat32_8018B23C_80185E34;
typedef Blk20_8016DF5C Mat32_8018B23C_801860E8;
typedef Blk20_8016DF5C Mat32_8018B23C_801865DC;
typedef Blk20_8016DF5C Mat32_8018B23C_80187314;
typedef Blk20_8016DF5C Mat32_8018B23C_8018B2C4;
typedef Blk20_8016DF5C Mat32_8018B23C_8018EBCC;
typedef struct {
s32 unk0; /* 0x00 */
s32 mode; /* 0x04 */
@@ -1676,20 +1671,20 @@ typedef Mtx8_8017C910_8017E924 Mtx8_8017C910_8017D7F0;
typedef Mtx8_8017C910_8017E924 Mtx8_8017C910_8017D9EC;
typedef Mtx8_8017C910_8017E924 Mtx8_8017C910_8017DB00;
typedef Mtx8_8017C910_8017E924 Mtx8_8017C910_8017E608;
typedef struct { s32 w[8]; } Mtx8_8017C910_8017EAE8;
typedef struct { s32 w[8]; } Mtx8_8017C910_801808E0;
typedef struct { s32 w[8]; } Mtx8_8017C910_80180E74;
typedef struct { s32 w[8]; } Mtx8_8017C910_80182A40;
typedef struct { s32 w[8]; } Mtx8_8017DE10;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017C95C;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017D0BC;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017D370;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017DB00;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017E710;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017E878;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017EA24;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017EE3C;
typedef struct { s32 w[8]; } Mtx8_8017DE10_8017FBC8;
typedef Blk20_8016DF5C Mtx8_8017C910_8017EAE8;
typedef Blk20_8016DF5C Mtx8_8017C910_801808E0;
typedef Blk20_8016DF5C Mtx8_8017C910_80180E74;
typedef Blk20_8016DF5C Mtx8_8017C910_80182A40;
typedef Blk20_8016DF5C Mtx8_8017DE10;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017C95C;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017D0BC;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017D370;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017DB00;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017E710;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017E878;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017EA24;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017EE3C;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017FBC8;
typedef MATRIX Mtx_8017C218;
typedef MATRIX Mtx_8017C218_8017C218;
typedef MATRIX Mtx_8017C218_8017D030;
@@ -2470,7 +2465,7 @@ struct Fr_80187368 {
s32 flg[4]; /* sp+0x50 (RotTransSV flag out) */
};
typedef struct Fr_80187368 Fr_8018C190;
struct Mtx32_80184008 { s32 w[8]; };
typedef Blk20_8016DF5C Mtx32_80184008;
typedef MATRIX Mtx_8017DB0C;
typedef MATRIX Mtx_8017E024;
typedef MATRIX Mtx_8017EBE4;
@@ -2606,27 +2601,27 @@ typedef struct {
u16 unk1A; /* 0x1A */
} Blk1C;
typedef struct { s16 v[8]; s32 w; } Blk20_8017D110;
typedef struct { s32 w[8]; } Blk20_8017E3F8;
typedef struct { s32 w[8]; } Blk20_80180B38;
typedef Blk20_8016DF5C Blk20_8017E3F8;
typedef Blk20_8016DF5C Blk20_80180B38;
typedef struct { s32 w[8]; } Blk20_80180B78;
typedef struct { s32 w[8]; } Blk20_80181260;
typedef struct { s32 w[8]; } Blk20_80181EE8;
typedef struct { s32 w[8]; } Blk20_80182D70;
typedef struct { s32 w[8]; } Blk20_8018454C;
typedef Blk20_8016DF5C Blk20_80181260;
typedef Blk20_8016DF5C Blk20_80181EE8;
typedef Blk20_8016DF5C Blk20_80182D70;
typedef Blk20_8016DF5C Blk20_8018454C;
typedef struct { s32 w[8]; } Blk20_80184694;
typedef struct { s32 b[8]; } Blk20_80187108;
typedef struct { s32 b[8]; } Blk20_80187714;
typedef struct { s32 w[8]; } Blk20_80188AF4;
typedef struct { s32 w[8]; } Blk20_8018A4C4;
typedef Blk20_8016DF5C Blk20_80187108;
typedef Blk20_8016DF5C Blk20_80187714;
typedef Blk20_8016DF5C Blk20_80188AF4;
typedef Blk20_8016DF5C Blk20_8018A4C4;
typedef struct {
s32 w[0x95];
} Blk254_80186AE4;
typedef struct { s32 w[8]; } Blk32_8017ECD4;
typedef struct { s32 w[8]; } Blk32_8017F76C;
typedef struct { s32 w[8]; } Blk32_8017F76C_80186D9C;
typedef struct { s32 w[8]; } Blk32_8017F76C_80187780;
typedef struct { s32 w[8]; } Blk32_80180770;
typedef struct { s32 w[8]; } Blk32_80180908;
typedef Blk20_8016DF5C Blk32_8017ECD4;
typedef Blk20_8016DF5C Blk32_8017F76C;
typedef Blk20_8016DF5C Blk32_8017F76C_80186D9C;
typedef Blk20_8016DF5C Blk32_8017F76C_80187780;
typedef Blk20_8016DF5C Blk32_80180770;
typedef Blk20_8016DF5C Blk32_80180908;
typedef struct { s32 w[8]; } Blk32_80180E8C;
typedef struct { s32 w[8]; } Blk32_8018287C;
typedef struct { s32 w[8]; } Blk32_80183F10;
@@ -2641,8 +2636,8 @@ typedef struct { u8 b[4]; } Blk4_8017D7A0;
typedef struct { u8 b[4]; } Blk4_8017DF40;
typedef struct { u8 d[4]; } Blk4_8017E808;
typedef struct { u8 b[4]; } Blk4_8017EBCC;
typedef struct { u8 c[4]; } Blk4_8017FE90;
typedef struct { u8 c[4]; } Blk4_801800E0;
typedef B4_8017F154 Blk4_8017FE90;
typedef B4_8017F154 Blk4_801800E0;
typedef struct { char c[4]; } Blk4_8018048C;
typedef struct { u8 c[4]; } Blk4_80180518;
typedef struct { u8 b0, b1, b2, b3; } Blk4_801815D4;
@@ -2655,7 +2650,7 @@ typedef struct { u8 b[4]; } Blk4_80183AF4;
typedef struct { u8 b[4]; } Blk4_80183FCC;
typedef struct { u8 d[4]; } Blk4_80185CD8;
typedef struct { u8 b[4]; } Blk4_80185D4C;
typedef struct { u8 c[4]; } Blk4_80187D68;
typedef B4_8017F154 Blk4_80187D68;
typedef struct { u8 c[4]; } Blk4_8018B4E0;
typedef struct { u8 d[4]; } Blk4_8018B5E4;
typedef struct { u8 c[4]; } Blk4_8018B948;
@@ -3208,11 +3203,11 @@ typedef MATRIX MTX_DF98;
typedef MATRIX MTX_EDF8;
typedef MATRIX MTX_FD64;
typedef MATRIX MT_8017EC4C;
typedef struct { s32 w[8]; } Mat32L;
typedef struct { s32 w[8]; } Mat32_8017E2BC;
typedef struct { s32 w[8]; } Mat32_8017E910;
typedef Blk20_8016DF5C Mat32L;
typedef Blk20_8016DF5C Mat32_8017E2BC;
typedef Blk20_8016DF5C Mat32_8017E910;
typedef Mat32 Mat32_8017F4E4;
typedef struct { s32 w[8]; } Mat32_80186C20;
typedef Blk20_8016DF5C Mat32_80186C20;
typedef Mat32 Mat32_8018741C;
typedef Mat32 Mat32_80188B78;
typedef MatEntry MatEntry_80187B04;
@@ -3243,14 +3238,14 @@ typedef struct {
s16 pad_E;
s32 extra;
} Msg_80187050;
typedef struct { s32 w[8]; } Mtx32_80180088;
typedef Blk20_8016DF5C Mtx32_80180088;
typedef MATRIX Mtx32_80182938;
typedef MATRIX Mtx32_80183A28;
typedef MATRIX Mtx32_80185480;
typedef struct { s32 w[8]; } Mtx32_80186A34;
typedef Blk20_8016DF5C Mtx32_80186A34;
typedef MATRIX Mtx32_80187654;
typedef struct { s32 w[8]; } Mtx8;
typedef struct { s32 w[8]; } Mtx8_80189E18;
typedef Blk20_8016DF5C Mtx8;
typedef Blk20_8016DF5C Mtx8_80189E18;
typedef MATRIX Mtx8_8018AF58;
typedef MATRIX MtxLocal;
typedef struct {
@@ -3259,7 +3254,7 @@ typedef struct {
MtxLocal mtx; /* sp+0x44 : MATRIX out, t[] at sp+0x58 */
u8 _gap2[52]; /* sp+0x64..0x98 : never referenced by an instruction */
} Frame1;
typedef struct { s32 m[5]; s32 t[3]; } MtxW;
typedef Blk20_8016DF5C MtxW;
typedef MATRIX Mtx_8017D278;
typedef MATRIX Mtx_8017DC24;
typedef MATRIX Mtx_8017DECC;
@@ -3270,7 +3265,7 @@ typedef struct { s32 w[8]; } Mtx_8017F370;
typedef MATRIX Mtx_8017F6A8;
typedef MATRIX Mtx_8017FC10;
typedef MATRIX Mtx_8018012C;
typedef struct { s32 w[8]; } Mtx_80180C38;
typedef Blk20_8016DF5C Mtx_80180C38;
typedef MATRIX Mtx_801812AC;
typedef MATRIX Mtx_80185C0C;
typedef MATRIX Mtx_8018A180;
@@ -4727,20 +4722,19 @@ typedef struct {
s16 fE2;
} Args_801837B0;
typedef Blk16_8018A8B8 B16_80183ED8;
typedef struct { s32 w[8]; } B20;
typedef struct { u8 b[4]; } B4_8017F154;
typedef struct { u8 b[4]; } B4_80188094;
typedef Blk20_8016DF5C B20;
typedef B4_8017F154 B4_80188094;
struct B8_17F474 { u8 b[8]; };
typedef Blk164 Blk164_SC02_005_8017E798;
typedef struct { s32 w[4]; } Blk16_SC01_084_8017DAF8;
typedef Blk16_SC01_084_8017DAF8 Blk16_E898;
typedef Blk16_SC01_084_8017DAF8 Blk16_SC02_000_80182CB4;
typedef struct { s32 w[8]; } Blk32_80181708;
typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_80180450;
typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_801809B0;
typedef struct { s32 w[8]; } Blk32_8018AA98_80183D30_80183DEC;
typedef struct { u8 c[4]; } Blk4_80187B40;
typedef struct { u8 d[4]; } Blk4_8018B1B4;
typedef Blk20_8016DF5C Blk32_80181708;
typedef Blk20_8016DF5C Blk32_8018AA98_80183D30_80180450;
typedef Blk20_8016DF5C Blk32_8018AA98_80183D30_801809B0;
typedef Blk20_8016DF5C Blk32_8018AA98_80183D30_80183DEC;
typedef B4_8017F154 Blk4_80187B40;
typedef B4_8017F154 Blk4_8018B1B4;
typedef struct { u16 w[4]; } Blk8017FD54;
typedef Blk80182030 Blk801819B0;
typedef Blk80182030 Blk80181A1C;
@@ -5134,8 +5128,8 @@ typedef MATRIX MTX_8017FE38;
typedef MATRIX MTX_8017FE38_80183FE0;
typedef MATRIX MTX_80183940;
typedef MATRIX MTX_85810;
typedef struct { s32 m[8]; } Mtx8_8017DE10_8017E710_SC03_006_8018450C;
typedef struct { s32 w[8]; } Mtx_8018A0E0;
typedef Blk20_8016DF5C Mtx8_8017DE10_8017E710_SC03_006_8018450C;
typedef Blk20_8016DF5C Mtx_8018A0E0;
typedef struct { u8 pad[0x3C]; s32 x3C; s32 x40; s32 x44; s32 x48; s32 x4C; s32 x50; } OB;
typedef struct {
u8 pad_0[0x8];
src/shared/ov/func_80168F40.h
+1 -1
View File
@@ -17,7 +17,7 @@ void func_80168F40(void *arg0) {
a.unk11 = 0;
a.unk16 = 0x80;
a.unk15 = 0x80;
*(struct Bv *)&b = *(struct Bv *)&D_800AE620;
*(Bv *)&b = *(Bv *)&D_800AE620;
a.unk18 = 0x50000000;
func_80016A5C(&a, &b);
}