En_Al (#595)

* En_Al

* Merge

* Merge

* PR

* Names

* PR

spec

@@ -4852,8 +4852,7 @@ beginseg
     name "ovl_En_Al"
     compress
     include "build/src/overlays/actors/ovl_En_Al/z_en_al.o"
-    include "build/data/ovl_En_Al/ovl_En_Al.data.o"
-    include "build/data/ovl_En_Al/ovl_En_Al.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Al/ovl_En_Al_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Al/z_en_al.h

@@ -6,12 +6,43 @@
 struct EnAl;
 
 typedef void (*EnAlActionFunc)(struct EnAl*, GlobalContext*);
+typedef s32 (*EnAlUnkFunc)(struct EnAl*, GlobalContext*);
+typedef void (*EnAlUnkFunc2)(struct EnAl*, GlobalContext*);
 
 typedef struct EnAl {
     /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
+    /* 0x0144 */ SkelAnime skelAnime;
     /* 0x0188 */ EnAlActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x374];
+    /* 0x018C */ EnAlUnkFunc2 unk_18C;
+    /* 0x0190 */ MtxF unk_190[6];
+    /* 0x0310 */ ColliderCylinder unk_310;
+    /* 0x035C */ u8 unk_35C;
+    /* 0x0360 */ s32* unk_360;
+    /* 0x0364 */ s32 unk_364;
+    /* 0x0368 */ Actor* unk_368;
+    /* 0x036C */ Vec3f unk_36C;
+    /* 0x0378 */ Vec3s unk_378;
+    /* 0x037E */ Vec3s jointTable[27];
+    /* 0x0420 */ Vec3s morphTable[27];
+    /* 0x04C2 */ u16 unk_4C2;
+    /* 0x04C4 */ u16 unk_4C4;
+    /* 0x04C8 */ f32 unk_4C8;
+    /* 0x04CC */ UNK_TYPE1 unk4CC[8];
+    /* 0x04D4 */ f32 unk_4D4;
+    /* 0x04D8 */ UNK_TYPE1 unk4D8[4];
+    /* 0x04DC */ s16 unk_4DC;
+    /* 0x04DE */ s16 unk_4DE;
+    /* 0x04E0 */ s16 unk_4E0;
+    /* 0x04E2 */ s16 unk_4E2;
+    /* 0x04E4 */ s16 unk_4E4;
+    /* 0x04E6 */ s16 unk_4E6;
+    /* 0x04E8 */ s16 unk_4E8;
+    /* 0x04EA */ s16 unk_4EA;
+    /* 0x04EC */ EnAlUnkFunc unk_4EC;
+    /* 0x04F0 */ s32 unk_4F0;
+    /* 0x04F4 */ s32 unk_4F4;
+    /* 0x04F8 */ s32 unk_4F8;
+    /* 0x04FC */ UNK_TYPE1 unk4FC[4];
 } EnAl; // size = 0x500
 
 extern const ActorInit En_Al_InitVars;

tools/disasm/functions.txt

@@ -16029,9 +16029,9 @@
     0x80BDF75C:("EnAl_Init",),
     0x80BDF840:("EnAl_Destroy",),
     0x80BDF86C:("EnAl_Update",),
-    0x80BDF914:("func_80BDF914",),
-    0x80BDF950:("func_80BDF950",),
-    0x80BDFA34:("func_80BDFA34",),
+    0x80BDF914:("EnAl_OverrideLimbDraw",),
+    0x80BDF950:("EnAl_PostLimbDraw",),
+    0x80BDFA34:("EnAl_TransformLimbDraw",),
     0x80BDFB30:("EnAl_Draw",),
     0x80BE04E0:("func_80BE04E0",),
     0x80BE0590:("func_80BE0590",),

undefined_syms.txt

@@ -1091,10 +1091,6 @@ D_06000F38 = 0x06000F38;
 
 D_06009E70 = 0x06009E70;
 
-// ovl_En_Al
-
-D_0600A0D8 = 0x0600A0D8;
-
 // ovl_En_An
 
 D_06000308 = 0x06000308;