En_Tsn (#651)

* En_Tsn

* PR

* PR

* Merge

assets/xml/objects/object_tsn.xml

@@ -26,11 +26,11 @@
         <Texture Name="object_tsn_Tex_006CB8" OutName="tex_006CB8" Format="ci8" Width="32" Height="32" Offset="0x6CB8" />
         <Texture Name="object_tsn_Tex_0070B8" OutName="tex_0070B8" Format="rgba16" Width="16" Height="16" Offset="0x70B8" />
         <Texture Name="object_tsn_Tex_0072B8" OutName="tex_0072B8" Format="ci8" Width="16" Height="16" Offset="0x72B8" />
-        <!-- <Blob Name="object_tsn_Blob_0073B8" Size="0x400" Offset="0x73B8" /> -->
+        <Texture Name="object_tsn_Tex_0073B8" OutName="tex_0073B8" Format="ci8" Width="32" Height="32" Offset="0x73B8" />
         <Texture Name="object_tsn_Tex_0077B8" OutName="tex_0077B8" Format="rgba16" Width="16" Height="32" Offset="0x77B8" />
         <Texture Name="object_tsn_Tex_007BB8" OutName="tex_007BB8" Format="rgba16" Width="16" Height="16" Offset="0x7BB8" />
         <Texture Name="object_tsn_Tex_007DB8" OutName="tex_007DB8" Format="rgba16" Width="32" Height="32" Offset="0x7DB8" />
-        <!-- <Blob Name="object_tsn_Blob_0085B8" Size="0x400" Offset="0x85B8" /> -->
+        <Texture Name="object_tsn_Tex_0085B8" OutName="tex_0085B8" Format="ci8" Width="32" Height="32" Offset="0x85B8" />
         <Limb Name="object_tsn_Standardlimb_0089B8" Type="Standard" EnumName="OBJECT_TSN_LIMB_01" Offset="0x89B8" />
         <Limb Name="object_tsn_Standardlimb_0089C4" Type="Standard" EnumName="OBJECT_TSN_LIMB_02" Offset="0x89C4" />
         <Limb Name="object_tsn_Standardlimb_0089D0" Type="Standard" EnumName="OBJECT_TSN_LIMB_03" Offset="0x89D0" />

include/z64item.h

@@ -332,7 +332,8 @@ typedef enum {
     /* 0x8E */ GI_MASK_SCENTS,
     /* 0x8F */ GI_MASK_GIANT,
     /* 0x92 */ GI_MILK = 0x92,
-    /* 0x96 */ GI_MOON_TEAR = 0x96,
+    /* 0x95 */ GI_95 = 0x95,
+    /* 0x96 */ GI_MOON_TEAR,
     /* 0x97 */ GI_DEED_LAND,
     /* 0x98 */ GI_DEED_SWAMP,
     /* 0x99 */ GI_DEED_MOUNTAIN,

spec

@@ -3620,8 +3620,7 @@ beginseg
     name "ovl_En_Tsn"
     compress
     include "build/src/overlays/actors/ovl_En_Tsn/z_en_tsn.o"
-    include "build/data/ovl_En_Tsn/ovl_En_Tsn.data.o"
-    include "build/data/ovl_En_Tsn/ovl_En_Tsn.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Tsn/ovl_En_Tsn_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Tsn/z_en_tsn.h

@@ -7,11 +7,26 @@ struct EnTsn;
 
 typedef void (*EnTsnActionFunc)(struct EnTsn*, GlobalContext*);
 
+#define ENTSN_GET_F(thisx) ((thisx)->params & 0xF)
+#define ENTSN_GET_100(thisx) ((thisx)->params & 0x100)
+#define ENTSN_GET_Z(thisx) ((thisx)->home.rot.z)
+#define ENTSN_SET_Z(thisx, state) ((thisx)->home.rot.z = state)
+
+#define ENTSN_F_0 0
+#define ENTSN_F_1 1
+
 typedef struct EnTsn {
     /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x90];
+    /* 0x0144 */ ColliderCylinder collider;
+    /* 0x0190 */ SkelAnime skelAnime;
     /* 0x01D4 */ EnTsnActionFunc actionFunc;
-    /* 0x01D8 */ char unk_1D8[0x5C];
+    /* 0x01D8 */ struct EnTsn* unk_1D8;
+    /* 0x01DC */ UNK_TYPE1 unk1DC[0x44];
+    /* 0x0220 */ u16 unk_220;
+    /* 0x0222 */ Vec3s unk_222;
+    /* 0x0228 */ Vec3s unk_228;
+    /* 0x022E */ s16 unk_22E;
+    /* 0x0230 */ s16 unk_230;
 } EnTsn; // size = 0x234
 
 extern const ActorInit En_Tsn_InitVars;

tools/disasm/functions.txt

@@ -12384,8 +12384,8 @@
     0x80AE0D78:("func_80AE0D78",),
     0x80AE0DDC:("EnTsn_Update",),
     0x80AE0F84:("func_80AE0F84",),
-    0x80AE0FA8:("func_80AE0FA8",),
-    0x80AE1024:("func_80AE1024",),
+    0x80AE0FA8:("EnTsn_OverrideLimbDraw",),
+    0x80AE1024:("EnTsn_PostLimbDraw",),
     0x80AE1080:("EnTsn_Draw",),
     0x80AE1650:("func_80AE1650",),
     0x80AE16A0:("func_80AE16A0",),

undefined_syms.txt

@@ -1802,13 +1802,6 @@ D_0601A830 = 0x0601A830;
 D_060004C8 = 0x060004C8;
 D_0601AA60 = 0x0601AA60;
 
-// ovl_En_Tsn
-
-D_06000964 = 0x06000964;
-D_06001198 = 0x06001198;
-D_06008AB8 = 0x06008AB8;
-D_060092FC = 0x060092FC;
-
 // ovl_En_Twig
 
 D_060014C8 = 0x060014C8;