Match ityoshistar (#950)

doldecomp · Jul 1, 2023 · a955581 · a955581
1 parent 7fb4ea8
commit a955581
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 330 deletions.
diff --git a/asm/melee/it/items/ityoshistar.s b/asm/melee/it/items/ityoshistar.s
diff --git a/obj_files.mk b/obj_files.mk
@@ -640,7 +640,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itpikachuthunder.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itmariocape.s.o\
     $(BUILD_DIR)/asm/melee/it/items/ityoshieggthrow.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/ityoshistar.s.o\
+    $(BUILD_DIR)/src/melee/it/items/ityoshistar.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itpikachutjoltground.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itpikachutjoltair.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itsamusbomb.s.o\

diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h
@@ -143,5 +143,9 @@ bool it_80272C6C(HSD_GObj*);
 void it_80279CDC(HSD_GObj*, f32);
 void it_8027A344(Item_GObj*);
 void it_8027A160(HSD_JObj* bone, Item*);
+bool itColl_BounceOffShield(Item_GObj*);
+void it_8026E0F4(Item_GObj*);
+void it_80272BA4(Item_GObj*);
+void it_80273030(Item_GObj*);
 
 #endif
diff --git a/src/melee/it/it_803F3100.c b/src/melee/it/it_803F3100.c
@@ -3,6 +3,7 @@
 #include <melee/it/items/itfoxillusion.h>
 #include <melee/it/items/itpeachparasol.h>
 #include <melee/it/items/itseakvanish.h>
+#include <melee/it/items/ityoshistar.h>
 
 void it_8027C8B0();
 bool it_8029BA38();
@@ -122,13 +123,6 @@ bool it_802B2E5C();
 bool it_802B2E7C();
 bool it_802B2F88();
 void it_802B2FA8();
-bool it_802B309C();
-bool it_802B30C0();
-bool it_802B30E4();
-bool it_802B3108();
-bool it_802B312C();
-bool it_802B314C();
-void it_802B3348();
 void it_802B34E4();
 bool it_802B3A94();
 bool it_802B3AF8();
@@ -373,7 +367,6 @@ extern ItemStateTable it_803F70A8[];
 extern ItemStateTable it_803F70C8[];
 extern ItemStateTable it_803F70F8[];
 extern ItemStateTable it_803F7118[];
-extern ItemStateTable it_803F7158[];
 extern ItemStateTable it_803F7190[];
 extern ItemStateTable it_803F71D8[];
 extern ItemStateTable it_803F7220[];

diff --git a/src/melee/it/items/itcapsule.c b/src/melee/it/items/itcapsule.c
@@ -11,17 +11,10 @@ void it_8026E15C(Item_GObj*, HSD_GObjEvent);
 void it_8026E414(Item_GObj*, HSD_GObjEvent);
 void it_8026F3D4(Item_GObj*, int, bool, int);
 bool it_8026F8B4(Item_GObj*, Vec3*, Vec3*, int);
-void it_80272860(Item_GObj*, f32, f32);
 void it_80272C08();
 void it_80273454();
-void it_80274658(Item_GObj*, f32);
-void it_8027518C();
 void it_80275444();
-void it_802756D0();
-void it_8027D258(Item_GObj*);
-void it_8027D2DC();
 void it_8026E8C4(Item_GObj*, HSD_GObjEvent, HSD_GObjEvent);
-void itColl_BounceOffShield(Item_GObj*);
 
 ItemStateTable it_803F5468[] = {
     {