En_Geg (#436)

* En_Geg

* Format comments

* PR

* Object

* undef

* PR

assets/xml/objects/object_oF1d_map.xml

@@ -71,7 +71,10 @@
         <Texture Name="object_oF1d_map_Tex_00FAB8" OutName="tex_00FAB8" Format="ci8" Width="8" Height="16" Offset="0xFAB8" />
         <Texture Name="object_oF1d_map_Tex_00FB38" OutName="tex_00FB38" Format="ci8" Width="32" Height="64" Offset="0xFB38" />
         <Texture Name="object_oF1d_map_Tex_010338" OutName="tex_010338" Format="ci8" Width="16" Height="16" Offset="0x10338" />
-        <!-- <Blob Name="object_oF1d_map_Blob_010438" Size="0x1000" Offset="0x10438" /> -->
+        <Texture Name="object_oF1d_map_Tex_010438" OutName="tex_010438" Format="ci8" Width="32" Height="32" Offset="0x10438" />
+        <Texture Name="object_oF1d_map_Tex_010838" OutName="tex_010838" Format="ci8" Width="32" Height="32" Offset="0x10838" />
+        <Texture Name="object_oF1d_map_Tex_010C38" OutName="tex_010C38" Format="ci8" Width="32" Height="32" Offset="0x10C38" />
+        <Texture Name="object_oF1d_map_Tex_011038" OutName="tex_011038" Format="ci8" Width="32" Height="32" Offset="0x11038" />
         <Texture Name="object_oF1d_map_Tex_011438" OutName="tex_011438" Format="rgba16" Width="8" Height="8" Offset="0x11438" />
         <Texture Name="object_oF1d_map_Tex_0114B8" OutName="tex_0114B8" Format="ci8" Width="16" Height="16" Offset="0x114B8" />
         <Texture Name="object_oF1d_map_Tex_0115B8" OutName="tex_0115B8" Format="rgba16" Width="32" Height="16" Offset="0x115B8" />
@@ -98,7 +101,7 @@
         <Animation Name="object_oF1d_map_Anim_0135E8" Offset="0x135E8" />
         <Animation Name="object_oF1d_map_Anim_013DB0" Offset="0x13DB0" />
         <Animation Name="object_oF1d_map_Anim_0143AC" Offset="0x143AC" />
-        <Blob Name="object_oF1d_map_Blob_0143C0" Size="0x930" Offset="0x143C0" /> <!-- ZAPD erroneously generates an extra pad variable if this is commented out -->
+        <Animation Name="object_oF1d_map_Anim_014CE0" Offset="0x14CE0" />
         <DList Name="object_oF1d_map_DL_014CF0" Offset="0x14CF0" />
         <DList Name="object_oF1d_map_DL_014D00" Offset="0x14D00" />
     </File>

include/functions.h

@@ -3791,9 +3791,9 @@ void func_8019F230(void); // cancel
 // void func_8019F258(void);
 // void func_8019F300(void);
 void func_8019F420(Vec3f* pos, u16 sfxId);
-// void func_8019F4AC(void);
+void func_8019F4AC(Vec3f* pos, u16 sfxId);
 void func_8019F540(u8 arg0);
-// void func_8019F570(void);
+void func_8019F570(Vec3f* pos, s8 arg1);
 // void func_8019F5AC(void);
 // void func_8019F638(void);
 // void func_8019F780(void);

include/variables.h

@@ -3976,7 +3976,7 @@ extern UNK_TYPE D_04062020;
 extern UNK_TYPE D_04062040;
 extern UNK_TYPE D_04062060;
 extern Gfx D_040622C0[];
-extern UNK_TYPE D_0406AB30;
+extern Gfx D_0406AB30[];
 extern UNK_TYPE D_0406B730;
 extern UNK_TYPE D_0406BB0C;
 extern UNK_TYPE D_0406F380;

spec

@@ -4578,8 +4578,7 @@ beginseg
     name "ovl_En_Geg"
     compress
     include "build/src/overlays/actors/ovl_En_Geg/z_en_geg.o"
-    include "build/data/ovl_En_Geg/ovl_En_Geg.data.o"
+    include "build/src/overlays/actors/ovl_En_Geg/ovl_En_Geg_reloc.o"
-    include "build/data/ovl_En_Geg/ovl_En_Geg.reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Geg/z_en_geg.h

@@ -8,10 +8,44 @@ struct EnGeg;
 typedef void (*EnGegActionFunc)(struct EnGeg*, GlobalContext*);
 
 typedef struct EnGeg {
-    /* 0x0000 */ Actor actor;
+    /* 0x000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
+    /* 0x144 */ SkelAnime skelAnime;
-    /* 0x0188 */ EnGegActionFunc actionFunc;
+    /* 0x188 */ EnGegActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x364];
+    /* 0x18C */ ColliderCylinder colliderCylinder;
+    /* 0x1D8 */ ColliderSphere colliderSphere;
+    /* 0x230 */ u16 unk_230;
+    /* 0x232 */ s16 unk_232;
+    /* 0x234 */ UNK_TYPE1 unk234[4];
+    /* 0x238 */ s16 unk_238;
+    /* 0x23A */ UNK_TYPE1 unk23A[0x4];
+    /* 0x23E */ s16 unk_23E;
+    /* 0x240 */ s16 unk_240;
+    /* 0x242 */ s16 unk_242;
+    /* 0x244 */ s16 unk_244;
+    /* 0x248 */ s32 unk_248;
+    /* 0x24C */ Vec3s jointTable[18];
+    /* 0x2B8 */ Vec3s morphTable[18];
+    /* 0x324 */ UNK_TYPE1 unk324[0x144];
+    /* 0x468 */ s16 unk_468;
+    /* 0x46A */ s16 unk_46A;
+    /* 0x46C */ s16 unk_46C;
+    /* 0x46E */ s16 unk_46E;
+    /* 0x470 */ Vec3f unk_470;
+    /* 0x47C */ Vec3s unk_47C;
+    /* 0x484 */ Vec3f unk_484;
+    /* 0x490 */ Vec3s unk_490;
+    /* 0x496 */ u16 unk_496;
+    /* 0x498 */ s16 unk_498;
+    /* 0x49A */ s16 unk_49A;
+    /* 0x49C */ s16 unk_49C[8];
+    /* 0x4AC */ s32 unk_4AC;
+    /* 0x4B0 */ s16 unk_4B0;
+    /* 0x4B4 */ Vec3f unk_4B4;
+    /* 0x4C0 */ Vec3f unk_4C0[2];
+    /* 0x4D8 */ s16 unk_4D8;
+    /* 0x4DC */ s32 unk_4DC;
+    /* 0x4E0 */ s16 unk_4E0;
+    /* 0x4E4 */ Vec3f unk_4E4;
 } EnGeg; // size = 0x4F0
 
 extern const ActorInit En_Geg_InitVars;

tools/disasm/functions.txt

@@ -15324,9 +15324,9 @@
     0x80BB3650:("EnGeg_Destroy",),
     0x80BB36A0:("EnGeg_Update",),
     0x80BB3728:("func_80BB3728",),
-    0x80BB3860:("func_80BB3860",),
+    0x80BB3860:("EnGeg_OverrideLimbDraw",),
-    0x80BB387C:("func_80BB387C",),
+    0x80BB387C:("EnGeg_PostLimbDraw",),
-    0x80BB39F8:("func_80BB39F8",),
+    0x80BB39F8:("EnGeg_UnkDraw",),
     0x80BB3BE0:("func_80BB3BE0",),
     0x80BB3CB4:("func_80BB3CB4",),
     0x80BB3E0C:("EnGeg_Draw",),

undefined_syms.txt

@@ -2342,13 +2342,6 @@ D_0600A344 = 0x0600A344;
 D_06001EFC = 0x06001EFC;
 D_0600A808 = 0x0600A808;
 
-// ovl_En_Geg
-
-D_06004DB0 = 0x06004DB0;
-D_060091A8 = 0x060091A8;
-D_06011AC8 = 0x06011AC8;
-D_06012DE0 = 0x06012DE0;
-
 // ovl_En_Gg
 
 D_0600F578 = 0x0600F578;