Finish matching itzrshell (#1274)

* Match it_802E0488, finish matching itzrshell * Add missing function prototype
doldecomp · Feb 20, 2024 · 604b21a · 604b21a
1 parent 48d930f
commit 604b21a
Show file tree

Hide file tree

Showing 13 changed files with 132 additions and 328 deletions.
diff --git a/asm/melee/it/items/itzrshell.s b/asm/melee/it/items/itzrshell.s
diff --git a/configure.py b/configure.py
@@ -1005,7 +1005,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(NonMatching, "melee/it/items/itlikelike.c"),
             Object(NonMatching, "melee/it/items/itnokonoko.c"),
             Object(NonMatching, "melee/it/items/itzgshell.c"),
-            Object(NonMatching, "melee/it/items/itzrshell.c"),
+            Object(Matching, "melee/it/items/itzrshell.c"),
             Object(NonMatching, "melee/it/items/itpatapata.c"),
             Object(NonMatching, "melee/it/items/itklap.c"),
             Object(NonMatching, "melee/it/items/itoldottosea.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -706,7 +706,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itlikelike.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itnokonoko.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itzgshell.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/itzrshell.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itzrshell.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itpatapata.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itklap.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itoldottosea.s.o\

diff --git a/src/melee/gr/ground.c b/src/melee/gr/ground.c
@@ -1802,7 +1802,7 @@ s32 Ground_801C4210(void)
     enum_t i;
     for (i = 199; i < 220; i++) {
         if (stage_info.x280[i] != NULL &&
-            it_8027B5B0(It_Kind_Mato, 0, stage_info.x280[i], 0, 0) != NULL)
+            it_8027B5B0(It_Kind_Mato, 0, stage_info.x280[i], NULL, 0) != NULL)
         {
             count++;
         }

diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h
@@ -97,6 +97,11 @@ typedef struct {
     HSD_JObj* x0;
 } ItMatoVars;
 
+typedef struct {
+    u8 padding[0xE10 - 0xDD4];
+    int xE10;
+} itShellVars;
+
 typedef struct itPokemonAttributes {
     f32 x0;
     s32 timer;

diff --git a/src/melee/it/it_266F.dox b/src/melee/it/it_266F.dox
@@ -25,7 +25,7 @@
 /* 4A0F60 */ extern Article* it_804A0F60[]; // stage items
 
 /* 27B4A4 */ void it_8027B4A4(Fighter_GObj*, Item_GObj*);
-/* 27B5B0 */ void* it_8027B5B0(s32, s32, HSD_JObj*, s32, s32);
+/* 27B5B0 */ Item_GObj* it_8027B5B0(s32, s32, HSD_JObj*, Vec3*, s32);
 /* 274EE8 */ void it_80274EE8(u32);
 
 /// Load ItCo.dat/usd

diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h
@@ -119,7 +119,7 @@
 /* 27A344 */ void it_8027A344(Item_GObj*);
 /* 27B0C4 */ void it_8027B0C4(HSD_GObj*, SpawnItem*);
 /* 27B4A4 */ void it_8027B4A4(Fighter_GObj*, Item_GObj*);
-/* 27B5B0 */ void* it_8027B5B0(s32, s32, HSD_JObj*, s32, s32);
+/* 27B5B0 */ Item_GObj* it_8027B5B0(s32, s32, HSD_JObj*, Vec3*, s32);
 /* 4A0E30 */ extern HSD_ObjAllocUnk4 it_804A0E30;
 /* 4A0E50 */ extern HSD_ObjAllocUnk5 it_804A0E50;
 /* 4A0E60 */ extern HSD_ObjAllocUnk6 it_804A0E60;

diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
@@ -21,13 +21,15 @@
 /* 2750F8 */ void it_802750F8(Item_GObj*);
 /* 276214 */ bool it_80276214(Item_GObj*);
 /* 276CB8 */ void it_80276CB8(Item_GObj* gobj);
+/* 277040 */ bool it_80277040(Item_GObj*);
 /* 27781C */ bool it_8027781C(Item_GObj*);
 /* 279C48 */ void it_80279C48(Item_GObj*, Article*);
 /* 279FF8 */ void it_80279FF8(Item_GObj*);
 /* 27A09C */ bool it_8027A09C(Item_GObj*);
 /* 27A118 */ bool it_8027A118(Item_GObj*, void (*)(Item_GObj*));
 /* 27B070 */ void it_8027B070(Item_GObj* gobj, Fighter_GObj* owner_gobj);
 /* 27B378 */ void it_8027B378(Fighter_GObj*, Item_GObj*, float);
+/* 27C56C */ void it_8027C56C(Item_GObj*, f32);
 /* 27C8B0 */ void it_8027C8B0(Item_GObj*);
 /* 27CE44 */ void it_8027CE44(Item_GObj*);
 /* 3F14C4 */ extern struct ItemLogicTable it_803F14C4[43];

diff --git a/src/melee/it/items/itnokonoko.h b/src/melee/it/items/itnokonoko.h
@@ -1 +1,11 @@
+#ifndef _itnokonoko_h_
+#define _itnokonoko_h_
 
+#include <platform.h>
+
+#include "it/item.h"
+#include "it/items/types.h"
+
+bool it_802DDA84(Item_GObj*);
+
+#endif