Corrected func declarations

doldecomp · Jun 17, 2024 · 1df7efd · 1df7efd
1 parent ae4e35d
commit 1df7efd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/src/melee/it/items/itfflowerflame.c b/src/melee/it/items/itfflowerflame.c
@@ -7,11 +7,11 @@
 #include "it/item.h"
 
 ItemStateTable it_803F66C8[] = {
-    { 0, NULL, NULL, NULL },
-    { 0, NULL, NULL, NULL },
-    { 0, NULL, NULL, NULL },
-    { 0, NULL, NULL, NULL },
-    { 0, NULL, NULL, NULL },
+    { 0, it_8029AA6C, it_8029AB60, it_8029AB64 },
+    { 0, it_8029ABCC, it_8029ACCC, it_8029ACFC },
+    { 0, it_8029AD58, NULL, NULL },
+    { 0, it_8029ADD0, it_8029AED0, it_8029AF00 },
+    { 0, it_8029AF70, it_8029B070, it_8029B074 },
 };
 
 HSD_GObj* it_8029A748(Item_GObj* arg0, Vec3* arg1, u8 arg2, f32 arg3)
@@ -98,7 +98,7 @@ void it_8029AA1C(HSD_GObj* arg0)
     it_8026B3A8((Item_GObj*) arg0);
 }
 
-u32 it_8029AA6C(Item_GObj* arg0)
+int it_8029AA6C(Item_GObj* arg0)
 {
     HSD_JObj* jobj;
     Item* item = GET_ITEM((HSD_GObj*) arg0);
@@ -108,12 +108,12 @@ u32 it_8029AA6C(Item_GObj* arg0)
     return 0;
 }
 
-void it_8029AB60(void)
+void it_8029AB60(HSD_GObj*)
 {
     return;
 }
 
-s32 it_8029AB64(Item_GObj* arg0)
+int it_8029AB64(Item_GObj* arg0)
 {
     it_8026D62C(arg0, it_8029AB90);
     return 0;
@@ -125,7 +125,7 @@ void it_8029AB90(HSD_GObj* gobj)
     it_8026B3A8((Item_GObj*) gobj);
 }
 
-void it_8029ABCC(Item_GObj* arg0)
+int it_8029ABCC(Item_GObj* arg0)
 {
     HSD_JObj* jobj;
     Item* item = GET_ITEM((HSD_GObj*) arg0);
@@ -144,7 +144,7 @@ void it_8029ACCC(Item_GObj* arg0)
     it_80272860(arg0, temp_r4->x10_fall_speed, temp_r4->x14_fall_speed_max);
 }
 
-void it_8029ACFC(void)
+int it_8029ACFC(HSD_GObj* arg0)
 {
     it_8026DF34();
 }
@@ -155,7 +155,7 @@ void it_8029AD1C(Item_GObj* arg0)
     it_8026B3A8(arg0);
 }
 
-s32 it_8029AD58(Item_GObj* arg0)
+int it_8029AD58(Item_GObj* arg0)
 {
     Item* item = GET_ITEM((HSD_GObj*) arg0);
     it_80272F7C(it_80272CC0(arg0, 1), item->xDD4_itemVar.fflowerflame.unk);
@@ -168,7 +168,7 @@ void it_8029AD94(Item_GObj* arg0)
     it_8026B3A8(arg0);
 }
 
-void it_8029ADD0(Item_GObj* arg0)
+int it_8029ADD0(Item_GObj* arg0)
 {
     HSD_JObj* jobj;
     Item* item = GET_ITEM((HSD_GObj*) arg0);
@@ -187,7 +187,7 @@ void it_8029AED0(Item_GObj* arg0)
     it_80272860(arg0, temp_r4->x10_fall_speed, temp_r4->x14_fall_speed_max);
 }
 
-s32 it_8029AF00(Item_GObj* arg0)
+int it_8029AF00(Item_GObj* arg0)
 {
     if (it_8026DA08(arg0) != 0) {
         return 1;
@@ -201,7 +201,7 @@ void it_8029AF34(Item_GObj* arg0)
     it_8026B3A8(arg0);
 }
 
-void it_8029AF70(Item_GObj* arg0)
+int it_8029AF70(Item_GObj* arg0)
 {
     HSD_JObj* jobj;
     Item* item = GET_ITEM((HSD_GObj*) arg0);
@@ -211,12 +211,12 @@ void it_8029AF70(Item_GObj* arg0)
     it_80273130(arg0);
 }
 
-void it_8029B070(void)
+void it_8029B070(HSD_GObj* arg0)
 {
     return;
 }
 
-s32 it_8029B074(Item_GObj* arg0)
+int it_8029B074(Item_GObj* arg0)
 {
     it_8026E8C4(arg0, it_8029AA1C, it_8029AB90);
     return 0;

diff --git a/src/melee/it/items/itfflowerflame.h b/src/melee/it/items/itfflowerflame.h
@@ -12,23 +12,23 @@
 /* 29A89C */ void it_8029A89C(Item_GObj*, f32);
 /* 29A9FC */ void it_8029A9FC(Item_GObj*);
 /* 29AA1C */ void it_8029AA1C(HSD_GObj*);
-/* 29AA6C */ u32 it_8029AA6C(Item_GObj*);
-/* 29AB60 */ void it_8029AB60(void);
-/* 29AB64 */ s32 it_8029AB64(Item_GObj*);
+/* 29AA6C */ int it_8029AA6C(Item_GObj*);
+/* 29AB60 */ void it_8029AB60(HSD_GObj*);
+/* 29AB64 */ int it_8029AB64(Item_GObj*);
 /* 29AB90 */ void it_8029AB90(HSD_GObj*);
-/* 29ABCC */ void it_8029ABCC(Item_GObj*);
+/* 29ABCC */ int it_8029ABCC(Item_GObj*);
 /* 29ACCC */ void it_8029ACCC(Item_GObj*);
-/* 29ACFC */ void it_8029ACFC(void);
+/* 29ACFC */ int it_8029ACFC(HSD_GObj*);
 /* 29AD1C */ void it_8029AD1C(Item_GObj*);
-/* 29AD58 */ s32 it_8029AD58(Item_GObj*);
+/* 29AD58 */ int it_8029AD58(Item_GObj*);
 /* 29AD94 */ void it_8029AD94(Item_GObj*);
-/* 29ADD0 */ void it_8029ADD0(Item_GObj*);
+/* 29ADD0 */ int it_8029ADD0(Item_GObj*);
 /* 29AED0 */ void it_8029AED0(Item_GObj*);
-/* 29AF00 */ s32 it_8029AF00(Item_GObj*);
+/* 29AF00 */ int it_8029AF00(Item_GObj*);
 /* 29AF34 */ void it_8029AF34(Item_GObj*);
-/* 29AF70 */ void it_8029AF70(Item_GObj*);
-/* 29B070 */ void it_8029B070(void);
-/* 29B074 */ s32 it_8029B074(Item_GObj*);
+/* 29AF70 */ int it_8029AF70(Item_GObj*);
+/* 29B070 */ void it_8029B070(HSD_GObj*);
+/* 29B074 */ int it_8029B074(Item_GObj*);
 /* 29B0A8 */ void it_8029B0A8(Item_GObj*, Item_GObj*);
 /* 3F66C8 */ extern ItemStateTable it_803F66C8[];