Match itkinoko (#1445)

* Match itkinoko * Fix include
doldecomp · Sep 7, 2024 · cb52999 · cb52999
1 parent 8cad9f0
commit cb52999
Show file tree

Hide file tree

Showing 11 changed files with 192 additions and 320 deletions.
diff --git a/asm/melee/it/items/itkinoko.s b/asm/melee/it/items/itkinoko.s
diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -14322,7 +14322,7 @@ it_80293754 = .text:0x80293754; // type:function size:0x8 scope:global
 it_8029375C = .text:0x8029375C; // type:function size:0x3C scope:global
 it_80293798 = .text:0x80293798; // type:function size:0xC4 scope:global
 it_8029385C = .text:0x8029385C; // type:function size:0x28 scope:global
-fn_80293884 = .text:0x80293884; // type:function size:0x28
+it_80293884 = .text:0x80293884; // type:function size:0x28
 it_802938AC = .text:0x802938AC; // type:function size:0x8 scope:global
 it_802938B4 = .text:0x802938B4; // type:function size:0xB0 scope:global
 it_80293964 = .text:0x80293964; // type:function size:0x7C scope:global

diff --git a/configure.py b/configure.py
@@ -962,7 +962,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(NonMatching, "melee/it/items/itstarrod.c"),
             Object(NonMatching, "melee/it/items/itharisen.c"),
             Object(Matching, "melee/it/items/itfflower.c"),
-            Object(NonMatching, "melee/it/items/itkinoko.c"),
+            Object(Matching, "melee/it/items/itkinoko.c"),
             Object(NonMatching, "melee/it/items/itdkinoko.c"),
             Object(Matching, "melee/it/items/ithammer.c"),
             Object(NonMatching, "melee/it/items/itwstar.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -585,7 +585,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itstarrod.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itharisen.s.o\
     $(BUILD_DIR)/src/melee/it/items/itfflower.c.o\
-    $(BUILD_DIR)/asm/melee/it/items/itkinoko.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itkinoko.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itdkinoko.s.o\
     $(BUILD_DIR)/src/melee/it/items/ithammer.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itwstar.s.o\

diff --git a/src/common_structs.h b/src/common_structs.h
@@ -55,6 +55,7 @@ typedef u32 HSD_Pad;
 #define MPCOLL_FLAGS_B11 (1 << 11)
 #define MPCOLL_CEIL 0x6000 ///< Bits 13-14
 #define MPCOLL_FLAGS_B14 (1 << 14)
+#define MPCOLL_UNK 0x18000
 #define MPCOLL_GRPUSH (1 << 15)
 #define MPCOLL_FLAGS_B16 (1 << 16)
 #define MPCOLL_FLAGS_B23 (1 << 23)

diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h
@@ -299,4 +299,11 @@ typedef struct HassamVars {
     f32 x68;
 } HassamVars;
 
+typedef struct KinokoVars {
+    f32 x0;
+    f32 x4;
+    f32 x8;
+    f32 xC;
+} KinokoVars;
+
 #endif
diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h
@@ -59,6 +59,7 @@ typedef void (*ItCallback)(HSD_GObj*);
 /* 26E248 */ void it_8026E248(Item_GObj*, HSD_GObjEvent);
 /* 26E414 */ void it_8026E414(Item_GObj*, HSD_GObjEvent);
 /* 26E71C */ void it_8026E71C(Item_GObj*, HSD_GObjEvent);
+/* 26E7E0 */ void it_8026E7E0(Item_GObj*, ItCallback);
 /* 26E8C4 */ void it_8026E8C4(Item_GObj*, HSD_GObjEvent, HSD_GObjEvent);
 /* 26E9A4 */ s32 it_8026E9A4(Item_GObj*, Vec3*, Vec3*, Vec3*);
 /* 26EA20 */ s32 it_8026EA20(Item_GObj*, Vec3*, Vec3*, Vec3*, s32*, Vec3*);

diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
@@ -7,6 +7,7 @@
 #include <baselib/forward.h>
 
 #include "it/items/types.h"
+#include "lb/types.h"
 
 #include <placeholder.h>
 
@@ -31,6 +32,7 @@
 /* 275DFC */ void it_80275DFC(HSD_GObj*);
 /* 276214 */ bool it_80276214(Item_GObj*);
 /* 2762D8 */ bool it_802762D8(HSD_GObj*);
+/* 276408 */ void it_80276408(Item_GObj*, CollData*, f32*);
 /* 276CB8 */ void it_80276CB8(Item_GObj* gobj);
 /* 276CEC */ void it_80276CEC(HSD_GObj*);
 /* 276FC4 */ void it_80276FC4(HSD_GObj*);