Match itpeachparasol (#949)

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

Hide file tree

Showing 8 changed files with 177 additions and 346 deletions.
diff --git a/asm/melee/it/items/itpeachparasol.s b/asm/melee/it/items/itpeachparasol.s
diff --git a/obj_files.mk b/obj_files.mk
@@ -650,7 +650,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itseakchain.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itpeachexplode.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itpeachturnip.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/itpeachparasol.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itpeachparasol.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itpeachtoad.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itpeachtoadspore.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itnessyoyo.s.o\

diff --git a/src/melee/ft/chara/ftPeach/ftPe_SpecialHi.c b/src/melee/ft/chara/ftPeach/ftPe_SpecialHi.c
@@ -22,6 +22,8 @@
 #include "it/it_27CF.h"
 #include "lb/lb_00B0.h"
 
+#include <melee/it/items/itpeachparasol.h>
+
 #include <math.h>
 #include <placeholder.h>
 #include <baselib/gobj.h>

diff --git a/src/melee/ft/ftcommon.c b/src/melee/ft/ftcommon.c
@@ -25,6 +25,8 @@
 #include "pl/pl_0371.h"
 #include "un/un_2FC9.h"
 
+#include <melee/it/items/itpeachparasol.h>
+
 #include <dolphin/mtx/types.h>
 #include <dolphin/os/os.h>
 #include <baselib/rumble.h>
@@ -1246,7 +1248,6 @@ static s32 parasol_table_4[7] = {
 };
 
 s32 it_8028B08C(void*, s32);
-s32 it_802BDA40(void*, s32);
 
 static const int FtParasol_None = -1;
 

diff --git a/src/melee/it/it_27CF.h b/src/melee/it/it_27CF.h
@@ -173,7 +173,6 @@ void it_802BD158(Item_GObj* gobj, Vec3*, int, float);
 HSD_GObj* it_802BD4AC(Item_GObj*, Vec3*, u8, s32, f32);
 
 void it_802BD45C(Item_GObj* gobj);
-HSD_GObj* it_802BDA64(Item_GObj*, Vec3*, int, f32);
 void it_802BDB94(Item_GObj* gobj);
 void it_802BDBF8(Item_GObj* gobj);
 void it_802BDC18(Item_GObj* gobj);