En_Fu (#343)

* En_Fu

* Fix non-matching, thanks Anon58

include/functions.h

@@ -2161,7 +2161,7 @@ void func_80115908(GlobalContext* globalCtx, u8 param_2);
 void func_801159c0(s16 param_1);
 void func_801159EC(s16 arg0);
 void func_80115A14(s32 arg0, s16 arg1);
-// void Parameter_AddMagic(void);
+void Parameter_AddMagic(GlobalContext* globalCtx, s16 arg1);
 void func_80115D5C(GameState* gamestate);
 // void func_80115DB4(void);
 // void func_80116088(void);
@@ -3388,7 +3388,7 @@ void SysMatrix_InsertXRotation_s(s16 rotation, s32 appendToState);
 void SysMatrix_InsertXRotation_f(f32 rotation, s32 appendToState);
 void SysMatrix_RotateStateAroundXAxis(f32 rotation);
 void SysMatrix_SetStateXRotation(f32 rotation);
-void Matrix_RotateY(s16 rotation, u8 appendToState);
+void Matrix_RotateY(s16 rotation, s32 appendToState);
 void SysMatrix_InsertYRotation_f(f32 rotation, s32 appendToState);
 void SysMatrix_InsertZRotation_s(s16 rotation, s32 appendToState);
 void SysMatrix_InsertZRotation_f(f32 rotation, s32 appendToState);

include/z64.h

@@ -964,7 +964,7 @@ typedef struct {
     /* 0x12020 */ u8 unk12020;
     /* 0x12021 */ u8 choiceIndex;
     /* 0x12022 */ UNK_TYPE1 unk12022;
-    /* 0x12023 */ s8 unk12023;
+    /* 0x12023 */ u8 unk12023;
     /* 0x12024 */ UNK_TYPE1 unk12024[0x6];
     /* 0x1202A */ u16 unk1202A;
     /* 0x1202C */ UNK_TYPE1 pad1202C[0x2];

spec

@@ -1721,8 +1721,7 @@ beginseg
     name "ovl_En_Fu"
     compress
     include "build/src/overlays/actors/ovl_En_Fu/z_en_fu.o"
-    include "build/data/ovl_En_Fu/ovl_En_Fu.data.o"
-    include "build/data/ovl_En_Fu/ovl_En_Fu.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Fu/ovl_En_Fu_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h

@@ -7,7 +7,8 @@ struct BgFuMizu;
 
 typedef struct BgFuMizu {
     /* 0x000 */ Actor actor;
-    /* 0x144 */ char unk_144[0x20];
+    /* 0x144 */ char unk_144[0x1C];
+    /* 0x160 */ s16 unk_160;
 } BgFuMizu; // size = 0x164
 
 extern const ActorInit Bg_Fu_Mizu_InitVars;

src/overlays/actors/ovl_En_Fu/z_en_fu.h

@@ -7,11 +7,48 @@ struct EnFu;
 
 typedef void (*EnFuActionFunc)(struct EnFu*, GlobalContext*);
 
+#define ENFU_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
+
+typedef struct {
+    /* 0x00 */ f32 unk_00;
+    /* 0x04 */ char unk_04[0x4];
+    /* 0x08 */ Vec3f unk_08;
+    /* 0x14 */ Vec3f unk_14;
+    /* 0x20 */ Vec3f unk_20;
+    /* 0x2C */ s16 unk_2C;
+    /* 0x2E */ char unk_2E[0x8];
+    /* 0x36 */ u8 unk_36;
+    /* 0x37 */ u8 unk_37;
+} EnFuUnkStruct; // size = 0x38
+
 typedef struct EnFu {
     /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x90];
+    /* 0x0144 */ ColliderCylinder collider;
+    /* 0x0190 */ SkelAnime skelAnime;
     /* 0x01D4 */ EnFuActionFunc actionFunc;
-    /* 0x01D8 */ char unk_1D8[0x37C];
+    /* 0x01D8 */ Vec3s jointTable[21];
+    /* 0x0256 */ Vec3s morphTable[21];
+    /* 0x02D4 */ BgFuMizu* unk_2D4;
+    /* 0x02D8 */ EnFuUnkStruct unk_2D8[10];
+    /* 0x0508 */ Vec3f unk_508;
+    /* 0x0514 */ Vec3f unk_514;
+    /* 0x0520 */ s32 unk_520;
+    /* 0x0524 */ s16 unk_524[3];
+    /* 0x052A */ s16 unk_52A[3];
+    /* 0x0530 */ char unk530[0x8];
+    /* 0x0538 */ Vec3s* unk_538;
+    /* 0x053C */ s16 unk_53C;
+    /* 0x053E */ s16 unk_53E;
+    /* 0x0540 */ s16 unk_540;
+    /* 0x0542 */ s16 unk_542;
+    /* 0x0544 */ s16 unk_544;
+    /* 0x0546 */ s16 unk_546;
+    /* 0x0548 */ s16 unk_548;
+    /* 0x054A */ s16 unk_54A;
+    /* 0x054C */ s16 unk_54C;
+    /* 0x054E */ s16 unk_54E;
+    /* 0x0550 */ s16 unk_550;
+    /* 0x0552 */ u16 unk_552;
 } EnFu; // size = 0x554
 
 extern const ActorInit En_Fu_InitVars;

src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h

@@ -11,7 +11,8 @@ typedef struct EnFuKago {
     /* 0x0000 */ Actor actor;
     /* 0x0144 */ char unk_144[0x18];
     /* 0x015C */ EnFuKagoActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x1E0];
+    /* 0x0160 */ char unk_160[0x1DC];
+    /* 0x033C */ s16 unk_33C;
 } EnFuKago; // size = 0x340
 
 extern const ActorInit En_Fu_Kago_InitVars;

src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h

@@ -11,7 +11,8 @@ typedef struct EnFuMato {
     /* 0x0000 */ Actor actor;
     /* 0x0144 */ char unk_144[0x18];
     /* 0x015C */ EnFuMatoActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x1AC];
+    /* 0x0160 */ char unk_160[0x1AA];
+    /* 0x030A */ s16 unk_30A;
 } EnFuMato; // size = 0x30C
 
 extern const ActorInit En_Fu_Mato_InitVars;

src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c

@@ -626,7 +626,7 @@ void func_809C7620(EnSyatekiMan* this, GlobalContext* globalCtx) {
 
             case 0x3FD:
             case 0x3FF:
-                if (this->unk_26A == 4U) {
+                if (this->unk_26A == 4) {
                     if (this->unk_284 == 0x3FD) {
                         func_801518B0(globalCtx, 0x3FE, &this->actor);
                         this->unk_284 = 0x3FE;

tools/disasm/functions.txt

@@ -7883,8 +7883,8 @@
     0x8096426C:("func_8096426C",),
     0x809642E0:("func_809642E0",),
     0x80964350:("EnFu_Update",),
-    0x809643FC:("func_809643FC",),
-    0x8096450C:("func_8096450C",),
+    0x809643FC:("EnFu_OverrideLimbDraw",),
+    0x8096450C:("EnFu_PostLimbDraw",),
     0x80964570:("EnFu_Draw",),
     0x80964694:("func_80964694",),
     0x809647EC:("func_809647EC",),

undefined_syms.txt

@@ -2252,9 +2252,14 @@ D_0601430C = 0x0601430C;
 // ovl_En_Fu
 
 D_06001F74 = 0x06001F74;
+D_06002F64 = 0x06002F64;
+D_06004904 = 0x06004904;
+D_06005304 = 0x06005304;
+D_060053E0 = 0x060053E0;
 D_0600B0A0 = 0x0600B0A0;
 D_0600B0E0 = 0x0600B0E0;
 D_0600B2B0 = 0x0600B2B0;
+D_0600BAC4 = 0x0600BAC4;
 
 // ovl_En_Fu_Kago