Match itlinkbow

config/GALE01/symbols.txt

@@ -15243,14 +15243,14 @@ it_802AF184 = .text:0x802AF184; // type:function size:0x20 scope:global
 it_802AF1A4 = .text:0x802AF1A4; // type:function size:0xF4 scope:global
 it_802AF298 = .text:0x802AF298; // type:function size:0x6C scope:global
 it_802AF304 = .text:0x802AF304; // type:function size:0x28 scope:global
-it_802AF32C = .text:0x802AF32C; // type:function size:0x108 scope:global
+it_802AF32C = .text:0x802AF32C; // type:function size:0x108 scope:local
 it_802AF434 = .text:0x802AF434; // type:function size:0x218 scope:global
-it_802AF64C = .text:0x802AF64C; // type:function size:0x1F8 scope:global
-it_802AF844 = .text:0x802AF844; // type:function size:0x4 scope:global
-it_802AF848 = .text:0x802AF848; // type:function size:0xC4 scope:global
-it_802AF90C = .text:0x802AF90C; // type:function size:0x8 scope:global
-it_802AF914 = .text:0x802AF914; // type:function size:0x4 scope:global
-it_802AF918 = .text:0x802AF918; // type:function size:0x8 scope:global
+it_802AF64C = .text:0x802AF64C; // type:function size:0x1F8 scope:local
+it_802AF844 = .text:0x802AF844; // type:function size:0x4 scope:local
+it_802AF848 = .text:0x802AF848; // type:function size:0xC4 scope:local
+it_802AF90C = .text:0x802AF90C; // type:function size:0x8 scope:local
+it_802AF914 = .text:0x802AF914; // type:function size:0x4 scope:local
+it_802AF918 = .text:0x802AF918; // type:function size:0x8 scope:local
 it_802AF920 = .text:0x802AF920; // type:function size:0x20 scope:global
 it_802AF940 = .text:0x802AF940; // type:function size:0xEC scope:global
 it_802AFA2C = .text:0x802AFA2C; // type:function size:0x44 scope:global

configure.py

@@ -946,7 +946,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(Matching, "melee/it/items/it_2ADA.c"),
             Object(Matching, "melee/it/items/itkirbyhammer.c"),
             Object(NonMatching, "melee/it/items/itfoxblaster.c"),
-            Object(NonMatching, "melee/it/items/itlinkbow.c"),
+            Object(Matching, "melee/it/items/itlinkbow.c"),
             Object(NonMatching, "melee/it/items/itnesspkflushexplode.c"),
             Object(NonMatching, "melee/it/items/itseakneedlethrown.c"),
             Object(NonMatching, "melee/it/items/itseakneedleheld.c"),

obj_files.mk

@@ -626,7 +626,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/src/melee/it/items/it_2ADA.c.o\
     $(BUILD_DIR)/src/melee/it/items/itkirbyhammer.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itfoxblaster.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/itlinkbow.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itlinkbow.c.o\
     $(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\

src/melee/ft/chara/ftCommon/ftCo_ItemGet.c

@@ -304,7 +304,7 @@ void ftCo_800948A8(ftCo_GObj* gobj, Item_GObj* item_gobj)
     }
     inlineB0(gobj);
     {
-        u8 ret_part;
+        Fighter_Part ret_part;
         if (it_8026B2B4(item_gobj) == 0) {
             if (itGetKind(item_gobj) == It_Kind_WStar) {
                 ret_part = 0;

src/melee/ft/chara/ftKirby/ftKb_Init.h

@@ -401,10 +401,10 @@
 /* 0FB1E4 */ void ftKb_KpSpecialAirNStart_Coll(ftKb_GObj* gobj);
 /* 0FB274 */ void ftKb_KpSpecialAirN_Coll(ftKb_GObj* gobj);
 /* 0FB304 */ void ftKb_KpSpecialAirNEnd_Coll(ftKb_GObj* gobj);
-/* 0FB394 */ void ftKb_SpecialNLk800FB394(ftKb_GObj* gobj);
+/* 0FB394 */ ftLk_SpecialNIndex ftKb_SpecialNLk800FB394(ftKb_GObj* gobj);
 /* 0FB418 */ void ftKb_SpecialNLk800FB418(ftKb_GObj* gobj);
 /* 0FB444 */ void ftKb_SpecialNLk800FB444(ftKb_GObj* gobj);
-/* 0FB470 */ void ftKb_SpecialNLk800FB470(ftKb_GObj* gobj);
+/* 0FB470 */ bool ftKb_SpecialNLk800FB470(ftKb_GObj* gobj);
 /* 0FB500 */ void ftKb_SpecialNLk800FB500(ftKb_GObj* gobj);
 /* 0FB5F4 */ void ftKb_SpecialNLk800FB5F4(ftKb_GObj* gobj);
 /* 0FB6DC */ void ftKb_SpecialNLk800FB6DC(ftKb_GObj* gobj);

src/melee/ft/chara/ftLink/ftLk_SpecialN.c

@@ -20,6 +20,7 @@
 #include "ftCommon/ftCo_ItemGet.h"
 #include "ftLink/types.h"
 #include "it/items/it_27CF.h"
+#include "it/items/itlinkbow.h"
 #include "lb/lb_00B0.h"
 #include "lb/lbrefract.h"
 

src/melee/it/itCharItems.h

@@ -23,4 +23,9 @@ typedef struct {
     u32 x0;
 } itKirbyHammerVars;
 
+typedef struct {
+    f32 x0;
+    HSD_GObj *x4;
+} itLinkBowVars;
+
 #endif

src/melee/it/it_266F.h

@@ -79,7 +79,7 @@
 /* 274198 */ void it_80274198(HSD_GObj*, s32);
 /* 2741F4 */ void it_802741F4(HSD_GObj*, s32);
 /* 27429C */ void it_8027429C(HSD_GObj*, Vec3*);
-/* 2742F4 */ void it_802742F4(HSD_GObj*, HSD_GObj*, u8);
+/* 2742F4 */ void it_802742F4(HSD_GObj*, HSD_GObj*, Fighter_Part);
 /* 274594 */ void it_80274594(Item_GObj*);
 /* 274658 */ void it_80274658(HSD_GObj*, f32);
 /* 274740 */ void it_80274740(HSD_GObj* gobj);

src/melee/it/it_26B1.c

@@ -629,7 +629,7 @@ static inline void What(HSD_GObj* gobj, struct ItemStateDesc* itemStateDesc,
 }
 
 /// Transfer item on character transformation (Zelda <-> Sheik)
-void it_8026B9A8(HSD_GObj* gobj, HSD_GObj* arg1, u8 arg2)
+void it_8026B9A8(HSD_GObj* gobj, HSD_GObj* arg1, Fighter_Part arg2)
 {
     Vec3 vec;
     Item* ip = GET_ITEM(gobj);

src/melee/it/it_26B1.h

@@ -3,6 +3,7 @@
 
 #include <platform.h>
 #include "it/forward.h"
+#include "ft/types.h"
 #include "lb/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
@@ -53,7 +54,7 @@
 /* 26B894 */ bool it_8026B894(Item_GObj* gobj, HSD_GObj* referenced_gobj);
 /* 26B924 */ s32 it_8026B924(Item_GObj* gobj);
 /* 26B960 */ float it_8026B960(Item_GObj* gobj);
-/* 26B9A8 */ void it_8026B9A8(Item_GObj* gobj, HSD_GObj* arg1, u8 arg2);
+/* 26B9A8 */ void it_8026B9A8(Item_GObj* gobj, HSD_GObj* arg1, Fighter_Part arg2);
 /* 26BAE8 */ void it_8026BAE8(Item_GObj* gobj, float scale_mul);
 /* 26BB20 */ void it_8026BB20(Item_GObj* gobj);
 /* 26BB44 */ void it_8026BB44(Item_GObj* gobj);

src/melee/it/item.c

@@ -2031,7 +2031,7 @@ void Item_8026A8EC(Item_GObj* gobj)
     HSD_GObjPLink_80390228(gobj);
 }
 
-void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* pickup_gfx, u8 pickup_sfx)
+void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* pickup_gfx, Fighter_Part pickup_sfx)
 {
     u8 _[16];
 

src/melee/it/item.h

@@ -3,6 +3,7 @@
 
 #include <platform.h>
 #include "it/forward.h"
+#include "ft/types.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
@@ -35,7 +36,7 @@ struct ItemStateDesc;
 /* 269CA0 */ void Item_80269CA0(Item* item_data, s32 damage);
 /* 26A848 */ void Item_8026A848(HSD_GObj* gobj, HSD_GObj* fgobj);
 /* 26A8EC */ void Item_8026A8EC(Item_GObj* gobj);
-/* 26AB54 */ void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* owner_gobj, u8 part);
+/* 26AB54 */ void Item_8026AB54(HSD_GObj* gobj, HSD_GObj* owner_gobj, Fighter_Part part);
 /* 26ABD8 */ void Item_8026ABD8(HSD_GObj* gobj, Vec3* pos, float);
 /* 26AC74 */ void Item_8026AC74(HSD_GObj* gobj, Vec3*, Vec3*, float);
 /* 26AD20 */ void Item_8026AD20(HSD_GObj* gobj, Vec3*, Vec3*, float);

src/melee/it/items/it_27CF.h

@@ -26,7 +26,6 @@
 /* 294E78 */ void it_80294E78(Item_GObj*, float);
 /* 294EB0 */ void it_80294EB0(Item_GObj*, Vec3*, Vec3*);
 /* 2950D4 */ void it_802950D4(Item_GObj*, bool);
-/* 29A748 */ HSD_GObj* it_8029A748(Item_GObj*, Vec3*, u8, float);
 /* 29D968 */ void it_8029D968(Item_GObj*);
 /* 29DD58 */ HSD_GObj* it_8029DD58(Item_GObj* fighter_gobj, Vec3*, u8, int,
                                    float);
@@ -58,9 +57,6 @@
 /* 2AE608 */ void it_802AE608(Item_GObj*);
 /* 2AE8A8 */ HSD_GObj* it_802AE8A8(float, HSD_GObj*, Vec3*, s32, s32);
 /* 2AEAB4 */ void it_802AEAB4(Item_GObj*);
-/* 2AF1A4 */ HSD_GObj* it_802AF1A4(float facing_dir, Fighter_GObj* owner_gobj,
-                                   Vec3*, Fighter_Part, int);
-/* 2AF304 */ void it_802AF304(Item_GObj* gobj);
 /* 2B1DEC */ s32 it_802B1DEC(u32);
 /* 2B1DF8 */ u32 it_802B1DF8(Item_GObj*, Vec3*, Vec3*, s32, s32, s32);
 /* 2B1FC8 */ s32 it_802B1FC8(u32);

src/melee/it/items/itfflowerflame.c

@@ -32,7 +32,7 @@ ItemStateTable it_803F66C8[] = {
     { 0, it_8029AF70, it_8029B070, it_8029B074 },
 };
 
-HSD_GObj* it_8029A748(Item_GObj* arg0, Vec3* arg1, u8 arg2, f32 arg3)
+HSD_GObj* it_8029A748(Item_GObj* arg0, Vec3* arg1, Fighter_Part arg2, f32 arg3)
 {
     SpawnItem spawn;
 

src/melee/it/items/itfflowerflame.h

@@ -2,12 +2,13 @@
 #define GALE01_29A748
 
 #include <platform.h>
+#include "ft/forward.h"
 #include "it/forward.h"
 
 #include "it/items/types.h"
 #include "it/types.h"
 
-/* 29A748 */ HSD_GObj* it_8029A748(Item_GObj*, Vec3*, u8, f32);
+/* 29A748 */ HSD_GObj* it_8029A748(Item_GObj*, Vec3*, Fighter_Part, f32);
 /* 29A89C */ void it_8029A89C(Item_GObj*, f32);
 /* 29A8F4 */ void it_8029A8F4(Item_GObj*, Vec3*);
 /* 29A9FC */ void it_8029A9FC(Item_GObj*);

src/melee/it/items/itgamewatchturtle.c

@@ -25,7 +25,7 @@ ItemStateTable it_803F7918[] = {
     },
 };
 
-Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, u8 arg2, f32 dir)
+Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, Fighter_Part arg2, f32 dir)
 {
     SpawnItem spawn_item;
     HSD_GObj* item_gobj;

src/melee/it/items/itgamewatchturtle.h

@@ -4,11 +4,12 @@
 #include <melee/it/forward.h>
 
 #include <melee/it/types.h>
+#include <melee/ft/types.h>
 #include <melee/it/items/types.h>
 
 extern ItemStateTable it_803F7918[];
 
-Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, u8 arg2, f32 dir);
+Item_GObj* it_802C6F40(HSD_GObj* parent, Vec3* pos, Fighter_Part arg2, f32 dir);
 void it_802C7044(Item_GObj* item_gobj);
 void it_802C7074(Item_GObj* item_gobj);
 void it_802C70C0(Item_GObj*);

src/melee/it/items/itkirbyhammer.c

@@ -28,7 +28,7 @@ void it_802ADC34(Item_GObj* gobj)
 }
 
 static void setupHammerParticles(HSD_GObj* parent, Item_GObj* item_gobj,
-                                 u8 sfx, u32 vars)
+                                 Fighter_Part sfx, u32 vars)
 {
     HSD_JObj* jobj;
     u32 particle_id;
@@ -47,7 +47,7 @@ static void setupHammerParticles(HSD_GObj* parent, Item_GObj* item_gobj,
                   0, particle_id, jobj);
 }
 
-Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, u8 sfx, u32 vars, f32 dir)
+Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, Fighter_Part sfx, u32 vars, f32 dir)
 {
     Item_GObj* item_gobj;
     SpawnItem spawn;

src/melee/it/items/itkirbyhammer.h

@@ -3,14 +3,15 @@
 
 #include <platform.h>
 #include "it/forward.h"
+#include "ft/types.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
 #include "it/items/types.h"
 
 /* 2ADC04 */ void it_802ADC04(Item_GObj* gobj);
 /* 2ADC34 */ void it_802ADC34(Item_GObj* gobj);
-/* 2ADC54 */ Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, u8 sfx,
+/* 2ADC54 */ Item_GObj* it_802ADC54(HSD_GObj* parent, Vec3* pos, Fighter_Part sfx,
                                     u32 vars, float dir);
 /* 2ADD88 */ void it_802ADD88(Item_GObj* gobj);
 /* 2ADDB0 */ void it_802ADDB0(Item_GObj* gobj, HSD_GObj* ref_gobj);