En_Wf (#370)

* En_Wf

* PR

* Fix make and actorfixer

* Format

* Warnings

include/functions.h

@@ -881,7 +881,7 @@ void func_800BC154(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* acto
 Actor* func_800BC270(GlobalContext* globalCtx, Actor* actor, f32 arg2, UNK_TYPE4 arg3);
 Actor* func_800BC444(GlobalContext* globalCtx, Actor* actor, f32 arg2);
 // void func_800BC4EC(void);
-// void func_800BC5B8(void);
+s32 func_800BC5B8(GlobalContext* globalCtx, Actor* actor);
 s32 func_800BC5EC(GlobalContext* globalCtx, Actor* actor);
 void func_800BC620(Vec3f* arg0, Vec3f* arg1, u8 arg2, GlobalContext* globalCtx);
 // void func_800BC770(void);
@@ -907,12 +907,12 @@ void Actor_Noop(Actor* actor, GlobalContext* globalCtx);
 void func_800BDFC0(GlobalContext* globalCtx, Gfx* dl);
 void func_800BE03C(GlobalContext* globalCtx, Gfx* dl);
 Actor* func_800BE0B8(GlobalContext* globalCtx, Actor* inActor, s16 arg2, u8 arg3, f32 arg4);
-// void func_800BE184(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
+s32 func_800BE184(GlobalContext* globalCtx, Actor* actor, f32 arg2, s32 arg3, s32 arg4, s32 arg5);
 u8 Actor_ApplyDamage(Actor* actor); // returns current health
 void func_800BE258(Actor* actor, UNK_PTR arg1);
 void func_800BE2B8(Actor* actor, ColliderJntSph* jntSphere);
 void func_800BE33C(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3);
-void func_800BE3D0(Actor* actor, s16 arg1, s16* arg2);
+void func_800BE3D0(Actor* actor, s16 angle, Vec3s* arg2);
 void func_800BE504(Actor* actor, ColliderCylinder* collider);
 void func_800BE568(Actor* actor, ColliderSphere* collider);
 void func_800BE5CC(Actor* actor, ColliderJntSph* collider, s32 arg2);
@@ -1638,7 +1638,7 @@ void func_800F0390(GlobalContext* globalCtx);
 void func_800F03C0(GlobalContext* globalCtx);
 void func_800F048C(GlobalContext* globalCtx, Vec3f* param_2, u8 param_3, u16 param_4, u8 param_5);
 void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* position, s32 param_3, u16 sfxId);
-// void func_800F0590(void);
+void func_800F0590(GlobalContext* globalCtx, Vec3f* arg1, s32 arg2, s32 arg3);
 // void func_800F05C0(void);
 // void func_800F07C0(void);
 // void func_800F0888(void);

spec

@@ -2192,8 +2192,7 @@ beginseg
     name "ovl_En_Wf"
     compress
     include "build/src/overlays/actors/ovl_En_Wf/z_en_wf.o"
-    include "build/data/ovl_En_Wf/ovl_En_Wf.data.o"
-    include "build/data/ovl_En_Wf/ovl_En_Wf.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Wf/ovl_En_Wf_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Tite/z_en_tite.c

@@ -1071,7 +1071,7 @@ void EnTite_Update(Actor* thisx, GlobalContext* globalCtx) {
         Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 25.0f, 40.0f, 20.0f, this->unk_2C0);
         func_808963B4(this, globalCtx);
         if (this->actor.bgCheckFlags & 1) {
-            func_800BE3D0(&this->actor, this->actor.shape.rot.y, &this->actor.shape.rot.x);
+            func_800BE3D0(&this->actor, this->actor.shape.rot.y, &this->actor.shape.rot);
             if (this->unk_2B9 != 0) {
                 this->actor.shape.rot.z = BINANG_ROT180(this->actor.shape.rot.z);
             }

src/overlays/actors/ovl_En_Wf/z_en_wf.h

@@ -7,11 +7,33 @@ struct EnWf;
 
 typedef void (*EnWfActionFunc)(struct EnWf*, GlobalContext*);
 
+#define ENWF_GET_80(thisx) ((thisx)->params & 0x80)
+
 typedef struct EnWf {
     /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x14C];
+    /* 0x0144 */ SkelAnime skelAnime;
+    /* 0x0188 */ Vec3s jointTable[22];
+    /* 0x020C */ Vec3s morphTable[22];
     /* 0x0290 */ EnWfActionFunc actionFunc;
-    /* 0x0294 */ char unk_294[0x254];
+    /* 0x0294 */ u8 unk_294;
+    /* 0x0295 */ u8 unk_295;
+    /* 0x0296 */ u8 unk_296;
+    /* 0x0298 */ s16 unk_298;
+    /* 0x029A */ s16 unk_29A;
+    /* 0x029C */ s16 unk_29C;
+    /* 0x029E */ s16 unk_29E;
+    /* 0x02A0 */ s16 unk_2A0;
+    /* 0x02A2 */ u16 unk_2A2;
+    /* 0x02A4 */ f32 unk_2A4;
+    /* 0x02A8 */ f32 unk_2A8;
+    /* 0x02AC */ f32 unk_2AC;
+    /* 0x02B0 */ f32 unk_2B0;
+    /* 0x02B4 */ f32 unk_2B4;
+    /* 0x02B8 */ Vec3f unk_2B8[10];
+    /* 0x0330 */ ColliderJntSph collider1;
+    /* 0x0350 */ ColliderJntSphElement collider1Elements[4];
+    /* 0x0450 */ ColliderCylinder collider2;
+    /* 0x049C */ ColliderCylinder collider3;
 } EnWf; // size = 0x4E8
 
 extern const ActorInit En_Wf_InitVars;

src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h

@@ -10,7 +10,8 @@ typedef void (*ObjIcePolyActionFunc)(struct ObjIcePoly*, GlobalContext*);
 typedef struct ObjIcePoly {
     /* 0x0000 */ Actor actor;
     /* 0x0144 */ ObjIcePolyActionFunc actionFunc;
-    /* 0x0148 */ char unk_144[0x134];
+    /* 0x0148 */ u8 unk_148;
+    /* 0x0149 */ char unk_149[0x133];
 } ObjIcePoly; // size = 0x27C
 
 extern const ActorInit Obj_Ice_Poly_InitVars;

undefined_syms.txt

@@ -3766,12 +3766,18 @@ D_06001E20 = 0x06001E20;
 
 // ovl_En_Wf
 
+D_06000300 = 0x06000300;
+D_060027D8 = 0x060027D8;
+D_060029D8 = 0x060029D8;
 D_06003BC0 = 0x06003BC0;
 D_06004638 = 0x06004638;
 D_06004A90 = 0x06004A90;
 D_06004C44 = 0x06004C44;
 D_060053D0 = 0x060053D0;
 D_06005700 = 0x06005700;
+D_06007AA8 = 0x06007AA8;
+D_060082A8 = 0x060082A8;
+D_060084A8 = 0x060084A8;
 D_060095D0 = 0x060095D0;
 D_06009808 = 0x06009808;
 D_06009A50 = 0x06009A50;