Match itseakvanish (#947)

doldecomp · Jul 1, 2023 · ae3fdab · ae3fdab
1 parent 66673a0
commit ae3fdab
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 143 deletions.
diff --git a/asm/melee/it/items/itseakvanish.s b/asm/melee/it/items/itseakvanish.s
diff --git a/obj_files.mk b/obj_files.mk
@@ -636,7 +636,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itnesspkflushexplode.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itseakneedlethrown.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itseakneedleheld.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/itseakvanish.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itseakvanish.c.o\
     $(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\

diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h
@@ -137,5 +137,7 @@ bool it_8026DA08(Item_GObj*);
 bool it_80276308(Item_GObj*);
 bool it_802763E0(Item_GObj*);
 void it_80272860(Item_GObj*, f32, f32);
+void it_8027518C(Item_GObj*);
+bool it_802751D8(Item_GObj*);
 
 #endif
diff --git a/src/melee/it/it_803F3100.c b/src/melee/it/it_803F3100.c
@@ -1,6 +1,7 @@
 #include <melee/it/it_27CF.h>
 #include <melee/it/items/itfoxlaser.h>
 #include <melee/it/items/itfoxillusion.h>
+#include <melee/it/items/itseakvanish.h>
 
 void it_8027C8B0();
 bool it_8029BA38();
@@ -104,8 +105,6 @@ bool it_802B16E4();
 void it_802B1890();
 void it_802B1AAC();
 void it_802B1C40();
-bool it_802B1D38();
-void it_802B1DCC();
 void it_802B202C();
 bool it_802B2508();
 bool it_802B2510();
@@ -373,7 +372,6 @@ extern ItemStateTable it_803F6E98[];
 extern ItemStateTable it_803F6F40[];
 extern ItemStateTable it_803F6F50[];
 extern ItemStateTable it_803F70A8[];
-extern ItemStateTable it_803F70B8[];
 extern ItemStateTable it_803F70C8[];
 extern ItemStateTable it_803F70F8[];
 extern ItemStateTable it_803F7118[];

diff --git a/src/melee/it/items/itcapsule.c b/src/melee/it/items/itcapsule.c
@@ -16,7 +16,6 @@ void it_80272C08();
 void it_80273454();
 void it_80274658(Item_GObj*, f32);
 void it_8027518C();
-bool it_802751D8(Item_GObj*);
 void it_80275444();
 void it_802756D0();
 void it_8027D258(Item_GObj*);

diff --git a/src/melee/it/items/itseakvanish.c b/src/melee/it/items/itseakvanish.c
@@ -0,0 +1,68 @@
+#include "itseakvanish.h"
+
+#include <melee/db/db_2253.h>
+#include <melee/it/it_266F.h>
+#include <melee/it/it_26B1.h>
+#include <melee/it/item.h>
+#include <melee/it/types.h>
+
+ItemStateTable it_803F70B8[] = {
+    {
+        0,
+        it_802B1DAC,
+        NULL,
+        NULL,
+    },
+};
+
+Item_GObj* it_802B1C60(HSD_GObj* parent, Vec3* pos, f32 dir)
+{
+    SpawnItem spawn;
+    Item_GObj* item_gobj;
+
+    spawn.kind = 0x55;
+    spawn.prev_pos = *pos;
+    spawn.pos = spawn.prev_pos;
+    spawn.facing_dir = dir;
+    spawn.x3C_damage = 0;
+    spawn.vel.x = spawn.vel.y = spawn.vel.z = 0.0F;
+    spawn.x0_parent_gobj = parent;
+    spawn.x4_parent_gobj2 = spawn.x0_parent_gobj;
+    spawn.x44_flag.bits.b0 = 1;
+    spawn.x40 = 0;
+    item_gobj = Item_80268B18(&spawn);
+    if (item_gobj != NULL) {
+        it_802B1D40(item_gobj, parent);
+        db_80225DD8(item_gobj, parent);
+        return item_gobj;
+    }
+    return NULL;
+}
+
+bool it_802B1D38(Item_GObj* item_gobj)
+{
+    return false;
+}
+
+void it_802B1D40(Item_GObj* item_gobj, HSD_GObj* owner)
+{
+    Item* item = GET_ITEM(item_gobj);
+    item->owner = owner;
+    item->xD44_lifeTimer = 60.0F;
+    item->xDAC_itcmd_var0 = 0;
+    it_8026BB44(item_gobj);
+    it_8026B3A8(item_gobj);
+    it_8026BD24(item_gobj);
+    it_8027518C(item_gobj);
+    Item_80268E5C(item_gobj, 0, ITEM_ANIM_UPDATE);
+}
+
+bool it_802B1DAC(Item_GObj* item_gobj)
+{
+    return it_802751D8(item_gobj);
+}
+
+void it_802B1DCC(Item_GObj* item_gobj, HSD_GObj* gobj)
+{
+    it_8026B894(item_gobj, gobj);
+}
diff --git a/src/melee/it/items/itseakvanish.h b/src/melee/it/items/itseakvanish.h
@@ -0,0 +1,16 @@
+#ifndef MELEE_IT_ITSEAKVANISH_H
+#define MELEE_IT_ITSEAKVANISH_H
+
+#include <melee/it/forward.h>
+#include <dolphin/mtx/forward.h>
+#include <sysdolphin/baselib/forward.h>
+
+extern ItemStateTable it_803F70B8[];
+
+Item_GObj* it_802B1C60(HSD_GObj* parent, Vec3* pos, f32 dir);
+bool it_802B1D38(Item_GObj*);
+void it_802B1D40(Item_GObj*, HSD_GObj*);
+bool it_802B1DAC(Item_GObj*);
+void it_802B1DCC(Item_GObj*, HSD_GObj*);
+
+#endif