Link it_2F28 (#1476)

Co-authored-by: Robin Avery <[email protected]>
doldecomp · Sep 30, 2024 · 9f36bae · 9f36bae
1 parent eba088d
commit 9f36bae
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 274 deletions.
diff --git a/asm/melee/it/items/it_2F28.s b/asm/melee/it/items/it_2F28.s
diff --git a/configure.py b/configure.py
@@ -1140,7 +1140,7 @@ def TRKLib(lib_name: str, objects: Objects) -> Library:
             Object(NonMatching, "melee/it/items/itcrazyhandbomb.c"),
             Object(Matching, "melee/it/items/itcoin.c"),
             Object(NonMatching, "melee/it/items/itkirby_2F23.c"),
-            Object(NonMatching, "melee/it/items/it_2F28.c"),
+            Object(Matching, "melee/it/items/it_2F28.c"),
             Object(Matching, "melee/it/items/it_2F2B.c"),
             Object(Matching, "melee/it/items/itkirbyyoshispecialn.c"),
             Object(NonMatching, "melee/it/items/it_27CF.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -732,7 +732,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itcrazyhandbomb.s.o\
     $(BUILD_DIR)/src/melee/it/items/itcoin.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itkirby_2F23.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/it_2F28.s.o\
+    $(BUILD_DIR)/src/melee/it/items/it_2F28.c.o\
     $(BUILD_DIR)/src/melee/it/items/it_2F2B.c.o\
     $(BUILD_DIR)/src/melee/it/items/itkirbyyoshispecialn.c.o\
     $(BUILD_DIR)/asm/melee/it/items/it_27CF.s.o\

diff --git a/src/melee/it/forward.h b/src/melee/it/forward.h
@@ -5,6 +5,7 @@
 
 typedef struct Article Article;
 typedef struct BobOmbRain BobOmbRain;
+typedef struct BoneDynamicsDesc BoneDynamicsDesc;
 typedef struct CameraBoxFlags CameraBoxFlags;
 typedef struct DynamicBoneTable DynamicBoneTable;
 typedef struct ECB ECB;
@@ -14,12 +15,12 @@ typedef struct HSD_ObjAllocUnk2 HSD_ObjAllocUnk2;
 typedef struct HSD_ObjAllocUnk4 HSD_ObjAllocUnk4;
 typedef struct HSD_ObjAllocUnk5 HSD_ObjAllocUnk5;
 typedef struct HSD_ObjAllocUnk6 HSD_ObjAllocUnk6;
+typedef struct it_2F28_DatAttrs it_2F28_DatAttrs;
 typedef struct Item Item;
 typedef struct Item_DynamicBones Item_DynamicBones;
 typedef struct ItemAttr ItemAttr;
 typedef struct ItemCommonData ItemCommonData;
 typedef struct ItemDynamics ItemDynamics;
-typedef struct BoneDynamicsDesc BoneDynamicsDesc;
 typedef struct ItemModelDesc ItemModelDesc;
 typedef struct ItemModStruct ItemModStruct;
 typedef struct ItemStateArray ItemStateArray;

diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h
@@ -393,4 +393,15 @@ typedef struct itTaruCann_DatAttrs {
     /* +2C */ int x2C;
 } itTaruCann_DatAttrs;
 
+typedef struct it_2F28_ItemVars {
+    f32 x0;
+} it_2F28_ItemVars;
+
+struct it_2F28_DatAttrs {
+    Vec3 pos;
+    Vec3 vel;
+    f32 float1;
+    f32 float2;
+};
+
 #endif
diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
@@ -128,7 +128,7 @@
 /* 275788 */ UNK_RET it_80275788(UNK_PARAMS);
 /* 275820 */ UNK_RET it_80275820(UNK_PARAMS);
 /* 275870 */ bool it_80275870(Item_GObj* gobj);
-/* 2758D4 */ UNK_RET it_802758D4(UNK_PARAMS);
+/* 2758D4 */ float it_802758D4(Item_GObj* gobj);
 /* 2759DC */ UNK_RET it_802759DC(UNK_PARAMS);
 /* 275BC8 */ UNK_RET it_80275BC8(UNK_PARAMS);
 /* 275D5C */ void it_80275D5C(Item_GObj*, ECB*);