refactor(types): lift Block4, Blk4_E960, Rec80182744, MATRIX_80188114, D80190448_t into src/shared/engine_types.h (lift_types --apply; 12 local defs stripped, the divergent Block4 in ov_SC02_011 kept local) — the naming types jr_isolate_all could not carry for 10 staged drafts; fleet clean sweep 213/213 (P31 S62 T3)

This commit is contained in:
Drew T
2026-08-26 15:25:58 -06:00
parent d7d8fdb50c
commit dcbe05cabe
13 changed files with 11 additions and 16 deletions
@@ -10191,7 +10191,6 @@ void func_801870D0(s32 param_1) {
extern void func_8001CD9C(s32, void *);
extern void func_800233CC(void *, u16);
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
extern Block4 D_801E9E30;
extern Block4 D_801EB524;
@@ -3748,7 +3748,6 @@ void func_8017F8C0(void *a0) {
extern void func_8001CD9C(int, void *);
extern void func_800233CC(void *, unsigned short);
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
extern Block4 D_801B41C8;
extern Block4 D_801B2BCC;
@@ -3724,7 +3724,6 @@ u8 *func_8017E908(void) {
}
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
extern Block4 D_80191968;
extern Block4 D_8019196C;
extern u8 *func_8017E908(void);
@@ -5307,7 +5307,6 @@ void func_80189630(void *param_1) {
extern void func_8001CD9C(s32, void *);
extern void func_800233CC(void *, u16);
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
extern u8 D_801EAC94;
extern Block4 D_801E94F4;
@@ -5263,7 +5263,6 @@ struct Rec80182744_s {
s32 f1;
s32 f2;
} __attribute__((packed, aligned(1)));
typedef struct Rec80182744_s Rec80182744;
extern Rec80182744 D_8018BCD8[];
@@ -4854,7 +4854,6 @@ void func_80183F0C(void *a0) {
* flag (s32) @0x70. var_size = 0x40+0x20+8 = 0x68 -> frame 0x98 w/ 7 saves.
*/
typedef struct { s16 vx, vy, vz, pad; } SVec_80183F84;
typedef struct { short m[3][3]; long t[3]; } MATRIX_80188114;
typedef struct {
SVec_80183F84 v[4]; /* 0x00 */
s16 u0, t0, u1, t1, u2, t2, u3, t3; /* 0x20 */
@@ -4138,7 +4138,6 @@ void func_8017E9BC(s32 s0) {
#include "common.h"
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
extern Block4 D_801CE398;
extern Block4 D_801CCEF8;
@@ -4422,7 +4422,6 @@ void func_80182E38(void *param_1) {
extern void func_8001CD9C(int, void *);
extern void func_800233CC(void *, unsigned short);
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
void func_80182E88(s32 a0) {
extern Block4 D_801D2E50;
@@ -14,7 +14,6 @@ typedef struct {
u8 pad[7]; /* -> 0x40 */
} Prim_8016E7C8;
typedef void (*Handler)(struct Entry_8016E95C *);
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
extern void func_801458E0(void);
extern s32 D_800AE6AC;
extern s32 D_800AE6B0;
-1
View File
@@ -14,7 +14,6 @@ typedef struct {
u8 pad[7]; /* -> 0x40 */
} Prim_8016E7C8;
typedef void (*Handler)(struct Entry_8016E95C *);
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
extern void func_801458E0(void);
extern s32 D_800AE6AC;
extern s32 D_800AE6B0;
@@ -4505,11 +4505,6 @@ extern void func_8012C218(void *a0);
extern u8 D_80190348[]; /* §183 unified with func_80180FE0 */
typedef struct {
s16 f0;
s16 f2;
s16 f4;
} D80190448_t;
extern D80190448_t D_80190448;
extern s32 D_801DDB2C[5]; /* §183 TYPE-adopted-TU */
@@ -4186,7 +4186,6 @@ void func_8017E830(void *arg0)
}
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Blk4_E960;
extern s16 D_801D05A0[];
extern Blk4_E960 D_80186540[];
+11
View File
@@ -4619,6 +4619,17 @@ typedef struct { u32 tag; u32 w1; u32 w2; u32 w3; } Prim_1412A8;
#define getaddr_1412A8(t) (((PTag_1412A8 *)(t))->addr)
#define setaddr_1412A8(t, v) (((PTag_1412A8 *)(t))->addr = (u32)(v))
/* --- lift_types.py fleet lift --- */
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Blk4_E960;
typedef struct { u8 b[4]; } __attribute__((packed, aligned(1))) Block4;
typedef struct {
s16 f0;
s16 f2;
s16 f4;
} D80190448_t;
typedef struct { short m[3][3]; long t[3]; } MATRIX_80188114;
typedef struct Rec80182744_s Rec80182744;
#endif /* BFM_ENGINE_TYPES_H */ /* SESSION-19: moved here — 11 typedefs (the
* Phase-29 crack-wave lift onward) were sitting OUTSIDE the guard, so any TU that
* included this header twice re-declared them. gcc-2.7.2 rejects a repeated typedef