Merge branch 'master' into itlinkbomb2

doldecomp · Jul 19, 2024 · 493e389 · 493e389
2 parents 8cb30e3 + c090e46
commit 493e389
Show file tree

Hide file tree

Showing 10 changed files with 1,029 additions and 13 deletions.
diff --git a/src/melee/ft/chara/ftCommon/ftCo_Guard.c b/src/melee/ft/chara/ftCommon/ftCo_Guard.c
@@ -885,7 +885,7 @@ void ftCo_GuardReflect_Coll(ftCo_GObj* gobj)
     ft_800845B4(gobj);
 }
 
-UNK_RET ftCo_80094098(UNK_PARAMS)
+f32 ftCo_80094098(HSD_GObj *gobj, f32 *arg1)
 {
     NOT_IMPLEMENTED;
 }

diff --git a/src/melee/ft/chara/ftCommon/ftCo_Guard.h b/src/melee/ft/chara/ftCommon/ftCo_Guard.h
@@ -38,7 +38,7 @@
 /* 093694 */ bool ftCo_80093694(ftCo_GObj* gobj);
 /* 09370C */ void ftCo_8009370C(HSD_GObj*, HSD_GObjEvent);
 /* 093BC0 */ void ftCo_80093BC0(ftCo_GObj* gobj);
-/* 093C3C */ UNK_RET ftCo_80094098(UNK_PARAMS);
+/* 093C3C */ float ftCo_80094098(HSD_GObj*, float*);
 /* 093CD0 */ void ftCo_GuardReflect_Anim(ftCo_GObj* gobj);
 /* 093CDC */ void ftCo_80094138(ftCo_Fighter* fp);
 /* 093EC0 */ void ftCo_GuardReflect_IASA(ftCo_GObj* gobj);

diff --git a/src/melee/ft/chara/ftLink/ftLk_SpecialN.c b/src/melee/ft/chara/ftLink/ftLk_SpecialN.c
@@ -21,6 +21,7 @@
 #include "ftLink/types.h"
 #include "it/items/it_27CF.h"
 #include "it/items/itlinkbow.h"
+#include "it/items/itlinkarrow.h"
 #include "lb/lb_00B0.h"
 #include "lb/lbrefract.h"
 
@@ -254,7 +255,7 @@ static inline void bar(ftLk_GObj* gobj)
     fp->mv.lk.specialn.x8.z = 0;
     fp->mv.lk.specialn.x8.x = atan2f(vecs.b.y - vecs.a.y, vecs.b.x - vecs.a.x);
     if (fp->fv.lk.arrow_gobj != NULL) {
-        it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b);
+        it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b, &vecs.a);
     }
     if (ftAnim_IsFramesRemaining(gobj)) {
         Fighter_ChangeMotionState(gobj, ftLk_MS_SpecialNLoop, mf, 0, 1, 0,
@@ -301,7 +302,7 @@ void ftLk_SpecialNLoop_Anim(ftLk_GObj* gobj)
     fp->mv.lk.specialn.x8.z = 0;
     fp->mv.lk.specialn.x8.x = atan2f(vecs.b.y - vecs.a.y, vecs.b.x - vecs.a.x);
     if (fp->fv.lk.arrow_gobj != NULL) {
-        it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b);
+        it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b, &vecs.a);
     }
 }
 
@@ -357,7 +358,7 @@ void ftLk_SpecialAirNStart_Anim(ftLk_GObj* gobj)
         fp->mv.lk.specialn.x8.x =
             atan2f(vecs.b.y - vecs.a.y, vecs.b.x - vecs.a.x);
         if (fp->fv.lk.arrow_gobj != NULL) {
-            it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b);
+            it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b, &vecs.a);
         }
         if (!ftAnim_IsFramesRemaining(gobj)) {
             Fighter_ChangeMotionState(gobj, ftLk_MS_SpecialAirNLoop, mf, 0, 1,
@@ -389,7 +390,7 @@ void ftLk_SpecialAirNLoop_Anim(ftLk_GObj* gobj)
     fp->mv.lk.specialn.x8.y = vecs.b.y - vecs.c.y;
     fp->mv.lk.specialn.x8.x = atan2f(vecs.b.y - vecs.a.y, vecs.b.x - vecs.a.x);
     if (fp->fv.lk.arrow_gobj != NULL) {
-        it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b);
+        it_802A8398(fp->fv.lk.arrow_gobj, &vecs.b, &vecs.a);
     }
 }
 

diff --git a/src/melee/it/itCharItems.h b/src/melee/it/itCharItems.h
@@ -52,6 +52,61 @@ typedef struct itLinkBombAttributes {
     /* x28 */ f32 vel[3];
 } itLinkBombAttributes;
 
+typedef struct {
+    f32 x0;
+    f32 x4;
+    f32 x8;
+    f32 xC;
+    f32 x10;
+    f32 x14;
+    Vec3 x18;
+    Vec3 x24;
+    Vec3 x30;
+    Vec3 x3C;
+    Vec3 x48;
+    Quaternion x54;
+    Quaternion x64;
+    Quaternion x74;
+    Quaternion x84;
+    f32 x94;
+    f32 x98;
+    u32 x9C;
+    s32 xA0;
+    u32 xA4;
+    f32 xA8;
+    f32 xAC;
+    s32 xB0;
+    HSD_JObj* xB4[3];
+    f32 xC0;
+    HSD_GObj* xC4;
+    f32 xC8;
+    f32 xCC;
+    void* xD0;
+    f32 xD4;
+    f32 xD8;
+    f32 xDC;
+    HSD_GObj* xE0;
+    s32 xE4;
+    f32 xE8;
+    f32 xEC;
+    s32 xF0;
+} itLinkArrowVars;
+
+typedef struct {
+    f32 x0;
+    f32 x4;
+    f32 x8;
+    f32 xC;
+    f32 x10;
+    f32 x14;
+    f32 x18;
+    f32 x1C;
+    f32 x20;
+    HSD_Joint* x24;
+    HSD_Joint* x28;
+    f32 x2C;
+} itLinkArrowAttributes;
+
 typedef struct {
     f32 x0;
     HSD_GObj *x4;

diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h
@@ -21,6 +21,7 @@
 /* 26DAA8 */ s32 it_8026DAA8(Item_GObj*);
 /* 26DF34 */ bool it_8026DF34(void);
 /* 26DFB0 */ bool it_8026DFB0(void);
+/* 26EA20 */ bool it_8026EA20(Item_GObj*, Vec3*, Vec3*, Vec3*, s32*, UNK_T);
 /* 26E0F4 */ void it_8026E0F4(Item_GObj*);
 /* 26E15C */ void it_8026E15C(Item_GObj*, HSD_GObjEvent);
 /* 26E248 */ void it_8026E248(Item_GObj*, HSD_GObjEvent);

diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
@@ -29,7 +29,9 @@
 /* 276214 */ bool it_80276214(Item_GObj*);
 /* 276CB8 */ void it_80276CB8(Item_GObj* gobj);
 /* 277040 */ bool it_80277040(Item_GObj*);
+/* 277040 */ bool it_80277040(Item_GObj*);
 /* 27781C */ bool it_8027781C(Item_GObj*);
+/* 2787B4 */ void it_802787B4(Item_GObj*, s32);
 /* 279C48 */ void it_80279C48(Item_GObj*, Article*);
 /* 279FF8 */ void it_80279FF8(Item_GObj*);
 /* 27A09C */ bool it_8027A09C(Item_GObj*);

diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h
@@ -32,9 +32,6 @@
                                    Vec3* pos, Fighter_Part, int);
 /* 2A0534 */ void it_802A0534(Item_GObj* gobj, Vec3*);
 /* 2A07B4 */ void it_802A07B4(Item_GObj* gobj);
-/* 2A8398 */ void it_802A8398(Item_GObj*, Vec3*);
-/* 2A83E0 */ HSD_GObj* it_802A83E0(float facing_dir, Fighter_GObj*, Vec3*,
-                                   Fighter_Part, int);
 /* 2A850C */ void it_802A850C(Item_GObj*, Vec3*, Vec3*, float, float, float);
 /* 2A8A7C */ void it_802A8A7C(Item_GObj* gobj);
 /* 2AA054 */ void it_802AA054(Item_GObj*, Vec3*, Vec3*, float, float);