Remove it/types.h dependency on ft/types.h

doldecomp · Feb 19, 2024 · b7f51cf · b7f51cf
1 parent d7785dd
commit b7f51cf
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 88 deletions.
diff --git a/src/melee/ft/forward.h b/src/melee/ft/forward.h
@@ -10,7 +10,6 @@
 #define FIGHTERVARS_SIZE 0xF8
 
 typedef enum_t FtMotionId;
-typedef struct CollData CollData;
 typedef struct Fighter Fighter;
 typedef struct Fighter_CostumeStrings Fighter_CostumeStrings;
 typedef struct Fighter_DemoStrings Fighter_DemoStrings;

diff --git a/src/melee/ft/types.h b/src/melee/ft/types.h
@@ -725,89 +725,6 @@ struct FighterBone {
     /* +6 */ u8 filler_x6[7];
 };
 
-typedef struct _ftECB {
-    Vec2 top;
-    Vec2 bottom;
-    Vec2 right;
-    Vec2 left;
-} ftECB;
-
-typedef struct _ECBFlagStruct {
-    union {
-        struct {
-            u8 b0 : 1;
-            u8 b1234 : 4;
-            u8 b5 : 1;
-            u8 b6 : 1;
-            u8 b7 : 1;
-        } bits;
-        u8 raw;
-    };
-} ECBFlagStruct;
-
-typedef struct SurfaceData {
-    int index;
-    u32 unk;
-    Vec3 normal;
-} SurfaceData;
-
-struct CollData {
-    /* fp+6F0 */ HSD_GObj* x0_gobj;
-    /* fp+6F4 */ Vec3 x4_vec;
-    /* fp+700 */ Vec3 x10_vec;
-    /* fp+70C */ Vec3 x1C_vec;
-    /* fp+718 */ Vec3 x28_vec;
-    /* fp+724 */ ECBFlagStruct x34_flags;
-    /* fp+725 */ ECBFlagStruct x35_flags;
-    /* fp+726 */ s16 x36;
-    /* fp+728 */ s32 x38;
-    /* fp+72C */ s32 x3C;
-    /* fp+730 */ int ledge_id_unk0;
-    /* fp+734 */ int ledge_id_unk1;
-    /* fp+738 */ u32 x48;
-    /* fp+73C */ u32 x4C;
-    /* fp+740 */ float x50;
-    /* fp+744 */ float x54;
-    /* fp+748 */ float x58;
-    /* fp+74C */ float x5C;
-    /* fp+750 */ s32 x60;
-    /* fp+754 */ ftECB x64_ecb;
-    /* fp+774 */ ftECB x84_ecb;
-    /* fp+794 */ ftECB xA4_ecbCurrCorrect;
-    /* fp+7B4 */ ftECB xC4_ecb;
-    /* fp+7D4 */ ftECB xE4_ecb;
-    /// @todo this is the start of a substruct with size 0x2C
-    /* fp+7F4 */ s32 x104;
-    /* fp+7F8 */ union {
-        /* fp+7F8 */ struct {
-            /* fp+7F8 */ HSD_JObj* x108_joint;
-            /* fp+7FC */ HSD_JObj* x10C_joint[6];
-        };
-        /* fp+7F8 */ struct {
-            /* fp+7F8 */ float x108_f32;
-            /* fp+7FC */ float x10C_f32;
-            /* fp+800 */ float x110_f32;
-            /* fp+804 */ float x114_f32;
-            /* fp+808 */ float x118_f32;
-            /* fp+80C */ float x11C_f32;
-            /* fp+810 */ float x120_f32;
-        };
-    };
-    /* fp+814 */ float x124;
-    /* fp+818 */ float x128;
-    /* fp+81C */ float x12C;
-    /* fp+820 */ u32 x130_flags;
-    /* fp+824 */ s32 env_flags;
-    /* fp+828 */ s32 prev_env_flags;
-    /* fp+82C */ s32 x13C;
-    /* fp+830 */ Vec3 x140;
-    /* fp+83C */ SurfaceData floor;
-    /* fp+850 */ SurfaceData right_wall;
-    /* fp+864 */ SurfaceData left_wall;
-    /* fp+878 */ SurfaceData ceiling;
-    /* fp+88C */ s32 x19C;
-};
-
 /* fp+2114 */ typedef struct _SmashAttr {
     /* fp+2114 */ SmashState state;
     /// number of frames fp has charged for

diff --git a/src/melee/it/types.h b/src/melee/it/types.h
@@ -2,16 +2,16 @@
 #define MELEE_IT_TYPES_H
 
 #include <platform.h>
+#include "cm/forward.h"
 #include "it/forward.h" // IWYU pragma: export
-#include "lb/forward.h"
 #include <dolphin/gx/forward.h>
 #include <baselib/forward.h>
 
-#include "ft/types.h"
 #include "it/itCharItems.h"
 #include "it/itCommonItems.h"
 #include "it/itPKFlash.h"
 #include "it/itPKThunder.h"
+#include "lb/types.h"
 
 #include <common_structs.h>
 #include <placeholder.h>

diff --git a/src/melee/lb/forward.h b/src/melee/lb/forward.h
@@ -4,14 +4,15 @@
 #include <platform.h>
 
 typedef struct AbsorbDesc AbsorbDesc;
+typedef struct CollData CollData;
 typedef struct HitCapsule HitCapsule;
 typedef struct HitResult HitResult;
 typedef struct HitVictim HitVictim;
 typedef struct HurtCapsule HurtCapsule;
 typedef struct lb_UnkAnimStruct lb_UnkAnimStruct;
+typedef struct lbRefract_CallbackData lbRefract_CallbackData;
 typedef struct ReflectDesc ReflectDesc;
 typedef struct ShieldDesc ShieldDesc;
-typedef struct lbRefract_CallbackData lbRefract_CallbackData;
 
 typedef enum HurtCapsuleState {
     HurtCapsule_Enabled,

diff --git a/src/melee/lb/types.h b/src/melee/lb/types.h
@@ -154,4 +154,87 @@ struct lbRefract_CallbackData {
     void* callback1; // x20
 };
 
+typedef struct _ECBFlagStruct {
+    union {
+        struct {
+            u8 b0 : 1;
+            u8 b1234 : 4;
+            u8 b5 : 1;
+            u8 b6 : 1;
+            u8 b7 : 1;
+        } bits;
+        u8 raw;
+    };
+} ECBFlagStruct;
+
+typedef struct SurfaceData {
+    int index;
+    u32 unk;
+    Vec3 normal;
+} SurfaceData;
+
+typedef struct _ftECB {
+    Vec2 top;
+    Vec2 bottom;
+    Vec2 right;
+    Vec2 left;
+} ftECB;
+
+struct CollData {
+    /* fp+6F0 */ HSD_GObj* x0_gobj;
+    /* fp+6F4 */ Vec3 x4_vec;
+    /* fp+700 */ Vec3 x10_vec;
+    /* fp+70C */ Vec3 x1C_vec;
+    /* fp+718 */ Vec3 x28_vec;
+    /* fp+724 */ ECBFlagStruct x34_flags;
+    /* fp+725 */ ECBFlagStruct x35_flags;
+    /* fp+726 */ s16 x36;
+    /* fp+728 */ s32 x38;
+    /* fp+72C */ s32 x3C;
+    /* fp+730 */ int ledge_id_unk0;
+    /* fp+734 */ int ledge_id_unk1;
+    /* fp+738 */ u32 x48;
+    /* fp+73C */ u32 x4C;
+    /* fp+740 */ float x50;
+    /* fp+744 */ float x54;
+    /* fp+748 */ float x58;
+    /* fp+74C */ float x5C;
+    /* fp+750 */ s32 x60;
+    /* fp+754 */ ftECB x64_ecb;
+    /* fp+774 */ ftECB x84_ecb;
+    /* fp+794 */ ftECB xA4_ecbCurrCorrect;
+    /* fp+7B4 */ ftECB xC4_ecb;
+    /* fp+7D4 */ ftECB xE4_ecb;
+    /// @todo this is the start of a substruct with size 0x2C
+    /* fp+7F4 */ s32 x104;
+    /* fp+7F8 */ union {
+        /* fp+7F8 */ struct {
+            /* fp+7F8 */ HSD_JObj* x108_joint;
+            /* fp+7FC */ HSD_JObj* x10C_joint[6];
+        };
+        /* fp+7F8 */ struct {
+            /* fp+7F8 */ float x108_f32;
+            /* fp+7FC */ float x10C_f32;
+            /* fp+800 */ float x110_f32;
+            /* fp+804 */ float x114_f32;
+            /* fp+808 */ float x118_f32;
+            /* fp+80C */ float x11C_f32;
+            /* fp+810 */ float x120_f32;
+        };
+    };
+    /* fp+814 */ float x124;
+    /* fp+818 */ float x128;
+    /* fp+81C */ float x12C;
+    /* fp+820 */ u32 x130_flags;
+    /* fp+824 */ s32 env_flags;
+    /* fp+828 */ s32 prev_env_flags;
+    /* fp+82C */ s32 x13C;
+    /* fp+830 */ Vec3 x140;
+    /* fp+83C */ SurfaceData floor;
+    /* fp+850 */ SurfaceData right_wall;
+    /* fp+864 */ SurfaceData left_wall;
+    /* fp+878 */ SurfaceData ceiling;
+    /* fp+88C */ s32 x19C;
+};
+
 #endif
diff --git a/src/melee/mp/forward.h b/src/melee/mp/forward.h
@@ -2,7 +2,7 @@
 #define MELEE_MP_FORWARD_H
 
 #include <platform.h>
-#include "ft/forward.h"
+#include "lb/forward.h"
 
 typedef struct mp_UnkStruct0 mp_UnkStruct0;
 typedef struct mp_UnkStruct1 mp_UnkStruct1;

diff --git a/src/melee/mp/mpisland.h b/src/melee/mp/mpisland.h
@@ -2,6 +2,7 @@
 #define GALE01_05A6F8
 
 #include "mp/forward.h"
+#include <dolphin/mtx/forward.h>
 
 #include <placeholder.h>