En_Tru (1 non-matching) (#325)

* En_Tru * Fixups * PR * The meme * I rebased by accident sorry * Add object memes * Type
2021-12-22 16:25:00 +00:00 · 2021-12-22 16:25:00 +00:00 · a3478c4056
parent aad8f64c65
commit a3478c4056
9 changed files with 1285 additions and 59 deletions
--- a/assets/xml/objects/object_tru.xml
+++ b/assets/xml/objects/object_tru.xml
@ -70,7 +70,9 @@
        <Texture Name="object_tru_Tex_018E20" OutName="tex_018E20" Format="rgba16" Width="16" Height="8" Offset="0x18E20" />
        <Texture Name="object_tru_Tex_018F20" OutName="tex_018F20" Format="ci8" Width="8" Height="8" Offset="0x18F20" />
        <Texture Name="object_tru_Tex_018F60" OutName="tex_018F60" Format="ci8" Width="8" Height="8" Offset="0x18F60" />
-        <!-- <Blob Name="object_tru_Blob_018FA0" Size="0x1800" Offset="0x18FA0" /> -->
+        <Texture Name="object_tru_Tex_018FA0" OutName="tex_018FA0" Format="rgba16" Width="32" Height="32" Offset="0x18FA0" />
+        <Texture Name="object_tru_Tex_0197A0" OutName="tex_0197A0" Format="rgba16" Width="32" Height="32" Offset="0x197A0" />
+        <Texture Name="object_tru_Tex_019FA0" OutName="tex_019FA0" Format="rgba16" Width="32" Height="32" Offset="0x19FA0" />
        <Texture Name="object_tru_Tex_01A7A0" OutName="tex_01A7A0" Format="rgba16" Width="8" Height="8" Offset="0x1A7A0" />
        <DList Name="object_tru_DL_01A820" Offset="0x1A820" />
        <DList Name="object_tru_DL_01A830" Offset="0x1A830" />
--- a/assets/xml/overlays/ovl_En_Tru.xml
+++ b/assets/xml/overlays/ovl_En_Tru.xml
@ -0,0 +1,24 @@
+<Root>
+    <File Name="ovl_En_Tru" BaseAddress="0x80A85620" RangeStart="0x33B0" RangeEnd="0x5C30">
+        <Texture Name="D_80A889D0" OutName="en_tru_33B0" Format="i4" Width="32" Height="64" Offset="0x33B0"/>
+        <Texture Name="D_80A88DD0" OutName="en_tru_37B0" Format="i4" Width="32" Height="32" Offset="0x37B0"/>
+        <Array Name="D_80A88FD0" Count="3" Offset="0x39B0">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80A89000" Offset="0x39E0"/>
+        <DList Name="D_80A890A8" Offset="0x3A88"/>
+
+        <Texture Name="D_80A890C8" OutName="en_tru_3AA8" Format="i8" Width="64" Height="64" Offset="0x3AA8"/>
+        <Array Name="D_80A8A0C8" Count="4" Offset="0x4AA8">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80A8A108" Offset="0x4AE8"/>
+
+        <Texture Name="D_80A8A188" OutName="en_tru_4B68" Format="i8" Width="64" Height="64" Offset="0x4B68"/>
+        <Array Name="D_80A8B188" Count="4" Offset="0x5B68">
+            <Vtx/>
+        </Array>
+        <DList Name="D_80A8B1C8" Offset="0x5BA8"/>
+        <DList Name="D_80A8B238" Offset="0x5C18"/>
+    </File>
+</Root>
--- a/include/functions.h
+++ b/include/functions.h
@ -2162,7 +2162,7 @@ s32 func_80123590(GlobalContext* globalCtx, Actor* actor);
 s32 func_80123810(GlobalContext* globalCtx);
 // void func_80123960(void);
 // void func_801239AC(void);
-// void func_80123AA4(void);
+void func_80123AA4(Player* player, s32 arg1);
 // void func_80123BD4(void);
 // void func_80123C58(void);
 // void func_80123C90(void);
@ -3012,7 +3012,7 @@ s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx);
 // void func_8016A0AC(void);
 s32 func_8016A168(void);
 // void func_8016A178(void);
-// void func_8016A268(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE1 param_6);
+void func_8016A268(GlobalContext* globalCtx, s32 param_2, s32 param_3, s32 param_4, s32 param_5, s32 param_6);
 void Play_Init(GameState* gameState);
 // void func_8016AC10(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10);
 // void func_8016AE1C(void);
@ -3963,7 +3963,7 @@ void func_801A5CFC(u16 sfxId, Vec3f* param_2, u8 param_3, f32* param_4, f32* par
 void func_801A72CC(Vec3f* uParm1);
 void func_801A7328(Vec3f* pos, u16 sfxId);
 // void func_801A7484(void);
-// void func_801A75E8(void);
+void func_801A75E8(u16 sfxId);
 // void func_801A7720(void);
 void func_801A7794(u32 param_1, u32 param_2, u32 param_3);
 // void func_801A7828(void);
--- a/7
+++ b/7
@ -3215,8 +3215,11 @@ beginseg
    name "ovl_En_Tru"
    compress
    include "build/src/overlays/actors/ovl_En_Tru/z_en_tru.o"
-    include "build/data/ovl_En_Tru/ovl_En_Tru.data.o"
-    include "build/data/ovl_En_Tru/ovl_En_Tru.reloc.o"
+    #ifdef NON_MATCHING
+        include "build/src/overlays/actors/ovl_En_Tru/ovl_En_Tru_reloc.o"
+    #else
+        include "build/data/ovl_En_Tru/ovl_En_Tru.reloc.o"
+    #endif
 endseg

 beginseg
--- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c
+++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c
--- a/src/overlays/actors/ovl_En_Tru/z_en_tru.h
+++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.h
@ -6,12 +6,55 @@
 struct EnTru;

 typedef void (*EnTruActionFunc)(struct EnTru*, GlobalContext*);
+typedef s32 (*EnTruUnkFunc)(Actor*, GlobalContext*);
+
+typedef struct {
+    /* 0x00 */ u8 unk_00;
+    /* 0x01 */ u8 unk_01;
+    /* 0x02 */ u8 unk_02;
+    /* 0x04 */ Vec3f unk_04;
+    /* 0x10 */ Vec3f unk_10;
+    /* 0x1C */ Vec3f unk_1C;
+    /* 0x28 */ f32 unk_28;
+    /* 0x2C */ f32 unk_2C;
+} EnTruUnkStruct; // size = 0x30

 typedef struct EnTru {
    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
+    /* 0x0144 */ SkelAnime skelAnime;
    /* 0x0188 */ EnTruActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x7A8];
+    /* 0x018C */ ColliderSphere collider;
+    /* 0x01E4 */ Path* path;
+    /* 0x01E8 */ s32 unk_1E8;
+    /* 0x01EC */ Vec3f unk_1EC;
+    /* 0x01F8 */ Vec3f unk_1F8;
+    /* 0x0204 */ Vec3s unk_204;
+    /* 0x020A */ Vec3s jointTable[27];
+    /* 0x02AC */ Vec3s morphTable[27];
+    /* 0x034E */ u16 unk_34E;
+    /* 0x0350 */ UNK_TYPE1 unk350[0x4];
+    /* 0x0354 */ s32* unk_354;
+    /* 0x0358 */ f32 unk_358;
+    /* 0x035C */ f32 unk_35C;
+    /* 0x0360 */ s16 unk_360;
+    /* 0x0362 */ s16 unk_362;
+    /* 0x0364 */ s16 unk_364;
+    /* 0x0366 */ s16 unk_366;
+    /* 0x0368 */ s16 unk_368;
+    /* 0x036A */ s16 unk_36A;
+    /* 0x036C */ s16 unk_36C;
+    /* 0x036E */ s16 unk_36E;
+    /* 0x0370 */ s16 unk_370;
+    /* 0x0372 */ s16 unk_372;
+    /* 0x0374 */ s16 unk_374;
+    /* 0x0378 */ EnTruUnkFunc unk_378;
+    /* 0x037C */ s32 unk_37C;
+    /* 0x0380 */ UNK_TYPE1 unk380[0x4];
+    /* 0x0384 */ s32 unk_384;
+    /* 0x0388 */ s32 unk_388;
+    /* 0x038C */ s32 unk_38C;
+    /* 0x0390 */ s32 unk_390;
+    /* 0x0394 */ EnTruUnkStruct unk_394[30];
 } EnTru; // size = 0x934

 extern const ActorInit En_Tru_InitVars;
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@ -11247,8 +11247,8 @@
    0x80A88334:("EnTru_Init",),
    0x80A884BC:("EnTru_Destroy",),
    0x80A884E8:("EnTru_Update",),
-    0x80A885B8:("func_80A885B8",),
-    0x80A88698:("func_80A88698",),
+    0x80A885B8:("EnTru_OverrideLimbDraw",),
+    0x80A88698:("EnTru_PostLimbDraw",),
    0x80A886D4:("func_80A886D4",),
    0x80A887E4:("EnTru_Draw",),
    0x80A8B770:("EnTrt_ChangeAnim",),
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@ -12593,8 +12593,7 @@
    0x80A8A188:("D_80A8A188","UNK_TYPE1","",0x1),
    0x80A8B188:("D_80A8B188","UNK_TYPE1","",0x1),
    0x80A8B250:("D_80A8B250","UNK_TYPE4","",0x4),
-    0x80A8B25C:("D_80A8B25C","UNK_TYPE1","",0x1),
-    0x80A8B268:("D_80A8B268","UNK_TYPE1","",0x1),
+    0x80A8B25C:("D_80A8B25C","Color_RGBA8","[6]",0x18),
    0x80A8B280:("D_80A8B280","UNK_TYPE1","",0x1),
    0x80A8B2A0:("D_80A8B2A0","UNK_TYPE1","",0x1),
    0x80A8B2CC:("D_80A8B2CC","UNK_TYPE1","",0x1),
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@ -3872,9 +3872,25 @@ D_0600FEF0 = 0x0600FEF0;

 D_06001F90 = 0x06001F90;
 D_060020C8 = 0x060020C8;
+D_06002BD8 = 0x06002BD8;
+D_06003698 = 0x06003698;
+D_0600446C = 0x0600446C;
+D_06007FA0 = 0x06007FA0;
+D_06009348 = 0x06009348;
+D_0600EEDC = 0x0600EEDC;
+D_0600F9A0 = 0x0600F9A0;
+D_060108AC = 0x060108AC;
+D_06011F88 = 0x06011F88;
+D_06014728 = 0x06014728;
+D_06015CA0 = 0x06015CA0;
+D_06016B4C = 0x06016B4C;
+D_06018FA0 = 0x06018FA0;
+D_060197A0 = 0x060197A0;
+D_06019FA0 = 0x06019FA0;
 D_0601A820 = 0x0601A820;
 D_0601A830 = 0x0601A830;
 D_0601AA60 = 0x0601AA60;
+D_0601B5C4 = 0x0601B5C4;

 // ovl_En_Tru_Mt